Skip to content

Commit

Permalink
[chore] Update types used in extensiontest.NewNopSettingsWithType (op…
Browse files Browse the repository at this point in the history
…en-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.-->
  • Loading branch information
sincejune authored and khushijain21 committed Feb 14, 2025
1 parent 1522978 commit e24b646
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
10 changes: 5 additions & 5 deletions extension/observer/k8sobserver/extension_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion extension/observer/k8sobserver/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
10 changes: 6 additions & 4 deletions extension/opampextension/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()))
Expand Down

0 comments on commit e24b646

Please sign in to comment.