Substitute CreateSettings and NewNopCreateSettings after deprecat…

…ion.
GoogleCloudPlatform · Aug 7, 2024 · 49a5be4 · 49a5be4
1 parent 01b3e15
commit 49a5be4
Show file tree

Hide file tree

Showing 45 changed files with 78 additions and 78 deletions.
diff --git a/processor/agentmetricsprocessor/agentmetricsprocessor_test.go b/processor/agentmetricsprocessor/agentmetricsprocessor_test.go
@@ -100,7 +100,7 @@ func TestAgentMetricsProcessor(t *testing.T) {
 			tmn := &consumertest.MetricsSink{}
 			rmp, err := processorhelper.NewMetricsProcessor(
 				context.Background(),
-				processortest.NewNopCreateSettings(),
+				processortest.NewNopSettings(),
 				&Config{},
 				tmn,
 				amp.ProcessMetrics,

diff --git a/processor/agentmetricsprocessor/factory.go b/processor/agentmetricsprocessor/factory.go
@@ -41,7 +41,7 @@ var processorCapabilities = consumer.Capabilities{MutatesData: true}
 
 func createMetricsProcessor(
 	ctx context.Context,
-	params processor.CreateSettings,
+	params processor.Settings,
 	cfg component.Config,
 	nextConsumer consumer.Metrics,
 ) (processor.Metrics, error) {

diff --git a/processor/agentmetricsprocessor/factory_test.go b/processor/agentmetricsprocessor/factory_test.go
@@ -29,7 +29,7 @@ func TestCreateDefaultConfig(t *testing.T) {
 }
 
 func TestCreateProcessor(t *testing.T) {
-	mp, err := createMetricsProcessor(context.Background(), processor.CreateSettings{}, createDefaultConfig(), consumertest.NewNop())
+	mp, err := createMetricsProcessor(context.Background(), processor.Settings{}, createDefaultConfig(), consumertest.NewNop())
 	assert.NoError(t, err)
 	assert.NotNil(t, mp)
 }
diff --git a/processor/casttosumprocessor/factory.go b/processor/casttosumprocessor/factory.go
@@ -42,7 +42,7 @@ var processorCapabilities = consumer.Capabilities{MutatesData: true}
 
 func createMetricsProcessor(
 	ctx context.Context,
-	params processor.CreateSettings,
+	params processor.Settings,
 	cfg component.Config,
 	nextConsumer consumer.Metrics,
 ) (processor.Metrics, error) {

diff --git a/processor/casttosumprocessor/factory_test.go b/processor/casttosumprocessor/factory_test.go
@@ -41,7 +41,7 @@ func TestCreateProcessor(t *testing.T) {
 	assert.NotNil(t, config)
 
 	for _, cfg := range config.Processors {
-		mp, err := createMetricsProcessor(context.Background(), processor.CreateSettings{}, cfg, consumertest.NewNop())
+		mp, err := createMetricsProcessor(context.Background(), processor.Settings{}, cfg, consumertest.NewNop())
 		assert.NoError(t, err)
 		assert.NotNil(t, mp)
 	}

diff --git a/processor/casttosumprocessor/processor_test.go b/processor/casttosumprocessor/processor_test.go
@@ -88,7 +88,7 @@ func TestCastToSumProcessor(t *testing.T) {
 			tmn := &consumertest.MetricsSink{}
 			rmp, err := processorhelper.NewMetricsProcessor(
 				context.Background(),
-				processortest.NewNopCreateSettings(),
+				processortest.NewNopSettings(),
 				cfg,
 				tmn,
 				nsp.ProcessMetrics,

diff --git a/processor/modifyscopeprocessor/factory.go b/processor/modifyscopeprocessor/factory.go
@@ -41,7 +41,7 @@ var processorCapabilities = consumer.Capabilities{MutatesData: true}
 
 func createMetricsProcessor(
 	ctx context.Context,
-	params processor.CreateSettings,
+	params processor.Settings,
 	cfg component.Config,
 	nextConsumer consumer.Metrics,
 ) (processor.Metrics, error) {

diff --git a/processor/modifyscopeprocessor/factory_test.go b/processor/modifyscopeprocessor/factory_test.go
@@ -28,7 +28,7 @@ func TestCreateDefaultConfig(t *testing.T) {
 	assert.NoError(t, componenttest.CheckConfigStruct(NewFactory().CreateDefaultConfig()))
 }
 func TestCreateProcessor(t *testing.T) {
-	mp, err := createMetricsProcessor(context.Background(), processor.CreateSettings{}, createDefaultConfig(), consumertest.NewNop())
+	mp, err := createMetricsProcessor(context.Background(), processor.Settings{}, createDefaultConfig(), consumertest.NewNop())
 	assert.NoError(t, err)
 	assert.NotNil(t, mp)
 }
diff --git a/processor/modifyscopeprocessor/processor_test.go b/processor/modifyscopeprocessor/processor_test.go
@@ -53,7 +53,7 @@ func TestModifyScopeProcessor(t *testing.T) {
 			tmn := &consumertest.MetricsSink{}
 			rmp, err := processorhelper.NewMetricsProcessor(
 				context.Background(),
-				processortest.NewNopCreateSettings(),
+				processortest.NewNopSettings(),
 				cfg,
 				tmn,
 				msp.ProcessMetrics,

diff --git a/processor/normalizesumsprocessor/factory.go b/processor/normalizesumsprocessor/factory.go
@@ -41,7 +41,7 @@ var processorCapabilities = consumer.Capabilities{MutatesData: true}
 
 func createMetricsProcessor(
 	ctx context.Context,
-	params processor.CreateSettings,
+	params processor.Settings,
 	cfg component.Config,
 	nextConsumer consumer.Metrics,
 ) (processor.Metrics, error) {

diff --git a/processor/normalizesumsprocessor/factory_test.go b/processor/normalizesumsprocessor/factory_test.go
@@ -28,7 +28,7 @@ func TestCreateDefaultConfig(t *testing.T) {
 	assert.NoError(t, componenttest.CheckConfigStruct(NewFactory().CreateDefaultConfig()))
 }
 func TestCreateProcessor(t *testing.T) {
-	mp, err := createMetricsProcessor(context.Background(), processor.CreateSettings{}, createDefaultConfig(), consumertest.NewNop())
+	mp, err := createMetricsProcessor(context.Background(), processor.Settings{}, createDefaultConfig(), consumertest.NewNop())
 	assert.NoError(t, err)
 	assert.NotNil(t, mp)
 }
diff --git a/processor/normalizesumsprocessor/processor_test.go b/processor/normalizesumsprocessor/processor_test.go
@@ -80,7 +80,7 @@ func TestNormalizeSumsProcessor(t *testing.T) {
 			tmn := &consumertest.MetricsSink{}
 			rmp, err := processorhelper.NewMetricsProcessor(
 				context.Background(),
-				processortest.NewNopCreateSettings(),
+				processortest.NewNopSettings(),
 				&Config{},
 				tmn,
 				nsp.ProcessMetrics,

diff --git a/receiver/dcgmreceiver/component_test.go b/receiver/dcgmreceiver/component_test.go
@@ -50,12 +50,12 @@ func TestComponentLifecycle(t *testing.T) {
 
 	tests := []struct {
 		name     string
-		createFn func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error)
+		createFn func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error)
 	}{
 
 		{
 			name: "metrics",
-			createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) {
+			createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) {
 				return factory.CreateMetricsReceiver(ctx, set, cfg, consumertest.NewNop())
 			},
 		},
@@ -70,19 +70,19 @@ func TestComponentLifecycle(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name+"-shutdown", func(t *testing.T) {
-			c, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg)
+			c, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg)
 			require.NoError(t, err)
 			err = c.Shutdown(context.Background())
 			require.NoError(t, err)
 		})
 		t.Run(test.name+"-lifecycle", func(t *testing.T) {
-			firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg)
+			firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg)
 			require.NoError(t, err)
 			host := componenttest.NewNopHost()
 			require.NoError(t, err)
 			require.NoError(t, firstRcvr.Start(context.Background(), host))
 			require.NoError(t, firstRcvr.Shutdown(context.Background()))
-			secondRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg)
+			secondRcvr, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg)
 			require.NoError(t, err)
 			require.NoError(t, secondRcvr.Start(context.Background(), host))
 			require.NoError(t, secondRcvr.Shutdown(context.Background()))

diff --git a/receiver/dcgmreceiver/factory_gpu_off.go b/receiver/dcgmreceiver/factory_gpu_off.go
@@ -29,7 +29,7 @@ import (
 
 func createMetricsReceiver(
 	_ context.Context,
-	_ receiver.CreateSettings,
+	_ receiver.Settings,
 	_ component.Config,
 	_ consumer.Metrics,
 ) (receiver.Metrics, error) {

diff --git a/receiver/dcgmreceiver/factory_gpu_off_test.go b/receiver/dcgmreceiver/factory_gpu_off_test.go
@@ -34,7 +34,7 @@ func TestCreateMetricsReceiverWithGPUSupportOff(t *testing.T) {
 	cfg := factory.CreateDefaultConfig()
 	receiver, err := factory.CreateMetricsReceiver(
 		context.Background(),
-		receivertest.NewNopCreateSettings(),
+		receivertest.NewNopSettings(),
 		cfg,
 		consumertest.NewNop())
 

diff --git a/receiver/dcgmreceiver/factory_gpu_on.go b/receiver/dcgmreceiver/factory_gpu_on.go
@@ -68,7 +68,7 @@ func init() {
 
 func createMetricsReceiver(
 	_ context.Context,
-	params receiver.CreateSettings,
+	params receiver.Settings,
 	rConf component.Config,
 	consumer consumer.Metrics,
 ) (receiver.Metrics, error) {

diff --git a/receiver/dcgmreceiver/factory_gpu_on_test.go b/receiver/dcgmreceiver/factory_gpu_on_test.go
@@ -33,7 +33,7 @@ func TestCreateMetricsReceiverOnLinux(t *testing.T) {
 
 	receiver, err := factory.CreateMetricsReceiver(
 		context.Background(),
-		receivertest.NewNopCreateSettings(),
+		receivertest.NewNopSettings(),
 		receiverConfig,
 		consumertest.NewNop(),
 	)

diff --git a/receiver/dcgmreceiver/internal/metadata/generated_metrics.go b/receiver/dcgmreceiver/internal/metadata/generated_metrics.go
diff --git a/receiver/dcgmreceiver/internal/metadata/generated_metrics_test.go b/receiver/dcgmreceiver/internal/metadata/generated_metrics_test.go
diff --git a/receiver/dcgmreceiver/scraper.go b/receiver/dcgmreceiver/scraper.go
@@ -33,12 +33,12 @@ import (
 
 type dcgmScraper struct {
 	config   *Config
-	settings receiver.CreateSettings
+	settings receiver.Settings
 	client   *dcgmClient
 	mb       *metadata.MetricsBuilder
 }
 
-func newDcgmScraper(config *Config, settings receiver.CreateSettings) *dcgmScraper {
+func newDcgmScraper(config *Config, settings receiver.Settings) *dcgmScraper {
 	return &dcgmScraper{config: config, settings: settings}
 }
 

diff --git a/receiver/dcgmreceiver/scraper_gpu_test.go b/receiver/dcgmreceiver/scraper_gpu_test.go
@@ -38,7 +38,7 @@ import (
 )
 
 func TestScrapeWithGpuPresent(t *testing.T) {
-	var settings receiver.CreateSettings
+	var settings receiver.Settings
 	settings.Logger = zaptest.NewLogger(t)
 
 	scraper := newDcgmScraper(createDefaultConfig().(*Config), settings)
@@ -59,7 +59,7 @@ func TestScrapeWithDelayedDcgmService(t *testing.T) {
 		return nil, fmt.Errorf("No DCGM client library *OR* No DCGM connection")
 	}
 
-	var settings receiver.CreateSettings
+	var settings receiver.Settings
 	settings.Logger = zaptest.NewLogger(t)
 
 	scraper := newDcgmScraper(createDefaultConfig().(*Config), settings)
@@ -86,7 +86,7 @@ func TestScrapeWithDelayedDcgmService(t *testing.T) {
 }
 
 func TestScrapeWithEmptyMetricsConfig(t *testing.T) {
-	var settings receiver.CreateSettings
+	var settings receiver.Settings
 	settings.Logger = zaptest.NewLogger(t)
 	emptyConfig := &Config{
 		ControllerConfig: scraperhelper.ControllerConfig{
@@ -141,7 +141,7 @@ func TestScrapeOnPollingError(t *testing.T) {
 		return nil, fmt.Errorf("DCGM polling error")
 	}
 
-	var settings receiver.CreateSettings
+	var settings receiver.Settings
 	settings.Logger = zaptest.NewLogger(t)
 
 	scraper := newDcgmScraper(createDefaultConfig().(*Config), settings)
@@ -160,7 +160,7 @@ func TestScrapeOnProfilingPaused(t *testing.T) {
 	config := createDefaultConfig().(*Config)
 	config.CollectionInterval = 10 * time.Millisecond
 
-	var settings receiver.CreateSettings
+	var settings receiver.Settings
 	settings.Logger = zaptest.NewLogger(t)
 
 	scraper := newDcgmScraper(config, settings)

diff --git a/receiver/dcgmreceiver/scraper_test.go b/receiver/dcgmreceiver/scraper_test.go
@@ -32,7 +32,7 @@ import (
 )
 
 func TestScraperWithoutDcgm(t *testing.T) {
-	var settings receiver.CreateSettings
+	var settings receiver.Settings
 	seenDcgmNotInstalledWarning := false
 	settings.Logger = zaptest.NewLogger(t, zaptest.WrapOptions(zap.Hooks(func(e zapcore.Entry) error {
 		if e.Level == zap.WarnLevel && strings.Contains(e.Message, "Unable to connect to DCGM daemon at localhost:5555 on libdcgm.so not Found; Is the DCGM daemon running") {

diff --git a/receiver/mongodbreceiver/factory.go b/receiver/mongodbreceiver/factory.go
@@ -55,7 +55,7 @@ func createDefaultConfig() component.Config {
 
 func createMetricsReceiver(
 	_ context.Context,
-	params receiver.CreateSettings,
+	params receiver.Settings,
 	rConf component.Config,
 	consumer consumer.Metrics,
 ) (receiver.Metrics, error) {

diff --git a/receiver/mongodbreceiver/factory_test.go b/receiver/mongodbreceiver/factory_test.go
@@ -42,7 +42,7 @@ func TestCreateMetricsReceiver(t *testing.T) {
 	factory := NewFactory()
 	_, err := factory.CreateMetricsReceiver(
 		context.Background(),
-		receivertest.NewNopCreateSettings(),
+		receivertest.NewNopSettings(),
 		&Config{
 			ControllerConfig: scraperhelper.ControllerConfig{
 				CollectionInterval: 10 * time.Second,

diff --git a/receiver/mongodbreceiver/generated_component_test.go b/receiver/mongodbreceiver/generated_component_test.go
diff --git a/receiver/mongodbreceiver/internal/metadata/generated_metrics.go b/receiver/mongodbreceiver/internal/metadata/generated_metrics.go
diff --git a/receiver/mongodbreceiver/internal/metadata/generated_metrics_test.go b/receiver/mongodbreceiver/internal/metadata/generated_metrics_test.go
diff --git a/receiver/mongodbreceiver/scraper.go b/receiver/mongodbreceiver/scraper.go
@@ -40,7 +40,7 @@ type mongodbScraper struct {
 	mb           *metadata.MetricsBuilder
 }
 
-func newMongodbScraper(settings receiver.CreateSettings, config *Config) *mongodbScraper {
+func newMongodbScraper(settings receiver.Settings, config *Config) *mongodbScraper {
 	mbConfig := metadata.DefaultMetricsBuilderConfig()
 	mbConfig.Metrics = config.Metrics
 	return &mongodbScraper{

diff --git a/receiver/nvmlreceiver/component_test.go b/receiver/nvmlreceiver/component_test.go
@@ -50,12 +50,12 @@ func TestComponentLifecycle(t *testing.T) {
 
 	tests := []struct {
 		name     string
-		createFn func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error)
+		createFn func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error)
 	}{
 
 		{
 			name: "metrics",
-			createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) {
+			createFn: func(ctx context.Context, set receiver.Settings, cfg component.Config) (component.Component, error) {
 				return factory.CreateMetricsReceiver(ctx, set, cfg, consumertest.NewNop())
 			},
 		},
@@ -70,19 +70,19 @@ func TestComponentLifecycle(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name+"-shutdown", func(t *testing.T) {
-			c, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg)
+			c, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg)
 			require.NoError(t, err)
 			err = c.Shutdown(context.Background())
 			require.NoError(t, err)
 		})
 		t.Run(test.name+"-lifecycle", func(t *testing.T) {
-			firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg)
+			firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg)
 			require.NoError(t, err)
 			host := componenttest.NewNopHost()
 			require.NoError(t, err)
 			require.NoError(t, firstRcvr.Start(context.Background(), host))
 			require.NoError(t, firstRcvr.Shutdown(context.Background()))
-			secondRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg)
+			secondRcvr, err := test.createFn(context.Background(), receivertest.NewNopSettings(), cfg)
 			require.NoError(t, err)
 			require.NoError(t, secondRcvr.Start(context.Background(), host))
 			require.NoError(t, secondRcvr.Shutdown(context.Background()))

diff --git a/receiver/nvmlreceiver/factory_gpu_off.go b/receiver/nvmlreceiver/factory_gpu_off.go
@@ -29,7 +29,7 @@ import (
 
 func createMetricsReceiver(
 	_ context.Context,
-	_ receiver.CreateSettings,
+	_ receiver.Settings,
 	_ component.Config,
 	_ consumer.Metrics,
 ) (receiver.Metrics, error) {