Remove unused not_component config for mdatagen

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
open-telemetry · Feb 1, 2025 · ba6c64f · ba6c64f
1 parent 51672ad
commit ba6c64f
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 42 deletions.
diff --git a/cmd/mdatagen/internal/command.go b/cmd/mdatagen/internal/command.go
@@ -84,7 +84,7 @@ func run(ymlPath string) error {
 		return fmt.Errorf("unable to create output test directory %q: %w", codeDir, err)
 	}
 	if md.Status != nil {
-		if md.Status.Class != "cmd" && md.Status.Class != "pkg" && !md.Status.NotComponent {
+		if md.Status.Class != "cmd" && md.Status.Class != "pkg" {
 			if err = generateFile(filepath.Join(tmplDir, "status.go.tmpl"),
 				filepath.Join(codeDir, "generated_status.go"), md, "metadata"); err != nil {
 				return err

diff --git a/cmd/mdatagen/internal/status.go b/cmd/mdatagen/internal/status.go
@@ -46,7 +46,6 @@ type Status struct {
 	Warnings             []string     `mapstructure:"warnings"`
 	Codeowners           *Codeowners  `mapstructure:"codeowners"`
 	UnsupportedPlatforms []string     `mapstructure:"unsupported_platforms"`
-	NotComponent         bool         `mapstructure:"not_component"`
 }
 
 func (s *Status) SortedDistributions() []string {

diff --git a/processor/processorhelper/internal/metadatatest/generated_telemetrytest.go b/processor/processorhelper/internal/metadatatest/generated_telemetrytest.go
diff --git a/processor/processorhelper/logs_test.go b/processor/processorhelper/logs_test.go
@@ -20,6 +20,7 @@ import (
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 	"go.opentelemetry.io/collector/pdata/plog"
+	"go.opentelemetry.io/collector/processor"
 	"go.opentelemetry.io/collector/processor/processorhelper/internal/metadatatest"
 	"go.opentelemetry.io/collector/processor/processortest"
 )
@@ -121,7 +122,7 @@ func TestLogs_RecordInOut(t *testing.T) {
 	incomingLogRecords.AppendEmpty()
 
 	tel := componenttest.NewTelemetry()
-	lp, err := NewLogs(context.Background(), metadatatest.NewSettings(tel), &testLogsCfg, consumertest.NewNop(), mockAggregate)
+	lp, err := NewLogs(context.Background(), newSettings(tel), &testLogsCfg, consumertest.NewNop(), mockAggregate)
 	require.NoError(t, err)
 
 	assert.NoError(t, lp.Start(context.Background(), componenttest.NewNopHost()))
@@ -159,7 +160,7 @@ func TestLogs_RecordIn_ErrorOut(t *testing.T) {
 	incomingLogRecords.AppendEmpty()
 
 	tel := componenttest.NewTelemetry()
-	lp, err := NewLogs(context.Background(), metadatatest.NewSettings(tel), &testLogsCfg, consumertest.NewNop(), mockErr)
+	lp, err := NewLogs(context.Background(), newSettings(tel), &testLogsCfg, consumertest.NewNop(), mockErr)
 	require.NoError(t, err)
 
 	require.NoError(t, lp.Start(context.Background(), componenttest.NewNopHost()))
@@ -181,3 +182,10 @@ func TestLogs_RecordIn_ErrorOut(t *testing.T) {
 			},
 		}, metricdatatest.IgnoreTimestamp())
 }
+
+func newSettings(tel *componenttest.Telemetry) processor.Settings {
+	set := processortest.NewNopSettings()
+	set.ID = component.NewID(component.MustNewType("processorhelper"))
+	set.TelemetrySettings = tel.NewTelemetrySettings()
+	return set
+}
diff --git a/processor/processorhelper/metadata.yaml b/processor/processorhelper/metadata.yaml
@@ -1,8 +1,7 @@
 type: processorhelper
 
 status:
-  class: processor
-  not_component: true
+  class: pkg
   stability:
     beta: [traces, metrics, logs]
 

diff --git a/processor/processorhelper/metrics_test.go b/processor/processorhelper/metrics_test.go
@@ -121,7 +121,7 @@ func TestMetrics_RecordInOut(t *testing.T) {
 	dps.AppendEmpty()
 
 	tel := componenttest.NewTelemetry()
-	mp, err := NewMetrics(context.Background(), metadatatest.NewSettings(tel), &testMetricsCfg, consumertest.NewNop(), mockAggregate)
+	mp, err := NewMetrics(context.Background(), newSettings(tel), &testMetricsCfg, consumertest.NewNop(), mockAggregate)
 	require.NoError(t, err)
 
 	assert.NoError(t, mp.Start(context.Background(), componenttest.NewNopHost()))
@@ -158,7 +158,7 @@ func TestMetrics_RecordIn_ErrorOut(t *testing.T) {
 	dps.AppendEmpty()
 
 	tel := componenttest.NewTelemetry()
-	mp, err := NewMetrics(context.Background(), metadatatest.NewSettings(tel), &testMetricsCfg, consumertest.NewNop(), mockErr)
+	mp, err := NewMetrics(context.Background(), newSettings(tel), &testMetricsCfg, consumertest.NewNop(), mockErr)
 	require.NoError(t, err)
 
 	require.NoError(t, mp.Start(context.Background(), componenttest.NewNopHost()))

diff --git a/processor/processorhelper/traces_test.go b/processor/processorhelper/traces_test.go
@@ -123,7 +123,7 @@ func TestTraces_RecordInOut(t *testing.T) {
 	incomingSpans.AppendEmpty()
 
 	tel := componenttest.NewTelemetry()
-	tp, err := NewTraces(context.Background(), metadatatest.NewSettings(tel), &testLogsCfg, consumertest.NewNop(), mockAggregate)
+	tp, err := NewTraces(context.Background(), newSettings(tel), &testLogsCfg, consumertest.NewNop(), mockAggregate)
 	require.NoError(t, err)
 
 	assert.NoError(t, tp.Start(context.Background(), componenttest.NewNopHost()))
@@ -162,7 +162,7 @@ func TestTraces_RecordIn_ErrorOut(t *testing.T) {
 	incomingSpans.AppendEmpty()
 
 	tel := componenttest.NewTelemetry()
-	tp, err := NewTraces(context.Background(), metadatatest.NewSettings(tel), &testLogsCfg, consumertest.NewNop(), mockErr)
+	tp, err := NewTraces(context.Background(), newSettings(tel), &testLogsCfg, consumertest.NewNop(), mockErr)
 	require.NoError(t, err)
 
 	require.NoError(t, tp.Start(context.Background(), componenttest.NewNopHost()))

diff --git a/receiver/receiverhelper/internal/metadatatest/generated_telemetrytest.go b/receiver/receiverhelper/internal/metadatatest/generated_telemetrytest.go
diff --git a/receiver/receiverhelper/metadata.yaml b/receiver/receiverhelper/metadata.yaml
@@ -2,8 +2,7 @@ type: receiverhelper
 github_project: open-telemetry/opentelemetry-collector
 
 status:
-  class: receiver
-  not_component: true
+  class: pkg
   stability:
     beta: [traces, metrics, logs]