add lint test:-confusing-naming

.golangci.yml

@@ -195,9 +195,6 @@ linters-settings:
         # often looks like a red herring, needs investigation
         - name: flag-parameter
           disabled: true
-        # looks like a good linter, needs cleanup
-        - name: confusing-naming
-          disabled: true
         # too pendantic
         - name: function-length
           disabled: true
@@ -280,4 +277,4 @@ run:
     - thrift-0.9.2
     - .*-gen
   skip-files:
-    - ".*.pb.go$"
+    - ".*.pb.go$"

cmd/collector/app/handler/otlp_receiver.go

@@ -44,7 +44,7 @@ var _ component.Host = (*otelHost)(nil) // API check
 // StartOTLPReceiver starts OpenTelemetry OTLP receiver listening on gRPC and HTTP ports.
 func StartOTLPReceiver(options *flags.CollectorOptions, logger *zap.Logger, spanProcessor processor.SpanProcessor, tm *tenancy.Manager) (receiver.Traces, error) {
 	otlpFactory := otlpreceiver.NewFactory()
-	return startOTLPReceiver(
+	return start_OTLP_Receiver(
 		options,
 		logger,
 		spanProcessor,
@@ -58,7 +58,7 @@ func StartOTLPReceiver(options *flags.CollectorOptions, logger *zap.Logger, span
 // Some of OTELCOL constructor functions return errors when passed nil arguments,
 // which is a situation we cannot reproduce. To test our own error handling, this
 // function allows to mock those constructors.
-func startOTLPReceiver(
+func start_OTLP_Receiver(
 	options *flags.CollectorOptions,
 	logger *zap.Logger,
 	spanProcessor processor.SpanProcessor,

cmd/collector/app/handler/otlp_receiver_test.go

@@ -110,7 +110,7 @@ func TestStartOtlpReceiver_Error(t *testing.T) {
 		return nil, errors.New("mock error")
 	}
 	f := otlpreceiver.NewFactory()
-	_, err = startOTLPReceiver(opts, logger, spanProcessor, &tenancy.Manager{}, f, newTraces, f.CreateTracesReceiver)
+	_, err = start_OTLP_Receiver(opts, logger, spanProcessor, &tenancy.Manager{}, f, newTraces, f.CreateTracesReceiver)
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "could not create the OTLP consumer")
 
@@ -119,7 +119,7 @@ func TestStartOtlpReceiver_Error(t *testing.T) {
 	) (receiver.Traces, error) {
 		return nil, errors.New("mock error")
 	}
-	_, err = startOTLPReceiver(opts, logger, spanProcessor, &tenancy.Manager{}, f, consumer.NewTraces, createTracesReceiver)
+	_, err = start_OTLP_Receiver(opts, logger, spanProcessor, &tenancy.Manager{}, f, consumer.NewTraces, createTracesReceiver)
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "could not create the OTLP receiver")
 }

cmd/collector/app/handler/zipkin_receiver.go

@@ -28,7 +28,7 @@ func StartZipkinReceiver(
 	tm *tenancy.Manager,
 ) (receiver.Traces, error) {
 	zipkinFactory := zipkinreceiver.NewFactory()
-	return startZipkinReceiver(
+	return start_Zipk_in_Receiver(
 		options,
 		logger,
 		spanProcessor,
@@ -42,7 +42,7 @@ func StartZipkinReceiver(
 // Some of OTELCOL constructor functions return errors when passed nil arguments,
 // which is a situation we cannot reproduce. To test our own error handling, this
 // function allows to mock those constructors.
-func startZipkinReceiver(
+func start_Zipk_in_Receiver(
 	options *flags.CollectorOptions,
 	logger *zap.Logger,
 	spanProcessor processor.SpanProcessor,

cmd/collector/app/handler/zipkin_receiver_test.go

@@ -148,7 +148,7 @@ func TestStartZipkinReceiver_Error(t *testing.T) {
 		return nil, errors.New("mock error")
 	}
 	f := zipkinreceiver.NewFactory()
-	_, err = startZipkinReceiver(opts, logger, spanProcessor, tm, f, newTraces, f.CreateTracesReceiver)
+	_, err = start_Zipk_in_Receiver(opts, logger, spanProcessor, tm, f, newTraces, f.CreateTracesReceiver)
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "could not create Zipkin consumer")
 
@@ -157,7 +157,7 @@ func TestStartZipkinReceiver_Error(t *testing.T) {
 	) (receiver.Traces, error) {
 		return nil, errors.New("mock error")
 	}
-	_, err = startZipkinReceiver(opts, logger, spanProcessor, tm, f, consumer.NewTraces, createTracesReceiver)
+	_, err = start_Zipk_in_Receiver(opts, logger, spanProcessor, tm, f, consumer.NewTraces, createTracesReceiver)
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "could not create Zipkin receiver")
 }

cmd/collector/app/span_processor.go

@@ -71,7 +71,7 @@ func NewSpanProcessor(
 	additional []ProcessSpan,
 	opts ...Option,
 ) processor.SpanProcessor {
-	sp := newSpanProcessor(spanWriter, additional, opts...)
+	sp := new_Span_Processor(spanWriter, additional, opts...)
 
 	sp.queue.StartConsumers(sp.numWorkers, func(item any) {
 		value := item.(*queueItem)
@@ -87,7 +87,7 @@ func NewSpanProcessor(
 	return sp
 }
 
-func newSpanProcessor(spanWriter spanstore.Writer, additional []ProcessSpan, opts ...Option) *spanProcessor {
+func new_Span_Processor(spanWriter spanstore.Writer, additional []ProcessSpan, opts ...Option) *spanProcessor {
 	options := Options.apply(opts...)
 	handlerMetrics := NewSpanProcessorMetrics(
 		options.serviceMetrics,

cmd/collector/app/span_processor_test.go

@@ -87,7 +87,7 @@ func TestBySvcMetrics(t *testing.T) {
 		logger := zap.NewNop()
 		serviceMetrics := mb.Namespace(metrics.NSOptions{Name: "service", Tags: nil})
 		hostMetrics := mb.Namespace(metrics.NSOptions{Name: "host", Tags: nil})
-		sp := newSpanProcessor(
+		sp := new_Span_Processor(
 			&fakeSpanWriter{},
 			nil,
 			Options.ServiceMetrics(serviceMetrics),
@@ -574,7 +574,7 @@ func TestUpdateDynQueueSize(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			w := &fakeSpanWriter{}
-			p := newSpanProcessor(w, nil, Options.QueueSize(tt.initialCapacity), Options.DynQueueSizeWarmup(tt.warmup), Options.DynQueueSizeMemory(tt.sizeInBytes))
+			p := new_Span_Processor(w, nil, Options.QueueSize(tt.initialCapacity), Options.DynQueueSizeWarmup(tt.warmup), Options.DynQueueSizeMemory(tt.sizeInBytes))
 			assert.EqualValues(t, tt.initialCapacity, p.queue.Capacity())
 
 			p.spansProcessed.Store(tt.spansProcessed)
@@ -588,14 +588,14 @@ func TestUpdateDynQueueSize(t *testing.T) {
 
 func TestUpdateQueueSizeNoActivityYet(t *testing.T) {
 	w := &fakeSpanWriter{}
-	p := newSpanProcessor(w, nil, Options.QueueSize(1), Options.DynQueueSizeWarmup(1), Options.DynQueueSizeMemory(1))
+	p := new_Span_Processor(w, nil, Options.QueueSize(1), Options.DynQueueSizeWarmup(1), Options.DynQueueSizeMemory(1))
 	assert.NotPanics(t, p.updateQueueSize)
 }
 
 func TestStartDynQueueSizeUpdater(t *testing.T) {
 	w := &fakeSpanWriter{}
 	oneGiB := uint(1024 * 1024 * 1024)
-	p := newSpanProcessor(w, nil, Options.QueueSize(100), Options.DynQueueSizeWarmup(1000), Options.DynQueueSizeMemory(oneGiB))
+	p := new_Span_Processor(w, nil, Options.QueueSize(100), Options.DynQueueSizeWarmup(1000), Options.DynQueueSizeMemory(oneGiB))
 	assert.EqualValues(t, 100, p.queue.Capacity())
 
 	p.spansProcessed.Store(1000)

cmd/es-index-cleaner/app/index_filter.go

@@ -39,11 +39,11 @@ type IndexFilter struct {
 
 // Filter filters indices.
 func (i *IndexFilter) Filter(indices []client.Index) []client.Index {
-	indices = i.filter(indices)
+	indices = i.filter_apply(indices)
 	return filter.ByDate(indices, i.DeleteBeforeThisDate)
 }
 
-func (i *IndexFilter) filter(indices []client.Index) []client.Index {
+func (i *IndexFilter) filter_apply(indices []client.Index) []client.Index {
 	var reg *regexp.Regexp
 	switch {
 	case i.Archive:

cmd/es-index-cleaner/app/index_filter_test.go

@@ -24,14 +24,14 @@ import (
 )
 
 func TestIndexFilter(t *testing.T) {
-	testIndexFilter(t, "")
+	test_Index_Filter(t, "")
 }
 
 func TestIndexFilter_prefix(t *testing.T) {
-	testIndexFilter(t, "tenant1-")
+	test_Index_Filter(t, "tenant1-")
 }
 
-func testIndexFilter(t *testing.T, prefix string) {
+func test_Index_Filter(t *testing.T, prefix string) {
 	time20200807 := time.Date(2020, time.August, 0o6, 0, 0, 0, 0, time.UTC).AddDate(0, 0, 1)
 	indices := []client.Index{
 		{

crossdock/services/tracehandler.go

@@ -115,7 +115,7 @@ func (h *TraceHandler) AdaptiveSamplingTest(t crossdock.T) {
 	service := t.Param(servicesParam)
 	h.logger.Info("Starting AdaptiveSampling test", zap.String("service", service))
 
-	if err := h.runTest(service, request, h.adaptiveSamplingTest, validateAdaptiveSamplingTraces); err != nil {
+	if err := h.runTest(service, request, h.adaptive_Sampling_Test, validateAdaptiveSamplingTraces); err != nil {
 		h.logger.Error(err.Error())
 		t.Errorf("Fail: %s", err.Error())
 	} else {
@@ -131,7 +131,7 @@ func (h *TraceHandler) runTest(service string, request *traceRequest, tFunc test
 	return vFunc(request, traces)
 }
 
-func (h *TraceHandler) adaptiveSamplingTest(service string, request *traceRequest) ([]*ui.Trace, error) {
+func (h *TraceHandler) adaptive_Sampling_Test(service string, request *traceRequest) ([]*ui.Trace, error) {
 	stop := make(chan struct{})
 	go h.createTracesLoop(service, *request, stop)
 	defer close(stop)

crossdock/services/tracehandler_test.go

@@ -449,7 +449,7 @@ func TestAdaptiveSamplingTestInternal(t *testing.T) {
 				query.On("GetTraces", "crossdock-svc", "op", mock.Anything).Return([]*ui.Trace{&testTrace}, nil)
 			}
 
-			_, err := handler.adaptiveSamplingTest("svc", &traceRequest{Operation: "op"})
+			_, err := handler.adaptive_Sampling_Test("svc", &traceRequest{Operation: "op"})
 			if test.errMsg != "" {
 				require.EqualError(t, err, test.errMsg)
 			} else {

model/keyvalue.go

@@ -122,15 +122,15 @@ func (kv *KeyValue) Value() any {
 
 // AsStringLossy returns a potentially lossy string representation of the value.
 func (kv *KeyValue) AsStringLossy() string {
-	return kv.asString(true)
+	return kv.as_String(true)
 }
 
 // AsString returns a string representation of the value.
 func (kv *KeyValue) AsString() string {
-	return kv.asString(false)
+	return kv.as_String(false)
 }
 
-func (kv *KeyValue) asString(truncate bool) string {
+func (kv *KeyValue) as_String(truncate bool) string {
 	switch kv.VType {
 	case StringType:
 		return kv.VStr

pkg/clientcfg/clientcfghttp/handler_test.go

@@ -76,14 +76,14 @@ func withServer(
 }
 
 func TestHTTPHandler(t *testing.T) {
-	testHTTPHandler(t, "")
+	test_HTTP_Handler(t, "")
 }
 
 func TestHTTPHandlerWithBasePath(t *testing.T) {
-	testHTTPHandler(t, "/foo")
+	test_HTTP_Handler(t, "/foo")
 }
 
-func testHTTPHandler(t *testing.T, basePath string) {
+func test_HTTP_Handler(t *testing.T, basePath string) {
 	withServer(basePath, rateLimiting(42), restrictions("luggage", 10), func(ts *testServer) {
 		tests := []struct {
 			endpoint  string

plugin/storage/cassandra/spanstore/reader.go

@@ -265,7 +265,7 @@ func (s *SpanReader) FindTraceIDs(ctx context.Context, traceQuery *spanstore.Tra
 		traceQuery.NumTraces = defaultNumTraces
 	}
 
-	dbTraceIDs, err := s.findTraceIDs(ctx, traceQuery)
+	dbTraceIDs, err := s.find_Trace_IDs(ctx, traceQuery)
 	if err != nil {
 		return nil, err
 	}
@@ -280,7 +280,7 @@ func (s *SpanReader) FindTraceIDs(ctx context.Context, traceQuery *spanstore.Tra
 	return traceIDs, nil
 }
 
-func (s *SpanReader) findTraceIDs(ctx context.Context, traceQuery *spanstore.TraceQueryParameters) (dbmodel.UniqueTraceIDs, error) {
+func (s *SpanReader) find_Trace_IDs(ctx context.Context, traceQuery *spanstore.TraceQueryParameters) (dbmodel.UniqueTraceIDs, error) {
 	if traceQuery.DurationMin != 0 || traceQuery.DurationMax != 0 {
 		return s.queryByDuration(ctx, traceQuery)
 	}

plugin/storage/cassandra/spanstore/writer.go

@@ -141,7 +141,7 @@ func (s *SpanWriter) Close() error {
 func (s *SpanWriter) WriteSpan(ctx context.Context, span *model.Span) error {
 	ds := dbmodel.FromDomain(span)
 	if s.storageMode&storeFlag == storeFlag {
-		if err := s.writeSpan(span, ds); err != nil {
+		if err := s.write_Span(span, ds); err != nil {
 			return err
 		}
 	}
@@ -153,7 +153,7 @@ func (s *SpanWriter) WriteSpan(ctx context.Context, span *model.Span) error {
 	return nil
 }
 
-func (s *SpanWriter) writeSpan(span *model.Span, ds *dbmodel.Span) error {
+func (s *SpanWriter) write_Span(span *model.Span, ds *dbmodel.Span) error {
 	mainQuery := s.session.Query(
 		insertSpan,
 		ds.TraceID,

plugin/storage/es/dependencystore/storage.go

@@ -78,7 +78,7 @@ func prefixIndexName(prefix, index string) string {
 // WriteDependencies implements dependencystore.Writer#WriteDependencies.
 func (s *DependencyStore) WriteDependencies(ts time.Time, dependencies []model.DependencyLink) error {
 	writeIndexName := s.getWriteIndex(ts)
-	s.writeDependencies(writeIndexName, ts, dependencies)
+	s.write_Dependencies(writeIndexName, ts, dependencies)
 	return nil
 }
 
@@ -91,7 +91,7 @@ func (s *DependencyStore) CreateTemplates(dependenciesTemplate string) error {
 	return nil
 }
 
-func (s *DependencyStore) writeDependencies(indexName string, ts time.Time, dependencies []model.DependencyLink) {
+func (s *DependencyStore) write_Dependencies(indexName string, ts time.Time, dependencies []model.DependencyLink) {
 	s.client().Index().Index(indexName).Type(dependencyType).
 		BodyJson(&dbmodel.TimeDependencies{
 			Timestamp:    ts,

plugin/storage/es/factory_test.go

@@ -336,12 +336,12 @@ func TestPasswordFromFile(t *testing.T) {
 	defer testutils.VerifyGoLeaksOnce(t)
 	t.Run("primary client", func(t *testing.T) {
 		f := NewFactory()
-		testPasswordFromFile(t, f, f.getPrimaryClient, f.CreateSpanWriter)
+		test_Password_From_File(t, f, f.getPrimaryClient, f.CreateSpanWriter)
 	})
 
 	t.Run("archive client", func(t *testing.T) {
 		f2 := NewFactory()
-		testPasswordFromFile(t, f2, f2.getArchiveClient, f2.CreateArchiveSpanWriter)
+		test_Password_From_File(t, f2, f2.getArchiveClient, f2.CreateArchiveSpanWriter)
 	})
 
 	t.Run("load token error", func(t *testing.T) {
@@ -352,7 +352,7 @@ func TestPasswordFromFile(t *testing.T) {
 	})
 }
 
-func testPasswordFromFile(t *testing.T, f *Factory, getClient func() es.Client, getWriter func() (spanstore.Writer, error)) {
+func test_Password_From_File(t *testing.T, f *Factory, getClient func() es.Client, getWriter func() (spanstore.Writer, error)) {
 	const (
 		pwd1 = "first password"
 		pwd2 = "second password"

plugin/storage/es/spanstore/dbmodel/to_domain_test.go

@@ -32,13 +32,13 @@ import (
 )
 
 func TestToDomain(t *testing.T) {
-	testToDomain(t, false)
-	testToDomain(t, true)
+	test_To_Domain(t, false)
+	test_To_Domain(t, true)
 	// this is just to confirm the uint64 representation of float64(72.5) used as a "temperature" tag
 	assert.Equal(t, int64(4634802150889750528), int64(math.Float64bits(72.5)))
 }
 
-func testToDomain(t *testing.T, testParentSpanID bool) {
+func test_To_Domain(t *testing.T, testParentSpanID bool) {
 	for i := 1; i <= NumberOfFixtures; i++ {
 		span, err := loadESSpanFixture(i)
 		require.NoError(t, err)

plugin/storage/es/spanstore/reader.go

@@ -354,7 +354,7 @@ func (s *SpanReader) FindTraceIDs(ctx context.Context, traceQuery *spanstore.Tra
 		traceQuery.NumTraces = defaultNumTraces
 	}
 
-	esTraceIDs, err := s.findTraceIDs(ctx, traceQuery)
+	esTraceIDs, err := s.find_TraceIDs(ctx, traceQuery)
 	if err != nil {
 		return nil, err
 	}
@@ -514,7 +514,7 @@ func validateQuery(p *spanstore.TraceQueryParameters) error {
 	return nil
 }
 
-func (s *SpanReader) findTraceIDs(ctx context.Context, traceQuery *spanstore.TraceQueryParameters) ([]string, error) {
+func (s *SpanReader) find_TraceIDs(ctx context.Context, traceQuery *spanstore.TraceQueryParameters) ([]string, error) {
 	ctx, childSpan := s.tracer.Start(ctx, "findTraceIDs")
 	defer childSpan.End()
 	//  Below is the JSON body to our HTTP GET request to ElasticSearch. This function creates this.

plugin/storage/es/spanstore/reader_test.go

@@ -696,7 +696,7 @@ func returnSearchFunc(typ string, r *spanReaderTest) (any, error) {
 			spanstore.OperationQueryParameters{ServiceName: "someService"},
 		)
 	case traceIDAggregation:
-		return r.reader.findTraceIDs(context.Background(), &spanstore.TraceQueryParameters{})
+		return r.reader.find_TraceIDs(context.Background(), &spanstore.TraceQueryParameters{})
 	}
 	return nil, errors.New("Specify services, operations, traceIDs only")
 }

plugin/storage/es/spanstore/writer.go

@@ -142,7 +142,7 @@ func (s *SpanWriter) WriteSpan(_ context.Context, span *model.Span) error {
 	if serviceIndexName != "" {
 		s.writeService(serviceIndexName, jsonSpan)
 	}
-	s.writeSpan(spanIndexName, jsonSpan)
+	s.write_Span(spanIndexName, jsonSpan)
 	return nil
 }
 
@@ -163,6 +163,6 @@ func (s *SpanWriter) writeService(indexName string, jsonSpan *dbmodel.Span) {
 	s.serviceWriter(indexName, jsonSpan)
 }
 
-func (s *SpanWriter) writeSpan(indexName string, jsonSpan *dbmodel.Span) {
+func (s *SpanWriter) write_Span(indexName string, jsonSpan *dbmodel.Span) {
 	s.client().Index().Index(indexName).Type(spanType).BodyJson(&jsonSpan).Add()
 }

plugin/storage/es/spanstore/writer_test.go

@@ -327,7 +327,7 @@ func TestWriteSpanInternal(t *testing.T) {
 
 		jsonSpan := &dbmodel.Span{}
 
-		w.writer.writeSpan(indexName, jsonSpan)
+		w.writer.write_Span(indexName, jsonSpan)
 		indexService.AssertNumberOfCalls(t, "Add", 1)
 		assert.Equal(t, "", w.logBuffer.String())
 	})
@@ -350,7 +350,7 @@ func TestWriteSpanInternalError(t *testing.T) {
 			SpanID:  dbmodel.SpanID("0"),
 		}
 
-		w.writer.writeSpan(indexName, jsonSpan)
+		w.writer.write_Span(indexName, jsonSpan)
 		indexService.AssertNumberOfCalls(t, "Add", 1)
 	})
 }