Skip to content

Commit ef07ea0

Browse files
authored
[mdatagen] move ScopeName to generated_status (#10848)
This will make it available to most components, as the generated_telemetry is only generated for components that have internal telemetry configured. Arguably the scope name should be moved to its own file, but i'd rather not add yet another file if possible. Signed-off-by: Alex Boten <[email protected]>
1 parent 053d370 commit ef07ea0

File tree

24 files changed

+54
-57
lines changed

24 files changed

+54
-57
lines changed

cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_status.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go

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

cmd/mdatagen/main_test.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,8 @@ import (
462462
)
463463
464464
var (
465-
Type = component.MustNewType("foo")
465+
Type = component.MustNewType("foo")
466+
ScopeName = ""
466467
)
467468
468469
const (
@@ -491,7 +492,8 @@ import (
491492
)
492493
493494
var (
494-
Type = component.MustNewType("foo")
495+
Type = component.MustNewType("foo")
496+
ScopeName = ""
495497
)
496498
497499
const (
@@ -546,14 +548,12 @@ import (
546548
"go.opentelemetry.io/collector/config/configtelemetry"
547549
)
548550
549-
const ScopeName = ""
550-
551551
func Meter(settings component.TelemetrySettings) metric.Meter {
552-
return settings.MeterProvider.Meter(ScopeName)
552+
return settings.MeterProvider.Meter("")
553553
}
554554
555555
func Tracer(settings component.TelemetrySettings) trace.Tracer {
556-
return settings.TracerProvider.Tracer(ScopeName)
556+
return settings.TracerProvider.Tracer("")
557557
}
558558
`,
559559
},
@@ -582,14 +582,12 @@ import (
582582
"go.opentelemetry.io/collector/config/configtelemetry"
583583
)
584584
585-
const ScopeName = ""
586-
587585
func Meter(settings component.TelemetrySettings) metric.Meter {
588-
return settings.MeterProvider.Meter(ScopeName)
586+
return settings.MeterProvider.Meter("")
589587
}
590588
591589
func Tracer(settings component.TelemetrySettings) trace.Tracer {
592-
return settings.TracerProvider.Tracer(ScopeName)
590+
return settings.TracerProvider.Tracer("")
593591
}
594592
`,
595593
},

cmd/mdatagen/templates/status.go.tmpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import (
77
)
88

99
var (
10-
Type = component.MustNewType("{{ .Type }}")
10+
Type = component.MustNewType("{{ .Type }}")
11+
ScopeName = "{{ .ScopeName }}"
1112
)
1213

1314
const (

cmd/mdatagen/templates/telemetry.go.tmpl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@ import (
1616
"go.opentelemetry.io/collector/config/configtelemetry"
1717
)
1818

19-
const ScopeName = "{{ .ScopeName }}"
20-
2119
func Meter(settings component.TelemetrySettings) metric.Meter {
22-
return settings.MeterProvider.Meter(ScopeName)
20+
return settings.MeterProvider.Meter("{{ .ScopeName }}")
2321
}
2422

2523
func Tracer(settings component.TelemetrySettings) trace.Tracer {
26-
return settings.TracerProvider.Tracer(ScopeName)
24+
return settings.TracerProvider.Tracer("{{ .ScopeName }}")
2725
}
2826
{{- if .Telemetry.Metrics }}
2927

connector/forwardconnector/internal/metadata/generated_status.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/debugexporter/internal/metadata/generated_status.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/exporterhelper/internal/metadata/generated_telemetry.go

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

exporter/loggingexporter/internal/metadata/generated_status.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/nopexporter/internal/metadata/generated_status.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)