diff --git a/receiver/azureeventhubreceiver/azureresourcelogs_unmarshaler_test.go b/receiver/azureeventhubreceiver/azureresourcelogs_unmarshaler_test.go index 53237f54e2ac7..08c93d1aad0a4 100644 --- a/receiver/azureeventhubreceiver/azureresourcelogs_unmarshaler_test.go +++ b/receiver/azureeventhubreceiver/azureresourcelogs_unmarshaler_test.go @@ -236,7 +236,7 @@ func TestUnmarshalLogs(t *testing.T) { expectedMinimum := plog.NewLogs() resourceLogs := expectedMinimum.ResourceLogs().AppendEmpty() scopeLogs := resourceLogs.ScopeLogs().AppendEmpty() - scopeLogs.Scope().SetName("otelcol/" + typeStr) + scopeLogs.Scope().SetName("otelcol/azureeventhubreceiver") scopeLogs.Scope().SetVersion(testBuildInfo.Version) lr := scopeLogs.LogRecords().AppendEmpty() resourceLogs.Resource().Attributes().PutStr(azureResourceID, "/RESOURCE_ID") @@ -246,7 +246,7 @@ func TestUnmarshalLogs(t *testing.T) { resourceLogs = expectedMinimum2.ResourceLogs().AppendEmpty() resourceLogs.Resource().Attributes().PutStr(azureResourceID, "/RESOURCE_ID") scopeLogs = resourceLogs.ScopeLogs().AppendEmpty() - scopeLogs.Scope().SetName("otelcol/" + typeStr) + scopeLogs.Scope().SetName("otelcol/azureeventhubreceiver") scopeLogs.Scope().SetVersion(testBuildInfo.Version) logRecords := scopeLogs.LogRecords() lr = logRecords.AppendEmpty() @@ -258,7 +258,7 @@ func TestUnmarshalLogs(t *testing.T) { resourceLogs = expectedMaximum.ResourceLogs().AppendEmpty() resourceLogs.Resource().Attributes().PutStr(azureResourceID, "/RESOURCE_ID") scopeLogs = resourceLogs.ScopeLogs().AppendEmpty() - scopeLogs.Scope().SetName("otelcol/" + typeStr) + scopeLogs.Scope().SetName("otelcol/azureeventhubreceiver") scopeLogs.Scope().SetVersion(testBuildInfo.Version) lr = scopeLogs.LogRecords().AppendEmpty() maximumLogRecord.CopyTo(lr) diff --git a/receiver/azureeventhubreceiver/config_test.go b/receiver/azureeventhubreceiver/config_test.go index c5394f22323af..fa40162211cc4 100644 --- a/receiver/azureeventhubreceiver/config_test.go +++ b/receiver/azureeventhubreceiver/config_test.go @@ -22,6 +22,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/otelcol/otelcoltest" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver/internal/metadata" ) func TestLoadConfig(t *testing.T) { @@ -29,7 +31,7 @@ func TestLoadConfig(t *testing.T) { assert.Nil(t, err) factory := NewFactory() - factories.Receivers[typeStr] = factory + factories.Receivers[metadata.Type] = factory cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "config.yaml"), factories) require.NoError(t, err) @@ -37,13 +39,13 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, len(cfg.Receivers), 2) - r0 := cfg.Receivers[component.NewID(typeStr)] + r0 := cfg.Receivers[component.NewID(metadata.Type)] assert.Equal(t, "Endpoint=sb://namespace.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=superSecret1234=;EntityPath=hubName", r0.(*Config).Connection) assert.Equal(t, "", r0.(*Config).Offset) assert.Equal(t, "", r0.(*Config).Partition) assert.Equal(t, defaultLogFormat, logFormat(r0.(*Config).Format)) - r1 := cfg.Receivers[component.NewIDWithName(typeStr, "all")] + r1 := cfg.Receivers[component.NewIDWithName(metadata.Type, "all")] assert.Equal(t, "Endpoint=sb://namespace.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=superSecret1234=;EntityPath=hubName", r1.(*Config).Connection) assert.Equal(t, "1234-5566", r1.(*Config).Offset) assert.Equal(t, "foo", r1.(*Config).Partition) diff --git a/receiver/azureeventhubreceiver/eventhubhandler_test.go b/receiver/azureeventhubreceiver/eventhubhandler_test.go index 4a2b9ec458853..a734ec1e8e896 100644 --- a/receiver/azureeventhubreceiver/eventhubhandler_test.go +++ b/receiver/azureeventhubreceiver/eventhubhandler_test.go @@ -29,6 +29,8 @@ import ( "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver/internal/metadata" ) type mockHubWrapper struct { @@ -88,7 +90,7 @@ func (m *mockDataConsumer) consume(ctx context.Context, event *eventhub.Event) e } err = m.nextLogsConsumer.ConsumeLogs(logsContext, logs) - m.obsrecv.EndLogsOp(logsContext, typeStr, 1, err) + m.obsrecv.EndLogsOp(logsContext, metadata.Type, 1, err) return err } @@ -119,7 +121,7 @@ func TestEventhubHandler_newMessageHandler(t *testing.T) { sink := new(consumertest.LogsSink) obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ - ReceiverID: component.NewID(typeStr), + ReceiverID: component.NewID(metadata.Type), Transport: "", LongLivedCtx: false, ReceiverCreateSettings: receivertest.NewNopCreateSettings(), diff --git a/receiver/azureeventhubreceiver/factory.go b/receiver/azureeventhubreceiver/factory.go index acec2f3948b59..2d12b2948f0d7 100644 --- a/receiver/azureeventhubreceiver/factory.go +++ b/receiver/azureeventhubreceiver/factory.go @@ -27,11 +27,8 @@ import ( ) const ( - // The value of "type" key in configuration. - typeStr = "azureeventhub" - // The receiver scope name - receiverScopeName = "otelcol/" + typeStr + receiverScopeName = "otelcol/" + metadata.Type + "receiver" ) var ( @@ -49,7 +46,7 @@ func NewFactory() receiver.Factory { } return receiver.NewFactory( - typeStr, + metadata.Type, createDefaultConfig, receiver.WithLogs(f.createLogsReceiver, metadata.LogsStability), receiver.WithMetrics(f.createMetricsReceiver, metadata.MetricsStability)) diff --git a/receiver/azureeventhubreceiver/internal/metadata/generated_status.go b/receiver/azureeventhubreceiver/internal/metadata/generated_status.go index 21670a76d1ee0..3d47cf2b77f55 100644 --- a/receiver/azureeventhubreceiver/internal/metadata/generated_status.go +++ b/receiver/azureeventhubreceiver/internal/metadata/generated_status.go @@ -7,7 +7,7 @@ import ( ) const ( - Type = "azureeventhubreceiver" + Type = "azureeventhub" MetricsStability = component.StabilityLevelAlpha LogsStability = component.StabilityLevelAlpha ) diff --git a/receiver/azureeventhubreceiver/metadata.yaml b/receiver/azureeventhubreceiver/metadata.yaml index 6cf3689a706b4..d509fd4a24368 100644 --- a/receiver/azureeventhubreceiver/metadata.yaml +++ b/receiver/azureeventhubreceiver/metadata.yaml @@ -1,4 +1,4 @@ -type: azureeventhubreceiver +type: azureeventhub status: class: receiver diff --git a/receiver/azureeventhubreceiver/receiver.go b/receiver/azureeventhubreceiver/receiver.go index 65f9feb12221e..0ac58cac13404 100644 --- a/receiver/azureeventhubreceiver/receiver.go +++ b/receiver/azureeventhubreceiver/receiver.go @@ -27,6 +27,8 @@ import ( "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver/internal/metadata" ) type dataConsumer interface { @@ -106,7 +108,7 @@ func (receiver *eventhubReceiver) consumeLogs(ctx context.Context, event *eventh receiver.logger.Debug("Log Records", zap.Any("logs", logs)) err = receiver.nextLogsConsumer.ConsumeLogs(logsContext, logs) - receiver.obsrecv.EndLogsOp(logsContext, typeStr, 1, err) + receiver.obsrecv.EndLogsOp(logsContext, metadata.Type, 1, err) return err } @@ -131,7 +133,7 @@ func (receiver *eventhubReceiver) consumeMetrics(ctx context.Context, event *eve receiver.logger.Debug("Metric Records", zap.Any("metrics", metrics)) err = receiver.nextMetricsConsumer.ConsumeMetrics(metricsContext, metrics) - receiver.obsrecv.EndMetricsOp(metricsContext, typeStr, 1, err) + receiver.obsrecv.EndMetricsOp(metricsContext, metadata.Type, 1, err) return err }