[chore] use status Type in azureeventhubreceiver (open-telemetry#21391)

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)

receiver/azureeventhubreceiver/config_test.go

@@ -22,28 +22,30 @@ 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) {
  factories, err := otelcoltest.NopFactories()
  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)
  require.NotNil(t, cfg)
 
  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:https://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:https://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)

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(),

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))

receiver/azureeventhubreceiver/metadata.yaml

@@ -1,4 +1,4 @@
-type: azureeventhubreceiver
+type: azureeventhub
 
 status:
  class: receiver

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
 }