Skip to content

Commit 3f3e208

Browse files
Remove deprecated TelemetrySettings.LeveledMeterProvider (open-telemetry#11811)
Signed-off-by: Bogdan Drutu <[email protected]> Co-authored-by: Evan Bradley <[email protected]>
1 parent 71f7d9e commit 3f3e208

File tree

4 files changed

+26
-15
lines changed

4 files changed

+26
-15
lines changed

.chloggen/LeveledMeterProvider.yaml

+25
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: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: component
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove deprecated TelemetrySettings.LeveledMeterProvider
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [11811]
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: [api]

component/componenttest/nop_telemetry.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package componenttest // import "go.opentelemetry.io/collector/component/componenttest"
55

66
import (
7-
"go.opentelemetry.io/otel/metric"
87
noopmetric "go.opentelemetry.io/otel/metric/noop"
98
nooptrace "go.opentelemetry.io/otel/trace/noop"
109
"go.uber.org/zap"
@@ -17,10 +16,7 @@ import (
1716
// NewNopTelemetrySettings returns a new nop telemetry settings for Create* functions.
1817
func NewNopTelemetrySettings() component.TelemetrySettings {
1918
return component.TelemetrySettings{
20-
Logger: zap.NewNop(),
21-
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
22-
return noopmetric.NewMeterProvider()
23-
},
19+
Logger: zap.NewNop(),
2420
TracerProvider: nooptrace.NewTracerProvider(),
2521
MeterProvider: noopmetric.NewMeterProvider(),
2622
MetricsLevel: configtelemetry.LevelNone,

component/telemetry.go

-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ type TelemetrySettings struct {
2424
// MeterProvider that the factory can pass to other instrumented third-party libraries.
2525
MeterProvider metric.MeterProvider
2626

27-
// Deprecated: [v0.114.0] use MeterProvider instead.
28-
LeveledMeterProvider func(level configtelemetry.Level) metric.MeterProvider
29-
3027
// MetricsLevel represents the configuration value set when the collector
3128
// is configured. Components may use this level to decide whether it is
3229
// appropriate to avoid computationally expensive calculations.

service/service.go

-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"go.opentelemetry.io/contrib/config"
1515
"go.opentelemetry.io/otel/log"
1616
"go.opentelemetry.io/otel/metric"
17-
"go.opentelemetry.io/otel/metric/noop"
1817
sdkresource "go.opentelemetry.io/otel/sdk/resource"
1918
"go.uber.org/multierr"
2019
"go.uber.org/zap"
@@ -172,12 +171,6 @@ func New(ctx context.Context, set Settings, cfg Config) (*Service, error) {
172171

173172
logsAboutMeterProvider(logger, cfg.Telemetry.Metrics, mp)
174173
srv.telemetrySettings = component.TelemetrySettings{
175-
LeveledMeterProvider: func(level configtelemetry.Level) metric.MeterProvider {
176-
if level <= cfg.Telemetry.Metrics.Level {
177-
return mp
178-
}
179-
return noop.NewMeterProvider()
180-
},
181174
Logger: logger,
182175
MeterProvider: mp,
183176
TracerProvider: tracerProvider,

0 commit comments

Comments
 (0)