delint

Signed-off-by: Yuri Shkuro <github@ysh.us>
jaegertracing · Jun 19, 2024 · 140991f · 140991f
1 parent 91a1a8d
commit 140991f
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 18 deletions.
diff --git a/cmd/collector/app/handler/otlp_receiver.go b/cmd/collector/app/handler/otlp_receiver.go
@@ -66,7 +66,7 @@ func startOTLPReceiver(
 	// from here: params that can be mocked in tests
 	otlpFactory receiver.Factory,
 	newTraces func(consume consumer.ConsumeTracesFunc, options ...consumer.Option) (consumer.Traces, error),
-	createTracesReceiver func(ctx context.Context, set receiver.CreateSettings,
+	createTracesReceiver func(ctx context.Context, set receiver.Settings,
 		cfg component.Config, nextConsumer consumer.Traces) (receiver.Traces, error),
 ) (receiver.Traces, error) {
 	otlpReceiverConfig := otlpFactory.CreateDefaultConfig().(*otlpreceiver.Config)
@@ -76,7 +76,7 @@ func startOTLPReceiver(
 		// TODO this could be wired into changing healthcheck.HealthCheck
 		logger.Info("OTLP receiver status change", zap.Stringer("status", ev.Status()))
 	}
-	otlpReceiverSettings := receiver.CreateSettings{
+	otlpReceiverSettings := receiver.Settings{
 		TelemetrySettings: component.TelemetrySettings{
 			Logger:         logger,
 			TracerProvider: nooptrace.NewTracerProvider(),

diff --git a/cmd/collector/app/handler/otlp_receiver_test.go b/cmd/collector/app/handler/otlp_receiver_test.go
@@ -115,7 +115,7 @@ func TestStartOtlpReceiver_Error(t *testing.T) {
 	assert.Contains(t, err.Error(), "could not create the OTLP consumer")
 
 	createTracesReceiver := func(
-		context.Context, receiver.CreateSettings, component.Config, consumer.Traces,
+		context.Context, receiver.Settings, component.Config, consumer.Traces,
 	) (receiver.Traces, error) {
 		return nil, errors.New("mock error")
 	}

diff --git a/cmd/collector/app/handler/zipkin_receiver.go b/cmd/collector/app/handler/zipkin_receiver.go
@@ -50,7 +50,7 @@ func startZipkinReceiver(
 	// from here: params that can be mocked in tests
 	zipkinFactory receiver.Factory,
 	newTraces func(consume consumer.ConsumeTracesFunc, options ...consumer.Option) (consumer.Traces, error),
-	createTracesReceiver func(ctx context.Context, set receiver.CreateSettings,
+	createTracesReceiver func(ctx context.Context, set receiver.Settings,
 		cfg component.Config, nextConsumer consumer.Traces) (receiver.Traces, error),
 ) (receiver.Traces, error) {
 	receiverConfig := zipkinFactory.CreateDefaultConfig().(*zipkinreceiver.Config)
@@ -60,7 +60,7 @@ func startZipkinReceiver(
 		CORS:     options.HTTP.CORS,
 		// TODO keepAlive not supported?
 	})
-	receiverSettings := receiver.CreateSettings{
+	receiverSettings := receiver.Settings{
 		TelemetrySettings: component.TelemetrySettings{
 			Logger:         logger,
 			TracerProvider: nooptrace.NewTracerProvider(),

diff --git a/cmd/collector/app/handler/zipkin_receiver_test.go b/cmd/collector/app/handler/zipkin_receiver_test.go
@@ -153,7 +153,7 @@ func TestStartZipkinReceiver_Error(t *testing.T) {
 	assert.Contains(t, err.Error(), "could not create Zipkin consumer")
 
 	createTracesReceiver := func(
-		context.Context, receiver.CreateSettings, component.Config, consumer.Traces,
+		context.Context, receiver.Settings, component.Config, consumer.Traces,
 	) (receiver.Traces, error) {
 		return nil, errors.New("mock error")
 	}

diff --git a/cmd/jaeger/internal/command.go b/cmd/jaeger/internal/command.go
@@ -53,7 +53,7 @@ func Command() *cobra.Command {
 		},
 	}
 
-	cmd := otelcol.NewCommand(settings)
+	cmd := otelcol.NewCommandMustSetProvider(settings)
 
 	// We want to support running the binary in all-in-one mode without a config file.
 	// Since there are no explicit hooks in OTel Collector for that today (as of v0.87),

diff --git a/cmd/jaeger/internal/exporters/storageexporter/exporter_test.go b/cmd/jaeger/internal/exporters/storageexporter/exporter_test.go
@@ -92,7 +92,7 @@ func TestExporter(t *testing.T) {
 	err := config.Validate()
 	require.NoError(t, err)
 
-	tracesExporter, err := exporterFactory.CreateTracesExporter(ctx, exporter.CreateSettings{
+	tracesExporter, err := exporterFactory.CreateTracesExporter(ctx, exporter.Settings{
 		ID:                ID,
 		TelemetrySettings: telemetrySettings,
 		BuildInfo:         component.NewDefaultBuildInfo(),
@@ -137,7 +137,7 @@ func makeStorageExtension(t *testing.T, memstoreName string) storageHost {
 	extensionFactory := jaegerstorage.NewFactory()
 	storageExtension, err := extensionFactory.CreateExtension(
 		context.Background(),
-		extension.CreateSettings{
+		extension.Settings{
 			TelemetrySettings: component.TelemetrySettings{
 				Logger:         zap.L(),
 				TracerProvider: nooptrace.NewTracerProvider(),

diff --git a/cmd/jaeger/internal/exporters/storageexporter/factory.go b/cmd/jaeger/internal/exporters/storageexporter/factory.go
@@ -32,7 +32,7 @@ func createDefaultConfig() component.Config {
 	return &Config{}
 }
 
-func createTracesExporter(ctx context.Context, set exporter.CreateSettings, config component.Config) (exporter.Traces, error) {
+func createTracesExporter(ctx context.Context, set exporter.Settings, config component.Config) (exporter.Traces, error) {
 	cfg := config.(*Config)
 	ex := newExporter(cfg, set.TelemetrySettings)
 	return exporterhelper.NewTracesExporter(ctx, set, cfg,

diff --git a/cmd/jaeger/internal/extension/jaegerquery/factory.go b/cmd/jaeger/internal/extension/jaegerquery/factory.go
@@ -32,6 +32,6 @@ func createDefaultConfig() component.Config {
 }
 
 // createExtension creates the extension based on this config.
-func createExtension(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.Extension, error) {
+func createExtension(_ context.Context, set extension.Settings, cfg component.Config) (extension.Extension, error) {
 	return newServer(cfg.(*Config), set.TelemetrySettings), nil
 }
diff --git a/cmd/jaeger/internal/extension/jaegerquery/factory_test.go b/cmd/jaeger/internal/extension/jaegerquery/factory_test.go
@@ -19,7 +19,7 @@ func Test_NewFactory(t *testing.T) {
 }
 
 func Test_CreateExtension(t *testing.T) {
-	set := extension.CreateSettings{
+	set := extension.Settings{
 		ID: ID,
 	}
 	cfg := createDefaultConfig()

diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go b/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go
@@ -206,7 +206,7 @@ func makeStorageExtenion(t *testing.T, config *Config) component.Component {
 	extensionFactory := NewFactory()
 	ctx := context.Background()
 	storageExtension, err := extensionFactory.CreateExtension(ctx,
-		extension.CreateSettings{
+		extension.Settings{
 			ID:                ID,
 			TelemetrySettings: noopTelemetrySettings(),
 			BuildInfo:         component.NewDefaultBuildInfo(),

diff --git a/cmd/jaeger/internal/extension/jaegerstorage/factory.go b/cmd/jaeger/internal/extension/jaegerstorage/factory.go
@@ -30,6 +30,6 @@ func createDefaultConfig() component.Config {
 }
 
 // createExtension creates the extension based on this config.
-func createExtension(_ context.Context, set extension.CreateSettings, cfg component.Config) (extension.Extension, error) {
+func createExtension(_ context.Context, set extension.Settings, cfg component.Config) (extension.Extension, error) {
 	return newStorageExt(cfg.(*Config), set.TelemetrySettings), nil
 }
diff --git a/cmd/jaeger/internal/integration/receivers/storagereceiver/factory.go b/cmd/jaeger/internal/integration/receivers/storagereceiver/factory.go
@@ -29,7 +29,7 @@ func createDefaultConfig() component.Config {
 	return &Config{}
 }
 
-func createTracesReceiver(_ context.Context, set receiver.CreateSettings, config component.Config, nextConsumer consumer.Traces) (receiver.Traces, error) {
+func createTracesReceiver(_ context.Context, set receiver.Settings, config component.Config, nextConsumer consumer.Traces) (receiver.Traces, error) {
 	cfg := config.(*Config)
 
 	return newTracesReceiver(cfg, set, nextConsumer)

diff --git a/cmd/jaeger/internal/integration/receivers/storagereceiver/receiver.go b/cmd/jaeger/internal/integration/receivers/storagereceiver/receiver.go
@@ -22,7 +22,7 @@ import (
 type storageReceiver struct {
 	cancelConsumeLoop context.CancelFunc
 	config            *Config
-	settings          receiver.CreateSettings
+	settings          receiver.Settings
 	consumedTraces    map[model.TraceID]*consumedTrace
 	nextConsumer      consumer.Traces
 	spanReader        spanstore.Reader
@@ -32,7 +32,7 @@ type consumedTrace struct {
 	spanIDs map[model.SpanID]struct{}
 }
 
-func newTracesReceiver(config *Config, set receiver.CreateSettings, nextConsumer consumer.Traces) (*storageReceiver, error) {
+func newTracesReceiver(config *Config, set receiver.Settings, nextConsumer consumer.Traces) (*storageReceiver, error) {
 	return &storageReceiver{
 		config:         config,
 		settings:       set,

diff --git a/cmd/jaeger/internal/integration/storagecleaner/factory.go b/cmd/jaeger/internal/integration/storagecleaner/factory.go
@@ -33,7 +33,7 @@ func createDefaultConfig() component.Config {
 
 func createExtension(
 	_ context.Context,
-	set extension.CreateSettings,
+	set extension.Settings,
 	cfg component.Config,
 ) (extension.Extension, error) {
 	return newStorageCleaner(cfg.(*Config), set.TelemetrySettings), nil