Skip to content

Commit d2723d6

Browse files
authored
[chore] Update types used in extensiontest.NewNopSettingsWithType (open-telemetry#37844)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description This PR replaced `extensiontest.NopType` with actual factory type if it's created. cc @mx-psi <!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. --> #### Link to tracking issue Follow up PR of open-telemetry#37808 <!--Describe what testing was performed and which tests were added.--> #### Testing n/a <!--Describe the documentation added.--> #### Documentation n/a <!--Please delete paragraphs that you did not use before submitting.-->
1 parent 2e98573 commit d2723d6

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

extension/observer/k8sobserver/extension_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestNewExtension(t *testing.T) {
3535
config := factory.CreateDefaultConfig().(*Config)
3636
mockServiceHost(t, config)
3737

38-
ext, err := newObserver(config, extensiontest.NewNopSettingsWithType(extensiontest.NopType))
38+
ext, err := newObserver(config, extensiontest.NewNopSettingsWithType(factory.Type()))
3939
require.NoError(t, err)
4040
require.NotNil(t, ext)
4141
}
@@ -46,7 +46,7 @@ func TestExtensionObserveServices(t *testing.T) {
4646
config.ObservePods = false // avoid causing data race when multiple test cases running in the same process using podListerWatcher
4747
mockServiceHost(t, config)
4848

49-
set := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
49+
set := extensiontest.NewNopSettingsWithType(factory.Type())
5050
set.ID = component.NewID(metadata.Type)
5151
ext, err := newObserver(config, set)
5252
require.NoError(t, err)
@@ -135,7 +135,7 @@ func TestExtensionObservePods(t *testing.T) {
135135
config := factory.CreateDefaultConfig().(*Config)
136136
mockServiceHost(t, config)
137137

138-
set := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
138+
set := extensiontest.NewNopSettingsWithType(factory.Type())
139139
set.ID = component.NewID(metadata.Type)
140140
ext, err := newObserver(config, set)
141141
require.NoError(t, err)
@@ -219,7 +219,7 @@ func TestExtensionObserveNodes(t *testing.T) {
219219
config.ObservePods = false // avoid causing data race when multiple test cases running in the same process using podListerWatcher
220220
mockServiceHost(t, config)
221221

222-
set := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
222+
set := extensiontest.NewNopSettingsWithType(factory.Type())
223223
set.ID = component.NewID(metadata.Type)
224224
ext, err := newObserver(config, set)
225225
require.NoError(t, err)
@@ -320,7 +320,7 @@ func TestExtensionObserveIngresses(t *testing.T) {
320320
config.ObserveIngresses = true
321321
mockServiceHost(t, config)
322322

323-
set := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
323+
set := extensiontest.NewNopSettingsWithType(factory.Type())
324324
set.ID = component.NewID(metadata.Type)
325325
ext, err := newObserver(config, set)
326326
require.NoError(t, err)

extension/observer/k8sobserver/factory_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestFactory_Create(t *testing.T) {
2626
factory := NewFactory()
2727
cfg := factory.CreateDefaultConfig().(*Config)
2828

29-
ext, err := factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
29+
ext, err := factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(factory.Type()), cfg)
3030
require.Error(t, err)
3131
require.Nil(t, ext)
3232
}

extension/opampextension/factory_test.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,21 @@ import (
1414
)
1515

1616
func TestFactory_CreateDefaultConfig(t *testing.T) {
17-
cfg := NewFactory().CreateDefaultConfig()
17+
f := NewFactory()
18+
cfg := f.CreateDefaultConfig()
1819
assert.Equal(t, createDefaultConfig().(*Config), cfg)
1920

2021
assert.NoError(t, componenttest.CheckConfigStruct(cfg))
21-
ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
22+
ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(f.Type()), cfg)
2223
require.NoError(t, err)
2324
require.NotNil(t, ext)
2425
require.NoError(t, ext.Shutdown(context.Background()))
2526
}
2627

2728
func TestFactory_Create(t *testing.T) {
28-
cfg := NewFactory().CreateDefaultConfig()
29-
ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
29+
f := NewFactory()
30+
cfg := f.CreateDefaultConfig()
31+
ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(f.Type()), cfg)
3032
require.NoError(t, err)
3133
require.NotNil(t, ext)
3234
require.NoError(t, ext.Shutdown(context.Background()))

0 commit comments

Comments
 (0)