Deprecate extensiontest.NewNopSettings

exporter/fileexporter/encoding_test.go

@@ -43,7 +43,7 @@ func TestEncoding(t *testing.T) {
 	ef := otlpencodingextension.NewFactory()
 	efCfg := ef.CreateDefaultConfig().(*otlpencodingextension.Config)
 	efCfg.Protocol = "otlp_json"
-	ext, err := ef.Create(context.Background(), extensiontest.NewNopSettings(), efCfg)
+	ext, err := ef.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), efCfg)
 	require.NoError(t, err)
 	require.NoError(t, ext.Start(context.Background(), componenttest.NewNopHost()))
 

extension/asapauthextension/factory_test.go

@@ -72,7 +72,7 @@ func TestCreate(t *testing.T) {
 			cfg.PrivateKey = testcase.settings.PrivateKey
 
 			// validate extension creation
-			ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg)
+			ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 			if testcase.shouldError {
 				assert.Error(t, err)
 			} else {

extension/awsproxy/factory_test.go

@@ -62,7 +62,7 @@ func TestFactory_Create(t *testing.T) {
 	t.Setenv("AWS_SECRET_ACCESS_KEY", "fakeSecretAccessKey")
 
 	ctx := context.Background()
-	cs := extensiontest.NewNopSettings()
+	cs := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
 	ext, err := createExtension(ctx, cs, cfg)
 	assert.NoError(t, err)
 	assert.NotNil(t, ext)

extension/basicauthextension/factory_test.go

@@ -28,7 +28,7 @@ func TestCreateExtension_ValidConfig(t *testing.T) {
 		},
 	}
 
-	ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg)
+	ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 	assert.NoError(t, err)
 	assert.NotNil(t, ext)
 }

extension/bearertokenauthextension/factory_test.go

@@ -22,7 +22,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) {
 func TestFactory_Create(t *testing.T) {
 	cfg := createDefaultConfig().(*Config)
 	cfg.BearerToken = "somerandometoken"
-	ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg)
+	ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 	require.NoError(t, err)
 	require.NotNil(t, ext)
 }

extension/cgroupruntimeextension/extension_test.go

@@ -53,7 +53,7 @@ func TestExtension(t *testing.T) {
 				allCalls++
 				return func() { allCalls++ }, _err
 			}
-			settings := extensiontest.NewNopSettings()
+			settings := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
 			cg := newCgroupRuntime(test.config, settings.Logger, setterMock, func(_ float64) (undoFunc, error) { return setterMock() })
 			ctx := context.Background()
 

extension/encoding/jaegerencodingextension/extension_test.go

@@ -23,7 +23,7 @@ func TestExtension_Start(t *testing.T) {
 			name: "jaegerProtobuf",
 			getExtension: func() (extension.Extension, error) {
 				factory := NewFactory()
-				return factory.Create(context.Background(), extensiontest.NewNopSettings(), factory.CreateDefaultConfig())
+				return factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), factory.CreateDefaultConfig())
 			},
 		},
 		{
@@ -32,7 +32,7 @@ func TestExtension_Start(t *testing.T) {
 				factory := NewFactory()
 				cfg := factory.CreateDefaultConfig()
 				cfg.(*Config).Protocol = "xyz"
-				return factory.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+				return factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 			},
 			expectedErr: "unsupported protocol: \"xyz\"",
 		},

extension/encoding/otlpencodingextension/extension_test.go

@@ -30,7 +30,7 @@ func TestExtension_Start(t *testing.T) {
 				factory := NewFactory()
 				cfg := factory.CreateDefaultConfig()
 				cfg.(*Config).Protocol = "otlp_json"
-				return factory.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+				return factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 			},
 		},
 
@@ -40,7 +40,7 @@ func TestExtension_Start(t *testing.T) {
 				factory := NewFactory()
 				cfg := factory.CreateDefaultConfig()
 				cfg.(*Config).Protocol = "otlp_proto"
-				return factory.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+				return factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 			},
 		},
 	}

extension/encoding/skywalkingencodingextension/extension_test.go

@@ -24,7 +24,7 @@ func TestExtension_Start(t *testing.T) {
 			getExtension: func() (extension.Extension, error) {
 				factory := NewFactory()
 				cfg := factory.CreateDefaultConfig()
-				return factory.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+				return factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 			},
 		},
 	}

extension/encoding/textencodingextension/extension_test.go

