diff --git a/extension/observer/k8sobserver/extension_test.go b/extension/observer/k8sobserver/extension_test.go index b844255ba82a..95581859a7e7 100644 --- a/extension/observer/k8sobserver/extension_test.go +++ b/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.NewNopSettingsWithType(extensiontest.NopType)) + ext, err := newObserver(config, extensiontest.NewNopSettingsWithType(factory.Type())) 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.NewNopSettingsWithType(extensiontest.NopType) + set := extensiontest.NewNopSettingsWithType(factory.Type()) 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.NewNopSettingsWithType(extensiontest.NopType) + set := extensiontest.NewNopSettingsWithType(factory.Type()) 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.NewNopSettingsWithType(extensiontest.NopType) + set := extensiontest.NewNopSettingsWithType(factory.Type()) 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.NewNopSettingsWithType(extensiontest.NopType) + set := extensiontest.NewNopSettingsWithType(factory.Type()) set.ID = component.NewID(metadata.Type) ext, err := newObserver(config, set) require.NoError(t, err) diff --git a/extension/observer/k8sobserver/factory_test.go b/extension/observer/k8sobserver/factory_test.go index 2c6de67587dc..12afa7667cb1 100644 --- a/extension/observer/k8sobserver/factory_test.go +++ b/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.NewNopSettingsWithType(extensiontest.NopType), cfg) + ext, err := factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(factory.Type()), cfg) require.Error(t, err) require.Nil(t, ext) } diff --git a/extension/opampextension/factory_test.go b/extension/opampextension/factory_test.go index edff10524065..c4077ad93f4b 100644 --- a/extension/opampextension/factory_test.go +++ b/extension/opampextension/factory_test.go @@ -14,19 +14,21 @@ import ( ) func TestFactory_CreateDefaultConfig(t *testing.T) { - cfg := NewFactory().CreateDefaultConfig() + f := NewFactory() + cfg := f.CreateDefaultConfig() assert.Equal(t, createDefaultConfig().(*Config), cfg) assert.NoError(t, componenttest.CheckConfigStruct(cfg)) - ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg) + ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(f.Type()), 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.NewNopSettingsWithType(extensiontest.NopType), cfg) + f := NewFactory() + cfg := f.CreateDefaultConfig() + ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(f.Type()), cfg) require.NoError(t, err) require.NotNil(t, ext) require.NoError(t, ext.Shutdown(context.Background()))