Skip to content

Commit f14fd28

Browse files
bogdandrutubogdandrutu
committed
Remove unused not_component config for mdatagen
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent a4ae175 commit f14fd28

File tree

11 files changed

+17
-45
lines changed

11 files changed

+17
-45
lines changed

‎cmd/mdatagen/internal/command.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func run(ymlPath string) error {
7878
codeDir := filepath.Join(ymlDir, "internal", md.GeneratedPackageName)
7979
toGenerate := map[string]string{}
8080
if md.Status != nil {
81-
if md.Status.Class != "cmd" && md.Status.Class != "pkg" && !md.Status.NotComponent {
81+
if md.Status.Class != "cmd" && md.Status.Class != "pkg" {
8282
toGenerate[filepath.Join(tmplDir, "status.go.tmpl")] = filepath.Join(codeDir, "generated_status.go")
8383
if err = generateFile(filepath.Join(tmplDir, "component_test.go.tmpl"),
8484
filepath.Join(ymlDir, "generated_component_test.go"), md, packageName); err != nil {

‎cmd/mdatagen/internal/status.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ type Status struct {
4646
Warnings []string `mapstructure:"warnings"`
4747
Codeowners *Codeowners `mapstructure:"codeowners"`
4848
UnsupportedPlatforms []string `mapstructure:"unsupported_platforms"`
49-
NotComponent bool `mapstructure:"not_component"`
5049
}
5150

5251
func (s *Status) SortedDistributions() []string {

‎processor/processorhelper/internal/metadatatest/generated_telemetrytest.go

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎processor/processorhelper/logs_test.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"go.opentelemetry.io/collector/consumer"
2121
"go.opentelemetry.io/collector/consumer/consumertest"
2222
"go.opentelemetry.io/collector/pdata/plog"
23+
"go.opentelemetry.io/collector/processor"
2324
"go.opentelemetry.io/collector/processor/processorhelper/internal/metadatatest"
2425
"go.opentelemetry.io/collector/processor/processortest"
2526
)
@@ -121,7 +122,7 @@ func TestLogs_RecordInOut(t *testing.T) {
121122
incomingLogRecords.AppendEmpty()
122123

123124
tel := componenttest.NewTelemetry()
124-
lp, err := NewLogs(context.Background(), metadatatest.NewSettings(tel), &testLogsCfg, consumertest.NewNop(), mockAggregate)
125+
lp, err := NewLogs(context.Background(), newSettings(tel), &testLogsCfg, consumertest.NewNop(), mockAggregate)
125126
require.NoError(t, err)
126127

127128
assert.NoError(t, lp.Start(context.Background(), componenttest.NewNopHost()))
@@ -159,7 +160,7 @@ func TestLogs_RecordIn_ErrorOut(t *testing.T) {
159160
incomingLogRecords.AppendEmpty()
160161

161162
tel := componenttest.NewTelemetry()
162-
lp, err := NewLogs(context.Background(), metadatatest.NewSettings(tel), &testLogsCfg, consumertest.NewNop(), mockErr)
163+
lp, err := NewLogs(context.Background(), newSettings(tel), &testLogsCfg, consumertest.NewNop(), mockErr)
163164
require.NoError(t, err)
164165

165166
require.NoError(t, lp.Start(context.Background(), componenttest.NewNopHost()))
@@ -181,3 +182,10 @@ func TestLogs_RecordIn_ErrorOut(t *testing.T) {
181182
},
182183
}, metricdatatest.IgnoreTimestamp())
183184
}
185+
186+
func newSettings(tel *componenttest.Telemetry) processor.Settings {
187+
set := processortest.NewNopSettings()
188+
set.ID = component.NewID(component.MustNewType("processorhelper"))
189+
set.TelemetrySettings = tel.NewTelemetrySettings()
190+
return set
191+
}

‎processor/processorhelper/metadata.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
type: processorhelper
22

33
status:
4-
class: processor
5-
not_component: true
4+
class: pkg
65
stability:
76
beta: [traces, metrics, logs]
87

‎processor/processorhelper/metrics_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func TestMetrics_RecordInOut(t *testing.T) {
121121
dps.AppendEmpty()
122122

123123
tel := componenttest.NewTelemetry()
124-
mp, err := NewMetrics(context.Background(), metadatatest.NewSettings(tel), &testMetricsCfg, consumertest.NewNop(), mockAggregate)
124+
mp, err := NewMetrics(context.Background(), newSettings(tel), &testMetricsCfg, consumertest.NewNop(), mockAggregate)
125125
require.NoError(t, err)
126126

127127
assert.NoError(t, mp.Start(context.Background(), componenttest.NewNopHost()))
@@ -158,7 +158,7 @@ func TestMetrics_RecordIn_ErrorOut(t *testing.T) {
158158
dps.AppendEmpty()
159159

160160
tel := componenttest.NewTelemetry()
161-
mp, err := NewMetrics(context.Background(), metadatatest.NewSettings(tel), &testMetricsCfg, consumertest.NewNop(), mockErr)
161+
mp, err := NewMetrics(context.Background(), newSettings(tel), &testMetricsCfg, consumertest.NewNop(), mockErr)
162162
require.NoError(t, err)
163163

164164
require.NoError(t, mp.Start(context.Background(), componenttest.NewNopHost()))

‎processor/processorhelper/traces_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func TestTraces_RecordInOut(t *testing.T) {
123123
incomingSpans.AppendEmpty()
124124

125125
tel := componenttest.NewTelemetry()
126-
tp, err := NewTraces(context.Background(), metadatatest.NewSettings(tel), &testLogsCfg, consumertest.NewNop(), mockAggregate)
126+
tp, err := NewTraces(context.Background(), newSettings(tel), &testLogsCfg, consumertest.NewNop(), mockAggregate)
127127
require.NoError(t, err)
128128

129129
assert.NoError(t, tp.Start(context.Background(), componenttest.NewNopHost()))
@@ -162,7 +162,7 @@ func TestTraces_RecordIn_ErrorOut(t *testing.T) {
162162
incomingSpans.AppendEmpty()
163163

164164
tel := componenttest.NewTelemetry()
165-
tp, err := NewTraces(context.Background(), metadatatest.NewSettings(tel), &testLogsCfg, consumertest.NewNop(), mockErr)
165+
tp, err := NewTraces(context.Background(), newSettings(tel), &testLogsCfg, consumertest.NewNop(), mockErr)
166166
require.NoError(t, err)
167167

168168
require.NoError(t, tp.Start(context.Background(), componenttest.NewNopHost()))

‎receiver/go.mod

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ require (
99
go.opentelemetry.io/collector/consumer v1.25.0
1010
go.opentelemetry.io/collector/consumer/consumertest v0.119.0
1111
go.opentelemetry.io/collector/pipeline v0.119.0
12-
go.opentelemetry.io/collector/receiver/receivertest v0.119.0
1312
go.opentelemetry.io/otel v1.34.0
1413
go.opentelemetry.io/otel/metric v1.34.0
1514
go.opentelemetry.io/otel/sdk/metric v1.34.0
@@ -28,11 +27,9 @@ require (
2827
github.com/modern-go/reflect2 v1.0.2 // indirect
2928
github.com/pmezard/go-difflib v1.0.0 // indirect
3029
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
31-
go.opentelemetry.io/collector/consumer/consumererror v0.119.0 // indirect
3230
go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect
3331
go.opentelemetry.io/collector/pdata v1.25.0 // indirect
3432
go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect
35-
go.opentelemetry.io/collector/receiver/xreceiver v0.119.0 // indirect
3633
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
3734
go.uber.org/multierr v1.11.0 // indirect
3835
go.uber.org/zap v1.27.0 // indirect
@@ -61,12 +58,6 @@ replace go.opentelemetry.io/collector/consumer/xconsumer => ../consumer/xconsume
6158

6259
replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consumertest
6360

64-
replace go.opentelemetry.io/collector/receiver/xreceiver => ./xreceiver
65-
66-
replace go.opentelemetry.io/collector/receiver/receivertest => ./receivertest
67-
6861
retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module
6962

7063
replace go.opentelemetry.io/collector/pipeline => ../pipeline
71-
72-
replace go.opentelemetry.io/collector/consumer/consumererror => ../consumer/consumererror

‎receiver/receiverhelper/internal/metadatatest/generated_telemetrytest.go

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎receiver/receiverhelper/metadata.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ type: receiverhelper
22
github_project: open-telemetry/opentelemetry-collector
33

44
status:
5-
class: receiver
6-
not_component: true
5+
class: pkg
76
stability:
87
beta: [traces, metrics, logs]
98

0 commit comments

Comments
 (0)