From 06f177a66b26dcce74e15dd8983015b3a726f003 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Fri, 15 Mar 2024 09:54:41 -0700 Subject: [PATCH] Revert "[chore] change the way we unmarshal the config in tests" (#9771) Reverts open-telemetry/opentelemetry-collector#9765 We need to revert those changes as contrib has issues with them in isolation from #9750. --- .../samplereceiver/generated_component_test.go | 2 +- cmd/mdatagen/templates/component_test.go.tmpl | 10 +++++----- connector/forwardconnector/generated_component_test.go | 2 +- exporter/debugexporter/generated_component_test.go | 2 +- exporter/loggingexporter/generated_component_test.go | 2 +- exporter/nopexporter/generated_component_test.go | 2 +- exporter/otlpexporter/generated_component_test.go | 2 +- exporter/otlphttpexporter/generated_component_test.go | 2 +- extension/ballastextension/generated_component_test.go | 3 ++- .../memorylimiterextension/generated_component_test.go | 3 ++- extension/zpagesextension/generated_component_test.go | 3 ++- processor/batchprocessor/generated_component_test.go | 2 +- .../memorylimiterprocessor/generated_component_test.go | 2 +- receiver/nopreceiver/generated_component_test.go | 2 +- receiver/otlpreceiver/generated_component_test.go | 2 +- 15 files changed, 22 insertions(+), 19 deletions(-) diff --git a/cmd/mdatagen/internal/samplereceiver/generated_component_test.go b/cmd/mdatagen/internal/samplereceiver/generated_component_test.go index 11bffede3bc..8eb4377792f 100644 --- a/cmd/mdatagen/internal/samplereceiver/generated_component_test.go +++ b/cmd/mdatagen/internal/samplereceiver/generated_component_test.go @@ -51,7 +51,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { diff --git a/cmd/mdatagen/templates/component_test.go.tmpl b/cmd/mdatagen/templates/component_test.go.tmpl index 8ec2809669c..f4bb1bc8702 100644 --- a/cmd/mdatagen/templates/component_test.go.tmpl +++ b/cmd/mdatagen/templates/component_test.go.tmpl @@ -88,7 +88,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { {{- if not .Tests.SkipShutdown }} @@ -185,7 +185,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { {{- if not .Tests.SkipShutdown }} @@ -280,7 +280,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { {{- if not .Tests.SkipShutdown }} @@ -319,7 +319,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) {{- if not .Tests.SkipShutdown }} t.Run("shutdown", func(t *testing.T) { @@ -433,7 +433,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { {{- if not .Tests.SkipShutdown }} diff --git a/connector/forwardconnector/generated_component_test.go b/connector/forwardconnector/generated_component_test.go index 942fdb3d827..27af252dad1 100644 --- a/connector/forwardconnector/generated_component_test.go +++ b/connector/forwardconnector/generated_component_test.go @@ -51,7 +51,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { diff --git a/exporter/debugexporter/generated_component_test.go b/exporter/debugexporter/generated_component_test.go index 9adedd0177b..34ca9eaedce 100644 --- a/exporter/debugexporter/generated_component_test.go +++ b/exporter/debugexporter/generated_component_test.go @@ -55,7 +55,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { diff --git a/exporter/loggingexporter/generated_component_test.go b/exporter/loggingexporter/generated_component_test.go index e550551c4ac..2ea8edc933a 100644 --- a/exporter/loggingexporter/generated_component_test.go +++ b/exporter/loggingexporter/generated_component_test.go @@ -55,7 +55,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { diff --git a/exporter/nopexporter/generated_component_test.go b/exporter/nopexporter/generated_component_test.go index cba1c173ffb..4c1876140dc 100644 --- a/exporter/nopexporter/generated_component_test.go +++ b/exporter/nopexporter/generated_component_test.go @@ -55,7 +55,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { diff --git a/exporter/otlpexporter/generated_component_test.go b/exporter/otlpexporter/generated_component_test.go index a275a447c76..cad24cfa855 100644 --- a/exporter/otlpexporter/generated_component_test.go +++ b/exporter/otlpexporter/generated_component_test.go @@ -55,7 +55,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { diff --git a/exporter/otlphttpexporter/generated_component_test.go b/exporter/otlphttpexporter/generated_component_test.go index 1dafd67ecaf..3ed05244be2 100644 --- a/exporter/otlphttpexporter/generated_component_test.go +++ b/exporter/otlphttpexporter/generated_component_test.go @@ -55,7 +55,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { diff --git a/extension/ballastextension/generated_component_test.go b/extension/ballastextension/generated_component_test.go index d820a5c51de..f43cef29af4 100644 --- a/extension/ballastextension/generated_component_test.go +++ b/extension/ballastextension/generated_component_test.go @@ -8,6 +8,7 @@ import ( "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/extension/extensiontest" @@ -21,7 +22,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) t.Run("shutdown", func(t *testing.T) { e, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) diff --git a/extension/memorylimiterextension/generated_component_test.go b/extension/memorylimiterextension/generated_component_test.go index 04c872fbe3c..ef808e120ac 100644 --- a/extension/memorylimiterextension/generated_component_test.go +++ b/extension/memorylimiterextension/generated_component_test.go @@ -8,6 +8,7 @@ import ( "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/extension/extensiontest" @@ -21,7 +22,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) t.Run("lifecycle", func(t *testing.T) { firstExt, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) diff --git a/extension/zpagesextension/generated_component_test.go b/extension/zpagesextension/generated_component_test.go index d2bf96e9194..f8c9f634b3c 100644 --- a/extension/zpagesextension/generated_component_test.go +++ b/extension/zpagesextension/generated_component_test.go @@ -8,6 +8,7 @@ import ( "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/extension/extensiontest" @@ -21,7 +22,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) t.Run("shutdown", func(t *testing.T) { e, err := factory.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) require.NoError(t, err) diff --git a/processor/batchprocessor/generated_component_test.go b/processor/batchprocessor/generated_component_test.go index 581e2a6a864..ac9ea51dea2 100644 --- a/processor/batchprocessor/generated_component_test.go +++ b/processor/batchprocessor/generated_component_test.go @@ -56,7 +56,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { diff --git a/processor/memorylimiterprocessor/generated_component_test.go b/processor/memorylimiterprocessor/generated_component_test.go index f3bfd57e3b8..4179b548823 100644 --- a/processor/memorylimiterprocessor/generated_component_test.go +++ b/processor/memorylimiterprocessor/generated_component_test.go @@ -56,7 +56,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { t.Run(test.name+"-lifecycle", func(t *testing.T) { diff --git a/receiver/nopreceiver/generated_component_test.go b/receiver/nopreceiver/generated_component_test.go index 5a86d22f37f..7a5d702867d 100644 --- a/receiver/nopreceiver/generated_component_test.go +++ b/receiver/nopreceiver/generated_component_test.go @@ -51,7 +51,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) { diff --git a/receiver/otlpreceiver/generated_component_test.go b/receiver/otlpreceiver/generated_component_test.go index 06fd87aa934..310eaa3d6b0 100644 --- a/receiver/otlpreceiver/generated_component_test.go +++ b/receiver/otlpreceiver/generated_component_test.go @@ -51,7 +51,7 @@ func TestComponentLifecycle(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub("tests::config") require.NoError(t, err) - require.NoError(t, sub.Unmarshal(&cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) for _, test := range tests { t.Run(test.name+"-shutdown", func(t *testing.T) {