From fcdf7a5c6abcdf17609c416fdcbeadb2657c976d Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Wed, 21 Aug 2024 09:18:56 -0700 Subject: [PATCH] update reference in test Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../samplereceiver/internal/metadata/generated_telemetry.go | 2 +- cmd/mdatagen/main_test.go | 4 ++-- cmd/mdatagen/templates/telemetry.go.tmpl | 2 +- .../exporterhelper/internal/metadata/generated_telemetry.go | 2 +- .../batchprocessor/internal/metadata/generated_telemetry.go | 2 +- .../processorhelper/internal/metadata/generated_telemetry.go | 2 +- .../receiverhelper/internal/metadata/generated_telemetry.go | 2 +- .../scraperhelper/internal/metadata/generated_telemetry.go | 2 +- service/internal/metadata/generated_telemetry.go | 2 +- service/internal/proctelemetry/process_telemetry_test.go | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go index 7317623f513..43104bedead 100644 --- a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go +++ b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/configtelemetry" ) -// Deprecated [v0.108.0]: use LeveledMeter instead. +// Deprecated: [v0.108.0] use LeveledMeter instead. func Meter(settings component.TelemetrySettings) metric.Meter { return settings.MeterProvider.Meter("go.opentelemetry.io/collector/internal/receiver/samplereceiver") } diff --git a/cmd/mdatagen/main_test.go b/cmd/mdatagen/main_test.go index 331aace35ed..1372c31d5c5 100644 --- a/cmd/mdatagen/main_test.go +++ b/cmd/mdatagen/main_test.go @@ -569,7 +569,7 @@ import ( "go.opentelemetry.io/collector/config/configtelemetry" ) -// Deprecated [v0.108.0]: use LeveledMeter instead. +// Deprecated: [v0.108.0] use LeveledMeter instead. func Meter(settings component.TelemetrySettings) metric.Meter { return settings.MeterProvider.Meter("") } @@ -608,7 +608,7 @@ import ( "go.opentelemetry.io/collector/config/configtelemetry" ) -// Deprecated [v0.108.0]: use LeveledMeter instead. +// Deprecated: [v0.108.0] use LeveledMeter instead. func Meter(settings component.TelemetrySettings) metric.Meter { return settings.MeterProvider.Meter("") } diff --git a/cmd/mdatagen/templates/telemetry.go.tmpl b/cmd/mdatagen/templates/telemetry.go.tmpl index 2d2769997ed..a4b98c3359b 100644 --- a/cmd/mdatagen/templates/telemetry.go.tmpl +++ b/cmd/mdatagen/templates/telemetry.go.tmpl @@ -21,7 +21,7 @@ import ( "go.opentelemetry.io/collector/config/configtelemetry" ) -// Deprecated [v0.108.0]: use LeveledMeter instead. +// Deprecated: [v0.108.0] use LeveledMeter instead. func Meter(settings component.TelemetrySettings) metric.Meter { return settings.MeterProvider.Meter("{{ .ScopeName }}") } diff --git a/exporter/exporterhelper/internal/metadata/generated_telemetry.go b/exporter/exporterhelper/internal/metadata/generated_telemetry.go index 093bf3f7339..a35625ac0a5 100644 --- a/exporter/exporterhelper/internal/metadata/generated_telemetry.go +++ b/exporter/exporterhelper/internal/metadata/generated_telemetry.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/configtelemetry" ) -// Deprecated [v0.108.0]: use LeveledMeter instead. +// Deprecated: [v0.108.0] use LeveledMeter instead. func Meter(settings component.TelemetrySettings) metric.Meter { return settings.MeterProvider.Meter("go.opentelemetry.io/collector/exporter/exporterhelper") } diff --git a/processor/batchprocessor/internal/metadata/generated_telemetry.go b/processor/batchprocessor/internal/metadata/generated_telemetry.go index f0b57530fb8..38a97468402 100644 --- a/processor/batchprocessor/internal/metadata/generated_telemetry.go +++ b/processor/batchprocessor/internal/metadata/generated_telemetry.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/configtelemetry" ) -// Deprecated [v0.108.0]: use LeveledMeter instead. +// Deprecated: [v0.108.0] use LeveledMeter instead. func Meter(settings component.TelemetrySettings) metric.Meter { return settings.MeterProvider.Meter("go.opentelemetry.io/collector/processor/batchprocessor") } diff --git a/processor/processorhelper/internal/metadata/generated_telemetry.go b/processor/processorhelper/internal/metadata/generated_telemetry.go index c45fdacfc82..114ba9df7c0 100644 --- a/processor/processorhelper/internal/metadata/generated_telemetry.go +++ b/processor/processorhelper/internal/metadata/generated_telemetry.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/config/configtelemetry" ) -// Deprecated [v0.108.0]: use LeveledMeter instead. +// Deprecated: [v0.108.0] use LeveledMeter instead. func Meter(settings component.TelemetrySettings) metric.Meter { return settings.MeterProvider.Meter("go.opentelemetry.io/collector/processor/processorhelper") } diff --git a/receiver/receiverhelper/internal/metadata/generated_telemetry.go b/receiver/receiverhelper/internal/metadata/generated_telemetry.go index fae2e0cbfb3..766735f943c 100644 --- a/receiver/receiverhelper/internal/metadata/generated_telemetry.go +++ b/receiver/receiverhelper/internal/metadata/generated_telemetry.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/config/configtelemetry" ) -// Deprecated [v0.108.0]: use LeveledMeter instead. +// Deprecated: [v0.108.0] use LeveledMeter instead. func Meter(settings component.TelemetrySettings) metric.Meter { return settings.MeterProvider.Meter("go.opentelemetry.io/collector/receiver/receiverhelper") } diff --git a/receiver/scraperhelper/internal/metadata/generated_telemetry.go b/receiver/scraperhelper/internal/metadata/generated_telemetry.go index 224e39a44ae..498746b0e87 100644 --- a/receiver/scraperhelper/internal/metadata/generated_telemetry.go +++ b/receiver/scraperhelper/internal/metadata/generated_telemetry.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/config/configtelemetry" ) -// Deprecated [v0.108.0]: use LeveledMeter instead. +// Deprecated: [v0.108.0] use LeveledMeter instead. func Meter(settings component.TelemetrySettings) metric.Meter { return settings.MeterProvider.Meter("go.opentelemetry.io/collector/receiver/scraperhelper") } diff --git a/service/internal/metadata/generated_telemetry.go b/service/internal/metadata/generated_telemetry.go index 713b0212120..c08e6cd7cd3 100644 --- a/service/internal/metadata/generated_telemetry.go +++ b/service/internal/metadata/generated_telemetry.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/configtelemetry" ) -// Deprecated [v0.108.0]: use LeveledMeter instead. +// Deprecated: [v0.108.0] use LeveledMeter instead. func Meter(settings component.TelemetrySettings) metric.Meter { return settings.MeterProvider.Meter("go.opentelemetry.io/collector/service") } diff --git a/service/internal/proctelemetry/process_telemetry_test.go b/service/internal/proctelemetry/process_telemetry_test.go index ff6e44d2202..466605ce8a4 100644 --- a/service/internal/proctelemetry/process_telemetry_test.go +++ b/service/internal/proctelemetry/process_telemetry_test.go @@ -59,7 +59,7 @@ func setupTelemetry(t *testing.T) testTelemetry { } settings.TelemetrySettings.LeveledMeterProvider = func(_ configtelemetry.Level) metric.MeterProvider { - return settings.meterProvider + return meterProvider } settings.promHandler = promhttp.HandlerFor(promReg, promhttp.HandlerOpts{})