fix lint

Author: DmitryRomanov

playground/playground.go

@@ -270,7 +270,7 @@ func preparePipelineLogger(buf *bytes.Buffer, onFatal zapcore.CheckWriteHook) *z
 func formatMetricFamily(families []*dto.MetricFamily) string {
 	b := new(bytes.Buffer)
 	for _, f := range families {
-		_ = expfmt.NewEncoder(b, expfmt.FmtOpenMetrics).Encode(f)
+		_ = expfmt.NewEncoder(b, expfmt.NewFormat(expfmt.TypeOpenMetrics)).Encode(f)
 		b.WriteString("\n")
 	}
 	return b.String()

plugin/action/event_to_metrics/event_to_metrics.go

@@ -330,23 +330,25 @@ func (p *Plugin) Stop() {
 
 func (p *Plugin) Do(event *pipeline.Event) pipeline.ActionResult {
 	p.mu.Lock()
-	copyMetrics := make([]Metric, 0, len(p.Metrics))
+	metricIndices := make([]int, 0, len(p.Metrics))
 	for i := range p.Metrics {
-		if p.Metrics[i].DoIfChecker == nil {
-			copyMetrics = append(copyMetrics, p.Metrics[i])
-		} else {
-			if !p.config.Metrics[i].DoIfChecker.Check(event.Root) {
-				continue
-			}
-			copyMetrics = append(copyMetrics, p.Metrics[i])
-		}
-		if p.Metrics[i].Labels != nil {
-			copyMetrics[len(copyMetrics)-1].Labels = make(map[string]string, len(p.Metrics[i].Labels))
-			maps.Copy(copyMetrics[len(copyMetrics)-1].Labels, p.Metrics[i].Labels)
+		if p.Metrics[i].DoIfChecker == nil || p.config.Metrics[i].DoIfChecker.Check(event.Root) {
+			metricIndices = append(metricIndices, i)
 		}
 	}
 	p.mu.Unlock()
 
+	copyMetrics := make([]Metric, 0, len(metricIndices))
+	for _, idx := range metricIndices {
+		metric := p.Metrics[idx]
+		if metric.Labels != nil {
+			labels := make(map[string]string, len(metric.Labels))
+			maps.Copy(labels, metric.Labels)
+			metric.Labels = labels
+		}
+		copyMetrics = append(copyMetrics, metric)
+	}
+
 	var ts time.Time
 
 	if len(p.config.TimeField_) != 0 {
@@ -368,7 +370,8 @@ func (p *Plugin) Do(event *pipeline.Event) pipeline.ActionResult {
 	}
 
 	children := make([]*insaneJSON.Node, 0, len(copyMetrics))
-	for _, metric := range copyMetrics {
+	for i := range copyMetrics {
+		metric := &copyMetrics[i]
 		elem := new(insaneJSON.Node)
 		object := elem.MutateToObject()
 

plugin/action/event_to_metrics/event_to_metrics_test.go

@@ -48,8 +48,8 @@ func TestEventToMetrics(t *testing.T) {
 	wrongEventsCnt := 0
 	outWg := sync.WaitGroup{}
 	outWg.Add(len(config.Metrics))
-	output.SetOutFn(func(e *pipeline.Event) {
 
+	output.SetOutFn(func(e *pipeline.Event) {
 		message := e.Root
 
 		metricName := message.Dig("name").AsString()
@@ -62,17 +62,17 @@ func TestEventToMetrics(t *testing.T) {
 		ttl := e.Root.Dig("ttl").AsInt64()
 		value := e.Root.Dig("value").AsFloat()
 
-		if metricName == "status" {
+		switch metricName {
+		case "status":
 			assert.Equal(t, "counter", metricType)
 			assert.Equal(t, (1 * time.Hour).Milliseconds(), ttl)
 			assert.Equal(t, float64(1), value)
-		} else if metricName == "checkout_response_time" {
+		case "checkout_response_time":
 			assert.Equal(t, "gauge", metricType)
 			assert.Equal(t, int64(0), ttl)
 			assert.Equal(t, float64(0.1), value)
-		} else {
-			fmt.Println("unkown metric name", metricName)
-			return
+		default:
+			assert.Fail(t, "unknown metric name", metricName)
 		}
 
 		assert.Equal(t, now.UnixMilli(), timestamp)

plugin/output/prometheus/metric_collector.go

@@ -48,8 +48,6 @@ func newCollector(sender storageSender, flushTimeout time.Duration, logger *zap.
 	return c
 }
 
-var i int
-
 func (p *metricCollector) handleMetric(labels []promwrite.Label, value float64, timestamp int64, metricType string, ttl int64) {
 	key := labelsToKey(labels)
 	now := time.Now()
@@ -149,7 +147,7 @@ func createTimeSeries(labels []promwrite.Label, metric *metricValue, roundPeriod
 }
 
 func keyToLabels(key string) []promwrite.Label {
-	if len(key) == 0 {
+	if key == "" {
 		return nil
 	}
 	key = key[:len(key)-1] // Remove trailing comma

plugin/output/prometheus/metric_collector_test.go

@@ -37,12 +37,6 @@ func (t *TestStorageSender) reset() {
 	t.returnError = nil
 }
 
-func (t *TestStorageSender) setError(err error) {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	t.returnError = err
-}
-
 func TestMetricCollector(t *testing.T) {
 	t.Run("labelsToKey and keyToLabels roundtrip", func(t *testing.T) {
 		labels := []promwrite.Label{

plugin/output/prometheus/prometheus.go

@@ -25,10 +25,6 @@ const (
 	outPluginType = "prometheus"
 )
 
-type data struct {
-	outBuf []byte
-}
-
 type Label struct {
 	Label string `json:"label" required:"true"`
 	Value string `json:"value" required:"true"`

plugin/output/prometheus/prometheus_test.go

@@ -66,8 +66,6 @@ func (m *mockPrometheus) reset() {
 
 // mockController implements pipeline.OutputPluginController for testing
 type mockController struct {
-	mu          sync.Mutex
-	commitCount int
 }
 
 func (m *mockController) Commit(_ *pipeline.Event) {}