Skip to content

Commit

Permalink
Fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
liustanley committed Jan 24, 2025
1 parent 369e77f commit cbda996
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions comp/otelcol/status/statusimpl/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func (s statusProvider) getStatusInfo() map[string]interface{} {
return statusInfo
}

func getPrometheusUrl(extensionResp ddflareextension.Response) (string, error) {
func getPrometheusURL(extensionResp ddflareextension.Response) (string, error) {
var runtimeConfig prometheusRuntimeConfig
if err := yaml.Unmarshal([]byte(extensionResp.RuntimeConfig), &runtimeConfig); err != nil {
return "", err
Expand All @@ -147,8 +147,8 @@ func getPrometheusUrl(extensionResp ddflareextension.Response) (string, error) {
return fmt.Sprintf("http://%v:%d/metrics", prometheusHost, prometheusPort), nil
}

func (s statusProvider) populatePrometheusStatus(c *http.Client, prometheusUrl string) error {
resp, err := apiutil.DoGet(c, prometheusUrl, apiutil.CloseConnection)
func (s statusProvider) populatePrometheusStatus(c *http.Client, prometheusURL string) error {
resp, err := apiutil.DoGet(c, prometheusURL, apiutil.CloseConnection)
if err != nil {
return err
}
Expand Down Expand Up @@ -190,33 +190,33 @@ func (s statusProvider) populatePrometheusStatus(c *http.Client, prometheusUrl s
}

func (s statusProvider) populateStatus() map[string]interface{} {
extensionUrl := s.Config.GetString("otelcollector.extension_url")
extensionURL := s.Config.GetString("otelcollector.extension_url")
c := client()
resp, err := apiutil.DoGet(c, extensionUrl, apiutil.CloseConnection)
resp, err := apiutil.DoGet(c, extensionURL, apiutil.CloseConnection)
if err != nil {
return map[string]interface{}{
"url": extensionUrl,
"url": extensionURL,
"error": err.Error(),
}
}
var extensionResp ddflareextension.Response
if err = json.Unmarshal(resp, &extensionResp); err != nil {
return map[string]interface{}{
"url": extensionUrl,
"url": extensionURL,
"error": err.Error(),
}
}
prometheusUrl, err := getPrometheusUrl(extensionResp)
prometheusURL, err := getPrometheusURL(extensionResp)
if err != nil {
return map[string]interface{}{
"url": extensionUrl,
"url": extensionURL,
"error": err.Error(),
}
}
err = s.populatePrometheusStatus(c, prometheusUrl)
err = s.populatePrometheusStatus(c, prometheusURL)
if err != nil {
return map[string]interface{}{
"url": prometheusUrl,
"url": prometheusURL,
"error": err.Error(),
}
}
Expand Down

0 comments on commit cbda996

Please sign in to comment.