Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[component] Remove TelemetrySettings.MetricsLevel #12189

Merged
merged 7 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .chloggen/mx-psi_remove-metricslevel.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: component

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Remove deprecated field `component.TelemetrySettings.MetricsLevel`.

# One or more tracking issues or pull requests related to the change
issues: [11061]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [api]
3 changes: 0 additions & 3 deletions cmd/mdatagen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.119.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.119.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect
Expand Down Expand Up @@ -88,8 +87,6 @@ replace go.opentelemetry.io/collector/semconv => ../../semconv

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

replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry

replace go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/receivertest

retract (
Expand Down
3 changes: 0 additions & 3 deletions component/componentstatus/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/pdata v1.25.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
Expand All @@ -28,8 +27,6 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry

replace go.opentelemetry.io/collector/component => ../

replace go.opentelemetry.io/collector/pdata => ../../pdata
Expand Down
3 changes: 0 additions & 3 deletions component/componenttest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ go 1.22.0
require (
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v0.119.0
go.opentelemetry.io/collector/config/configtelemetry v0.119.0
go.opentelemetry.io/collector/pdata v1.25.0
go.opentelemetry.io/otel v1.34.0
go.opentelemetry.io/otel/metric v1.34.0
Expand Down Expand Up @@ -37,5 +36,3 @@ require (
replace go.opentelemetry.io/collector/component => ../

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

replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
2 changes: 0 additions & 2 deletions component/componenttest/nop_telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"go.uber.org/zap"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configtelemetry"
"go.opentelemetry.io/collector/pdata/pcommon"
)

Expand All @@ -19,7 +18,6 @@ func NewNopTelemetrySettings() component.TelemetrySettings {
Logger: zap.NewNop(),
TracerProvider: nooptrace.NewTracerProvider(),
MeterProvider: noopmetric.NewMeterProvider(),
MetricsLevel: configtelemetry.LevelNone,
Resource: pcommon.NewResource(),
}
}
3 changes: 0 additions & 3 deletions component/componenttest/nop_telemetry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import (
"testing"

"github.com/stretchr/testify/assert"

"go.opentelemetry.io/collector/config/configtelemetry"
)

func TestNewNopTelemetrySettings(t *testing.T) {
Expand All @@ -22,6 +20,5 @@ func TestNewNopTelemetrySettings(t *testing.T) {
assert.NotPanics(t, func() {
nts.MeterProvider.Meter("test")
})
assert.Equal(t, configtelemetry.LevelNone, nts.MetricsLevel) //nolint:staticcheck
assert.Equal(t, 0, nts.Resource.Attributes().Len())
}
2 changes: 0 additions & 2 deletions component/componenttest/telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"go.opentelemetry.io/otel/sdk/trace/tracetest"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configtelemetry"
)

type TelemetryOption interface {
Expand Down Expand Up @@ -70,7 +69,6 @@ func NewTelemetry(opts ...TelemetryOption) *Telemetry {
func (tt *Telemetry) NewTelemetrySettings() component.TelemetrySettings {
set := NewNopTelemetrySettings()
set.MeterProvider = tt.meterProvider
set.MetricsLevel = configtelemetry.LevelDetailed //nolint:staticcheck //SA1019
set.TracerProvider = tt.traceProvider
return set
}
Expand Down
3 changes: 0 additions & 3 deletions component/componenttest/telemetry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@ import (
"github.com/stretchr/testify/require"
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
sdktrace "go.opentelemetry.io/otel/sdk/trace"

"go.opentelemetry.io/collector/config/configtelemetry"
)

func TestNewTelemetry(t *testing.T) {
tel := NewTelemetry()
assert.NotNil(t, tel.Reader)
assert.NotNil(t, tel.SpanRecorder)
set := tel.NewTelemetrySettings()
assert.Equal(t, configtelemetry.LevelDetailed, set.MetricsLevel) //nolint:staticcheck //SA1019
assert.IsType(t, &sdktrace.TracerProvider{}, set.TracerProvider)
assert.IsType(t, &sdkmetric.MeterProvider{}, set.MeterProvider)
require.NoError(t, tel.Shutdown(context.Background()))
Expand Down
3 changes: 0 additions & 3 deletions component/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ go 1.22.0

require (
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/config/configtelemetry v0.119.0
go.opentelemetry.io/collector/pdata v1.25.0
go.opentelemetry.io/otel/metric v1.34.0
go.opentelemetry.io/otel/trace v1.34.0
Expand All @@ -27,8 +26,6 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry

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

retract (
Expand Down
9 changes: 0 additions & 9 deletions component/telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"

"go.opentelemetry.io/collector/config/configtelemetry"
"go.opentelemetry.io/collector/pdata/pcommon"
)

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

// MetricsLevel represents the configuration value set when the collector
// is configured. Components may use this level to decide whether it is
// appropriate to avoid computationally expensive calculations.
//
// Deprecated: [v0.119.0] Use https://pkg.go.dev/go.opentelemetry.io/otel/sdk/metric@v1.34.0/internal/x#readme-instrument-enabled instead.
// Components will temporarily need to add a view to `service/telemetry` to drop metrics based on the level.
MetricsLevel configtelemetry.Level

// Resource contains the resource attributes for the collector's telemetry.
Resource pcommon.Resource
}
3 changes: 0 additions & 3 deletions config/configauth/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/pdata v1.25.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
Expand All @@ -36,8 +35,6 @@ replace go.opentelemetry.io/collector/component => ../../component

replace go.opentelemetry.io/collector/component/componenttest => ../../component/componenttest

replace go.opentelemetry.io/collector/config/configtelemetry => ../configtelemetry

replace go.opentelemetry.io/collector/extension => ../../extension

replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth
3 changes: 0 additions & 3 deletions config/configgrpc/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/extension v0.119.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
Expand Down Expand Up @@ -66,8 +65,6 @@ replace go.opentelemetry.io/collector/config/configopaque => ../configopaque

replace go.opentelemetry.io/collector/config/configtls => ../configtls

replace go.opentelemetry.io/collector/config/configtelemetry => ../configtelemetry

replace go.opentelemetry.io/collector/extension => ../../extension

replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth
Expand Down
3 changes: 0 additions & 3 deletions config/confighttp/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ require (
github.com/google/uuid v1.6.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/extension v0.119.0 // indirect
go.opentelemetry.io/collector/pdata v1.25.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
Expand All @@ -58,8 +57,6 @@ replace go.opentelemetry.io/collector/config/configopaque => ../configopaque

replace go.opentelemetry.io/collector/config/configtls => ../configtls

replace go.opentelemetry.io/collector/config/configtelemetry => ../configtelemetry

replace go.opentelemetry.io/collector/extension => ../../extension

replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth
Expand Down
3 changes: 0 additions & 3 deletions config/confighttp/xconfighttp/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ require (
go.opentelemetry.io/collector/config/configauth v0.119.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.25.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.25.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/config/configtls v1.25.0 // indirect
go.opentelemetry.io/collector/extension v0.119.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.119.0 // indirect
Expand All @@ -51,8 +50,6 @@ require (

replace go.opentelemetry.io/collector/config/confighttp => ../../confighttp

replace go.opentelemetry.io/collector/config/configtelemetry => ../../configtelemetry

replace go.opentelemetry.io/collector/client => ../../../client

replace go.opentelemetry.io/collector/consumer => ../../../consumer
Expand Down
3 changes: 0 additions & 3 deletions connector/connectortest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.119.0 // indirect
go.opentelemetry.io/collector/pipeline v0.119.0 // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.119.0 // indirect
Expand Down Expand Up @@ -65,8 +64,6 @@ replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/co

replace go.opentelemetry.io/collector/connector/xconnector => ../xconnector

replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry

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

replace go.opentelemetry.io/collector/pipeline => ../../pipeline
Expand Down
3 changes: 0 additions & 3 deletions connector/forwardconnector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/connector/xconnector v0.119.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.119.0 // indirect
Expand Down Expand Up @@ -76,8 +75,6 @@ retract (
v0.69.0 // Release failed, use v0.69.1
)

replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry

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

replace go.opentelemetry.io/collector/consumer/xconsumer => ../../consumer/xconsumer
Expand Down
3 changes: 0 additions & 3 deletions connector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
Expand All @@ -41,8 +40,6 @@ require (

replace go.opentelemetry.io/collector/component => ../component

replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry

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

replace go.opentelemetry.io/collector/pdata => ../pdata
Expand Down
3 changes: 0 additions & 3 deletions connector/xconnector/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/pdata v1.25.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
Expand Down Expand Up @@ -53,8 +52,6 @@ replace go.opentelemetry.io/collector/component => ../../component

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

replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry

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

replace go.opentelemetry.io/collector/pipeline => ../../pipeline
Expand Down
3 changes: 0 additions & 3 deletions exporter/exporterhelper/xexporterhelper/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/extension v0.119.0 // indirect
go.opentelemetry.io/collector/extension/xextension v0.119.0 // indirect
go.opentelemetry.io/collector/featuregate v1.25.0 // indirect
Expand Down Expand Up @@ -88,8 +87,6 @@ replace go.opentelemetry.io/collector/pdata => ../../../pdata

replace go.opentelemetry.io/collector/exporter/xexporter => ../../xexporter

replace go.opentelemetry.io/collector/config/configtelemetry => ../../../config/configtelemetry

replace go.opentelemetry.io/collector/config/configretry => ../../../config/configretry

replace go.opentelemetry.io/collector/pipeline/xpipeline => ../../../pipeline/xpipeline
Expand Down
3 changes: 0 additions & 3 deletions exporter/exportertest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect
go.opentelemetry.io/collector/extension v0.119.0 // indirect
go.opentelemetry.io/collector/extension/xextension v0.119.0 // indirect
Expand Down Expand Up @@ -68,8 +67,6 @@ replace go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/re

replace go.opentelemetry.io/collector/extension => ../../extension

replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry

replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry

replace go.opentelemetry.io/collector/pipeline => ../../pipeline
Expand Down
3 changes: 0 additions & 3 deletions exporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.119.0 // indirect
go.opentelemetry.io/collector/extension v0.119.0 // indirect
Expand Down Expand Up @@ -79,8 +78,6 @@ retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module

replace go.opentelemetry.io/collector/config/configretry => ../config/configretry

replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry

replace go.opentelemetry.io/collector/consumer/xconsumer => ../consumer/xconsumer

replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consumertest
Expand Down
3 changes: 0 additions & 3 deletions exporter/nopexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/consumer v1.25.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.119.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect
Expand Down Expand Up @@ -75,8 +74,6 @@ replace go.opentelemetry.io/collector/receiver => ../../receiver

replace go.opentelemetry.io/collector/confmap => ../../confmap

replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry

replace go.opentelemetry.io/collector/extension => ../../extension

replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
Expand Down
3 changes: 0 additions & 3 deletions exporter/otlpexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ require (
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/client v1.25.0 // indirect
go.opentelemetry.io/collector/config/confignet v1.25.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.119.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.119.0 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.119.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect
Expand Down Expand Up @@ -117,8 +116,6 @@ replace go.opentelemetry.io/collector/consumer => ../../consumer

replace go.opentelemetry.io/collector/client => ../../client

replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry

replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry

replace go.opentelemetry.io/collector/consumer/xconsumer => ../../consumer/xconsumer
Expand Down
Loading
Loading