staticcheck fixes

aldas · aldas · commit 311eae359248 · 2021-09-17T22:51:44.000+03:00
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ format: ## Format the source code
 	@find ./ -type f -name "*.go" -exec gofmt -w {} \;
 
 lint: ## Lint the files
-	@staticcheck
+	@staticcheck -tests=false ${PKG_LIST}
 
 vet: ## Vet the files
 	@go vet ${PKG_LIST}
diff --git a/go.mod b/go.mod
@@ -18,4 +18,3 @@ require (
 	github.com/uber/jaeger-client-go v2.25.0+incompatible
 	github.com/uber/jaeger-lib v2.4.0+incompatible // indirect
 )
-
diff --git a/jaegertracing/jaegertracing.go b/jaegertracing/jaegertracing.go
@@ -193,7 +193,7 @@ func TraceWithConfig(config TraceConfig) echo.MiddlewareFunc {
 
 				// Dump response body
 				if config.IsBodyDump {
-					sp.SetTag("http.resp.body", string(resBody.Bytes()))
+					sp.SetTag("http.resp.body", resBody.String())
 				}
 
 				sp.Finish()
diff --git a/prometheus/prometheus.go b/prometheus/prometheus.go
@@ -133,6 +133,7 @@ type Prometheus struct {
 // PushGateway contains the configuration for pushing to a Prometheus pushgateway (optional)
 type PushGateway struct {
 	// Push interval in seconds
+	//lint:ignore ST1011 renaming would be breaking change
 	PushIntervalSeconds time.Duration
 
 	// Push Gateway URL in format http://domain:port
@@ -156,9 +157,7 @@ func NewPrometheus(subsystem string, skipper middleware.Skipper, customMetricsLi
 		metricsList = customMetricsList[0]
 	}
 
-	for _, metric := range standardMetrics {
-		metricsList = append(metricsList, metric)
-	}
+	metricsList = append(metricsList, standardMetrics...)
 
 	p := &Prometheus{
 		MetricsList: metricsList,
@@ -179,10 +178,10 @@ func NewPrometheus(subsystem string, skipper middleware.Skipper, customMetricsLi
 }
 
 // SetPushGateway sends metrics to a remote pushgateway exposed on pushGatewayURL
-// every pushIntervalSeconds. Metrics are fetched from
-func (p *Prometheus) SetPushGateway(pushGatewayURL string, pushIntervalSeconds time.Duration) {
+// every pushInterval. Metrics are fetched from
+func (p *Prometheus) SetPushGateway(pushGatewayURL string, pushInterval time.Duration) {
 	p.Ppg.PushGatewayURL = pushGatewayURL
-	p.Ppg.PushIntervalSeconds = pushIntervalSeconds
+	p.Ppg.PushIntervalSeconds = pushInterval
 	p.startPushTicker()
 }
 
@@ -245,6 +244,10 @@ func (p *Prometheus) getPushGatewayURL() string {
 
 func (p *Prometheus) sendMetricsToPushGateway(metrics []byte) {
 	req, err := http.NewRequest("POST", p.getPushGatewayURL(), bytes.NewBuffer(metrics))
+	if err != nil {
+		log.Errorf("failed to create push gateway request: %v", err)
+		return
+	}
 	client := &http.Client{}
 	if _, err = client.Do(req); err != nil {
 		log.Errorf("Error sending to push gateway: %v", err)
diff --git a/zipkintracing/response_writer.go b/zipkintracing/response_writer.go
@@ -101,5 +101,6 @@ func (rw *responseWriter) Flush() {
 }
 
 func (rw *responseWriter) CloseNotify() <-chan bool {
+	//lint:ignore SA1019 we support it for backwards compatibility reasons
 	return rw.ResponseWriter.(http.CloseNotifier).CloseNotify()
 }

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,3 @@ require (`
`18`	`18`	`github.com/uber/jaeger-client-go v2.25.0+incompatible`
`19`	`19`	`github.com/uber/jaeger-lib v2.4.0+incompatible // indirect`
`20`	`20`	`)`
`21`		`-`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ func TraceWithConfig(config TraceConfig) echo.MiddlewareFunc {`
`193`	`193`
`194`	`194`	`// Dump response body`
`195`	`195`	`if config.IsBodyDump {`
`196`		`- sp.SetTag("http.resp.body", string(resBody.Bytes()))`
	`196`	`+ sp.SetTag("http.resp.body", resBody.String())`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`sp.Finish()`
Original file line number	Diff line number	Diff line change
`@@ -101,5 +101,6 @@ func (rw *responseWriter) Flush() {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`func (rw *responseWriter) CloseNotify() <-chan bool {`
	`104`	`+ //lint:ignore SA1019 we support it for backwards compatibility reasons`
`104`	`105`	`return rw.ResponseWriter.(http.CloseNotifier).CloseNotify()`
`105`	`106`	`}`