diff --git a/internal/stanza/factory_test.go b/internal/stanza/factory_test.go index 9d7a89959fb2e..d56af1fd11dd4 100644 --- a/internal/stanza/factory_test.go +++ b/internal/stanza/factory_test.go @@ -20,16 +20,11 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" ) func TestCreateReceiver(t *testing.T) { - params := component.ReceiverCreateSettings{ - Logger: zap.NewNop(), - } - t.Run("Success", func(t *testing.T) { factory := NewFactory(TestReceiverType{}) cfg := factory.CreateDefaultConfig().(*TestConfig) @@ -38,7 +33,7 @@ func TestCreateReceiver(t *testing.T) { "type": "json_parser", }, } - receiver, err := factory.CreateLogsReceiver(context.Background(), params, cfg, consumertest.NewNop()) + receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) require.NoError(t, err, "receiver creation failed") require.NotNil(t, receiver, "receiver creation failed") }) @@ -50,7 +45,7 @@ func TestCreateReceiver(t *testing.T) { MaxFlushCount: 1, FlushInterval: 3 * time.Second, } - receiver, err := factory.CreateLogsReceiver(context.Background(), params, cfg, consumertest.NewNop()) + receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) require.NoError(t, err, "receiver creation failed") require.NotNil(t, receiver, "receiver creation failed") }) @@ -61,7 +56,7 @@ func TestCreateReceiver(t *testing.T) { badCfg.Input = map[string]interface{}{ "type": "unknown", } - receiver, err := factory.CreateLogsReceiver(context.Background(), params, badCfg, consumertest.NewNop()) + receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), badCfg, consumertest.NewNop()) require.Error(t, err, "receiver creation should fail if input config isn't valid") require.Nil(t, receiver, "receiver creation should fail if input config isn't valid") }) @@ -74,7 +69,7 @@ func TestCreateReceiver(t *testing.T) { "badparam": "badvalue", }, } - receiver, err := factory.CreateLogsReceiver(context.Background(), params, badCfg, consumertest.NewNop()) + receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), badCfg, consumertest.NewNop()) require.Error(t, err, "receiver creation should fail if parser configs aren't valid") require.Nil(t, receiver, "receiver creation should fail if parser configs aren't valid") }) diff --git a/internal/stanza/receiver_test.go b/internal/stanza/receiver_test.go index 44b578a3ebb34..ee8938d030e0c 100644 --- a/internal/stanza/receiver_test.go +++ b/internal/stanza/receiver_test.go @@ -27,24 +27,19 @@ import ( "github.com/open-telemetry/opentelemetry-log-collection/pipeline" "github.com/open-telemetry/opentelemetry-log-collection/testutil" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.uber.org/zap" - "go.uber.org/zap/zaptest" "gopkg.in/yaml.v2" ) func TestStart(t *testing.T) { - params := component.ReceiverCreateSettings{ - Logger: zaptest.NewLogger(t), - } mockConsumer := mockLogsConsumer{} factory := NewFactory(TestReceiverType{}) logsReceiver, err := factory.CreateLogsReceiver( context.Background(), - params, + componenttest.NewNopReceiverCreateSettings(), factory.CreateDefaultConfig(), &mockConsumer, ) @@ -67,9 +62,6 @@ func TestStart(t *testing.T) { } func TestHandleStartError(t *testing.T) { - params := component.ReceiverCreateSettings{ - Logger: zaptest.NewLogger(t), - } mockConsumer := mockLogsConsumer{} factory := NewFactory(TestReceiverType{}) @@ -77,7 +69,7 @@ func TestHandleStartError(t *testing.T) { cfg := factory.CreateDefaultConfig().(*TestConfig) cfg.Input = newUnstartableParams() - receiver, err := factory.CreateLogsReceiver(context.Background(), params, cfg, &mockConsumer) + receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, &mockConsumer) require.NoError(t, err, "receiver should successfully build") err = receiver.Start(context.Background(), componenttest.NewNopHost()) @@ -85,13 +77,10 @@ func TestHandleStartError(t *testing.T) { } func TestHandleConsumeError(t *testing.T) { - params := component.ReceiverCreateSettings{ - Logger: zaptest.NewLogger(t), - } mockConsumer := mockLogsRejecter{} factory := NewFactory(TestReceiverType{}) - logsReceiver, err := factory.CreateLogsReceiver(context.Background(), params, factory.CreateDefaultConfig(), &mockConsumer) + logsReceiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), factory.CreateDefaultConfig(), &mockConsumer) require.NoError(t, err, "receiver should successfully build") err = logsReceiver.Start(context.Background(), componenttest.NewNopHost()) diff --git a/receiver/awscontainerinsightreceiver/factory_test.go b/receiver/awscontainerinsightreceiver/factory_test.go index 039278ff1e32d..eb67b51d412ca 100644 --- a/receiver/awscontainerinsightreceiver/factory_test.go +++ b/receiver/awscontainerinsightreceiver/factory_test.go @@ -20,9 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/testbed/testbed" - "go.uber.org/zap" ) func TestNewFactory(t *testing.T) { @@ -33,7 +32,7 @@ func TestNewFactory(t *testing.T) { func TestCreateMetricsReceiver(t *testing.T) { metricsReceiver, _ := createMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), createDefaultConfig(), &testbed.MockMetricConsumer{}, ) diff --git a/receiver/awsecscontainermetricsreceiver/factory_test.go b/receiver/awsecscontainermetricsreceiver/factory_test.go index 1e598717beef6..ff5db3b87dc5b 100644 --- a/receiver/awsecscontainermetricsreceiver/factory_test.go +++ b/receiver/awsecscontainermetricsreceiver/factory_test.go @@ -21,10 +21,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/testbed/testbed" - "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver/awsecscontainermetrics" ) @@ -39,7 +38,7 @@ func TestCreateMetricsReceiver(t *testing.T) { metricsReceiver, err := createMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), createDefaultConfig(), &testbed.MockMetricConsumer{}, ) @@ -52,7 +51,7 @@ func TestCreateMetricsReceiverWithEnv(t *testing.T) { metricsReceiver, err := createMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), createDefaultConfig(), &testbed.MockMetricConsumer{}, ) @@ -65,7 +64,7 @@ func TestCreateMetricsReceiverWithBadUrl(t *testing.T) { metricsReceiver, err := createMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), createDefaultConfig(), &testbed.MockMetricConsumer{}, ) @@ -76,7 +75,7 @@ func TestCreateMetricsReceiverWithBadUrl(t *testing.T) { func TestCreateMetricsReceiverWithNilConsumer(t *testing.T) { metricsReceiver, err := createMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), createDefaultConfig(), nil, ) diff --git a/receiver/awsxrayreceiver/factory_test.go b/receiver/awsxrayreceiver/factory_test.go index 0afb0918d5b94..c9cc417072b01 100644 --- a/receiver/awsxrayreceiver/factory_test.go +++ b/receiver/awsxrayreceiver/factory_test.go @@ -22,12 +22,11 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenterror" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray" ) @@ -54,9 +53,7 @@ func TestCreateTracesReceiver(t *testing.T) { factory := NewFactory() _, err := factory.CreateTracesReceiver( context.Background(), - component.ReceiverCreateSettings{ - Logger: zap.NewNop(), - }, + componenttest.NewNopReceiverCreateSettings(), factory.CreateDefaultConfig().(*Config), consumertest.NewNop(), ) @@ -67,9 +64,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() _, err := factory.CreateMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{ - Logger: zap.NewNop(), - }, + componenttest.NewNopReceiverCreateSettings(), factory.CreateDefaultConfig().(*Config), consumertest.NewNop(), ) diff --git a/receiver/carbonreceiver/factory_test.go b/receiver/carbonreceiver/factory_test.go index c4a1588c7db08..ee0c690200111 100644 --- a/receiver/carbonreceiver/factory_test.go +++ b/receiver/carbonreceiver/factory_test.go @@ -19,10 +19,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" ) func TestCreateDefaultConfig(t *testing.T) { @@ -36,7 +35,7 @@ func TestCreateReceiver(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = "localhost:0" // Endpoint is required, not going to be used here. - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() tReceiver, err := createMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") diff --git a/receiver/collectdreceiver/factory_test.go b/receiver/collectdreceiver/factory_test.go index d512cb72db41e..9088b94872350 100644 --- a/receiver/collectdreceiver/factory_test.go +++ b/receiver/collectdreceiver/factory_test.go @@ -19,10 +19,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" ) func TestCreateDefaultConfig(t *testing.T) { @@ -36,7 +35,7 @@ func TestCreateReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") diff --git a/receiver/dockerstatsreceiver/factory_test.go b/receiver/dockerstatsreceiver/factory_test.go index 45daea388df09..2c97fb8d85bae 100644 --- a/receiver/dockerstatsreceiver/factory_test.go +++ b/receiver/dockerstatsreceiver/factory_test.go @@ -19,11 +19,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenterror" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/testbed/testbed" - "go.uber.org/zap" ) func TestCreateDefaultConfig(t *testing.T) { @@ -39,7 +38,7 @@ func TestCreateReceiver(t *testing.T) { factory := NewFactory() config := factory.CreateDefaultConfig() - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() traceReceiver, err := factory.CreateTracesReceiver(context.Background(), params, config, &testbed.MockTraceConsumer{}) assert.ErrorIs(t, err, componenterror.ErrDataTypeIsNotSupported) assert.Nil(t, traceReceiver) @@ -56,7 +55,7 @@ func TestCreateInvalidHTTPEndpoint(t *testing.T) { receiverCfg.Endpoint = "" - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() consumer := &testbed.MockMetricConsumer{} receiver, err := factory.CreateMetricsReceiver(context.Background(), params, receiverCfg, consumer) assert.Nil(t, receiver) diff --git a/receiver/dotnetdiagnosticsreceiver/factory_test.go b/receiver/dotnetdiagnosticsreceiver/factory_test.go index 6bf105c2c9d29..b5b18629b6873 100644 --- a/receiver/dotnetdiagnosticsreceiver/factory_test.go +++ b/receiver/dotnetdiagnosticsreceiver/factory_test.go @@ -21,10 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" ) func TestCreateDefaultConfig(t *testing.T) { @@ -43,7 +42,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestNewFactory(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig() - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() r, err := f.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, r) diff --git a/receiver/filelogreceiver/filelog_test.go b/receiver/filelogreceiver/filelog_test.go index 222dca5b3de1e..4014133172c47 100644 --- a/receiver/filelogreceiver/filelog_test.go +++ b/receiver/filelogreceiver/filelog_test.go @@ -30,14 +30,12 @@ import ( "github.com/open-telemetry/opentelemetry-log-collection/entry" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/model/pdata" - "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza" ) @@ -72,9 +70,7 @@ func TestCreateWithInvalidInputConfig(t *testing.T) { _, err := NewFactory().CreateLogsReceiver( context.Background(), - component.ReceiverCreateSettings{ - Logger: zaptest.NewLogger(t), - }, + componenttest.NewNopReceiverCreateSettings(), cfg, new(consumertest.LogsSink), ) @@ -88,7 +84,6 @@ func TestReadStaticFile(t *testing.T) { f := NewFactory() sink := new(consumertest.LogsSink) - params := component.ReceiverCreateSettings{Logger: zaptest.NewLogger(t)} cfg := testdataConfigYamlAsMap() cfg.Converter.MaxFlushCount = 10 @@ -102,7 +97,7 @@ func TestReadStaticFile(t *testing.T) { wg.Add(1) go consumeNLogsFromConverter(converter.OutChannel(), 3, &wg) - rcvr, err := f.CreateLogsReceiver(context.Background(), params, cfg, sink) + rcvr, err := f.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) @@ -178,7 +173,6 @@ func (rt *rotationTest) Run(t *testing.T) { f := NewFactory() sink := new(consumertest.LogsSink) - params := component.ReceiverCreateSettings{Logger: zaptest.NewLogger(t)} cfg := testdataRotateTestYamlAsMap(tempDir) cfg.Converter.MaxFlushCount = 1 @@ -199,7 +193,7 @@ func (rt *rotationTest) Run(t *testing.T) { wg.Add(1) go consumeNLogsFromConverter(converter.OutChannel(), numLogs, &wg) - rcvr, err := f.CreateLogsReceiver(context.Background(), params, cfg, sink) + rcvr, err := f.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) diff --git a/receiver/filelogreceiver/storage_test.go b/receiver/filelogreceiver/storage_test.go index 6cd142a997934..12ea72ef1e9bc 100644 --- a/receiver/filelogreceiver/storage_test.go +++ b/receiver/filelogreceiver/storage_test.go @@ -24,9 +24,8 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/storagetest" ) @@ -42,7 +41,6 @@ func TestStorage(t *testing.T) { storageDir := newTempDir(t) f := NewFactory() - params := component.ReceiverCreateSettings{Logger: zaptest.NewLogger(t)} cfg := testdataRotateTestYamlAsMap(logsDir) cfg.Converter.MaxFlushCount = 1 @@ -53,7 +51,7 @@ func TestStorage(t *testing.T) { host := storagetest.NewStorageHost(t, storageDir, "test") sink := new(consumertest.LogsSink) - rcvr, err := f.CreateLogsReceiver(ctx, params, cfg, sink) + rcvr, err := f.CreateLogsReceiver(ctx, componenttest.NewNopReceiverCreateSettings(), cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(ctx, host)) @@ -83,7 +81,7 @@ func TestStorage(t *testing.T) { // Start the components again host = storagetest.NewStorageHost(t, storageDir, "test") - rcvr, err = f.CreateLogsReceiver(ctx, params, cfg, sink) + rcvr, err = f.CreateLogsReceiver(ctx, componenttest.NewNopReceiverCreateSettings(), cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(ctx, host)) sink.Reset() @@ -127,7 +125,7 @@ func TestStorage(t *testing.T) { // Start the components again host = storagetest.NewStorageHost(t, storageDir, "test") - rcvr, err = f.CreateLogsReceiver(ctx, params, cfg, sink) + rcvr, err = f.CreateLogsReceiver(ctx, componenttest.NewNopReceiverCreateSettings(), cfg, sink) require.NoError(t, err, "failed to create receiver") require.NoError(t, rcvr.Start(ctx, host)) sink.Reset() diff --git a/receiver/fluentforwardreceiver/factory_test.go b/receiver/fluentforwardreceiver/factory_test.go index 51d4bb167a631..f829ed436e9b7 100644 --- a/receiver/fluentforwardreceiver/factory_test.go +++ b/receiver/fluentforwardreceiver/factory_test.go @@ -20,11 +20,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" ) func TestCreateDefaultConfig(t *testing.T) { @@ -41,7 +40,7 @@ func TestCreateReceiver(t *testing.T) { require.Equal(t, config.Type("fluentforward"), factory.Type()) - tReceiver, err := factory.CreateLogsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, consumertest.NewNop()) + tReceiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, tReceiver, "receiver creation failed") } diff --git a/receiver/googlecloudpubsubreceiver/factory_test.go b/receiver/googlecloudpubsubreceiver/factory_test.go index 51b1d0834fa15..82607c19d585c 100644 --- a/receiver/googlecloudpubsubreceiver/factory_test.go +++ b/receiver/googlecloudpubsubreceiver/factory_test.go @@ -19,11 +19,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" ) func TestCreateDefaultConfig(t *testing.T) { @@ -43,7 +42,7 @@ func TestCreateTracesReceiver(t *testing.T) { cfg := factory.CreateDefaultConfig() cfg.(*Config).Subscription = "projects/my-project/subscriptions/my-subscription" - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() tReceiver, err := factory.CreateTracesReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "traces receiver creation failed") @@ -56,7 +55,7 @@ func TestCreateMetricsReceiver(t *testing.T) { cfg := factory.CreateDefaultConfig() cfg.(*Config).Subscription = "projects/my-project/subscriptions/my-subscription" - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "metrics receiver creation failed") @@ -69,7 +68,7 @@ func TestCreateLogsReceiver(t *testing.T) { cfg := factory.CreateDefaultConfig() cfg.(*Config).Subscription = "projects/my-project/subscriptions/my-subscription" - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() tReceiver, err := factory.CreateLogsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "logs receiver creation failed") @@ -82,12 +81,12 @@ func TestEnsureReceiver(t *testing.T) { cfg := factory.CreateDefaultConfig() cfg.(*Config).Subscription = "projects/my-project/subscriptions/my-subscription" - tReceiver, err := factory.CreateTracesReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, consumertest.NewNop()) + tReceiver, err := factory.CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) assert.NoError(t, err) - mReceiver, err := factory.CreateMetricsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, consumertest.NewNop()) + mReceiver, err := factory.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, tReceiver, mReceiver) - lReceiver, err := factory.CreateLogsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, consumertest.NewNop()) + lReceiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) assert.NoError(t, err) assert.Equal(t, mReceiver, lReceiver) } diff --git a/receiver/jmxreceiver/factory_test.go b/receiver/jmxreceiver/factory_test.go index 2852b832e4237..0090410f25118 100644 --- a/receiver/jmxreceiver/factory_test.go +++ b/receiver/jmxreceiver/factory_test.go @@ -20,10 +20,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" ) func TestWithInvalidConfig(t *testing.T) { @@ -35,7 +34,7 @@ func TestWithInvalidConfig(t *testing.T) { r, err := f.CreateMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop(), ) require.Error(t, err) @@ -51,7 +50,7 @@ func TestWithValidConfig(t *testing.T) { cfg.(*Config).Endpoint = "myendpoint:12345" cfg.(*Config).GroovyScript = "mygroovyscriptpath" - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() r, err := f.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) require.NoError(t, err) require.NotNil(t, r) diff --git a/receiver/jmxreceiver/integration_test.go b/receiver/jmxreceiver/integration_test.go index ec8f87b67cac9..a646d56f3ec10 100644 --- a/receiver/jmxreceiver/integration_test.go +++ b/receiver/jmxreceiver/integration_test.go @@ -235,7 +235,7 @@ func (suite *JMXIntegrationSuite) TestJMXReceiverHappyPath() { } func TestJMXReceiverInvalidOTLPEndpointIntegration(t *testing.T) { - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() cfg := &Config{ CollectionInterval: 100 * time.Millisecond, Endpoint: fmt.Sprintf("service:jmx:rmi:///jndi/rmi://localhost:7199/jmxrmi"), diff --git a/receiver/jmxreceiver/receiver_test.go b/receiver/jmxreceiver/receiver_test.go index 0a3f4bc18a877..307b48b4d626c 100644 --- a/receiver/jmxreceiver/receiver_test.go +++ b/receiver/jmxreceiver/receiver_test.go @@ -21,16 +21,14 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/testutil" - "go.uber.org/zap" ) func TestReceiver(t *testing.T) { - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() config := &Config{ Endpoint: "service:jmx:protocol:sap", OTLPExporterConfig: otlpExporterConfig{ @@ -176,7 +174,7 @@ otel.exporter.otlp.headers = one=two,three=four for _, test := range tests { t.Run(test.name, func(tt *testing.T) { - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() receiver := newJMXMetricReceiver(params, &test.config, consumertest.NewNop()) jmxConfig, err := receiver.buildJMXMetricGathererConfig() if test.expectedError == "" { @@ -209,7 +207,7 @@ func TestBuildOTLPReceiverInvalidEndpoints(t *testing.T) { } for _, test := range tests { t.Run(test.name, func(tt *testing.T) { - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() jmxReceiver := newJMXMetricReceiver(params, &test.config, consumertest.NewNop()) otlpReceiver, err := jmxReceiver.buildOTLPReceiver() require.Error(t, err) diff --git a/receiver/k8sclusterreceiver/factory_test.go b/receiver/k8sclusterreceiver/factory_test.go index b9fdafdea01ed..eb3576140730d 100644 --- a/receiver/k8sclusterreceiver/factory_test.go +++ b/receiver/k8sclusterreceiver/factory_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" "k8s.io/client-go/kubernetes" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" @@ -47,7 +47,7 @@ func TestFactory(t *testing.T) { }, rCfg) r, err := f.CreateTracesReceiver( - context.Background(), component.ReceiverCreateSettings{}, + context.Background(), componenttest.NewNopReceiverCreateSettings(), &config.ReceiverSettings{}, consumertest.NewNop(), ) require.Error(t, err) @@ -55,7 +55,7 @@ func TestFactory(t *testing.T) { // Fails with bad K8s Config. r, err = f.CreateMetricsReceiver( - context.Background(), component.ReceiverCreateSettings{}, + context.Background(), componenttest.NewNopReceiverCreateSettings(), rCfg, consumertest.NewNop(), ) require.Error(t, err) @@ -66,7 +66,7 @@ func TestFactory(t *testing.T) { return nil, nil } r, err = f.CreateMetricsReceiver( - context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, + context.Background(), componenttest.NewNopReceiverCreateSettings(), rCfg, consumertest.NewNop(), ) require.NoError(t, err) diff --git a/receiver/kafkametricsreceiver/factory_test.go b/receiver/kafkametricsreceiver/factory_test.go index 1da232a2474c1..673e212ee424f 100644 --- a/receiver/kafkametricsreceiver/factory_test.go +++ b/receiver/kafkametricsreceiver/factory_test.go @@ -20,6 +20,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/consumer" ) @@ -37,7 +38,7 @@ func TestCreateMetricsReceiver_errors(t *testing.T) { cfg.Brokers = []string{"invalid:9092"} cfg.ProtocolVersion = "2.0.0" cfg.Scrapers = []string{"topics"} - r, err := createMetricsReceiver(context.Background(), component.ReceiverCreateSettings{}, cfg, nil) + r, err := createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) assert.Error(t, err) assert.Nil(t, r) } @@ -52,7 +53,7 @@ func TestCreateMetricsReceiver(t *testing.T) { cfg.Brokers = []string{"invalid:9092"} cfg.ProtocolVersion = "2.0.0" cfg.Scrapers = []string{"topics"} - _, err := createMetricsReceiver(context.Background(), component.ReceiverCreateSettings{}, cfg, nil) + _, err := createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) newMetricsReceiver = prev assert.Nil(t, err) } diff --git a/receiver/kafkametricsreceiver/kafkametrics_e2e_test.go b/receiver/kafkametricsreceiver/kafkametrics_e2e_test.go index 73863957efb33..af01a85683252 100644 --- a/receiver/kafkametricsreceiver/kafkametrics_e2e_test.go +++ b/receiver/kafkametricsreceiver/kafkametrics_e2e_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testing/container" ) @@ -63,11 +63,10 @@ func TestIntegrationSingleNode(t *testing.T) { cfg.Brokers = []string{kafkaAddress} cfg.CollectionInterval = 5 * time.Second consumer := new(consumertest.MetricsSink) - params := component.ReceiverCreateSettings{Logger: zaptest.NewLogger(t)} var receiver component.MetricsReceiver var err error - receiver, err = f.CreateMetricsReceiver(context.Background(), params, cfg, consumer) + receiver, err = f.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumer) require.NoError(t, err, "failed to create receiver") require.Eventuallyf(t, func() bool { err = receiver.Start(context.Background(), &testHost{t: t}) diff --git a/receiver/kafkametricsreceiver/receiver_test.go b/receiver/kafkametricsreceiver/receiver_test.go index 18b5b941122a4..5919d4e3f896e 100644 --- a/receiver/kafkametricsreceiver/receiver_test.go +++ b/receiver/kafkametricsreceiver/receiver_test.go @@ -21,7 +21,7 @@ import ( "github.com/Shopify/sarama" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/exporter/kafkaexporter" @@ -32,7 +32,7 @@ import ( func TestNewReceiver_invalid_version_err(t *testing.T) { c := createDefaultConfig().(*Config) c.ProtocolVersion = "invalid" - r, err := newMetricsReceiver(context.Background(), *c, component.ReceiverCreateSettings{}, nil) + r, err := newMetricsReceiver(context.Background(), *c, componenttest.NewNopReceiverCreateSettings(), nil) assert.Error(t, err) assert.Nil(t, r) } @@ -44,7 +44,7 @@ func TestNewReceiver_invalid_scraper_error(t *testing.T) { return nil, nil } allScrapers["brokers"] = mockScraper - r, err := newMetricsReceiver(context.Background(), *c, component.ReceiverCreateSettings{}, nil) + r, err := newMetricsReceiver(context.Background(), *c, componenttest.NewNopReceiverCreateSettings(), nil) assert.Nil(t, r) expectedError := fmt.Errorf("no scraper found for key: cpu") if assert.Error(t, err) { @@ -61,7 +61,7 @@ func TestNewReceiver_invalid_auth_error(t *testing.T) { }, }, } - r, err := newMetricsReceiver(context.Background(), *c, component.ReceiverCreateSettings{}, nil) + r, err := newMetricsReceiver(context.Background(), *c, componenttest.NewNopReceiverCreateSettings(), nil) assert.Error(t, err) assert.Contains(t, err.Error(), "failed to load TLS config") assert.Nil(t, r) @@ -74,7 +74,7 @@ func TestNewReceiver(t *testing.T) { return nil, nil } allScrapers["brokers"] = mockScraper - r, err := newMetricsReceiver(context.Background(), *c, component.ReceiverCreateSettings{}, consumertest.NewNop()) + r, err := newMetricsReceiver(context.Background(), *c, componenttest.NewNopReceiverCreateSettings(), consumertest.NewNop()) assert.Nil(t, err) assert.NotNil(t, r) } @@ -86,7 +86,7 @@ func TestNewReceiver_handles_scraper_error(t *testing.T) { return nil, fmt.Errorf("fail") } allScrapers["brokers"] = mockScraper - r, err := newMetricsReceiver(context.Background(), *c, component.ReceiverCreateSettings{}, consumertest.NewNop()) + r, err := newMetricsReceiver(context.Background(), *c, componenttest.NewNopReceiverCreateSettings(), consumertest.NewNop()) assert.NotNil(t, err) assert.Nil(t, r) } diff --git a/receiver/kubeletstatsreceiver/factory_test.go b/receiver/kubeletstatsreceiver/factory_test.go index 9d2a12b57894d..19a796beea053 100644 --- a/receiver/kubeletstatsreceiver/factory_test.go +++ b/receiver/kubeletstatsreceiver/factory_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenterror" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/config/configparser" "go.opentelemetry.io/collector/config/configtls" @@ -53,7 +53,7 @@ func TestCreateTracesReceiver(t *testing.T) { factory := NewFactory() traceReceiver, err := factory.CreateTracesReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), factory.CreateDefaultConfig(), nil, ) @@ -65,7 +65,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() metricsReceiver, err := factory.CreateMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), tlsConfig(), &testbed.MockMetricConsumer{}, ) @@ -80,7 +80,7 @@ func TestFactoryInvalidExtraMetadataLabels(t *testing.T) { } metricsReceiver, err := factory.CreateMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), &cfg, &testbed.MockMetricConsumer{}, ) @@ -100,7 +100,7 @@ func TestFactoryBadAuthType(t *testing.T) { } _, err := factory.CreateMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), cfg, &testbed.MockMetricConsumer{}, ) diff --git a/receiver/memcachedreceiver/factory_test.go b/receiver/memcachedreceiver/factory_test.go index e2fbc099df2a4..e157759ed99ee 100644 --- a/receiver/memcachedreceiver/factory_test.go +++ b/receiver/memcachedreceiver/factory_test.go @@ -20,11 +20,10 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/testbed/testbed" - "go.uber.org/zap" ) func TestType(t *testing.T) { @@ -43,7 +42,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() metricsReceiver, err := factory.CreateMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, diff --git a/receiver/memcachedreceiver/integration_test.go b/receiver/memcachedreceiver/integration_test.go index 7391f2e38a487..48e0a4fd3becd 100644 --- a/receiver/memcachedreceiver/integration_test.go +++ b/receiver/memcachedreceiver/integration_test.go @@ -23,11 +23,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/model/pdata" - "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testing/container" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver/internal/metadata" @@ -42,9 +40,8 @@ func TestIntegration(t *testing.T) { cfg.Endpoint = c.AddrForPort(11211) consumer := new(consumertest.MetricsSink) - params := component.ReceiverCreateSettings{Logger: zaptest.NewLogger(t)} - rcvr, err := f.CreateMetricsReceiver(context.Background(), params, cfg, consumer) + rcvr, err := f.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) diff --git a/receiver/nginxreceiver/factory_test.go b/receiver/nginxreceiver/factory_test.go index f80cf59e948a2..8fc57b794d6db 100644 --- a/receiver/nginxreceiver/factory_test.go +++ b/receiver/nginxreceiver/factory_test.go @@ -20,11 +20,10 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/testbed/testbed" - "go.uber.org/zap" ) func TestType(t *testing.T) { @@ -43,7 +42,7 @@ func TestCreateMetricsReceiver(t *testing.T) { factory := NewFactory() metricsReceiver, err := factory.CreateMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, diff --git a/receiver/prometheusexecreceiver/factory_test.go b/receiver/prometheusexecreceiver/factory_test.go index 3da6c2f3fb946..f19724b2a6035 100644 --- a/receiver/prometheusexecreceiver/factory_test.go +++ b/receiver/prometheusexecreceiver/factory_test.go @@ -30,7 +30,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/receiver/prometheusreceiver" - "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver/subprocessmanager" ) @@ -55,22 +54,22 @@ func TestCreateTraceAndMetricsReceiver(t *testing.T) { receiver := cfg.Receivers[config.NewID(typeStr)] // Test CreateTracesReceiver - traceReceiver, err = factory.CreateTracesReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, receiver, nil) + traceReceiver, err = factory.CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), receiver, nil) assert.Equal(t, nil, traceReceiver) assert.ErrorIs(t, err, componenterror.ErrDataTypeIsNotSupported) // Test CreateMetricsReceiver error because of lack of command - _, err = factory.CreateMetricsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, receiver, nil) + _, err = factory.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), receiver, nil) assert.NotNil(t, err) // Test CreateMetricsReceiver receiver = cfg.Receivers[config.NewIDWithName(typeStr, "test")] - metricReceiver, err = factory.CreateMetricsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, receiver, nil) + metricReceiver, err = factory.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), receiver, nil) assert.Equal(t, nil, err) wantPer := &prometheusExecReceiver{ - params: component.ReceiverCreateSettings{Logger: zap.NewNop()}, + params: componenttest.NewNopReceiverCreateSettings(), config: receiver.(*Config), consumer: nil, promReceiverConfig: &prometheusreceiver.Config{ diff --git a/receiver/prometheusexecreceiver/receiver_test.go b/receiver/prometheusexecreceiver/receiver_test.go index 4e4681c5fc467..304bf15265c59 100644 --- a/receiver/prometheusexecreceiver/receiver_test.go +++ b/receiver/prometheusexecreceiver/receiver_test.go @@ -25,7 +25,6 @@ import ( "github.com/prometheus/prometheus/discovery" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" @@ -33,7 +32,6 @@ import ( "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/prometheusreceiver" "go.opentelemetry.io/collector/translator/internaldata" - "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver/subprocessmanager" ) @@ -62,7 +60,7 @@ func TestExecKeyMissing(t *testing.T) { // assertErrorWhenExecKeyMissing makes sure the config passed throws an error, since it's missing the exec key func assertErrorWhenExecKeyMissing(t *testing.T, errorReceiverConfig config.Receiver) { - _, err := newPromExecReceiver(component.ReceiverCreateSettings{Logger: zap.NewNop()}, errorReceiverConfig.(*Config), nil) + _, err := newPromExecReceiver(componenttest.NewNopReceiverCreateSettings(), errorReceiverConfig.(*Config), nil) assert.Error(t, err, "newPromExecReceiver() didn't return an error") } @@ -77,7 +75,7 @@ func TestEndToEnd(t *testing.T) { // endToEndScrapeTest creates a receiver that invokes `go run test_prometheus_exporter.go` and waits until it has scraped the /metrics endpoint twice - the application will crash between each scrape func endToEndScrapeTest(t *testing.T, receiverConfig config.Receiver, testName string) { sink := new(consumertest.MetricsSink) - wrapper, err := newPromExecReceiver(component.ReceiverCreateSettings{Logger: zap.NewNop()}, receiverConfig.(*Config), sink) + wrapper, err := newPromExecReceiver(componenttest.NewNopReceiverCreateSettings(), receiverConfig.(*Config), sink) assert.NoError(t, err, "newPromExecReceiver() returned an error") ctx := context.Background() diff --git a/receiver/receivercreator/factory_test.go b/receiver/receivercreator/factory_test.go index 3300656c6e68a..de79206d21713 100644 --- a/receiver/receivercreator/factory_test.go +++ b/receiver/receivercreator/factory_test.go @@ -19,17 +19,16 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenterror" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" ) func TestCreateReceiver(t *testing.T) { factory := NewFactory() cfg := createDefaultConfig() - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err, "receiver creation failed") assert.NotNil(t, tReceiver, "receiver creation failed") diff --git a/receiver/receivercreator/receiver_test.go b/receiver/receivercreator/receiver_test.go index 1c8efa1af0154..d1d3c64c95a62 100644 --- a/receiver/receivercreator/receiver_test.go +++ b/receiver/receivercreator/receiver_test.go @@ -71,7 +71,7 @@ func TestMockedEndToEnd(t *testing.T) { } dynCfg := cfg.Receivers[config.NewIDWithName(typeStr, "1")] factory := NewFactory() - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() mockConsumer := new(consumertest.MetricsSink) rcvr, err := factory.CreateMetricsReceiver(context.Background(), params, dynCfg, mockConsumer) require.NoError(t, err) diff --git a/receiver/receivercreator/runner_test.go b/receiver/receivercreator/runner_test.go index 82cfb8eca6a55..0fc54bb814b4b 100644 --- a/receiver/receivercreator/runner_test.go +++ b/receiver/receivercreator/runner_test.go @@ -19,13 +19,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.uber.org/zap" ) func Test_loadAndCreateRuntimeReceiver(t *testing.T) { - run := &receiverRunner{params: component.ReceiverCreateSettings{Logger: zap.NewNop()}, idNamespace: config.NewIDWithName(typeStr, "1")} + run := &receiverRunner{params: componenttest.NewNopReceiverCreateSettings(), idNamespace: config.NewIDWithName(typeStr, "1")} exampleFactory := &nopWithEndpointFactory{} template, err := newReceiverTemplate("nop/1", nil) require.NoError(t, err) diff --git a/receiver/redisreceiver/redis_e2e_test.go b/receiver/redisreceiver/redis_e2e_test.go index 65dc5e1146b66..03aa8122d42af 100644 --- a/receiver/redisreceiver/redis_e2e_test.go +++ b/receiver/redisreceiver/redis_e2e_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testing/container" ) @@ -51,9 +51,8 @@ func TestIntegration(t *testing.T) { cfg.Endpoint = c.AddrForPort(6379) consumer := new(consumertest.MetricsSink) - params := component.ReceiverCreateSettings{Logger: zaptest.NewLogger(t)} - rcvr, err := f.CreateMetricsReceiver(context.Background(), params, cfg, consumer) + rcvr, err := f.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") require.NoError(t, rcvr.Start(context.Background(), &testHost{ t: t, diff --git a/receiver/sapmreceiver/factory_test.go b/receiver/sapmreceiver/factory_test.go index ca058cbe2f971..0fa434b6ab0ad 100644 --- a/receiver/sapmreceiver/factory_test.go +++ b/receiver/sapmreceiver/factory_test.go @@ -19,10 +19,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenterror" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" - "go.uber.org/zap" ) func TestCreateDefaultConfig(t *testing.T) { @@ -36,7 +35,7 @@ func TestCreateReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() tReceiver, err := factory.CreateTracesReceiver(context.Background(), params, cfg, nil) assert.NoError(t, err, "receiver creation failed") assert.NotNil(t, tReceiver, "receiver creation failed") @@ -52,7 +51,7 @@ func TestCreateInvalidHTTPEndpoint(t *testing.T) { rCfg := cfg.(*Config) rCfg.Endpoint = "" - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() _, err := factory.CreateTracesReceiver(context.Background(), params, cfg, nil) assert.Error(t, err, "receiver creation with no endpoints must fail") } @@ -63,7 +62,7 @@ func TestCreateNoPort(t *testing.T) { rCfg := cfg.(*Config) rCfg.Endpoint = "localhost:" - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() _, err := factory.CreateTracesReceiver(context.Background(), params, cfg, nil) assert.Error(t, err, "receiver creation with no port number must fail") } @@ -74,7 +73,7 @@ func TestCreateLargePort(t *testing.T) { rCfg := cfg.(*Config) rCfg.Endpoint = "localhost:65536" - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() _, err := factory.CreateTracesReceiver(context.Background(), params, cfg, nil) assert.Error(t, err, "receiver creation with too large port number must fail") } diff --git a/receiver/sapmreceiver/trace_receiver_test.go b/receiver/sapmreceiver/trace_receiver_test.go index 3abb8d3bc42e8..a8a8cc03d116a 100644 --- a/receiver/sapmreceiver/trace_receiver_test.go +++ b/receiver/sapmreceiver/trace_receiver_test.go @@ -39,7 +39,6 @@ import ( "go.opentelemetry.io/collector/testutil" "go.opentelemetry.io/collector/translator/conventions" tracetranslator "go.opentelemetry.io/collector/translator/trace" - "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk" ) @@ -212,7 +211,7 @@ func sendSapm(endpoint string, sapm *splunksapm.PostSpansRequest, zipped bool, t } func setupReceiver(t *testing.T, config *Config, sink *consumertest.TracesSink) component.TracesReceiver { - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() sr, err := New(context.Background(), params, config, sink) assert.NoError(t, err, "should not have failed to create the SAPM receiver") t.Log("Starting") diff --git a/receiver/signalfxreceiver/factory_test.go b/receiver/signalfxreceiver/factory_test.go index 43afac13fc455..c87d18ad4f67e 100644 --- a/receiver/signalfxreceiver/factory_test.go +++ b/receiver/signalfxreceiver/factory_test.go @@ -19,11 +19,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenterror" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" ) func TestCreateDefaultConfig(t *testing.T) { @@ -38,15 +37,15 @@ func TestCreateReceiverMetricsFirst(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Endpoint = "localhost:1" // Endpoint is required, not going to be used here. - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() mReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, mReceiver, "receiver creation failed") - _, err = factory.CreateTracesReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, nil) + _, err = factory.CreateTracesReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) assert.ErrorIs(t, err, componenterror.ErrDataTypeIsNotSupported) - lReceiver, err := factory.CreateLogsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, consumertest.NewNop()) + lReceiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, lReceiver, "receiver creation failed") @@ -58,11 +57,11 @@ func TestCreateReceiverLogsFirst(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Endpoint = "localhost:1" // Endpoint is required, not going to be used here. - lReceiver, err := factory.CreateLogsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, consumertest.NewNop()) + lReceiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, lReceiver, "receiver creation failed") - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() mReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, mReceiver, "receiver creation failed") @@ -75,12 +74,12 @@ func TestCreateInvalidHTTPEndpoint(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Endpoint = "" - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.Error(t, err, "endpoint is not formatted correctly: missing port in address") assert.Nil(t, tReceiver) - tReceiver, err = factory.CreateLogsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, consumertest.NewNop()) + tReceiver, err = factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) assert.Error(t, err, "endpoint is not formatted correctly: missing port in address") assert.Nil(t, tReceiver) } @@ -90,7 +89,7 @@ func TestCreateNoPort(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Endpoint = "localhost:" - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.Error(t, err, "endpoint port is not a number: strconv.ParseInt: parsing \"\": invalid syntax") assert.Nil(t, tReceiver) @@ -101,7 +100,7 @@ func TestCreateLargePort(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Endpoint = "localhost:65536" - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() tReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.Error(t, err, "port number must be between 1 and 65535") assert.Nil(t, tReceiver) diff --git a/receiver/simpleprometheusreceiver/factory_test.go b/receiver/simpleprometheusreceiver/factory_test.go index bc0edc2ee645e..2bf192ee7480a 100644 --- a/receiver/simpleprometheusreceiver/factory_test.go +++ b/receiver/simpleprometheusreceiver/factory_test.go @@ -19,9 +19,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/testbed/testbed" - "go.uber.org/zap" ) func TestFactory(t *testing.T) { @@ -31,7 +30,7 @@ func TestFactory(t *testing.T) { r, err := f.CreateMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), cfg, &testbed.MockMetricConsumer{}, ) diff --git a/receiver/simpleprometheusreceiver/receiver_test.go b/receiver/simpleprometheusreceiver/receiver_test.go index 137a58791c804..207136ab57841 100644 --- a/receiver/simpleprometheusreceiver/receiver_test.go +++ b/receiver/simpleprometheusreceiver/receiver_test.go @@ -26,12 +26,10 @@ import ( "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/discovery" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/receiver/prometheusreceiver" "go.opentelemetry.io/collector/testbed/testbed" - "go.uber.org/zap" ) func TestReceiver(t *testing.T) { @@ -57,7 +55,7 @@ func TestReceiver(t *testing.T) { r, err := f.CreateMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), cfg, &testbed.MockMetricConsumer{}, ) diff --git a/receiver/splunkhecreceiver/factory_test.go b/receiver/splunkhecreceiver/factory_test.go index 19d187481e763..983cf7c620eab 100644 --- a/receiver/splunkhecreceiver/factory_test.go +++ b/receiver/splunkhecreceiver/factory_test.go @@ -19,11 +19,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" ) func TestCreateDefaultConfig(t *testing.T) { @@ -37,12 +36,12 @@ func TestCreateReceiver(t *testing.T) { cfg.Endpoint = "localhost:1" // Endpoint is required, not going to be used here. mockLogsConsumer := consumertest.NewNop() - lReceiver, err := createLogsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, mockLogsConsumer) + lReceiver, err := createLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, mockLogsConsumer) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, lReceiver, "receiver creation failed") mockMetricsConsumer := consumertest.NewNop() - mReceiver, err := createMetricsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, mockMetricsConsumer) + mReceiver, err := createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, mockMetricsConsumer) assert.Nil(t, err, "receiver creation failed") assert.NotNil(t, mReceiver, "receiver creation failed") } @@ -67,7 +66,7 @@ func TestCreateNilNextConsumerMetrics(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = "localhost:1" - mReceiver, err := createMetricsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, nil) + mReceiver, err := createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) assert.EqualError(t, err, "nil metricsConsumer") assert.Nil(t, mReceiver, "receiver creation failed") } @@ -77,7 +76,7 @@ func TestCreateMetricsReceiverWithBadConfig(t *testing.T) { cfg.Endpoint = "localhost:1" cfg.Path = " *[* " - mReceiver, err := createMetricsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, consumertest.NewNop()) + mReceiver, err := createMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) assert.EqualError(t, err, "unexpected end of input") assert.Nil(t, mReceiver, "receiver creation failed") } @@ -87,7 +86,7 @@ func TestCreateLogsReceiverWithBadConfig(t *testing.T) { cfg.Endpoint = "localhost:1" cfg.Path = " *[* " - mReceiver, err := createLogsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, consumertest.NewNop()) + mReceiver, err := createLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop()) assert.EqualError(t, err, "unexpected end of input") assert.Nil(t, mReceiver, "receiver creation failed") } @@ -96,7 +95,7 @@ func TestCreateNilNextConsumerLogs(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = "localhost:1" - mReceiver, err := createLogsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, nil) + mReceiver, err := createLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) assert.EqualError(t, err, "nil logsConsumer") assert.Nil(t, mReceiver, "receiver creation failed") } @@ -106,7 +105,7 @@ func TestCreateBadEndpoint(t *testing.T) { cfg.Endpoint = "localhost:abc" mockLogsConsumer := consumertest.NewNop() - mReceiver, err := createLogsReceiver(context.Background(), component.ReceiverCreateSettings{Logger: zap.NewNop()}, cfg, mockLogsConsumer) + mReceiver, err := createLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, mockLogsConsumer) assert.EqualError(t, err, "endpoint port is not a number: strconv.ParseInt: parsing \"abc\": invalid syntax") assert.Nil(t, mReceiver, "receiver creation failed") } diff --git a/receiver/statsdreceiver/factory_test.go b/receiver/statsdreceiver/factory_test.go index 52f7bbe889f0e..aa1bfb02b7cfc 100644 --- a/receiver/statsdreceiver/factory_test.go +++ b/receiver/statsdreceiver/factory_test.go @@ -19,10 +19,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/protocol" ) @@ -38,7 +37,7 @@ func TestCreateReceiver(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.NetAddr.Endpoint = "localhost:0" // Endpoint is required, not going to be used here. - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() tReceiver, err := createMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") @@ -53,7 +52,7 @@ func TestCreateReceiverWithConfigErr(t *testing.T) { } receiver, err := createMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), cfg, consumertest.NewNop(), ) @@ -65,7 +64,7 @@ func TestCreateReceiverWithConfigErr(t *testing.T) { func TestCreateMetricsReceiverWithNilConsumer(t *testing.T) { receiver, err := createMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{Logger: zap.NewNop()}, + componenttest.NewNopReceiverCreateSettings(), createDefaultConfig(), nil, ) diff --git a/receiver/syslogreceiver/syslog_test.go b/receiver/syslogreceiver/syslog_test.go index af36b511c69f3..c605a31aac1fa 100644 --- a/receiver/syslogreceiver/syslog_test.go +++ b/receiver/syslogreceiver/syslog_test.go @@ -24,14 +24,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/model/pdata" - "go.uber.org/zap" - "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza" ) @@ -48,9 +45,8 @@ func testSyslog(t *testing.T, cfg *SysLogConfig) { numLogs := 5 f := NewFactory() - params := component.ReceiverCreateSettings{Logger: zaptest.NewLogger(t)} sink := new(consumertest.LogsSink) - rcvr, err := f.CreateLogsReceiver(context.Background(), params, cfg, sink) + rcvr, err := f.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, sink) require.NoError(t, err) require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) @@ -140,9 +136,6 @@ func testdataUDPConfig() *SysLogConfig { } func TestDecodeInputConfigFailure(t *testing.T) { - params := component.ReceiverCreateSettings{ - Logger: zap.NewNop(), - } sink := new(consumertest.LogsSink) factory := NewFactory() badCfg := &SysLogConfig{ @@ -157,7 +150,7 @@ func TestDecodeInputConfigFailure(t *testing.T) { "protocol": "rfc5424", }, } - receiver, err := factory.CreateLogsReceiver(context.Background(), params, badCfg, sink) + receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), badCfg, sink) require.Error(t, err, "receiver creation should fail if input config isn't valid") require.Nil(t, receiver, "receiver creation should fail if input config isn't valid") } diff --git a/receiver/tcplogreceiver/tcp_test.go b/receiver/tcplogreceiver/tcp_test.go index 79a9588c0ac0e..ab68d3ed3c1bd 100644 --- a/receiver/tcplogreceiver/tcp_test.go +++ b/receiver/tcplogreceiver/tcp_test.go @@ -24,13 +24,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" - "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza" ) @@ -43,9 +40,8 @@ func testTCP(t *testing.T, cfg *TCPLogConfig) { numLogs := 5 f := NewFactory() - params := component.ReceiverCreateSettings{Logger: zaptest.NewLogger(t)} sink := new(consumertest.LogsSink) - rcvr, err := f.CreateLogsReceiver(context.Background(), params, cfg, sink) + rcvr, err := f.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, sink) require.NoError(t, err) require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) @@ -105,10 +101,6 @@ func testdataConfigYamlAsMap() *TCPLogConfig { } func TestDecodeInputConfigFailure(t *testing.T) { - params := component.ReceiverCreateSettings{ - Logger: zap.NewNop(), - } - sink := new(consumertest.LogsSink) factory := NewFactory() badCfg := &TCPLogConfig{ BaseConfig: stanza.BaseConfig{ @@ -119,7 +111,7 @@ func TestDecodeInputConfigFailure(t *testing.T) { "max_buffer_size": "0.1.0.1-", }, } - receiver, err := factory.CreateLogsReceiver(context.Background(), params, badCfg, sink) + receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), badCfg, consumertest.NewNop()) require.Error(t, err, "receiver creation should fail if input config isn't valid") require.Nil(t, receiver, "receiver creation should fail if input config isn't valid") } diff --git a/receiver/udplogreceiver/udp_test.go b/receiver/udplogreceiver/udp_test.go index 3ead309b60179..f6efcd78e8435 100644 --- a/receiver/udplogreceiver/udp_test.go +++ b/receiver/udplogreceiver/udp_test.go @@ -24,13 +24,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" - "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza" ) @@ -43,9 +40,8 @@ func testUDP(t *testing.T, cfg *UDPLogConfig) { numLogs := 5 f := NewFactory() - params := component.ReceiverCreateSettings{Logger: zaptest.NewLogger(t)} sink := new(consumertest.LogsSink) - rcvr, err := f.CreateLogsReceiver(context.Background(), params, cfg, sink) + rcvr, err := f.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, sink) require.NoError(t, err) require.NoError(t, rcvr.Start(context.Background(), componenttest.NewNopHost())) @@ -106,9 +102,6 @@ func testdataConfigYamlAsMap() *UDPLogConfig { } func TestDecodeInputConfigFailure(t *testing.T) { - params := component.ReceiverCreateSettings{ - Logger: zap.NewNop(), - } sink := new(consumertest.LogsSink) factory := NewFactory() badCfg := &UDPLogConfig{ @@ -120,7 +113,7 @@ func TestDecodeInputConfigFailure(t *testing.T) { "max_buffer_size": "0.1.0.1-", }, } - receiver, err := factory.CreateLogsReceiver(context.Background(), params, badCfg, sink) + receiver, err := factory.CreateLogsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), badCfg, sink) require.Error(t, err, "receiver creation should fail if input config isn't valid") require.Nil(t, receiver, "receiver creation should fail if input config isn't valid") } diff --git a/receiver/wavefrontreceiver/factory_test.go b/receiver/wavefrontreceiver/factory_test.go index f9adf1850fa5e..a8729ca62044f 100644 --- a/receiver/wavefrontreceiver/factory_test.go +++ b/receiver/wavefrontreceiver/factory_test.go @@ -19,10 +19,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" ) func TestCreateDefaultConfig(t *testing.T) { @@ -36,7 +35,7 @@ func TestCreateReceiver(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = "localhost:0" // Endpoint is required, not going to be used here. - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() tReceiver, err := createMetricsReceiver(context.Background(), params, cfg, consumertest.NewNop()) assert.NoError(t, err) assert.NotNil(t, tReceiver, "receiver creation failed") diff --git a/receiver/wavefrontreceiver/receiver_test.go b/receiver/wavefrontreceiver/receiver_test.go index 44ccacf1ef92e..e8b7e033fc6ac 100644 --- a/receiver/wavefrontreceiver/receiver_test.go +++ b/receiver/wavefrontreceiver/receiver_test.go @@ -25,12 +25,10 @@ import ( metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/testutil" "go.opentelemetry.io/collector/translator/internaldata" - "go.uber.org/zap" "google.golang.org/protobuf/types/known/timestamppb" ) @@ -42,7 +40,7 @@ func Test_wavefrontreceiver_EndToEnd(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) rCfg.Endpoint = addr sink := new(consumertest.MetricsSink) - params := component.ReceiverCreateSettings{Logger: zap.NewNop()} + params := componenttest.NewNopReceiverCreateSettings() rcvr, err := createMetricsReceiver(context.Background(), params, rCfg, sink) require.NoError(t, err) diff --git a/receiver/windowsperfcountersreceiver/factory_test.go b/receiver/windowsperfcountersreceiver/factory_test.go index 3bf190c3cc614..6cab6d087423f 100644 --- a/receiver/windowsperfcountersreceiver/factory_test.go +++ b/receiver/windowsperfcountersreceiver/factory_test.go @@ -19,14 +19,13 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenterror" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap" ) -var creationParams = component.ReceiverCreateSettings{Logger: zap.NewNop()} +var creationParams = componenttest.NewNopReceiverCreateSettings() func TestCreateDefaultConfig(t *testing.T) { factory := NewFactory() diff --git a/receiver/zookeeperreceiver/factory_test.go b/receiver/zookeeperreceiver/factory_test.go index c30f6275a9931..85de9ca5f7252 100644 --- a/receiver/zookeeperreceiver/factory_test.go +++ b/receiver/zookeeperreceiver/factory_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/testbed/testbed" @@ -68,7 +68,7 @@ func TestFactory(t *testing.T) { t.Run(test.name, func(t *testing.T) { r, err := f.CreateMetricsReceiver( context.Background(), - component.ReceiverCreateSettings{}, + componenttest.NewNopReceiverCreateSettings(), test.config, &testbed.MockMetricConsumer{}, ) diff --git a/receiver/zookeeperreceiver/zk_e2e_test.go b/receiver/zookeeperreceiver/zk_e2e_test.go index 0062f0736dd12..2096cf570c5ce 100644 --- a/receiver/zookeeperreceiver/zk_e2e_test.go +++ b/receiver/zookeeperreceiver/zk_e2e_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testing/container" ) @@ -81,9 +81,8 @@ func TestIntegration(t *testing.T) { cfg.Endpoint = c.AddrForPort(zkPort) consumer := new(consumertest.MetricsSink) - params := component.ReceiverCreateSettings{Logger: zaptest.NewLogger(t)} - rcvr, err := f.CreateMetricsReceiver(context.Background(), params, cfg, consumer) + rcvr, err := f.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, consumer) require.NoError(t, err, "failed creating metrics receiver") require.NoError(t, rcvr.Start(context.Background(), &testHost{t: t}))