Skip to content

Commit 97cae29

Browse files
authored
[component] Remove TelemetrySettings.MetricsLevel (#12189)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Fixes #11061. Depends on releasing the deprecation.
1 parent 1041a0b commit 97cae29

File tree

50 files changed

+25
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+25
-149
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: 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 field `component.TelemetrySettings.MetricsLevel`.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [11061]
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]

cmd/mdatagen/go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ require (
4949
github.com/spf13/pflag v1.0.5 // indirect
5050
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
5151
go.opentelemetry.io/collector/component/componentstatus v0.119.0 // indirect
52-
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
5352
go.opentelemetry.io/collector/consumer/consumererror v0.119.0 // indirect
5453
go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect
5554
go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect
@@ -88,8 +87,6 @@ replace go.opentelemetry.io/collector/semconv => ../../semconv
8887

8988
replace go.opentelemetry.io/collector/consumer => ../../consumer
9089

91-
replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
92-
9390
replace go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/receivertest
9491

9592
retract (

component/componentstatus/go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ require (
1212
github.com/davecgh/go-spew v1.1.1 // indirect
1313
github.com/gogo/protobuf v1.3.2 // indirect
1414
github.com/pmezard/go-difflib v1.0.0 // indirect
15-
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
1615
go.opentelemetry.io/collector/pdata v1.25.0 // indirect
1716
go.opentelemetry.io/otel v1.34.0 // indirect
1817
go.opentelemetry.io/otel/metric v1.34.0 // indirect
@@ -28,8 +27,6 @@ require (
2827
gopkg.in/yaml.v3 v3.0.1 // indirect
2928
)
3029

31-
replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
32-
3330
replace go.opentelemetry.io/collector/component => ../
3431

3532
replace go.opentelemetry.io/collector/pdata => ../../pdata

component/componenttest/go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ go 1.22.0
55
require (
66
github.com/stretchr/testify v1.10.0
77
go.opentelemetry.io/collector/component v0.119.0
8-
go.opentelemetry.io/collector/config/configtelemetry v0.119.0
98
go.opentelemetry.io/collector/pdata v1.25.0
109
go.opentelemetry.io/otel v1.34.0
1110
go.opentelemetry.io/otel/metric v1.34.0
@@ -37,5 +36,3 @@ require (
3736
replace go.opentelemetry.io/collector/component => ../
3837

3938
replace go.opentelemetry.io/collector/pdata => ../../pdata
40-
41-
replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry

component/componenttest/nop_telemetry.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"go.uber.org/zap"
1010

1111
"go.opentelemetry.io/collector/component"
12-
"go.opentelemetry.io/collector/config/configtelemetry"
1312
"go.opentelemetry.io/collector/pdata/pcommon"
1413
)
1514

@@ -19,7 +18,6 @@ func NewNopTelemetrySettings() component.TelemetrySettings {
1918
Logger: zap.NewNop(),
2019
TracerProvider: nooptrace.NewTracerProvider(),
2120
MeterProvider: noopmetric.NewMeterProvider(),
22-
MetricsLevel: configtelemetry.LevelNone,
2321
Resource: pcommon.NewResource(),
2422
}
2523
}

component/componenttest/nop_telemetry_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import (
77
"testing"
88

99
"github.com/stretchr/testify/assert"
10-
11-
"go.opentelemetry.io/collector/config/configtelemetry"
1210
)
1311

1412
func TestNewNopTelemetrySettings(t *testing.T) {
@@ -22,6 +20,5 @@ func TestNewNopTelemetrySettings(t *testing.T) {
2220
assert.NotPanics(t, func() {
2321
nts.MeterProvider.Meter("test")
2422
})
25-
assert.Equal(t, configtelemetry.LevelNone, nts.MetricsLevel) //nolint:staticcheck
2623
assert.Equal(t, 0, nts.Resource.Attributes().Len())
2724
}

component/componenttest/telemetry.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"go.opentelemetry.io/otel/sdk/trace/tracetest"
1515

1616
"go.opentelemetry.io/collector/component"
17-
"go.opentelemetry.io/collector/config/configtelemetry"
1817
)
1918

2019
type TelemetryOption interface {
@@ -70,7 +69,6 @@ func NewTelemetry(opts ...TelemetryOption) *Telemetry {
7069
func (tt *Telemetry) NewTelemetrySettings() component.TelemetrySettings {
7170
set := NewNopTelemetrySettings()
7271
set.MeterProvider = tt.meterProvider
73-
set.MetricsLevel = configtelemetry.LevelDetailed //nolint:staticcheck //SA1019
7472
set.TracerProvider = tt.traceProvider
7573
return set
7674
}

component/componenttest/telemetry_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,13 @@ import (
1111
"github.com/stretchr/testify/require"
1212
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
1313
sdktrace "go.opentelemetry.io/otel/sdk/trace"
14-
15-
"go.opentelemetry.io/collector/config/configtelemetry"
1614
)
1715

1816
func TestNewTelemetry(t *testing.T) {
1917
tel := NewTelemetry()
2018
assert.NotNil(t, tel.Reader)
2119
assert.NotNil(t, tel.SpanRecorder)
2220
set := tel.NewTelemetrySettings()
23-
assert.Equal(t, configtelemetry.LevelDetailed, set.MetricsLevel) //nolint:staticcheck //SA1019
2421
assert.IsType(t, &sdktrace.TracerProvider{}, set.TracerProvider)
2522
assert.IsType(t, &sdkmetric.MeterProvider{}, set.MeterProvider)
2623
require.NoError(t, tel.Shutdown(context.Background()))

component/go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ go 1.22.0
44

55
require (
66
github.com/stretchr/testify v1.10.0
7-
go.opentelemetry.io/collector/config/configtelemetry v0.119.0
87
go.opentelemetry.io/collector/pdata v1.25.0
98
go.opentelemetry.io/otel/metric v1.34.0
109
go.opentelemetry.io/otel/trace v1.34.0
@@ -27,8 +26,6 @@ require (
2726
gopkg.in/yaml.v3 v3.0.1 // indirect
2827
)
2928

30-
replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry
31-
3229
replace go.opentelemetry.io/collector/pdata => ../pdata
3330

3431
retract (

component/telemetry.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"go.opentelemetry.io/otel/trace"
99
"go.uber.org/zap"
1010

11-
"go.opentelemetry.io/collector/config/configtelemetry"
1211
"go.opentelemetry.io/collector/pdata/pcommon"
1312
)
1413

@@ -24,14 +23,6 @@ type TelemetrySettings struct {
2423
// MeterProvider that the factory can pass to other instrumented third-party libraries.
2524
MeterProvider metric.MeterProvider
2625

27-
// MetricsLevel represents the configuration value set when the collector
28-
// is configured. Components may use this level to decide whether it is
29-
// appropriate to avoid computationally expensive calculations.
30-
//
31-
// Deprecated: [v0.119.0] Use https://pkg.go.dev/go.opentelemetry.io/otel/sdk/[email protected]/internal/x#readme-instrument-enabled instead.
32-
// Components will temporarily need to add a view to `service/telemetry` to drop metrics based on the level.
33-
MetricsLevel configtelemetry.Level
34-
3526
// Resource contains the resource attributes for the collector's telemetry.
3627
Resource pcommon.Resource
3728
}

0 commit comments

Comments
 (0)