Skip to content

Commit 725614c

Browse files
committed
[mdatagen] add LeveledMeter method
This will use the LeveledMeterProvider in TelemetrySettings. Split from open-telemetry#10912, follows open-telemetry#10931 Signed-off-by: Alex Boten <[email protected]>
1 parent b104eca commit 725614c

25 files changed

+154
-0
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: mdatagen
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Add `LeveledMeter` method to mdatagen"
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: []
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []

cmd/mdatagen/internal/samplereceiver/generated_component_telemetry_test.go

Lines changed: 5 additions & 0 deletions
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: 4 additions & 0 deletions
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_test.go

Lines changed: 7 additions & 0 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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,10 @@ func Meter(settings component.TelemetrySettings) metric.Meter {
573573
return settings.MeterProvider.Meter("")
574574
}
575575
576+
func LeveledMeter(settings component.TelemetrySettings, level configtelemetry.Level) metric.Meter {
577+
return settings.LeveledMeterProvider(level).Meter("")
578+
}
579+
576580
func Tracer(settings component.TelemetrySettings) trace.Tracer {
577581
return settings.TracerProvider.Tracer("")
578582
}
@@ -607,6 +611,10 @@ func Meter(settings component.TelemetrySettings) metric.Meter {
607611
return settings.MeterProvider.Meter("")
608612
}
609613
614+
func LeveledMeter(settings component.TelemetrySettings, level configtelemetry.Level) metric.Meter {
615+
return settings.LeveledMeterProvider(level).Meter("")
616+
}
617+
610618
func Tracer(settings component.TelemetrySettings) trace.Tracer {
611619
return settings.TracerProvider.Tracer("")
612620
}

cmd/mdatagen/templates/component_telemetry_test.go.tmpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313

1414
"go.opentelemetry.io/collector/component"
1515
{{- if or isConnector isExporter isExtension isProcessor isReceiver }}
16+
"go.opentelemetry.io/collector/config/configtelemetry"
1617
"go.opentelemetry.io/collector/{{ .Status.Class }}"
1718
"go.opentelemetry.io/collector/{{ .Status.Class }}/{{ .Status.Class }}test"
1819
{{- end }}
@@ -27,6 +28,9 @@ type componentTestTelemetry struct {
2728
func (tt *componentTestTelemetry) NewSettings() {{ .Status.Class }}.Settings {
2829
settings := {{ .Status.Class }}test.NewNopSettings()
2930
settings.MeterProvider = tt.meterProvider
31+
settings.LeveledMeterProvider = func(_ configtelemetry.Level) metric.MeterProvider {
32+
return tt.meterProvider
33+
}
3034
settings.ID = component.NewID(component.MustNewType("{{ .Type }}"))
3135

3236
return settings

cmd/mdatagen/templates/telemetry.go.tmpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ func Meter(settings component.TelemetrySettings) metric.Meter {
2525
return settings.MeterProvider.Meter("{{ .ScopeName }}")
2626
}
2727

28+
func LeveledMeter(settings component.TelemetrySettings, level configtelemetry.Level) metric.Meter {
29+
return settings.LeveledMeterProvider(level).Meter("{{ .ScopeName }}")
30+
}
31+
2832
func Tracer(settings component.TelemetrySettings) trace.Tracer {
2933
return settings.TracerProvider.Tracer("{{ .ScopeName }}")
3034
}

cmd/mdatagen/templates/telemetry_test.go.tmpl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ func (m mockTracerProvider) Tracer(name string, opts ...trace.TracerOption) trac
4343

4444
func TestProviders(t *testing.T) {
4545
set := component.TelemetrySettings{
46+
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
47+
return mockMeterProvider{}
48+
},
4649
MeterProvider: mockMeterProvider{},
4750
TracerProvider: mockTracerProvider{},
4851
}
@@ -65,6 +68,9 @@ func TestProviders(t *testing.T) {
6568

6669
func TestNewTelemetryBuilder(t *testing.T) {
6770
set := component.TelemetrySettings{
71+
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
72+
return mockMeterProvider{}
73+
},
6874
MeterProvider: mockMeterProvider{},
6975
TracerProvider: mockTracerProvider{},
7076
}

exporter/exporterhelper/generated_component_telemetry_test.go

Lines changed: 5 additions & 0 deletions
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: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)