@@ -23,7 +23,7 @@ func TestExtension_Start(t *testing.T) {
 			name: "text",
 			getExtension: func() (extension.Extension, error) {
 				factory := NewFactory()
-				return factory.Create(context.Background(), extensiontest.NewNopSettings(), factory.CreateDefaultConfig())
+				return factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), factory.CreateDefaultConfig())
 			},
 		},
 		{
@@ -32,7 +32,7 @@ func TestExtension_Start(t *testing.T) {
 				factory := NewFactory()
 				cfg := factory.CreateDefaultConfig()
 				cfg.(*Config).Encoding = "gbk"
-				return factory.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+				return factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 			},
 		},
 		{
@@ -41,7 +41,7 @@ func TestExtension_Start(t *testing.T) {
 				factory := NewFactory()
 				cfg := factory.CreateDefaultConfig()
 				cfg.(*Config).Encoding = "blabla"
-				return factory.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+				return factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 			},
 			expectedErr: "unsupported encoding 'blabla'",
 		},

extension/encoding/zipkinencodingextension/extension_test.go

@@ -25,7 +25,7 @@ func TestExtension_Start(t *testing.T) {
 				factory := NewFactory()
 				cfg := factory.CreateDefaultConfig()
 				cfg.(*Config).Protocol = "zipkin_json"
-				return factory.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+				return factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 			},
 		},
 		{
@@ -34,7 +34,7 @@ func TestExtension_Start(t *testing.T) {
 				factory := NewFactory()
 				cfg := factory.CreateDefaultConfig()
 				cfg.(*Config).Protocol = "zipkin_proto"
-				return factory.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+				return factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 			},
 		},
 		{
@@ -44,7 +44,7 @@ func TestExtension_Start(t *testing.T) {
 				cfg := factory.CreateDefaultConfig()
 				cfg.(*Config).Protocol = "zipkin_thrift"
 				cfg.(*Config).Version = "v1"
-				return factory.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+				return factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 			},
 		},
 		{
@@ -54,7 +54,7 @@ func TestExtension_Start(t *testing.T) {
 				cfg := factory.CreateDefaultConfig()
 				cfg.(*Config).Protocol = "zipkin_thrift"
 				cfg.(*Config).Version = "v2"
-				return factory.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+				return factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 			},
 			expectedErr: "unsupported version: \"v2\"",
 		},

extension/headerssetterextension/factory_test.go

@@ -24,7 +24,7 @@ func TestCreateDefaultConfig(t *testing.T) {
 func TestCreate(t *testing.T) {
 	cfg := createDefaultConfig().(*Config)
 
-	ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg)
+	ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 	assert.NoError(t, err)
 	assert.NotNil(t, ext)
 }

extension/healthcheckextension/factory_test.go

@@ -27,7 +27,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) {
 	}, cfg)
 
 	assert.NoError(t, componenttest.CheckConfigStruct(cfg))
-	ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg)
+	ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 	require.NoError(t, err)
 	require.NotNil(t, ext)
 }
@@ -36,7 +36,7 @@ func TestFactory_Create(t *testing.T) {
 	cfg := createDefaultConfig().(*Config)
 	cfg.Endpoint = testutil.GetAvailableLocalAddress(t)
 
-	ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg)
+	ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 	require.NoError(t, err)
 	require.NotNil(t, ext)
 }

extension/healthcheckextension/integration_test.go

