[Fix]: update all otel collector packages (#6759)

## Which problem is this PR solving? - This is solution to issue #6752 ## Description of the changes - Done minor code change of deprecated symbols after bot provided upgrade ## How was this change tested? - ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [ ] I have added unit tests for the new functionality - [ ] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: AnmolxSingh <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]>
jaegertracing · Feb 20, 2025 · 8d031d8 · 8d031d8
1 parent 46a7096
commit 8d031d8
Show file tree

Hide file tree

Showing 14 changed files with 260 additions and 236 deletions.
diff --git a/cmd/jaeger/internal/components.go b/cmd/jaeger/internal/components.go
@@ -50,11 +50,11 @@ type builders struct {
 
 func defaultBuilders() builders {
 	return builders{
-		extension: extension.MakeFactoryMap,
-		receiver:  receiver.MakeFactoryMap,
-		exporter:  exporter.MakeFactoryMap,
-		processor: processor.MakeFactoryMap,
-		connector: connector.MakeFactoryMap,
+		extension: otelcol.MakeFactoryMap[extension.Factory],
+		receiver:  otelcol.MakeFactoryMap[receiver.Factory],
+		exporter:  otelcol.MakeFactoryMap[exporter.Factory],
+		processor: otelcol.MakeFactoryMap[processor.Factory],
+		connector: otelcol.MakeFactoryMap[connector.Factory],
 	}
 }
 

diff --git a/cmd/jaeger/internal/exporters/storageexporter/config.go b/cmd/jaeger/internal/exporters/storageexporter/config.go
@@ -6,12 +6,13 @@ package storageexporter
 import (
 	"github.com/asaskevich/govalidator"
 	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/confmap/xconfmap"
 	"go.opentelemetry.io/collector/exporter/exporterhelper"
 )
 
 var (
-	_ component.Config          = (*Config)(nil)
-	_ component.ConfigValidator = (*Config)(nil)
+	_ component.Config   = (*Config)(nil)
+	_ xconfmap.Validator = (*Config)(nil)
 )
 
 // Config defines configuration for jaeger_storage_exporter.

diff --git a/cmd/jaeger/internal/exporters/storageexporter/exporter_test.go b/cmd/jaeger/internal/exporters/storageexporter/exporter_test.go
@@ -173,6 +173,7 @@ func makeStorageExtension(t *testing.T, memstoreName string) component.Host {
 	storageExtension, err := extensionFactory.Create(
 		context.Background(),
 		extension.Settings{
+			ID:                jaegerstorage.ID,
 			TelemetrySettings: telemetrySettings,
 		},
 		&jaegerstorage.Config{

diff --git a/cmd/jaeger/internal/extension/expvar/factory_test.go b/cmd/jaeger/internal/extension/expvar/factory_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component/componenttest"
-	"go.opentelemetry.io/collector/extension/extensiontest"
+	"go.opentelemetry.io/collector/extension"
 )
 
 func TestCreateDefaultConfig(t *testing.T) {
@@ -22,7 +22,10 @@ func TestCreateDefaultConfig(t *testing.T) {
 func TestCreateExtension(t *testing.T) {
 	cfg := createDefaultConfig().(*Config)
 	f := NewFactory()
-	r, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+	r, err := f.Create(context.Background(), extension.Settings{
+		ID:                ID,
+		TelemetrySettings: componenttest.NewNopTelemetrySettings(),
+	}, cfg)
 	require.NoError(t, err)
 	assert.NotNil(t, r)
 }
diff --git a/cmd/jaeger/internal/extension/jaegerquery/config.go b/cmd/jaeger/internal/extension/jaegerquery/config.go
@@ -5,12 +5,12 @@ package jaegerquery
 
 import (
 	"github.com/asaskevich/govalidator"
-	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/confmap/xconfmap"
 
 	queryApp "github.com/jaegertracing/jaeger/cmd/query/app"
 )
 
-var _ component.ConfigValidator = (*Config)(nil)
+var _ xconfmap.Validator = (*Config)(nil)
 
 // Config represents the configuration for jaeger-query,
 type Config struct {

diff --git a/cmd/jaeger/internal/extension/jaegerstorage/config.go b/cmd/jaeger/internal/extension/jaegerstorage/config.go
@@ -9,8 +9,8 @@ import (
 	"reflect"
 	"time"
 
-	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/confmap"
+	"go.opentelemetry.io/collector/confmap/xconfmap"
 
 	"github.com/jaegertracing/jaeger/internal/storage/metricstore/prometheus"
 	"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
@@ -24,9 +24,9 @@ import (
 )
 
 var (
-	_ component.ConfigValidator = (*Config)(nil)
-	_ confmap.Unmarshaler       = (*TraceBackend)(nil)
-	_ confmap.Unmarshaler       = (*MetricBackend)(nil)
+	_ xconfmap.Validator  = (*Config)(nil)
+	_ confmap.Unmarshaler = (*TraceBackend)(nil)
+	_ confmap.Unmarshaler = (*MetricBackend)(nil)
 )
 
 // Config contains configuration(s) for jaeger trace storage.

diff --git a/cmd/jaeger/internal/extension/remotesampling/config.go b/cmd/jaeger/internal/extension/remotesampling/config.go
@@ -12,6 +12,7 @@ import (
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/confmap"
+	"go.opentelemetry.io/collector/confmap/xconfmap"
 	"go.opentelemetry.io/collector/featuregate"
 
 	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/adaptive"
@@ -24,9 +25,9 @@ var (
 )
 
 var (
-	_ component.Config          = (*Config)(nil)
-	_ component.ConfigValidator = (*Config)(nil)
-	_ confmap.Unmarshaler       = (*Config)(nil)
+	_ component.Config    = (*Config)(nil)
+	_ xconfmap.Validator  = (*Config)(nil)
+	_ confmap.Unmarshaler = (*Config)(nil)
 
 	includeDefaultOpStrategies = featuregate.GlobalRegistry().MustRegister(
 		"jaeger.sampling.includeDefaultOpStrategies",

diff --git a/cmd/jaeger/internal/extension/remotesampling/extension_test.go b/cmd/jaeger/internal/extension/remotesampling/extension_test.go
@@ -43,6 +43,7 @@ func makeStorageExtension(t *testing.T, memstoreName string) component.Host {
 	storageExtension, err := extensionFactory.Create(
 		context.Background(),
 		extension.Settings{
+			ID:                jaegerstorage.ID,
 			TelemetrySettings: telemetrySettings,
 		},
 		&jaegerstorage.Config{TraceBackends: map[string]jaegerstorage.TraceBackend{
@@ -65,6 +66,7 @@ func makeRemoteSamplingExtension(t *testing.T, cfg component.Config) component.H
 	samplingExtension, err := extensionFactory.Create(
 		context.Background(),
 		extension.Settings{
+			ID: ID,
 			TelemetrySettings: component.TelemetrySettings{
 				Logger:         zap.L(),
 				TracerProvider: nooptrace.NewTracerProvider(),
@@ -91,6 +93,7 @@ func TestStartFileBasedProvider(t *testing.T) {
 	require.NoError(t, cfg.Validate())
 
 	ext, err := factory.Create(context.Background(), extension.Settings{
+		ID:                ID,
 		TelemetrySettings: componenttest.NewNopTelemetrySettings(),
 	}, cfg)
 	require.NoError(t, err)
@@ -111,6 +114,7 @@ func TestStartHTTP(t *testing.T) {
 	require.NoError(t, cfg.Validate())
 
 	ext, err := factory.Create(context.Background(), extension.Settings{
+		ID:                ID,
 		TelemetrySettings: componenttest.NewNopTelemetrySettings(),
 	}, cfg)
 	require.NoError(t, err)
@@ -152,6 +156,7 @@ func TestStartGRPC(t *testing.T) {
 	require.NoError(t, cfg.Validate())
 
 	ext, err := factory.Create(context.Background(), extension.Settings{
+		ID:                ID,
 		TelemetrySettings: componenttest.NewNopTelemetrySettings(),
 	}, cfg)
 	require.NoError(t, err)
@@ -181,6 +186,7 @@ func TestStartAdaptiveProvider(t *testing.T) {
 	require.NoError(t, cfg.Validate())
 
 	ext, err := factory.Create(context.Background(), extension.Settings{
+		ID:                ID,
 		TelemetrySettings: componenttest.NewNopTelemetrySettings(),
 	}, cfg)
 	require.NoError(t, err)
@@ -247,6 +253,7 @@ func TestDependencies(t *testing.T) {
 	factory := NewFactory()
 	cfg := factory.CreateDefaultConfig().(*Config)
 	ext, err := factory.Create(context.Background(), extension.Settings{
+		ID:                ID,
 		TelemetrySettings: componenttest.NewNopTelemetrySettings(),
 	}, cfg)
 	require.NoError(t, err)

diff --git a/cmd/jaeger/internal/extension/remotesampling/factory_test.go b/cmd/jaeger/internal/extension/remotesampling/factory_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component/componenttest"
-	"go.opentelemetry.io/collector/extension/extensiontest"
+	"go.opentelemetry.io/collector/extension"
 )
 
 func TestCreateDefaultConfig(t *testing.T) {
@@ -22,7 +22,10 @@ func TestCreateDefaultConfig(t *testing.T) {
 func TestCreateExtension(t *testing.T) {
 	cfg := createDefaultConfig().(*Config)
 	f := NewFactory()
-	r, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+	r, err := f.Create(context.Background(), extension.Settings{
+		ID:                ID,
+		TelemetrySettings: componenttest.NewNopTelemetrySettings(),
+	}, cfg)
 	require.NoError(t, err)
 	assert.NotNil(t, r)
 }
diff --git a/cmd/jaeger/internal/integration/storagecleaner/factory_test.go b/cmd/jaeger/internal/integration/storagecleaner/factory_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component/componenttest"
-	"go.opentelemetry.io/collector/extension/extensiontest"
+	"go.opentelemetry.io/collector/extension"
 )
 
 func TestCreateDefaultConfig(t *testing.T) {
@@ -22,7 +22,10 @@ func TestCreateDefaultConfig(t *testing.T) {
 func TestCreateExtension(t *testing.T) {
 	cfg := createDefaultConfig().(*Config)
 	f := NewFactory()
-	r, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+	r, err := f.Create(context.Background(), extension.Settings{
+		ID:                ID,
+		TelemetrySettings: componenttest.NewNopTelemetrySettings(),
+	}, cfg)
 	require.NoError(t, err)
 	assert.NotNil(t, r)
 }
diff --git a/cmd/jaeger/internal/processors/adaptivesampling/config.go b/cmd/jaeger/internal/processors/adaptivesampling/config.go
@@ -4,10 +4,10 @@
 package adaptivesampling
 
 import (
-	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/confmap/xconfmap"
 )
 
-var _ component.ConfigValidator = (*Config)(nil)
+var _ xconfmap.Validator = (*Config)(nil)
 
 type Config struct {
 	// all configuration for the processor is in the remotesampling extension

diff --git a/cmd/jaeger/internal/processors/adaptivesampling/processor_test.go b/cmd/jaeger/internal/processors/adaptivesampling/processor_test.go
@@ -35,6 +35,7 @@ func makeStorageExtension(t *testing.T, memstoreName string) component.Host {
 	storageExtension, err := extensionFactory.Create(
 		context.Background(),
 		extension.Settings{
+			ID:                jaegerstorage.ID,
 			TelemetrySettings: telemetrySettings,
 		},
 		&jaegerstorage.Config{
@@ -61,6 +62,7 @@ func makeRemoteSamplingExtension(t *testing.T, cfg component.Config) component.H
 	samplingExtension, err := extensionFactory.Create(
 		context.Background(),
 		extension.Settings{
+			ID: remotesampling.ID,
 			TelemetrySettings: component.TelemetrySettings{
 				Logger:         zap.L(),
 				TracerProvider: nooptrace.NewTracerProvider(),