chore(linter): Fix issues flagged by updated golangci-lint version (#19206)

Author: sophiewaldman

clients/cmd/docker-driver/config_test.go

@@ -87,7 +87,7 @@ func Test_parsePipeline(t *testing.T) {
 	}
 	defer os.Remove(f.Name())
 
-	_, err = f.Write([]byte(fmt.Sprintf("pipeline_stages:\n%s", pipelineString)))
+	_, err = fmt.Fprintf(f, "pipeline_stages:\n%s", pipelineString)
 	if err != nil {
 		t.Fatal(err)
 	}

clients/cmd/promtail/main.go

@@ -103,11 +103,11 @@ func main() {
 	}
 
 	// Init the logger which will honor the log level set in cfg.Server
-	if reflect.DeepEqual(&config.Config.ServerConfig.Config.LogLevel, &log.Level{}) {
+	if reflect.DeepEqual(&config.ServerConfig.LogLevel, &log.Level{}) {
 		fmt.Println("Invalid log level")
 		exit(1)
 	}
-	serverCfg := &config.Config.ServerConfig.Config
+	serverCfg := &config.ServerConfig.Config
 	serverCfg.Log = util_log.InitLogger(serverCfg, prometheus.DefaultRegisterer, false)
 
 	// Use Stderr instead of files for the klog.
@@ -119,7 +119,7 @@ func main() {
 
 	// Set the global debug variable in the stages package which is used to conditionally log
 	// debug messages which otherwise cause huge allocations processing log lines for log messages never printed
-	if config.Config.ServerConfig.Config.LogLevel.String() == "debug" {
+	if config.ServerConfig.LogLevel.String() == "debug" {
 		stages.Debug = true
 	}
 

clients/pkg/logentry/stages/decolorize.go

@@ -19,10 +19,10 @@ func (m *decolorizeStage) Run(in chan Entry) chan Entry {
 		for e := range in {
 			decolorizedLine, _ := decolorizer.Process(
 				e.Timestamp.Unix(),
-				[]byte(e.Entry.Line),
+				[]byte(e.Line),
 				nil,
 			)
-			e.Entry.Line = string(decolorizedLine)
+			e.Line = string(decolorizedLine)
 			out <- e
 		}
 	}()

clients/pkg/logentry/stages/eventlogmessage.go

@@ -155,7 +155,7 @@ func SanitizeFullLabelName(input string) string {
 	}
 	var validSb strings.Builder
 	for i, b := range input {
-		if !((b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z') || b == '_' || (b >= '0' && b <= '9' && i > 0)) {
+		if (b < 'a' || b > 'z') && (b < 'A' || b > 'Z') && b != '_' && (b < '0' || b > '9' || i <= 0) {
 			validSb.WriteRune('_')
 		} else {
 			validSb.WriteRune(b)

clients/pkg/logentry/stages/geoip.go

@@ -111,7 +111,7 @@ func (g *geoIPStage) Run(in chan Entry) chan Entry {
 		defer close(out)
 		defer g.close()
 		for e := range in {
-			g.process(e.Labels, e.Extracted, &e.Timestamp, &e.Entry.Line)
+			g.process(e.Labels, e.Extracted, &e.Timestamp, &e.Line)
 			out <- e
 		}
 	}()

clients/pkg/logentry/stages/labels_test.go

@@ -69,7 +69,7 @@ func TestLabelsPipelineWithMissingKey_Labels(t *testing.T) {
 
 	_ = processEntries(pl, newEntry(nil, nil, testLabelsLogLineWithMissingKey, time.Now()))
 
-	expectedLog := "level=debug msg=\"failed to convert extracted label value to string\" err=\"Can't convert <nil> to string\" type=null"
+	expectedLog := "level=debug msg=\"failed to convert extracted label value to string\" err=\"can't convert <nil> to string\" type=null"
 	if !(strings.Contains(buf.String(), expectedLog)) {
 		t.Errorf("\nexpected: %s\n+actual: %s", expectedLog, buf.String())
 	}

clients/pkg/logentry/stages/limit_test.go

@@ -124,11 +124,12 @@ func TestLimitByLabelPipeline(t *testing.T) {
 	var hasTotal, hasByLabel bool
 	mfs, _ := registry.Gather()
 	for _, mf := range mfs {
-		if *mf.Name == "logentry_dropped_lines_total" {
+		switch *mf.Name {
+		case "logentry_dropped_lines_total":
 			hasTotal = true
 			assert.Len(t, mf.Metric, 1)
 			assert.Equal(t, 8, int(mf.Metric[0].Counter.GetValue()))
-		} else if *mf.Name == "logentry_dropped_lines_by_label_total" {
+		case "logentry_dropped_lines_by_label_total":
 			hasByLabel = true
 			assert.Len(t, mf.Metric, 2)
 			assert.Equal(t, 4, int(mf.Metric[0].Counter.GetValue()))

clients/pkg/logentry/stages/multiline.go

@@ -212,9 +212,9 @@ func (m *multilineStage) flush(out chan Entry, s *multilineState) {
 	collapsed := Entry{
 		Extracted: extracted,
 		Entry: api.Entry{
-			Labels: s.startLineEntry.Entry.Labels.Clone(),
+			Labels: s.startLineEntry.Labels.Clone(),
 			Entry: logproto.Entry{
-				Timestamp: s.startLineEntry.Entry.Entry.Timestamp,
+				Timestamp: s.startLineEntry.Timestamp,
 				Line:      s.buffer.String(),
 			},
 		},

clients/pkg/logentry/stages/output_test.go

@@ -63,7 +63,7 @@ func TestPipelineWithMissingKey_Output(t *testing.T) {
 	}
 	Debug = true
 	_ = processEntries(pl, newEntry(nil, nil, testOutputLogLineWithMissingKey, time.Now()))
-	expectedLog := "level=debug msg=\"extracted output could not be converted to a string\" err=\"Can't convert <nil> to string\" type=null"
+	expectedLog := "level=debug msg=\"extracted output could not be converted to a string\" err=\"can't convert <nil> to string\" type=null"
 	if !(strings.Contains(buf.String(), expectedLog)) {
 		t.Errorf("\nexpected: %s\n+actual: %s", expectedLog, buf.String())
 	}

clients/pkg/logentry/stages/pack_test.go

@@ -83,7 +83,7 @@ func TestPackPipeline(t *testing.T) {
 
 	// Unmarshal the packed object and validate line1
 	w := &Packed{}
-	assert.NoError(t, json.Unmarshal([]byte(out1.Entry.Entry.Line), w))
+	assert.NoError(t, json.Unmarshal([]byte(out1.Line), w))
 	expectedPackedLabels := map[string]string{
 		"pod":       "foo-xsfs3",
 		"container": "foo",
@@ -93,7 +93,7 @@ func TestPackPipeline(t *testing.T) {
 
 	// Validate line 2
 	w = &Packed{}
-	assert.NoError(t, json.Unmarshal([]byte(out2.Entry.Entry.Line), w))
+	assert.NoError(t, json.Unmarshal([]byte(out2.Line), w))
 	expectedPackedLabels = map[string]string{
 		"pod":       "foo-vvsdded",
 		"container": "bar",