From 2dcfecdf2a637fdcfa7fe58f3ad68dd19c3943e8 Mon Sep 17 00:00:00 2001 From: Chao Date: Tue, 11 Feb 2025 01:01:10 +0800 Subject: [PATCH] Deprecate extensiontest.NewNopSettings --- exporter/fileexporter/encoding_test.go | 2 +- extension/asapauthextension/factory_test.go | 2 +- extension/awsproxy/factory_test.go | 2 +- extension/basicauthextension/factory_test.go | 2 +- .../bearertokenauthextension/factory_test.go | 2 +- .../cgroupruntimeextension/extension_test.go | 2 +- .../jaegerencodingextension/extension_test.go | 4 ++-- .../otlpencodingextension/extension_test.go | 4 ++-- .../extension_test.go | 2 +- .../textencodingextension/extension_test.go | 6 ++--- .../zipkinencodingextension/extension_test.go | 8 +++---- .../headerssetterextension/factory_test.go | 2 +- .../healthcheckextension/factory_test.go | 4 ++-- .../healthcheckextension/integration_test.go | 2 +- .../healthcheckv2extension/extension_test.go | 4 ++-- .../healthcheckv2extension/factory_test.go | 4 ++-- .../httpforwarderextension/factory_test.go | 2 +- .../jaegerremotesampling/factory_test.go | 2 +- .../oauth2clientauthextension/factory_test.go | 2 +- .../observer/cfgardenobserver/factory_test.go | 2 +- .../observer/dockerobserver/factory_test.go | 2 +- .../observer/ecsobserver/extension_test.go | 4 ++-- .../observer/ecstaskobserver/factory_test.go | 2 +- .../observer/hostobserver/factory_test.go | 2 +- .../observer/k8sobserver/extension_test.go | 10 ++++----- .../observer/k8sobserver/factory_test.go | 2 +- extension/oidcauthextension/factory_test.go | 2 +- extension/opampextension/factory_test.go | 4 ++-- extension/opampextension/opamp_agent_test.go | 22 +++++++++---------- extension/pprofextension/factory_test.go | 4 ++-- extension/sigv4authextension/factory_test.go | 6 ++--- extension/storage/dbstorage/extension_test.go | 4 ++-- .../storage/filestorage/extension_test.go | 16 +++++++------- extension/storage/filestorage/factory_test.go | 2 +- .../redisstorageextension/extension_test.go | 2 +- .../redisstorageextension/factory_test.go | 2 +- .../internal/bearertoken_test.go | 2 +- .../purefareceiver/internal/scraper_test.go | 2 +- .../internal/baerertoken_test.go | 2 +- .../purefbreceiver/internal/scraper_test.go | 2 +- 40 files changed, 77 insertions(+), 77 deletions(-) diff --git a/exporter/fileexporter/encoding_test.go b/exporter/fileexporter/encoding_test.go index 9410d4b029be..3492c368aa03 100644 --- a/exporter/fileexporter/encoding_test.go +++ b/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())) diff --git a/extension/asapauthextension/factory_test.go b/extension/asapauthextension/factory_test.go index f83e3320d275..12cad72e6736 100644 --- a/extension/asapauthextension/factory_test.go +++ b/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 { diff --git a/extension/awsproxy/factory_test.go b/extension/awsproxy/factory_test.go index ab26d5ace6aa..eacec033a41a 100644 --- a/extension/awsproxy/factory_test.go +++ b/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) diff --git a/extension/basicauthextension/factory_test.go b/extension/basicauthextension/factory_test.go index 7f88bdd63dad..aea3cdca3d0d 100644 --- a/extension/basicauthextension/factory_test.go +++ b/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) } diff --git a/extension/bearertokenauthextension/factory_test.go b/extension/bearertokenauthextension/factory_test.go index 88810f9da091..610e4d9de7aa 100644 --- a/extension/bearertokenauthextension/factory_test.go +++ b/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) } diff --git a/extension/cgroupruntimeextension/extension_test.go b/extension/cgroupruntimeextension/extension_test.go index 733478c735eb..bb50c3ae7dc9 100644 --- a/extension/cgroupruntimeextension/extension_test.go +++ b/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() diff --git a/extension/encoding/jaegerencodingextension/extension_test.go b/extension/encoding/jaegerencodingextension/extension_test.go index 76e389356a42..9bcece2e2452 100644 --- a/extension/encoding/jaegerencodingextension/extension_test.go +++ b/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\"", }, diff --git a/extension/encoding/otlpencodingextension/extension_test.go b/extension/encoding/otlpencodingextension/extension_test.go index 44d6aa5fa1f0..732b1da14ba9 100644 --- a/extension/encoding/otlpencodingextension/extension_test.go +++ b/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) }, }, } diff --git a/extension/encoding/skywalkingencodingextension/extension_test.go b/extension/encoding/skywalkingencodingextension/extension_test.go index b31ef31c1836..8c4b69430bbf 100644 --- a/extension/encoding/skywalkingencodingextension/extension_test.go +++ b/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) }, }, } diff --git a/extension/encoding/textencodingextension/extension_test.go b/extension/encoding/textencodingextension/extension_test.go index cbe144405300..46a3f79b1ec9 100644 --- a/extension/encoding/textencodingextension/extension_test.go +++ b/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'", }, diff --git a/extension/encoding/zipkinencodingextension/extension_test.go b/extension/encoding/zipkinencodingextension/extension_test.go index 8a8f45fc13eb..3486a1cf78ba 100644 --- a/extension/encoding/zipkinencodingextension/extension_test.go +++ b/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\"", }, diff --git a/extension/headerssetterextension/factory_test.go b/extension/headerssetterextension/factory_test.go index 77dda9b17a93..90639d25892c 100644 --- a/extension/headerssetterextension/factory_test.go +++ b/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) } diff --git a/extension/healthcheckextension/factory_test.go b/extension/healthcheckextension/factory_test.go index 676015bfcb4e..a13d97bc10b9 100644 --- a/extension/healthcheckextension/factory_test.go +++ b/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) } diff --git a/extension/healthcheckextension/integration_test.go b/extension/healthcheckextension/integration_test.go index 7ccc325b0632..1e9612d741fa 100644 --- a/extension/healthcheckextension/integration_test.go +++ b/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) diff --git a/extension/healthcheckv2extension/extension_test.go b/extension/healthcheckv2extension/extension_test.go index 57ba700e7e31..bc83f1f2eeb5 100644 --- a/extension/healthcheckv2extension/extension_test.go +++ b/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())) }) diff --git a/extension/healthcheckv2extension/factory_test.go b/extension/healthcheckv2extension/factory_test.go index eaf97966b373..fa91f968ab21 100644 --- a/extension/healthcheckv2extension/factory_test.go +++ b/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) } diff --git a/extension/httpforwarderextension/factory_test.go b/extension/httpforwarderextension/factory_test.go index b1678a5ff47a..a4cf3fcf3aa4 100644 --- a/extension/httpforwarderextension/factory_test.go +++ b/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 { diff --git a/extension/jaegerremotesampling/factory_test.go b/extension/jaegerremotesampling/factory_test.go index 32ce17c5010a..7c03f5cae4ca 100644 --- a/extension/jaegerremotesampling/factory_test.go +++ b/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) } diff --git a/extension/oauth2clientauthextension/factory_test.go b/extension/oauth2clientauthextension/factory_test.go index 0d64cf5ad271..dbc4b3dda877 100644 --- a/extension/oauth2clientauthextension/factory_test.go +++ b/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) diff --git a/extension/observer/cfgardenobserver/factory_test.go b/extension/observer/cfgardenobserver/factory_test.go index 23b8ead01631..97582f2c5a3e 100644 --- a/extension/observer/cfgardenobserver/factory_test.go +++ b/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) diff --git a/extension/observer/dockerobserver/factory_test.go b/extension/observer/dockerobserver/factory_test.go index f18505fc8003..d758713f56ab 100644 --- a/extension/observer/dockerobserver/factory_test.go +++ b/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) diff --git a/extension/observer/ecsobserver/extension_test.go b/extension/observer/ecsobserver/extension_test.go index 491dfc830ae5..4591f739349b 100644 --- a/extension/observer/ecsobserver/extension_test.go +++ b/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) diff --git a/extension/observer/ecstaskobserver/factory_test.go b/extension/observer/ecstaskobserver/factory_test.go index 431c2dfc2396..f4e3e1d72968 100644 --- a/extension/observer/ecstaskobserver/factory_test.go +++ b/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) diff --git a/extension/observer/hostobserver/factory_test.go b/extension/observer/hostobserver/factory_test.go index cf53f0864b8f..a600d00647fc 100644 --- a/extension/observer/hostobserver/factory_test.go +++ b/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) diff --git a/extension/observer/k8sobserver/extension_test.go b/extension/observer/k8sobserver/extension_test.go index 8e58659f4a66..b844255ba82a 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.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) diff --git a/extension/observer/k8sobserver/factory_test.go b/extension/observer/k8sobserver/factory_test.go index df25229c59a6..2c6de67587dc 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.NewNopSettings(), cfg) + ext, err := factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg) require.Error(t, err) require.Nil(t, ext) } diff --git a/extension/oidcauthextension/factory_test.go b/extension/oidcauthextension/factory_test.go index 80b20293cb54..66aea09d0d17 100644 --- a/extension/oidcauthextension/factory_test.go +++ b/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) } diff --git a/extension/opampextension/factory_test.go b/extension/opampextension/factory_test.go index eaa4d40c6d29..edff10524065 100644 --- a/extension/opampextension/factory_test.go +++ b/extension/opampextension/factory_test.go @@ -18,7 +18,7 @@ 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())) @@ -26,7 +26,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { 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())) diff --git a/extension/opampextension/opamp_agent_test.go b/extension/opampextension/opamp_agent_test.go index 7921bd767470..048e006877fc 100644 --- a/extension/opampextension/opamp_agent_test.go +++ b/extension/opampextension/opamp_agent_test.go @@ -33,7 +33,7 @@ import ( func TestNewOpampAgent(t *testing.T) { cfg := createDefaultConfig() - set := extensiontest.NewNopSettings() + set := extensiontest.NewNopSettingsWithType(extensiontest.NopType) set.BuildInfo = component.BuildInfo{Version: "test version", Command: "otelcoltest"} o, err := newOpampAgent(cfg.(*Config), set) assert.NoError(t, err) @@ -49,7 +49,7 @@ func TestNewOpampAgent(t *testing.T) { func TestNewOpampAgentAttributes(t *testing.T) { cfg := createDefaultConfig() - set := extensiontest.NewNopSettings() + set := extensiontest.NewNopSettingsWithType(extensiontest.NopType) set.BuildInfo = component.BuildInfo{Version: "test version", Command: "otelcoltest"} set.Resource.Attributes().PutStr(semconv.AttributeServiceName, "otelcol-distro") set.Resource.Attributes().PutStr(semconv.AttributeServiceVersion, "distro.0") @@ -146,7 +146,7 @@ func TestCreateAgentDescription(t *testing.T) { cfg := createDefaultConfig().(*Config) tc.cfg(cfg) - set := extensiontest.NewNopSettings() + set := extensiontest.NewNopSettingsWithType(extensiontest.NopType) set.Resource.Attributes().PutStr(semconv.AttributeServiceName, serviceName) set.Resource.Attributes().PutStr(semconv.AttributeServiceVersion, serviceVersion) set.Resource.Attributes().PutStr(semconv.AttributeServiceInstanceID, serviceInstanceUUID) @@ -165,7 +165,7 @@ func TestCreateAgentDescription(t *testing.T) { func TestUpdateAgentIdentity(t *testing.T) { cfg := createDefaultConfig() - set := extensiontest.NewNopSettings() + set := extensiontest.NewNopSettingsWithType(extensiontest.NopType) o, err := newOpampAgent(cfg.(*Config), set) assert.NoError(t, err) @@ -182,7 +182,7 @@ func TestUpdateAgentIdentity(t *testing.T) { func TestComposeEffectiveConfig(t *testing.T) { cfg := createDefaultConfig() - set := extensiontest.NewNopSettings() + set := extensiontest.NewNopSettingsWithType(extensiontest.NopType) o, err := newOpampAgent(cfg.(*Config), set) assert.NoError(t, err) assert.Empty(t, o.effectiveConfig) @@ -207,7 +207,7 @@ func TestComposeEffectiveConfig(t *testing.T) { func TestShutdown(t *testing.T) { cfg := createDefaultConfig() - set := extensiontest.NewNopSettings() + set := extensiontest.NewNopSettingsWithType(extensiontest.NopType) o, err := newOpampAgent(cfg.(*Config), set) assert.NoError(t, err) @@ -217,7 +217,7 @@ func TestShutdown(t *testing.T) { func TestStart(t *testing.T) { cfg := createDefaultConfig() - set := extensiontest.NewNopSettings() + set := extensiontest.NewNopSettingsWithType(extensiontest.NopType) o, err := newOpampAgent(cfg.(*Config), set) assert.NoError(t, err) @@ -227,7 +227,7 @@ func TestStart(t *testing.T) { func TestHealthReportingReceiveUpdateFromAggregator(t *testing.T) { cfg := createDefaultConfig().(*Config) - set := extensiontest.NewNopSettings() + set := extensiontest.NewNopSettingsWithType(extensiontest.NopType) statusUpdateChannel := make(chan *status.AggregateStatus) @@ -335,7 +335,7 @@ func TestHealthReportingReceiveUpdateFromAggregator(t *testing.T) { func TestHealthReportingForwardComponentHealthToAggregator(t *testing.T) { cfg := createDefaultConfig().(*Config) - set := extensiontest.NewNopSettings() + set := extensiontest.NewNopSettingsWithType(extensiontest.NopType) mtx := &sync.RWMutex{} @@ -420,7 +420,7 @@ func TestHealthReportingForwardComponentHealthToAggregator(t *testing.T) { func TestHealthReportingExitsOnClosedContext(t *testing.T) { cfg := createDefaultConfig().(*Config) - set := extensiontest.NewNopSettings() + set := extensiontest.NewNopSettingsWithType(extensiontest.NopType) statusUpdateChannel := make(chan *status.AggregateStatus) sa := &mockStatusAggregator{ @@ -496,7 +496,7 @@ func TestHealthReportingExitsOnClosedContext(t *testing.T) { func TestHealthReportingDisabled(t *testing.T) { cfg := createDefaultConfig() - set := extensiontest.NewNopSettings() + set := extensiontest.NewNopSettingsWithType(extensiontest.NopType) o, err := newOpampAgent(cfg.(*Config), set) assert.NoError(t, err) diff --git a/extension/pprofextension/factory_test.go b/extension/pprofextension/factory_test.go index dd69c2f2d0a2..53b25fc10794 100644 --- a/extension/pprofextension/factory_test.go +++ b/extension/pprofextension/factory_test.go @@ -24,7 +24,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) } @@ -33,7 +33,7 @@ func TestFactory_Create(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.TCPAddr.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) } diff --git a/extension/sigv4authextension/factory_test.go b/extension/sigv4authextension/factory_test.go index 31762460e0d7..dbf58ac69748 100644 --- a/extension/sigv4authextension/factory_test.go +++ b/extension/sigv4authextension/factory_test.go @@ -19,8 +19,8 @@ func TestNewFactory(t *testing.T) { cfg := createDefaultConfig().(*Config) assert.Equal(t, f.CreateDefaultConfig().(*Config), cfg) - ext, _ := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg) - fext, _ := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg) + ext, _ := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg) + fext, _ := f.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg) assert.Equal(t, fext, ext) } @@ -33,7 +33,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) } diff --git a/extension/storage/dbstorage/extension_test.go b/extension/storage/dbstorage/extension_test.go index 91925971bd1c..0db693ab5097 100644 --- a/extension/storage/dbstorage/extension_test.go +++ b/extension/storage/dbstorage/extension_test.go @@ -123,7 +123,7 @@ func newSqliteTestExtension(t *testing.T) storage.Extension { cfg.DriverName = "sqlite3" cfg.DataSource = fmt.Sprintf("file:%s/foo.db?_busy_timeout=10000&_journal=WAL&_sync=NORMAL", t.TempDir()) - extension, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg) + extension, err := f.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg) require.NoError(t, err) se, ok := extension.(storage.Extension) @@ -165,7 +165,7 @@ func newPostgresTestExtension(t *testing.T) storage.Extension { cfg.DriverName = "pgx" cfg.DataSource = fmt.Sprintf("host=%s port=%s user=%s password=%s dbname=%s sslmode=disable", "127.0.0.1", port.Port(), "root", "passwd", "db") - extension, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg) + extension, err := f.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg) require.NoError(t, err) se, ok := extension.(storage.Extension) diff --git a/extension/storage/filestorage/extension_test.go b/extension/storage/filestorage/extension_test.go index 90b0336fb232..6fa627bef94a 100644 --- a/extension/storage/filestorage/extension_test.go +++ b/extension/storage/filestorage/extension_test.go @@ -232,7 +232,7 @@ func TestComponentNameWithUnsafeCharacters(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) cfg.Directory = tempDir - extension, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg) + extension, err := f.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg) require.NoError(t, err) se, ok := extension.(storage.Extension) @@ -260,7 +260,7 @@ func TestGetClientErrorsOnDeletedDirectory(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) cfg.Directory = tempDir - extension, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg) + extension, err := f.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg) require.NoError(t, err) se, ok := extension.(storage.Extension) @@ -286,7 +286,7 @@ func newTestExtension(t *testing.T) storage.Extension { cfg := f.CreateDefaultConfig().(*Config) cfg.Directory = t.TempDir() - extension, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg) + extension, err := f.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg) require.NoError(t, err) se, ok := extension.(storage.Extension) @@ -308,7 +308,7 @@ func TestCompaction(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) cfg.Directory = tempDir - extension, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg) + extension, err := f.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg) require.NoError(t, err) se, ok := extension.(storage.Extension) @@ -398,7 +398,7 @@ func TestCompactionRemoveTemp(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) cfg.Directory = tempDir - extension, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg) + extension, err := f.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg) require.NoError(t, err) se, ok := extension.(storage.Extension) @@ -466,7 +466,7 @@ func TestCleanupOnStart(t *testing.T) { cfg.Directory = tempDir cfg.Compaction.Directory = tempDir cfg.Compaction.CleanupOnStart = true - extension, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg) + extension, err := f.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg) require.NoError(t, err) se, ok := extension.(storage.Extension) @@ -494,7 +494,7 @@ func TestCompactionOnStart(t *testing.T) { logCore, logObserver := observer.New(zap.DebugLevel) logger := zap.New(logCore) - set := extensiontest.NewNopSettings() + set := extensiontest.NewNopSettingsWithType(extensiontest.NopType) set.Logger = logger tempDir := t.TempDir() @@ -604,7 +604,7 @@ func TestDirectoryCreation(t *testing.T) { f := NewFactory() config := tt.config(t, f) if config != nil { - ext, err := f.Create(context.Background(), extensiontest.NewNopSettings(), config) + ext, err := f.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), config) require.NoError(t, err) require.NotNil(t, ext) tt.validate(t, config) diff --git a/extension/storage/filestorage/factory_test.go b/extension/storage/filestorage/factory_test.go index a770df0ef669..987df409f3a3 100644 --- a/extension/storage/filestorage/factory_test.go +++ b/extension/storage/filestorage/factory_test.go @@ -52,7 +52,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 { diff --git a/extension/storage/redisstorageextension/extension_test.go b/extension/storage/redisstorageextension/extension_test.go index 6d4f7da96a7e..27c826a27ae3 100644 --- a/extension/storage/redisstorageextension/extension_test.go +++ b/extension/storage/redisstorageextension/extension_test.go @@ -188,7 +188,7 @@ func newTestExtension(t *testing.T) storage.Extension { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) - extension, err := f.Create(context.Background(), extensiontest.NewNopSettings(), cfg) + extension, err := f.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg) require.NoError(t, err) se, ok := extension.(storage.Extension) diff --git a/extension/storage/redisstorageextension/factory_test.go b/extension/storage/redisstorageextension/factory_test.go index 3494cd85fa04..a7fae82ed8c9 100644 --- a/extension/storage/redisstorageextension/factory_test.go +++ b/extension/storage/redisstorageextension/factory_test.go @@ -33,7 +33,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, ) require.NoError(t, err) diff --git a/receiver/purefareceiver/internal/bearertoken_test.go b/receiver/purefareceiver/internal/bearertoken_test.go index 0740a8028de0..02627c117886 100644 --- a/receiver/purefareceiver/internal/bearertoken_test.go +++ b/receiver/purefareceiver/internal/bearertoken_test.go @@ -24,7 +24,7 @@ func TestBearerToken(t *testing.T) { baCfg := baFactory.CreateDefaultConfig().(*bearertokenauthextension.Config) baCfg.BearerToken = "the-token" - baExt, err := baFactory.Create(context.Background(), extensiontest.NewNopSettings(), baCfg) + baExt, err := baFactory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), baCfg) require.NoError(t, err) baComponentName := component.MustNewIDWithName("bearertokenauth", "array01") diff --git a/receiver/purefareceiver/internal/scraper_test.go b/receiver/purefareceiver/internal/scraper_test.go index 7a0cedce074b..3154ed5916c5 100644 --- a/receiver/purefareceiver/internal/scraper_test.go +++ b/receiver/purefareceiver/internal/scraper_test.go @@ -28,7 +28,7 @@ func TestToPrometheusConfig(t *testing.T) { baCfg := baFactory.CreateDefaultConfig().(*bearertokenauthextension.Config) baCfg.BearerToken = "the-token" - baExt, err := baFactory.Create(context.Background(), extensiontest.NewNopSettings(), baCfg) + baExt, err := baFactory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), baCfg) require.NoError(t, err) host := &mockHost{ diff --git a/receiver/purefbreceiver/internal/baerertoken_test.go b/receiver/purefbreceiver/internal/baerertoken_test.go index ffbd0b13fe68..f69e448ee92c 100644 --- a/receiver/purefbreceiver/internal/baerertoken_test.go +++ b/receiver/purefbreceiver/internal/baerertoken_test.go @@ -24,7 +24,7 @@ func TestBearerToken(t *testing.T) { baCfg := baFactory.CreateDefaultConfig().(*bearertokenauthextension.Config) baCfg.BearerToken = "the-token" - baExt, err := baFactory.Create(context.Background(), extensiontest.NewNopSettings(), baCfg) + baExt, err := baFactory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), baCfg) require.NoError(t, err) baComponentName := component.MustNewIDWithName("bearertokenauth", "fb02") diff --git a/receiver/purefbreceiver/internal/scraper_test.go b/receiver/purefbreceiver/internal/scraper_test.go index 8f8881b716f8..947206adaf50 100644 --- a/receiver/purefbreceiver/internal/scraper_test.go +++ b/receiver/purefbreceiver/internal/scraper_test.go @@ -27,7 +27,7 @@ func TestToPrometheusConfig(t *testing.T) { baCfg := baFactory.CreateDefaultConfig().(*bearertokenauthextension.Config) baCfg.BearerToken = "the-token" - baExt, err := baFactory.Create(context.Background(), extensiontest.NewNopSettings(), baCfg) + baExt, err := baFactory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), baCfg) require.NoError(t, err) host := &mockHost{