From b3045aac68045e8b3b1ae9d54764b82c0b02ddca Mon Sep 17 00:00:00 2001 From: Benedikt Bongartz Date: Thu, 31 Aug 2023 02:54:43 +0200 Subject: [PATCH] [receiver/jaegerreceiver] fix linting Signed-off-by: Benedikt Bongartz --- receiver/jaegerreceiver/factory.go | 1 + .../internal/clientcfghttp/cfgmgr_test.go | 9 ++++----- .../internal/clientcfghttp/handler.go | 1 - .../internal/clientcfghttp/thrift-0.9.2/ttypes.go | 1 + .../internal/configmanager/grpc/manager.go | 3 +-- .../internal/configmanager/metrics.go | 2 +- .../jaegerreceiverdeprecated/internal/httpserver/srv.go | 3 +-- .../internal/sampling/grpc_handler_test.go | 7 +++---- .../internal/sampling/strategystore/factory.go | 3 +-- .../internal/jaegerreceiverdeprecated/trace_receiver.go | 2 -- 10 files changed, 13 insertions(+), 19 deletions(-) diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go index 4834e0943df8..4ad73e005368 100644 --- a/receiver/jaegerreceiver/factory.go +++ b/receiver/jaegerreceiver/factory.go @@ -104,6 +104,7 @@ func createTracesReceiver( cfg component.Config, nextConsumer consumer.Traces, ) (receiver.Traces, error) { + logDeprecation(set.Logger) // Convert settings in the source config to configuration struct // that Jaeger receiver understands. diff --git a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/clientcfghttp/cfgmgr_test.go b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/clientcfghttp/cfgmgr_test.go index 7e6b9e26e98a..e510385c5527 100644 --- a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/clientcfghttp/cfgmgr_test.go +++ b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/clientcfghttp/cfgmgr_test.go @@ -22,18 +22,17 @@ import ( "errors" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "github.com/jaegertracing/jaeger/thrift-gen/baggage" "github.com/jaegertracing/jaeger/thrift-gen/sampling" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) type mockSamplingStore struct { samplingResponse *sampling.SamplingStrategyResponse } -func (m *mockSamplingStore) GetSamplingStrategy(_ context.Context, serviceName string) (*sampling.SamplingStrategyResponse, error) { +func (m *mockSamplingStore) GetSamplingStrategy(_ context.Context, _ string) (*sampling.SamplingStrategyResponse, error) { if m.samplingResponse == nil { return nil, errors.New("no mock response provided") } @@ -44,7 +43,7 @@ type mockBaggageMgr struct { baggageResponse []*baggage.BaggageRestriction } -func (m *mockBaggageMgr) GetBaggageRestrictions(_ context.Context, serviceName string) ([]*baggage.BaggageRestriction, error) { +func (m *mockBaggageMgr) GetBaggageRestrictions(_ context.Context, _ string) ([]*baggage.BaggageRestriction, error) { if m.baggageResponse == nil { return nil, errors.New("no mock response provided") } diff --git a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/clientcfghttp/handler.go b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/clientcfghttp/handler.go index 72116c762ed4..828481b385ae 100644 --- a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/clientcfghttp/handler.go +++ b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/clientcfghttp/handler.go @@ -26,7 +26,6 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/jaegertracing/jaeger/pkg/metrics" tSampling "github.com/jaegertracing/jaeger/thrift-gen/sampling" diff --git a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/clientcfghttp/thrift-0.9.2/ttypes.go b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/clientcfghttp/thrift-0.9.2/ttypes.go index 391617093f51..1a2724652a03 100644 --- a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/clientcfghttp/thrift-0.9.2/ttypes.go +++ b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/clientcfghttp/thrift-0.9.2/ttypes.go @@ -18,6 +18,7 @@ // Autogenerated by Thrift Compiler (0.9.2) but manually adapted to 0.14.x +// nolint package sampling // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/clientcfghttp/thrift-0.9.2" import ( diff --git a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/configmanager/grpc/manager.go b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/configmanager/grpc/manager.go index 64bed612b960..2cb700f76d82 100644 --- a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/configmanager/grpc/manager.go +++ b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/configmanager/grpc/manager.go @@ -21,12 +21,11 @@ import ( "context" "errors" - "google.golang.org/grpc" - "github.com/jaegertracing/jaeger/model/converter/thrift/jaeger" "github.com/jaegertracing/jaeger/proto-gen/api_v2" "github.com/jaegertracing/jaeger/thrift-gen/baggage" "github.com/jaegertracing/jaeger/thrift-gen/sampling" + "google.golang.org/grpc" ) // SamplingManager returns sampling decisions from collector over gRPC. diff --git a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/configmanager/metrics.go b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/configmanager/metrics.go index 26a696e7506a..33a37d12a450 100644 --- a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/configmanager/metrics.go +++ b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/configmanager/metrics.go @@ -49,7 +49,7 @@ type ManagerWithMetrics struct { // WrapWithMetrics wraps ClientConfigManager and creates metrics for its invocations. func WrapWithMetrics(manager ClientConfigManager, mFactory metrics.Factory) *ManagerWithMetrics { m := configManagerMetrics{} - metrics.Init(&m, mFactory, nil) + _ = metrics.Init(&m, mFactory, nil) return &ManagerWithMetrics{wrapped: manager, metrics: m} } diff --git a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/httpserver/srv.go b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/httpserver/srv.go index ea090aa3be61..f988c8579c60 100644 --- a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/httpserver/srv.go +++ b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/httpserver/srv.go @@ -23,11 +23,10 @@ import ( "time" "github.com/gorilla/mux" + "github.com/jaegertracing/jaeger/pkg/metrics" "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/jaegertracing/jaeger/pkg/metrics" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/clientcfghttp" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/configmanager" ) diff --git a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/sampling/grpc_handler_test.go b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/sampling/grpc_handler_test.go index 5e457cc86178..350670c5f098 100644 --- a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/sampling/grpc_handler_test.go +++ b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/sampling/grpc_handler_test.go @@ -21,17 +21,16 @@ import ( "errors" "testing" + "github.com/jaegertracing/jaeger/proto-gen/api_v2" + "github.com/jaegertracing/jaeger/thrift-gen/sampling" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/context" - - "github.com/jaegertracing/jaeger/proto-gen/api_v2" - "github.com/jaegertracing/jaeger/thrift-gen/sampling" ) type mockSamplingStore struct{} -func (s mockSamplingStore) GetSamplingStrategy(ctx context.Context, serviceName string) (*sampling.SamplingStrategyResponse, error) { +func (s mockSamplingStore) GetSamplingStrategy(_ context.Context, serviceName string) (*sampling.SamplingStrategyResponse, error) { if serviceName == "error" { return nil, errors.New("some error") } else if serviceName == "nil" { diff --git a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/sampling/strategystore/factory.go b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/sampling/strategystore/factory.go index 0127a8d5cf4a..bf8db2d1efc6 100644 --- a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/sampling/strategystore/factory.go +++ b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/sampling/strategystore/factory.go @@ -18,10 +18,9 @@ package strategystore // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/sampling/strategystore" import ( - "go.uber.org/zap" - "github.com/jaegertracing/jaeger/pkg/metrics" "github.com/jaegertracing/jaeger/storage" + "go.uber.org/zap" ) // Factory defines an interface for a factory that can create implementations of different strategy storage components. diff --git a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/trace_receiver.go b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/trace_receiver.go index dbdc380897cd..93ddcf8b22cc 100644 --- a/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/trace_receiver.go +++ b/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/trace_receiver.go @@ -26,7 +26,6 @@ import ( "github.com/jaegertracing/jaeger/thrift-gen/jaeger" "github.com/jaegertracing/jaeger/thrift-gen/sampling" "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" @@ -37,7 +36,6 @@ import ( "google.golang.org/grpc" jaegertranslator "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/configmanager" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver/internal/jaegerreceiverdeprecated/internal/httpserver" )