make linter happy

Author: pashagolub

docker/Dockerfile

@@ -42,6 +42,7 @@ FROM go-deps AS go-builder
 ARG VERSION
 ARG GIT_HASH
 ARG GIT_TIME
+ARG GO_TAGS
 
 # Copy source code
 COPY . .
@@ -50,7 +51,7 @@ COPY --from=webui-builder /webserver/build ./internal/webserver/build
 
 # Generate protobuf and build the application
 RUN go generate ./api/pb/ && \
-    CGO_ENABLED=0 go build -ldflags "\
+    CGO_ENABLED=0 go build -tags "${GO_TAGS}" -ldflags "\
         -X 'main.commit=${GIT_HASH}' \
         -X 'main.date=${GIT_TIME}' \
         -X 'main.version=${VERSION}'" ./cmd/pgwatch

internal/reaper/source_reaper.go

@@ -46,11 +46,11 @@ func (sr *SourceReaper) activeMetrics() map[string]time.Duration {
 	if sr.md.IsInRecovery && len(sr.md.MetricsStandby) > 0 {
 		src = sr.md.MetricsStandby
 	}
-	copy := make(map[string]time.Duration, len(src))
+	c := make(map[string]time.Duration, len(src))
 	for k, v := range src {
-		copy[k] = time.Duration(v) * time.Second
+		c[k] = time.Duration(v) * time.Second
 	}
-	return copy
+	return c
 }
 
 // GCDSlice computes GCD across a slice. Returns 0 for empty input.

internal/reaper/source_reaper_integration_test.go

@@ -67,7 +67,7 @@ func TestIntegration_ExecuteBatch(t *testing.T) {
 		delete(metricDefs.MetricDefs, "integ_uptime")
 	}()
 
-	md.Source.Metrics = metrics.MetricIntervals{
+	md.Metrics = metrics.MetricIntervals{
 		"integ_version": 30,
 		"integ_uptime":  60,
 	}
@@ -131,7 +131,7 @@ func TestIntegration_SourceReaper_RunCollectsMetrics(t *testing.T) {
 		delete(metricDefs.MetricDefs, "integ_run_size")
 	}()
 
-	md.Source.Metrics = metrics.MetricIntervals{
+	md.Metrics = metrics.MetricIntervals{
 		"integ_run_version": 5,
 		"integ_run_size":    5,
 	}

internal/reaper/source_reaper_test.go

@@ -310,7 +310,7 @@ func TestSourceReaper_FetchSpecialMetric(t *testing.T) {
 	t.Run("metric not found in definitions", func(t *testing.T) {
 		sr, _, mock := newSR(t)
 		defer mock.Close()
-		sr.fetchSpecialMetric(ctx, "no_such_special_xyz")
+		assert.NoError(t, sr.fetchSpecialMetric(ctx, "no_such_special_xyz"))
 		select {
 		case <-sr.reaper.measurementCh:
 			t.Error("expected no measurement")
@@ -324,7 +324,7 @@ func TestSourceReaper_FetchSpecialMetric(t *testing.T) {
 		defer mock.Close()
 		metricDefs.MetricDefs["sp_primary_only"] = metrics.Metric{NodeStatus: "primary"}
 		md.IsInRecovery = true
-		sr.fetchSpecialMetric(ctx, "sp_primary_only")
+		assert.NoError(t, sr.fetchSpecialMetric(ctx, "sp_primary_only"))
 		select {
 		case <-sr.reaper.measurementCh:
 			t.Error("expected no measurement for primary-only on standby")
@@ -338,7 +338,7 @@ func TestSourceReaper_FetchSpecialMetric(t *testing.T) {
 		defer mock.Close()
 		metricDefs.MetricDefs["sp_standby_only"] = metrics.Metric{NodeStatus: "standby"}
 		md.IsInRecovery = false
-		sr.fetchSpecialMetric(ctx, "sp_standby_only")
+		assert.NoError(t, sr.fetchSpecialMetric(ctx, "sp_standby_only"))
 		select {
 		case <-sr.reaper.measurementCh:
 			t.Error("expected no measurement for standby-only on primary")
@@ -352,7 +352,7 @@ func TestSourceReaper_FetchSpecialMetric(t *testing.T) {
 		defer mock.Close()
 		metricDefs.MetricDefs[specialMetricInstanceUp] = metrics.Metric{}
 		mock.ExpectPing()
-		sr.fetchSpecialMetric(ctx, specialMetricInstanceUp)
+		assert.NoError(t, sr.fetchSpecialMetric(ctx, specialMetricInstanceUp))
 		select {
 		case msg := <-sr.reaper.measurementCh:
 			assert.Equal(t, specialMetricInstanceUp, msg.MetricName)
@@ -369,7 +369,7 @@ func TestSourceReaper_FetchSpecialMetric(t *testing.T) {
 		defer mock.Close()
 		metricDefs.MetricDefs[specialMetricInstanceUp] = metrics.Metric{StorageName: "infra_up"}
 		mock.ExpectPing()
-		sr.fetchSpecialMetric(ctx, specialMetricInstanceUp)
+		assert.NoError(t, sr.fetchSpecialMetric(ctx, specialMetricInstanceUp))
 		select {
 		case msg := <-sr.reaper.measurementCh:
 			assert.Equal(t, "infra_up", msg.MetricName)
@@ -386,7 +386,7 @@ func TestSourceReaper_FetchSpecialMetric(t *testing.T) {
 		for _, name := range []string{"sproc_hashes", "table_hashes", "index_hashes", "configuration_hashes", "privilege_hashes"} {
 			delete(metricDefs.MetricDefs, name)
 		}
-		sr.fetchSpecialMetric(ctx, specialMetricChangeEvents)
+		assert.NoError(t, sr.fetchSpecialMetric(ctx, specialMetricChangeEvents))
 		select {
 		case <-sr.reaper.measurementCh:
 			t.Error("expected no measurement when no changes detected")