@@ -24,7 +24,7 @@ func Test_SimpleHealthCheck(t *testing.T) {
 	port := testutil.GetAvailablePort(t)
 	cfg := f.CreateDefaultConfig().(*Config)
 	cfg.Endpoint = fmt.Sprintf("localhost:%d", port)
-	e, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+	e, err := f.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 	require.NoError(t, err)
 	err = e.Start(context.Background(), componenttest.NewNopHost())
 	require.NoError(t, err)

extension/healthcheckv2extension/extension_test.go

@@ -30,7 +30,7 @@ func TestComponentStatus(t *testing.T) {
 	cfg.HTTPConfig.Endpoint = testutil.GetAvailableLocalAddress(t)
 	cfg.GRPCConfig.NetAddr.Endpoint = testutil.GetAvailableLocalAddress(t)
 	cfg.UseV2 = true
-	ext := newExtension(context.Background(), *cfg, extensiontest.NewNopSettings())
+	ext := newExtension(context.Background(), *cfg, extensiontest.NewNopSettingsWithType(extensiontest.NopType))
 
 	// Status before Start will be StatusNone
 	st, ok := ext.aggregator.AggregateStatus(status.ScopeAll, status.Concise)
@@ -109,7 +109,7 @@ func TestNotifyConfig(t *testing.T) {
 	cfg.HTTPConfig.Config.Enabled = true
 	cfg.HTTPConfig.Config.Path = "/config"
 
-	ext := newExtension(context.Background(), *cfg, extensiontest.NewNopSettings())
+	ext := newExtension(context.Background(), *cfg, extensiontest.NewNopSettingsWithType(extensiontest.NopType))
 
 	require.NoError(t, ext.Start(context.Background(), componenttest.NewNopHost()))
 	t.Cleanup(func() { require.NoError(t, ext.Shutdown(context.Background())) })

extension/healthcheckv2extension/factory_test.go

@@ -55,7 +55,7 @@ func TestCreateDefaultConfig(t *testing.T) {
 	assert.NoError(t, componenttest.CheckConfigStruct(cfg))
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	ext, err := createExtension(ctx, extensiontest.NewNopSettings(), cfg)
+	ext, err := createExtension(ctx, extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 	require.NoError(t, err)
 	require.NotNil(t, ext)
 }
@@ -65,7 +65,7 @@ func TestCreate(t *testing.T) {
 	cfg.Endpoint = testutil.GetAvailableLocalAddress(t)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	ext, err := createExtension(ctx, extensiontest.NewNopSettings(), cfg)
+	ext, err := createExtension(ctx, extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 	require.NoError(t, err)
 	require.NotNil(t, ext)
 }

extension/httpforwarderextension/factory_test.go

@@ -51,7 +51,7 @@ func TestFactory(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			e, err := f.Create(
 				context.Background(),
-				extensiontest.NewNopSettings(),
+				extensiontest.NewNopSettingsWithType(extensiontest.NopType),
 				test.config,
 			)
 			if test.wantErr {

extension/jaegerremotesampling/factory_test.go

@@ -36,7 +36,7 @@ func TestCreateDefaultConfig(t *testing.T) {
 func TestCreate(t *testing.T) {
 	cfg := createDefaultConfig().(*Config)
 
-	ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg)
+	ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 	assert.NoError(t, err)
 	assert.NotNil(t, ext)
 }

extension/oauth2clientauthextension/factory_test.go

@@ -54,7 +54,7 @@ func TestCreate(t *testing.T) {
 			cfg.ClientSecret = testcase.settings.ClientSecret
 			cfg.TokenURL = testcase.settings.TokenURL
 			cfg.Scopes = testcase.settings.Scopes
-			ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg)
+			ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 			if testcase.shouldError {
 				assert.Error(t, err)
 				assert.Nil(t, ext)

extension/observer/cfgardenobserver/factory_test.go

@@ -20,7 +20,7 @@ func TestValidConfig(t *testing.T) {
 func TestCreateCFGardenObserver(t *testing.T) {
 	cfGardenObserver, err := createExtension(
 		context.Background(),
-		extensiontest.NewNopSettings(),
+		extensiontest.NewNopSettingsWithType(extensiontest.NopType),
 		&Config{},
 	)
 	require.NoError(t, err)

extension/observer/dockerobserver/factory_test.go

@@ -20,7 +20,7 @@ func TestValidConfig(t *testing.T) {
 func TestCreate(t *testing.T) {
 	dockerObserver, err := createExtension(
 		context.Background(),
-		extensiontest.NewNopSettings(),
+		extensiontest.NewNopSettingsWithType(extensiontest.NopType),
 		&Config{},
 	)
 	require.NoError(t, err)

extension/observer/ecsobserver/extension_test.go

@@ -34,7 +34,7 @@ func TestExtensionStartStop(t *testing.T) {
 		sdCfg := cfg.(*Config)
 		sdCfg.RefreshInterval = refreshInterval
 		sdCfg.ResultFile = output
-		cs := extensiontest.NewNopSettings()
+		cs := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
 		ext, err := createExtensionWithFetcher(cs, sdCfg, f)
 		require.NoError(t, err)
 		return ext
@@ -59,7 +59,7 @@ func TestExtensionStartStop(t *testing.T) {
 		sdCfg := cfg.(*Config)
 		sdCfg.RefreshInterval = 100 * time.Millisecond
 		sdCfg.ResultFile = "testdata/ut_ext_critical_error.actual.yaml"
-		cs := extensiontest.NewNopSettings()
+		cs := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
 		statusEventChan := make(chan *componentstatus.Event)
 		ext, err := createExtensionWithFetcher(cs, sdCfg, f)
 		require.NoError(t, err)

extension/observer/ecstaskobserver/factory_test.go

@@ -18,7 +18,7 @@ func TestFactoryCreatedExtensionIsEndpointsLister(t *testing.T) {
 	cfg := etoFactory.CreateDefaultConfig()
 	cfg.(*Config).Endpoint = "http://localhost:1234/mock/endpoint"
 
-	eto, err := etoFactory.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+	eto, err := etoFactory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 	require.NoError(t, err)
 	require.NotNil(t, eto)
 	require.Implements(t, (*observer.EndpointsLister)(nil), eto)

extension/observer/hostobserver/factory_test.go

@@ -20,7 +20,7 @@ func TestValidConfig(t *testing.T) {
 func TestCreateMetrics(t *testing.T) {
 	hostObserver, err := createExtension(
 		context.Background(),
-		extensiontest.NewNopSettings(),
+		extensiontest.NewNopSettingsWithType(extensiontest.NopType),
 		&Config{},
 	)
 	require.NoError(t, err)

extension/observer/k8sobserver/extension_test.go

@@ -35,7 +35,7 @@ func TestNewExtension(t *testing.T) {
 	config := factory.CreateDefaultConfig().(*Config)
 	mockServiceHost(t, config)
 
-	ext, err := newObserver(config, extensiontest.NewNopSettings())
+	ext, err := newObserver(config, extensiontest.NewNopSettingsWithType(extensiontest.NopType))
 	require.NoError(t, err)
 	require.NotNil(t, ext)
 }
@@ -46,7 +46,7 @@ func TestExtensionObserveServices(t *testing.T) {
 	config.ObservePods = false // avoid causing data race when multiple test cases running in the same process using podListerWatcher
 	mockServiceHost(t, config)
 
-	set := extensiontest.NewNopSettings()
+	set := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
 	set.ID = component.NewID(metadata.Type)
 	ext, err := newObserver(config, set)
 	require.NoError(t, err)
@@ -135,7 +135,7 @@ func TestExtensionObservePods(t *testing.T) {
 	config := factory.CreateDefaultConfig().(*Config)
 	mockServiceHost(t, config)
 
-	set := extensiontest.NewNopSettings()
+	set := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
 	set.ID = component.NewID(metadata.Type)
 	ext, err := newObserver(config, set)
 	require.NoError(t, err)
@@ -219,7 +219,7 @@ func TestExtensionObserveNodes(t *testing.T) {
 	config.ObservePods = false // avoid causing data race when multiple test cases running in the same process using podListerWatcher
 	mockServiceHost(t, config)
 
-	set := extensiontest.NewNopSettings()
+	set := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
 	set.ID = component.NewID(metadata.Type)
 	ext, err := newObserver(config, set)
 	require.NoError(t, err)
@@ -320,7 +320,7 @@ func TestExtensionObserveIngresses(t *testing.T) {
 	config.ObserveIngresses = true
 	mockServiceHost(t, config)
 
-	set := extensiontest.NewNopSettings()
+	set := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
 	set.ID = component.NewID(metadata.Type)
 	ext, err := newObserver(config, set)
 	require.NoError(t, err)

extension/observer/k8sobserver/factory_test.go

@@ -26,7 +26,7 @@ func TestFactory_Create(t *testing.T) {
 	factory := NewFactory()
 	cfg := factory.CreateDefaultConfig().(*Config)
 
-	ext, err := factory.Create(context.Background(), extensiontest.NewNopSettings(), cfg)
+	ext, err := factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 	require.Error(t, err)
 	require.Nil(t, ext)
 }

extension/oidcauthextension/factory_test.go

@@ -31,7 +31,7 @@ func TestCreate(t *testing.T) {
 	cfg.Audience = "collector"
 	cfg.IssuerURL = "https://auth.example.com"
 
-	ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg)
+	ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 	assert.NoError(t, err)
 	assert.NotNil(t, ext)
 }

extension/opampextension/factory_test.go

@@ -18,15 +18,15 @@ func TestFactory_CreateDefaultConfig(t *testing.T) {
 	assert.Equal(t, createDefaultConfig().(*Config), cfg)
 
 	assert.NoError(t, componenttest.CheckConfigStruct(cfg))
-	ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg)
+	ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 	require.NoError(t, err)
 	require.NotNil(t, ext)
 	require.NoError(t, ext.Shutdown(context.Background()))
 }
 
 func TestFactory_Create(t *testing.T) {
 	cfg := NewFactory().CreateDefaultConfig()
-	ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg)
+	ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
 	require.NoError(t, err)
 	require.NotNil(t, ext)
 	require.NoError(t, ext.Shutdown(context.Background()))