diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 2eed28f19d8..2a641c23d6f 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -60,15 +60,12 @@ require ( go.opentelemetry.io/collector/consumer/xconsumer v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect go.opentelemetry.io/collector/internal/fanoutconsumer v0.137.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.137.0 // indirect go.opentelemetry.io/collector/pipeline/xpipeline v0.137.0 // indirect go.opentelemetry.io/collector/processor/xprocessor v0.137.0 // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.137.0 // indirect go.opentelemetry.io/collector/service v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index 1e1d1ce0595..dc31e8ad84b 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -65,14 +65,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/component/componentstatus/go.mod b/component/componentstatus/go.mod index ab8fce7ef4a..a7d886fdb80 100644 --- a/component/componentstatus/go.mod +++ b/component/componentstatus/go.mod @@ -11,20 +11,14 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -44,6 +38,4 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/pipeline => ../../pipeline -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/component/componentstatus/go.sum b/component/componentstatus/go.sum index afc0ef47254..1fb66343e32 100644 --- a/component/componentstatus/go.sum +++ b/component/componentstatus/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -43,18 +42,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/component/componenttest/go.mod b/component/componenttest/go.mod index 10ccd86c1d1..c76562804f3 100644 --- a/component/componenttest/go.mod +++ b/component/componenttest/go.mod @@ -28,10 +28,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect golang.org/x/net v0.42.0 // indirect golang.org/x/sys v0.35.0 // indirect golang.org/x/text v0.27.0 // indirect @@ -45,8 +42,4 @@ replace go.opentelemetry.io/collector/component => ../ replace go.opentelemetry.io/collector/pdata => ../../pdata -replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/component/componenttest/go.sum b/component/componenttest/go.sum index afc0ef47254..1839d792534 100644 --- a/component/componenttest/go.sum +++ b/component/componenttest/go.sum @@ -43,14 +43,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/component/go.mod b/component/go.mod index b692acd73c4..32de4e3daf8 100644 --- a/component/go.mod +++ b/component/go.mod @@ -4,30 +4,26 @@ go 1.24.0 require ( github.com/stretchr/testify v1.11.1 - go.opentelemetry.io/collector/internal/telemetry v0.137.0 + go.opentelemetry.io/collector/pdata v1.43.0 + go.opentelemetry.io/otel/metric v1.38.0 + go.opentelemetry.io/otel/trace v1.38.0 go.uber.org/goleak v1.3.0 + go.uber.org/zap v1.27.0 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect + github.com/rogpeppe/go-internal v1.13.1 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect - go.opentelemetry.io/otel/metric v1.38.0 // indirect - go.opentelemetry.io/otel/trace v1.38.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.42.0 // indirect golang.org/x/sys v0.35.0 // indirect golang.org/x/text v0.27.0 // indirect @@ -44,8 +40,4 @@ retract ( v0.69.0 // Release failed, use v0.69.1 ) -replace go.opentelemetry.io/collector/internal/telemetry => ../internal/telemetry - -replace go.opentelemetry.io/collector/pipeline => ../pipeline - replace go.opentelemetry.io/collector/featuregate => ../featuregate diff --git a/component/go.sum b/component/go.sum index afc0ef47254..e57ea2a3cda 100644 --- a/component/go.sum +++ b/component/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -43,14 +42,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/component/telemetry.go b/component/telemetry.go index 461dead4b32..7d39c18ab1d 100644 --- a/component/telemetry.go +++ b/component/telemetry.go @@ -4,8 +4,31 @@ package component // import "go.opentelemetry.io/collector/component" import ( - "go.opentelemetry.io/collector/internal/telemetry" + "go.opentelemetry.io/otel/metric" + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + + "go.opentelemetry.io/collector/pdata/pcommon" ) // TelemetrySettings provides components with APIs to report telemetry. -type TelemetrySettings = telemetry.TelemetrySettings +type TelemetrySettings struct { + // Logger that the factory can use during creation and can pass to the created + // component to be used later as well. + Logger *zap.Logger + + // TracerProvider that the factory can pass to other instrumented third-party libraries. + // + // The service may wrap this provider for attribute injection. The wrapper may implement an + // additional `Unwrap() trace.TracerProvider` method to grant access to the underlying SDK. + TracerProvider trace.TracerProvider + + // MeterProvider that the factory can pass to other instrumented third-party libraries. + MeterProvider metric.MeterProvider + + // Resource contains the resource attributes for the collector's telemetry. + Resource pcommon.Resource + + // prevent unkeyed literal initialization + _ struct{} +} diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 00a2b3f7ade..e80ebbbf6ec 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -13,21 +13,15 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -51,8 +45,4 @@ replace go.opentelemetry.io/collector/extension/extensionauth => ../../extension replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => ../../extension/extensionauth/extensionauthtest -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - -replace go.opentelemetry.io/collector/pipeline => ../../pipeline - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/config/configauth/go.sum b/config/configauth/go.sum index afc0ef47254..1fb66343e32 100644 --- a/config/configauth/go.sum +++ b/config/configauth/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -43,18 +42,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 46cc69213d4..d6104966c56 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -55,10 +55,7 @@ require ( go.opentelemetry.io/collector/confmap v1.43.0 // indirect go.opentelemetry.io/collector/confmap/xconfmap v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -111,10 +108,6 @@ replace go.opentelemetry.io/collector/consumer => ../../consumer replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => ../../extension/extensionauth/extensionauthtest -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - -replace go.opentelemetry.io/collector/pipeline => ../../pipeline - replace go.opentelemetry.io/collector/featuregate => ../../featuregate replace go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest => ../../extension/extensionmiddleware/extensionmiddlewaretest diff --git a/config/configgrpc/go.sum b/config/configgrpc/go.sum index eef5a18320d..489431dd230 100644 --- a/config/configgrpc/go.sum +++ b/config/configgrpc/go.sum @@ -73,16 +73,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 4032c66ff44..fcd628d976f 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -55,10 +55,7 @@ require ( go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/confmap v1.43.0 go.opentelemetry.io/collector/confmap/xconfmap v0.137.0 - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -104,10 +101,6 @@ replace go.opentelemetry.io/collector/client => ../../client replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => ../../extension/extensionauth/extensionauthtest -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - -replace go.opentelemetry.io/collector/pipeline => ../../pipeline - replace go.opentelemetry.io/collector/featuregate => ../../featuregate replace go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest => ../../extension/extensionmiddleware/extensionmiddlewaretest diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum index 60509be1297..cfc9cd3f27e 100644 --- a/config/confighttp/go.sum +++ b/config/confighttp/go.sum @@ -77,16 +77,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/config/confighttp/xconfighttp/go.mod b/config/confighttp/xconfighttp/go.mod index f07eda2fdaf..258ac4bdb30 100644 --- a/config/confighttp/xconfighttp/go.mod +++ b/config/confighttp/xconfighttp/go.mod @@ -51,11 +51,8 @@ require ( go.opentelemetry.io/collector/extension/extensionauth v1.43.0 // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -99,10 +96,6 @@ replace go.opentelemetry.io/collector/config/configtls => ../../configtls replace go.opentelemetry.io/collector/config/configcompression => ../../configcompression -replace go.opentelemetry.io/collector/pipeline => ../../../pipeline - -replace go.opentelemetry.io/collector/internal/telemetry => ../../../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../../../featuregate replace go.opentelemetry.io/collector/extension/extensionmiddleware => ../../../extension/extensionmiddleware diff --git a/config/confighttp/xconfighttp/go.sum b/config/confighttp/xconfighttp/go.sum index 60509be1297..cfc9cd3f27e 100644 --- a/config/confighttp/xconfighttp/go.sum +++ b/config/confighttp/xconfighttp/go.sum @@ -77,16 +77,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/config/configmiddleware/go.mod b/config/configmiddleware/go.mod index 8c6c8f9d9b8..6ad081d272c 100644 --- a/config/configmiddleware/go.mod +++ b/config/configmiddleware/go.mod @@ -13,21 +13,15 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -42,16 +36,12 @@ require ( replace go.opentelemetry.io/collector/component => ../../component -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/extension/extensionmiddleware => ../../extension/extensionmiddleware replace go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest => ../../extension/extensionmiddleware/extensionmiddlewaretest replace go.opentelemetry.io/collector/pdata => ../../pdata -replace go.opentelemetry.io/collector/pipeline => ../../pipeline - replace go.opentelemetry.io/collector/featuregate => ../../featuregate replace go.opentelemetry.io/collector/extension => ../../extension diff --git a/config/configmiddleware/go.sum b/config/configmiddleware/go.sum index afc0ef47254..1fb66343e32 100644 --- a/config/configmiddleware/go.sum +++ b/config/configmiddleware/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -43,18 +42,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/connector/connectortest/go.mod b/connector/connectortest/go.mod index a4908658b0e..5e04000217d 100644 --- a/connector/connectortest/go.mod +++ b/connector/connectortest/go.mod @@ -30,12 +30,9 @@ require ( go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect go.opentelemetry.io/collector/internal/fanoutconsumer v0.137.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pipeline v1.43.0 // indirect go.opentelemetry.io/collector/pipeline/xpipeline v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -77,6 +74,4 @@ replace go.opentelemetry.io/collector/pipeline/xpipeline => ../../pipeline/xpipe replace go.opentelemetry.io/collector/internal/fanoutconsumer => ../../internal/fanoutconsumer -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/connector/connectortest/go.sum b/connector/connectortest/go.sum index afc0ef47254..1839d792534 100644 --- a/connector/connectortest/go.sum +++ b/connector/connectortest/go.sum @@ -43,14 +43,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index cf9901c8baa..636a66d3a39 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -39,12 +39,9 @@ require ( go.opentelemetry.io/collector/consumer/xconsumer v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect go.opentelemetry.io/collector/internal/fanoutconsumer v0.137.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect go.opentelemetry.io/collector/pipeline/xpipeline v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -97,5 +94,3 @@ replace go.opentelemetry.io/collector/pipeline/xpipeline => ../../pipeline/xpipe replace go.opentelemetry.io/collector/internal/fanoutconsumer => ../../internal/fanoutconsumer replace go.opentelemetry.io/collector/featuregate => ../../featuregate - -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry diff --git a/connector/forwardconnector/go.sum b/connector/forwardconnector/go.sum index eb9803d4e95..0b7379d1cba 100644 --- a/connector/forwardconnector/go.sum +++ b/connector/forwardconnector/go.sum @@ -57,14 +57,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/connector/go.mod b/connector/go.mod index 25366cbe887..784bd520b75 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -17,22 +17,16 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/zap v1.27.0 // indirect @@ -63,6 +57,4 @@ replace go.opentelemetry.io/collector/pipeline => ../pipeline replace go.opentelemetry.io/collector/internal/fanoutconsumer => ../internal/fanoutconsumer -replace go.opentelemetry.io/collector/internal/telemetry => ../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../featuregate diff --git a/connector/go.sum b/connector/go.sum index afc0ef47254..1fb66343e32 100644 --- a/connector/go.sum +++ b/connector/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -43,18 +42,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/connector/xconnector/go.mod b/connector/xconnector/go.mod index 948f24c87c0..dfedf5dccd9 100644 --- a/connector/xconnector/go.mod +++ b/connector/xconnector/go.mod @@ -18,21 +18,15 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -68,6 +62,4 @@ replace go.opentelemetry.io/collector/pipeline/xpipeline => ../../pipeline/xpipe replace go.opentelemetry.io/collector/internal/fanoutconsumer => ../../internal/fanoutconsumer -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/connector/xconnector/go.sum b/connector/xconnector/go.sum index afc0ef47254..1fb66343e32 100644 --- a/connector/xconnector/go.sum +++ b/connector/xconnector/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -43,18 +42,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index ded0f1d39de..485a99e991b 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -54,15 +54,12 @@ require ( go.opentelemetry.io/collector/extension v1.43.0 // indirect go.opentelemetry.io/collector/extension/xextension v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pipeline v1.43.0 // indirect go.opentelemetry.io/collector/pipeline/xpipeline v0.137.0 // indirect go.opentelemetry.io/collector/receiver v1.43.0 // indirect go.opentelemetry.io/collector/receiver/receivertest v0.137.0 // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -129,8 +126,6 @@ replace go.opentelemetry.io/collector/featuregate => ../../featuregate replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/client => ../../client replace go.opentelemetry.io/collector/pdata/xpdata => ../../pdata/xpdata diff --git a/exporter/debugexporter/go.sum b/exporter/debugexporter/go.sum index 363de087e0e..b5d798e58e2 100644 --- a/exporter/debugexporter/go.sum +++ b/exporter/debugexporter/go.sum @@ -59,14 +59,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/exporter/exporterhelper/go.mod b/exporter/exporterhelper/go.mod index 213f6b99d99..248bb2db146 100644 --- a/exporter/exporterhelper/go.mod +++ b/exporter/exporterhelper/go.mod @@ -57,12 +57,9 @@ require ( go.opentelemetry.io/collector/consumer/xconsumer v0.137.0 // indirect go.opentelemetry.io/collector/exporter/xexporter v0.137.0 // indirect go.opentelemetry.io/collector/extension v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/receiver v1.43.0 // indirect go.opentelemetry.io/collector/receiver/receivertest v0.137.0 // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/net v0.42.0 // indirect golang.org/x/sys v0.35.0 // indirect @@ -115,8 +112,6 @@ replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xe replace go.opentelemetry.io/collector/featuregate => ../../featuregate -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/client => ../../client replace go.opentelemetry.io/collector/pdata/xpdata => ../../pdata/xpdata diff --git a/exporter/exporterhelper/go.sum b/exporter/exporterhelper/go.sum index efd80f5a716..22f5f8376dd 100644 --- a/exporter/exporterhelper/go.sum +++ b/exporter/exporterhelper/go.sum @@ -59,14 +59,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/exporter/exporterhelper/xexporterhelper/go.mod b/exporter/exporterhelper/xexporterhelper/go.mod index cbea62f07f2..2da4f5bde6c 100644 --- a/exporter/exporterhelper/xexporterhelper/go.mod +++ b/exporter/exporterhelper/xexporterhelper/go.mod @@ -54,13 +54,10 @@ require ( go.opentelemetry.io/collector/extension v1.43.0 // indirect go.opentelemetry.io/collector/extension/xextension v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pipeline v1.43.0 // indirect go.opentelemetry.io/collector/receiver v1.43.0 // indirect go.opentelemetry.io/collector/receiver/receivertest v0.137.0 // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -120,8 +117,6 @@ replace go.opentelemetry.io/collector/extension/xextension => ../../../extension replace go.opentelemetry.io/collector/featuregate => ../../../featuregate -replace go.opentelemetry.io/collector/internal/telemetry => ../../../internal/telemetry - replace go.opentelemetry.io/collector/client => ../../../client replace go.opentelemetry.io/collector/pdata/xpdata => ../../../pdata/xpdata diff --git a/exporter/exporterhelper/xexporterhelper/go.sum b/exporter/exporterhelper/xexporterhelper/go.sum index efd80f5a716..22f5f8376dd 100644 --- a/exporter/exporterhelper/xexporterhelper/go.sum +++ b/exporter/exporterhelper/xexporterhelper/go.sum @@ -59,14 +59,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/exporter/exportertest/go.mod b/exporter/exportertest/go.mod index 80de104b4b3..121dad3291d 100644 --- a/exporter/exportertest/go.mod +++ b/exporter/exportertest/go.mod @@ -49,12 +49,9 @@ require ( go.opentelemetry.io/collector/extension v1.43.0 // indirect go.opentelemetry.io/collector/extension/xextension v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/xpdata v0.137.0 // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -110,8 +107,6 @@ replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xe replace go.opentelemetry.io/collector/featuregate => ../../featuregate -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/client => ../../client replace go.opentelemetry.io/collector/pdata/xpdata => ../../pdata/xpdata diff --git a/exporter/exportertest/go.sum b/exporter/exportertest/go.sum index efd80f5a716..22f5f8376dd 100644 --- a/exporter/exportertest/go.sum +++ b/exporter/exportertest/go.sum @@ -59,14 +59,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/exporter/go.mod b/exporter/go.mod index 7341452f1d3..fb069ae7064 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -18,8 +18,6 @@ require ( require ( github.com/cenkalti/backoff/v5 v5.0.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -33,7 +31,6 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/client v1.43.0 // indirect go.opentelemetry.io/collector/config/configoptional v1.43.0 // indirect go.opentelemetry.io/collector/confmap v1.43.0 // indirect @@ -43,12 +40,9 @@ require ( go.opentelemetry.io/collector/extension v1.43.0 // indirect go.opentelemetry.io/collector/extension/xextension v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect go.opentelemetry.io/collector/pdata/xpdata v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -104,8 +98,6 @@ replace go.opentelemetry.io/collector/extension/xextension => ../extension/xexte replace go.opentelemetry.io/collector/featuregate => ../featuregate -replace go.opentelemetry.io/collector/internal/telemetry => ../internal/telemetry - replace go.opentelemetry.io/collector/client => ../client replace go.opentelemetry.io/collector/pdata/xpdata => ../pdata/xpdata diff --git a/exporter/go.sum b/exporter/go.sum index efd80f5a716..eec50b1b773 100644 --- a/exporter/go.sum +++ b/exporter/go.sum @@ -3,7 +3,6 @@ github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F9 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -59,14 +58,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index abefe890a61..8ddbde6dcbe 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -38,15 +38,12 @@ require ( go.opentelemetry.io/collector/consumer/xconsumer v0.137.0 // indirect go.opentelemetry.io/collector/exporter/xexporter v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect go.opentelemetry.io/collector/pipeline v1.43.0 // indirect go.opentelemetry.io/collector/receiver v1.43.0 // indirect go.opentelemetry.io/collector/receiver/receivertest v0.137.0 // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -107,8 +104,6 @@ replace go.opentelemetry.io/collector/featuregate => ../../featuregate replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/client => ../../client replace go.opentelemetry.io/collector/pdata/xpdata => ../../pdata/xpdata diff --git a/exporter/nopexporter/go.sum b/exporter/nopexporter/go.sum index efd80f5a716..22f5f8376dd 100644 --- a/exporter/nopexporter/go.sum +++ b/exporter/nopexporter/go.sum @@ -59,14 +59,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 86209bd3e29..80fc37823d2 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -70,17 +70,14 @@ require ( go.opentelemetry.io/collector/extension/extensionmiddleware v0.137.0 // indirect go.opentelemetry.io/collector/extension/xextension v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/xpdata v0.137.0 // indirect go.opentelemetry.io/collector/pipeline v1.43.0 // indirect go.opentelemetry.io/collector/pipeline/xpipeline v0.137.0 // indirect go.opentelemetry.io/collector/receiver v1.43.0 // indirect go.opentelemetry.io/collector/receiver/receivertest v0.137.0 // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -171,8 +168,6 @@ replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xe replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => ../../extension/extensionauth/extensionauthtest -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/extension/extensionmiddleware => ../../extension/extensionmiddleware replace go.opentelemetry.io/collector/config/configmiddleware => ../../config/configmiddleware diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum index 71fc747244d..ee0fede7529 100644 --- a/exporter/otlpexporter/go.sum +++ b/exporter/otlpexporter/go.sum @@ -75,16 +75,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 4b429b1b278..283b2a69ccd 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -70,17 +70,14 @@ require ( go.opentelemetry.io/collector/extension/extensionmiddleware v0.137.0 // indirect go.opentelemetry.io/collector/extension/xextension v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/xpdata v0.137.0 // indirect go.opentelemetry.io/collector/pipeline v1.43.0 // indirect go.opentelemetry.io/collector/pipeline/xpipeline v0.137.0 // indirect go.opentelemetry.io/collector/receiver v1.43.0 // indirect go.opentelemetry.io/collector/receiver/receivertest v0.137.0 // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -171,8 +168,6 @@ replace go.opentelemetry.io/collector/featuregate => ../../featuregate replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/config/configmiddleware => ../../config/configmiddleware replace go.opentelemetry.io/collector/extension/extensionmiddleware => ../../extension/extensionmiddleware diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum index 5d1b3eaae07..8fd1c594c96 100644 --- a/exporter/otlphttpexporter/go.sum +++ b/exporter/otlphttpexporter/go.sum @@ -79,16 +79,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/exporter/xexporter/go.mod b/exporter/xexporter/go.mod index b5123545e83..a3bb1c5ad73 100644 --- a/exporter/xexporter/go.mod +++ b/exporter/xexporter/go.mod @@ -13,23 +13,17 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/consumer v1.43.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -83,8 +77,6 @@ replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xe replace go.opentelemetry.io/collector/featuregate => ../../featuregate -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/client => ../../client replace go.opentelemetry.io/collector/pdata/xpdata => ../../pdata/xpdata diff --git a/exporter/xexporter/go.sum b/exporter/xexporter/go.sum index efd80f5a716..9b91cb209b2 100644 --- a/exporter/xexporter/go.sum +++ b/exporter/xexporter/go.sum @@ -3,7 +3,6 @@ github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F9 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -59,18 +58,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/extension/extensionauth/extensionauthtest/go.mod b/extension/extensionauth/extensionauthtest/go.mod index ccebe2e61b5..71a974d5fd0 100644 --- a/extension/extensionauth/extensionauthtest/go.mod +++ b/extension/extensionauth/extensionauthtest/go.mod @@ -13,21 +13,15 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -48,8 +42,4 @@ replace go.opentelemetry.io/collector/pdata => ../../../pdata replace go.opentelemetry.io/collector/extension => ../.. -replace go.opentelemetry.io/collector/internal/telemetry => ../../../internal/telemetry - -replace go.opentelemetry.io/collector/pipeline => ../../../pipeline - replace go.opentelemetry.io/collector/featuregate => ../../../featuregate diff --git a/extension/extensionauth/extensionauthtest/go.sum b/extension/extensionauth/extensionauthtest/go.sum index afc0ef47254..1fb66343e32 100644 --- a/extension/extensionauth/extensionauthtest/go.sum +++ b/extension/extensionauth/extensionauthtest/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -43,18 +42,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/extension/extensioncapabilities/go.mod b/extension/extensioncapabilities/go.mod index d8b92cd66e7..f987a43a1d5 100644 --- a/extension/extensioncapabilities/go.mod +++ b/extension/extensioncapabilities/go.mod @@ -9,8 +9,6 @@ require ( ) require ( - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -23,13 +21,9 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -52,7 +46,3 @@ replace go.opentelemetry.io/collector/confmap => ../../confmap replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/featuregate => ../../featuregate - -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - -replace go.opentelemetry.io/collector/pipeline => ../../pipeline diff --git a/extension/extensioncapabilities/go.sum b/extension/extensioncapabilities/go.sum index eb9803d4e95..7ff72424de8 100644 --- a/extension/extensioncapabilities/go.sum +++ b/extension/extensioncapabilities/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -57,18 +56,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/extension/extensionmiddleware/extensionmiddlewaretest/go.mod b/extension/extensionmiddleware/extensionmiddlewaretest/go.mod index 0b23da486ed..6b25fae7195 100644 --- a/extension/extensionmiddleware/extensionmiddlewaretest/go.mod +++ b/extension/extensionmiddleware/extensionmiddlewaretest/go.mod @@ -12,21 +12,15 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -47,8 +41,4 @@ replace go.opentelemetry.io/collector/pdata => ../../../pdata replace go.opentelemetry.io/collector/extension => ../.. -replace go.opentelemetry.io/collector/internal/telemetry => ../../../internal/telemetry - -replace go.opentelemetry.io/collector/pipeline => ../../../pipeline - replace go.opentelemetry.io/collector/featuregate => ../../../featuregate diff --git a/extension/extensionmiddleware/extensionmiddlewaretest/go.sum b/extension/extensionmiddleware/extensionmiddlewaretest/go.sum index afc0ef47254..1fb66343e32 100644 --- a/extension/extensionmiddleware/extensionmiddlewaretest/go.sum +++ b/extension/extensionmiddleware/extensionmiddlewaretest/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -43,18 +42,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/extension/extensiontest/go.mod b/extension/extensiontest/go.mod index 28b19dbe164..bc16ed1b94b 100644 --- a/extension/extensiontest/go.mod +++ b/extension/extensiontest/go.mod @@ -24,11 +24,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -50,8 +47,4 @@ replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/component/componenttest => ../../component/componenttest -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - -replace go.opentelemetry.io/collector/pipeline => ../../pipeline - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/extension/extensiontest/go.sum b/extension/extensiontest/go.sum index afc0ef47254..1839d792534 100644 --- a/extension/extensiontest/go.sum +++ b/extension/extensiontest/go.sum @@ -43,14 +43,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/extension/go.mod b/extension/go.mod index 90f5e59d0ee..3a5a4366856 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -10,21 +10,15 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -42,8 +36,4 @@ replace go.opentelemetry.io/collector/component => ../component replace go.opentelemetry.io/collector/pdata => ../pdata -replace go.opentelemetry.io/collector/internal/telemetry => ../internal/telemetry - -replace go.opentelemetry.io/collector/pipeline => ../pipeline - replace go.opentelemetry.io/collector/featuregate => ../featuregate diff --git a/extension/go.sum b/extension/go.sum index afc0ef47254..1fb66343e32 100644 --- a/extension/go.sum +++ b/extension/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -43,18 +42,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index e9fd4999290..0f52de674bf 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -42,11 +42,8 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -77,7 +74,3 @@ replace go.opentelemetry.io/collector/internal/memorylimiter => ../../internal/m replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension/extensiontest replace go.opentelemetry.io/collector/featuregate => ../../featuregate - -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - -replace go.opentelemetry.io/collector/pipeline => ../../pipeline diff --git a/extension/memorylimiterextension/go.sum b/extension/memorylimiterextension/go.sum index c730fc085b1..95f584033a8 100644 --- a/extension/memorylimiterextension/go.sum +++ b/extension/memorylimiterextension/go.sum @@ -74,14 +74,8 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/extension/xextension/go.mod b/extension/xextension/go.mod index 8e3e207b11c..adf5a78b7f3 100644 --- a/extension/xextension/go.mod +++ b/extension/xextension/go.mod @@ -8,20 +8,14 @@ require ( ) require ( - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -40,8 +34,4 @@ replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/pdata => ../../pdata -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - -replace go.opentelemetry.io/collector/pipeline => ../../pipeline - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/extension/xextension/go.sum b/extension/xextension/go.sum index f166bdeb228..21d6e241697 100644 --- a/extension/xextension/go.sum +++ b/extension/xextension/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -37,18 +36,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 256362e6949..e6f1fc2ba71 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -57,13 +57,10 @@ require ( go.opentelemetry.io/collector/extension/extensionauth v1.43.0 // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect go.opentelemetry.io/collector/pipeline v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -123,8 +120,6 @@ replace go.opentelemetry.io/collector/featuregate => ../../featuregate replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => ../../extension/extensionauth/extensionauthtest -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/extension/extensionmiddleware => ../extensionmiddleware replace go.opentelemetry.io/collector/config/configmiddleware => ../../config/configmiddleware diff --git a/extension/zpagesextension/go.sum b/extension/zpagesextension/go.sum index a1e86240b15..6d54e4e3493 100644 --- a/extension/zpagesextension/go.sum +++ b/extension/zpagesextension/go.sum @@ -77,18 +77,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg= go.opentelemetry.io/contrib/zpages v0.63.0 h1:TppOKuZGbqXMgsfjqq3i09N5Vbo1JLtLImUqiTPGnX4= go.opentelemetry.io/contrib/zpages v0.63.0/go.mod h1:5F8uugz75ay/MMhRRhxAXY33FuaI8dl7jTxefrIy5qk= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/internal/memorylimiter/go.mod b/internal/memorylimiter/go.mod index face3ecc1b6..553b0240ab1 100644 --- a/internal/memorylimiter/go.mod +++ b/internal/memorylimiter/go.mod @@ -14,8 +14,6 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/ebitengine/purego v0.9.0 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/gobwas/glob v0.2.3 // indirect @@ -35,13 +33,9 @@ require ( github.com/tklauser/go-sysconf v0.3.15 // indirect github.com/tklauser/numcpus v0.10.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -62,7 +56,3 @@ replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/featuregate => ../../featuregate - -replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/internal/telemetry => ../telemetry diff --git a/internal/memorylimiter/go.sum b/internal/memorylimiter/go.sum index c730fc085b1..327959bfa3d 100644 --- a/internal/memorylimiter/go.sum +++ b/internal/memorylimiter/go.sum @@ -3,7 +3,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/ebitengine/purego v0.9.0 h1:mh0zpKBIXDceC63hpvPuGLiJ8ZAa3DfrFTudmfi8A4k= github.com/ebitengine/purego v0.9.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -74,18 +73,12 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/internal/sharedcomponent/go.mod b/internal/sharedcomponent/go.mod index 59cec59e971..0d5d65f6a4e 100644 --- a/internal/sharedcomponent/go.mod +++ b/internal/sharedcomponent/go.mod @@ -23,12 +23,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect go.opentelemetry.io/collector/pipeline v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -54,6 +51,4 @@ replace go.opentelemetry.io/collector/pipeline => ../../pipeline replace go.opentelemetry.io/collector/pdata => ../../pdata -replace go.opentelemetry.io/collector/internal/telemetry => ../telemetry - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/internal/sharedcomponent/go.sum b/internal/sharedcomponent/go.sum index afc0ef47254..1839d792534 100644 --- a/internal/sharedcomponent/go.sum +++ b/internal/sharedcomponent/go.sum @@ -43,14 +43,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/internal/telemetry/componentattribute/attribute.go b/internal/telemetry/attribute.go similarity index 72% rename from internal/telemetry/componentattribute/attribute.go rename to internal/telemetry/attribute.go index 2c18e5d9144..329935f49b4 100644 --- a/internal/telemetry/componentattribute/attribute.go +++ b/internal/telemetry/attribute.go @@ -1,11 +1,9 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package componentattribute // import "go.opentelemetry.io/collector/internal/telemetry/componentattribute" +package telemetry // import "go.opentelemetry.io/collector/internal/telemetry" import ( - "slices" - "go.opentelemetry.io/otel/attribute" "go.uber.org/zap" ) @@ -18,17 +16,10 @@ const ( SignalOutputKey = "otelcol.signal.output" ) -func RemoveAttributes(attrs attribute.Set, fields ...string) attribute.Set { - attrs, _ = attribute.NewSetWithFiltered(attrs.ToSlice(), func(kv attribute.KeyValue) bool { - return !slices.Contains(fields, string(kv.Key)) - }) - return attrs -} - // ToZapFields converts an OTel Go attribute set to a slice of zap fields. -func ToZapFields(attrs attribute.Set) []zap.Field { - zapFields := make([]zap.Field, 0, attrs.Len()) - for _, attr := range attrs.ToSlice() { +func ToZapFields(attrs []attribute.KeyValue) []zap.Field { + zapFields := make([]zap.Field, 0, len(attrs)) + for _, attr := range attrs { var zapField zap.Field key := string(attr.Key) switch attr.Value.Type() { diff --git a/internal/telemetry/attribute_test.go b/internal/telemetry/attribute_test.go new file mode 100644 index 00000000000..f2f08536a4d --- /dev/null +++ b/internal/telemetry/attribute_test.go @@ -0,0 +1,98 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package telemetry // import "go.opentelemetry.io/collector/internal/telemetry" + +import ( + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/otel/attribute" + "go.uber.org/zap" +) + +func TestToZapFields(t *testing.T) { + tests := []struct { + attrs attribute.Set + expected []zap.Field + }{ + { + attrs: attribute.NewSet( + attribute.String("string_key", "string_value"), + ), + expected: []zap.Field{ + zap.String("string_key", "string_value"), + }, + }, + { + attrs: attribute.NewSet( + attribute.Bool("bool_key", true), + ), + expected: []zap.Field{ + zap.Bool("bool_key", true), + }, + }, + { + attrs: attribute.NewSet( + attribute.Int64("int64_key", 42), + ), + expected: []zap.Field{ + zap.Int64("int64_key", 42), + }, + }, + { + attrs: attribute.NewSet( + attribute.Float64("float64_key", 3.14), + ), + expected: []zap.Field{ + zap.Float64("float64_key", 3.14), + }, + }, + { + attrs: attribute.NewSet( + attribute.BoolSlice("bool_slice_key", []bool{true, false, true}), + ), + expected: []zap.Field{ + zap.Bools("bool_slice_key", []bool{true, false, true}), + }, + }, + { + attrs: attribute.NewSet( + attribute.Int64Slice("int64_slice_key", []int64{1, 2, 3}), + ), + expected: []zap.Field{ + zap.Int64s("int64_slice_key", []int64{1, 2, 3}), + }, + }, + { + attrs: attribute.NewSet( + attribute.Float64Slice("float64_slice_key", []float64{1.1, 2.2, 3.3}), + ), + expected: []zap.Field{ + zap.Float64s("float64_slice_key", []float64{1.1, 2.2, 3.3}), + }, + }, + { + attrs: attribute.NewSet( + attribute.StringSlice("string_slice_key", []string{"a", "b", "c"}), + ), + expected: []zap.Field{ + zap.Strings("string_slice_key", []string{"a", "b", "c"}), + }, + }, + } + + for _, tt := range tests { + name := "" + if tt.attrs.Len() > 0 { + attr, ok := tt.attrs.Get(0) + if ok { + name = string(attr.Key) + } + } + t.Run(name, func(t *testing.T) { + result := ToZapFields(tt.attrs.ToSlice()) + require.Equal(t, tt.expected, result) + }) + } +} diff --git a/internal/telemetry/componentattribute/logger_test.go b/internal/telemetry/componentattribute/logger_test.go deleted file mode 100644 index 7d6d51b92e8..00000000000 --- a/internal/telemetry/componentattribute/logger_test.go +++ /dev/null @@ -1,334 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package componentattribute - -import ( - "context" - "testing" - "time" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/log" - "go.opentelemetry.io/otel/log/logtest" - "go.opentelemetry.io/otel/log/noop" - "go.uber.org/zap" - "go.uber.org/zap/zapcore" - "go.uber.org/zap/zaptest/observer" - - "go.opentelemetry.io/collector/pipeline" -) - -type logRecorder struct { - zapLogs *observer.ObservedLogs - otelLogs *logtest.Recorder -} -type test struct { - name string - createLogger func() (*zap.Logger, logRecorder) - check func(*testing.T, logRecorder) -} - -func createZapCore() (zapcore.Core, *observer.ObservedLogs) { - core, observed := observer.New(zap.DebugLevel) - core = core.With([]zapcore.Field{zap.String("preexisting", "value")}) - core = NewConsoleCoreWithAttributes(core, attribute.NewSet()) - return core, observed -} - -func checkZapLogs(t *testing.T, observed *observer.ObservedLogs) { - observedLogs := observed.All() - require.Len(t, observedLogs, 3) - - parentContext := map[string]string{ - "preexisting": "value", - SignalKey: pipeline.SignalLogs.String(), - ComponentIDKey: "filelog", - } - childContext := map[string]string{ - "preexisting": "value", - ComponentIDKey: "filelog", - } - - require.Equal(t, "test parent before child", observedLogs[0].Message) - require.Len(t, observedLogs[0].Context, len(parentContext)) - for _, field := range observedLogs[0].Context { - require.Equal(t, parentContext[field.Key], field.String) - } - - require.Equal(t, "test child", observedLogs[1].Message) - require.Len(t, observedLogs[1].Context, len(childContext)) - for _, field := range observedLogs[1].Context { - require.Equal(t, childContext[field.Key], field.String) - } - - require.Equal(t, "test parent after child", observedLogs[2].Message) - require.Len(t, observedLogs[2].Context, len(parentContext)) - for _, field := range observedLogs[2].Context { - require.Equal(t, parentContext[field.Key], field.String) - } -} - -func TestCore(t *testing.T) { - attrs := attribute.NewSet( - attribute.String(SignalKey, pipeline.SignalLogs.String()), - attribute.String(ComponentIDKey, "filelog"), - ) - - tests := []test{ - { - name: "console", - createLogger: func() (*zap.Logger, logRecorder) { - core, observed := createZapCore() - return zap.New(core), logRecorder{zapLogs: observed} - }, - check: func(t *testing.T, rec logRecorder) { - checkZapLogs(t, rec.zapLogs) - }, - }, - { - name: "console + otel", - createLogger: func() (*zap.Logger, logRecorder) { - core, observed := createZapCore() - recorder := logtest.NewRecorder() - core = NewOTelTeeCoreWithAttributes(core, recorder, "testinstr", attribute.NewSet()) - return zap.New(core), logRecorder{zapLogs: observed, otelLogs: recorder} - }, - check: func(t *testing.T, rec logRecorder) { - checkZapLogs(t, rec.zapLogs) - - recorder := rec.otelLogs - - logAttributes := make(map[string]attribute.Set) - for scope, records := range recorder.Result() { - require.Equal(t, "testinstr", scope.Name) - for _, record := range records { - logAttributes[record.Body.String()] = scope.Attributes - } - } - - childAttrs := attribute.NewSet( - attribute.String(ComponentIDKey, "filelog"), - ) - - assert.Equal(t, map[string]attribute.Set{ - "test parent before child": attrs, - "test child": childAttrs, - "test parent after child": attrs, - }, logAttributes) - }, - }, - } - for _, test := range tests { - t.Run(test.name, func(t *testing.T) { - logger, state := test.createLogger() - - parent := ZapLoggerWithAttributes(logger, attrs) - parent.Info("test parent before child") - child := ZapLoggerWithAttributes(parent, RemoveAttributes(attrs, SignalKey)) - child.Info("test child") - parent.Info("test parent after child") - - test.check(t, state) - }) - } -} - -func TestNewOTelTeeCoreWithAttributes(t *testing.T) { - t.Run("copy_accepted_logs", func(t *testing.T) { - // Only log at Info level. Debug level logs should not be copied to the LoggerProvider. - observerCore, _ := observer.New(zap.InfoLevel) - recorder := logtest.NewRecorder() - core := NewOTelTeeCoreWithAttributes(observerCore, recorder, "scope", attribute.NewSet()) - timestamp := time.Now() - logger := zap.New(core, zap.WithClock(constantClock(timestamp))) - - loggerWith := logger.With(zap.String("logger_key", "logger_value")) - loggerWith.Info("message", zap.String("record_key", "record_value")) - loggerWith.Debug("dropped") // should not be recorded due to observer's level - - logtest.AssertEqual(t, logtest.Recording{ - logtest.Scope{Name: "scope"}: []logtest.Record{{ - Context: context.Background(), - Timestamp: timestamp, - Severity: log.SeverityInfo, - SeverityText: "info", - Body: log.StringValue("message"), - Attributes: []log.KeyValue{ - log.String("logger_key", "logger_value"), - log.String("record_key", "record_value"), - }, - }}, - }, recorder.Result()) - - require.NoError(t, logger.Sync()) // no-op for otelzap - }) - t.Run("nop_core", func(t *testing.T) { - // Using zapcore.NewNopCore should result in no logs being sent to the LoggerProvider. - recorder := logtest.NewRecorder() - core := NewOTelTeeCoreWithAttributes(zapcore.NewNopCore(), recorder, "scope", attribute.NewSet()) - logger := zap.New(core) - - logger.Error("message") - logtest.AssertEqual(t, logtest.Recording{logtest.Scope{Name: "scope"}: nil}, recorder.Result()) - }) - t.Run("noop_loggerprovider", func(t *testing.T) { - // Using a noop LoggerProvider should not impact the main zap core. - observerCore, observedLogs := observer.New(zap.InfoLevel) - noopProvider := noop.NewLoggerProvider() - core := NewOTelTeeCoreWithAttributes(observerCore, noopProvider, "scope", attribute.NewSet()) - logger := zap.New(core) - - logger.Info("message", zap.String("key", "value")) - logger.Debug("dropped") // should not be recorded due to observer's level - - assert.Equal(t, 1, observedLogs.Len()) - }) - t.Run("direct_write", func(t *testing.T) { - observerCore, observedLogs := observer.New(zap.InfoLevel) - recorder := logtest.NewRecorder() - core := NewOTelTeeCoreWithAttributes(observerCore, recorder, "scope", attribute.NewSet()) - - // Per https://pkg.go.dev/go.uber.org/zap/zapcore#Core: - // - // If called, Write should always log the Entry and Fields; - // it should not replicate the logic of Check. - // - // Even though the observer has been configured with Info level, - // Debug level logs should therefore be written. - require.NoError(t, core.Write(zapcore.Entry{ - Level: zapcore.DebugLevel, - Message: "m", - }, []zapcore.Field{{ - Key: "k", - Type: zapcore.StringType, - String: "s", - }})) - - logtest.AssertEqual(t, logtest.Recording{ - logtest.Scope{Name: "scope"}: []logtest.Record{{ - Context: context.Background(), - Severity: log.SeverityDebug, - SeverityText: "debug", - Body: log.StringValue("m"), - Attributes: []log.KeyValue{log.String("k", "s")}, - }}, - }, recorder.Result()) - - assert.Equal(t, 1, observedLogs.Len()) - }) -} - -type constantClock time.Time - -func (c constantClock) Now() time.Time { return time.Time(c) } -func (c constantClock) NewTicker(time.Duration) *time.Ticker { return &time.Ticker{} } - -func TestToZapFields(t *testing.T) { - tests := []struct { - attrs attribute.Set - expected []zap.Field - }{ - { - attrs: attribute.NewSet( - attribute.String("string_key", "string_value"), - ), - expected: []zap.Field{ - zap.String("string_key", "string_value"), - }, - }, - { - attrs: attribute.NewSet( - attribute.Bool("bool_key", true), - ), - expected: []zap.Field{ - zap.Bool("bool_key", true), - }, - }, - { - attrs: attribute.NewSet( - attribute.Int64("int64_key", 42), - ), - expected: []zap.Field{ - zap.Int64("int64_key", 42), - }, - }, - { - attrs: attribute.NewSet( - attribute.Float64("float64_key", 3.14), - ), - expected: []zap.Field{ - zap.Float64("float64_key", 3.14), - }, - }, - { - attrs: attribute.NewSet( - attribute.BoolSlice("bool_slice_key", []bool{true, false, true}), - ), - expected: []zap.Field{ - zap.Bools("bool_slice_key", []bool{true, false, true}), - }, - }, - { - attrs: attribute.NewSet( - attribute.Int64Slice("int64_slice_key", []int64{1, 2, 3}), - ), - expected: []zap.Field{ - zap.Int64s("int64_slice_key", []int64{1, 2, 3}), - }, - }, - { - attrs: attribute.NewSet( - attribute.Float64Slice("float64_slice_key", []float64{1.1, 2.2, 3.3}), - ), - expected: []zap.Field{ - zap.Float64s("float64_slice_key", []float64{1.1, 2.2, 3.3}), - }, - }, - { - attrs: attribute.NewSet( - attribute.StringSlice("string_slice_key", []string{"a", "b", "c"}), - ), - expected: []zap.Field{ - zap.Strings("string_slice_key", []string{"a", "b", "c"}), - }, - }, - } - - for _, tt := range tests { - name := "" - if tt.attrs.Len() > 0 { - attr, ok := tt.attrs.Get(0) - if ok { - name = string(attr.Key) - } - } - t.Run(name, func(t *testing.T) { - result := ToZapFields(tt.attrs) - require.Equal(t, tt.expected, result) - }) - } -} - -func TestLoggerWith(t *testing.T) { - core, observed := createZapCore() - logger := zap.New(core) - logger = logger.With(zap.String("postexisting", "value")) - logger = ZapLoggerWithAttributes(logger, attribute.NewSet(attribute.String("component.attr", "value"))) - logger.Info("test") - - observedLogs := observed.All() - require.Len(t, observedLogs, 1) - expectedContext := []string{ - "preexisting", - "component.attr", - "postexisting", - } - require.Equal(t, "test", observedLogs[0].Message) - require.Len(t, observedLogs[0].Context, len(expectedContext)) - for i, field := range observedLogs[0].Context { - require.Equal(t, expectedContext[i], field.Key) - } -} diff --git a/internal/telemetry/componentattribute/logger_zap.go b/internal/telemetry/componentattribute/logger_zap.go deleted file mode 100644 index 4034e69311b..00000000000 --- a/internal/telemetry/componentattribute/logger_zap.go +++ /dev/null @@ -1,149 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package componentattribute // import "go.opentelemetry.io/collector/internal/telemetry/componentattribute" - -import ( - "go.opentelemetry.io/contrib/bridges/otelzap" - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/log" - "go.uber.org/multierr" - "go.uber.org/zap" - "go.uber.org/zap/zapcore" -) - -// Interface for Zap cores that support setting and resetting a set of component attributes. -// -// There are two wrappers that implement this interface: -// -// - [NewConsoleCoreWithAttributes] injects component attributes as Zap fields. -// -// This is used for the Collector's console output. -// -// - [NewOTelTeeCoreWithAttributes] copies logs to a [log.LoggerProvider] using [otelzap]. For the -// copied logs, component attributes are injected as instrumentation scope attributes. -// -// This is used when service::telemetry::logs::processors is configured. -type coreWithAttributes interface { - zapcore.Core - withAttributeSet(attribute.Set) zapcore.Core -} - -// Tries setting the component attribute set for a Zap core. -// -// Does nothing if the core does not implement [coreWithAttributes]. -func tryWithAttributeSet(c zapcore.Core, attrs attribute.Set) zapcore.Core { - if cwa, ok := c.(coreWithAttributes); ok { - return cwa.withAttributeSet(attrs) - } - zap.New(c).Debug("Logger core does not support injecting component attributes") - return c -} - -type consoleCoreWithAttributes struct { - zapcore.Core - from zapcore.Core - extraFields []zap.Field -} - -var _ coreWithAttributes = (*consoleCoreWithAttributes)(nil) - -// NewConsoleCoreWithAttributes wraps a Zap core in order to inject component attributes as Zap fields. -// -// This is used for the Collector's console output. -func NewConsoleCoreWithAttributes(c zapcore.Core, attrs attribute.Set, extraFields ...zap.Field) zapcore.Core { - return &consoleCoreWithAttributes{ - Core: c.With(ToZapFields(attrs)).With(extraFields), - from: c, - } -} - -func (ccwa *consoleCoreWithAttributes) With(fields []zapcore.Field) zapcore.Core { - return &consoleCoreWithAttributes{ - Core: ccwa.Core.With(fields), - from: ccwa.from, - extraFields: append(ccwa.extraFields, fields...), - } -} - -func (ccwa *consoleCoreWithAttributes) withAttributeSet(attrs attribute.Set) zapcore.Core { - return NewConsoleCoreWithAttributes(ccwa.from, attrs, ccwa.extraFields...) -} - -type otelTeeCoreWithAttributes struct { - sourceCore zapcore.Core - otelCore zapcore.Core - lp log.LoggerProvider - scopeName string -} - -var _ coreWithAttributes = (*otelTeeCoreWithAttributes)(nil) - -// NewOTelTeeCoreWithAttributes wraps a Zap core in order to copy logs to a [log.LoggerProvider] using [otelzap]. -// For the copied logs, component attributes are injected as instrumentation scope attributes. -// -// Note that we intentionally do not use zapcore.NewTee here, because it will simply duplicate all log entries -// to each core. The provided Zap core may have sampling or a minimum log level applied to it, so in order to -// maintain consistency we need to ensure that only the logs accepted by the provided core are copied to the -// log.LoggerProvider. -func NewOTelTeeCoreWithAttributes(core zapcore.Core, lp log.LoggerProvider, scopeName string, attrs attribute.Set) zapcore.Core { - otelCore := otelzap.NewCore( - scopeName, - otelzap.WithLoggerProvider(lp), - otelzap.WithAttributes(attrs.ToSlice()...), - ) - return &otelTeeCoreWithAttributes{ - sourceCore: core, - otelCore: otelCore, - lp: lp, - scopeName: scopeName, - } -} - -func (ocwa *otelTeeCoreWithAttributes) withAttributeSet(attrs attribute.Set) zapcore.Core { - return NewOTelTeeCoreWithAttributes( - tryWithAttributeSet(ocwa.sourceCore, attrs), - ocwa.lp, ocwa.scopeName, attrs, - ) -} - -func (ocwa *otelTeeCoreWithAttributes) With(fields []zapcore.Field) zapcore.Core { - sourceCoreWith := ocwa.sourceCore.With(fields) - otelCoreWith := ocwa.otelCore.With(fields) - return &otelTeeCoreWithAttributes{ - sourceCore: sourceCoreWith, - otelCore: otelCoreWith, - lp: ocwa.lp, - scopeName: ocwa.scopeName, - } -} - -func (ocwa *otelTeeCoreWithAttributes) Enabled(level zapcore.Level) bool { - return ocwa.sourceCore.Enabled(level) -} - -func (ocwa *otelTeeCoreWithAttributes) Check(entry zapcore.Entry, ce *zapcore.CheckedEntry) *zapcore.CheckedEntry { - ce = ocwa.sourceCore.Check(entry, ce) - if ce != nil { - // Only log to the otelzap core if the input core accepted the log entry. - ce = ce.AddCore(entry, ocwa.otelCore) - } - return ce -} - -func (ocwa *otelTeeCoreWithAttributes) Write(entry zapcore.Entry, fields []zapcore.Field) error { - err := ocwa.sourceCore.Write(entry, fields) - return multierr.Append(err, ocwa.otelCore.Write(entry, fields)) -} - -func (ocwa *otelTeeCoreWithAttributes) Sync() error { - err := ocwa.sourceCore.Sync() - return multierr.Append(err, ocwa.otelCore.Sync()) -} - -// ZapLoggerWithAttributes creates a Zap Logger with a new set of injected component attributes. -func ZapLoggerWithAttributes(logger *zap.Logger, attrs attribute.Set) *zap.Logger { - return logger.WithOptions(zap.WrapCore(func(c zapcore.Core) zapcore.Core { - return tryWithAttributeSet(c, attrs) - })) -} diff --git a/internal/telemetry/componentattribute/meter_test.go b/internal/telemetry/componentattribute/meter_test.go deleted file mode 100644 index 3f0ff3946b8..00000000000 --- a/internal/telemetry/componentattribute/meter_test.go +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package componentattribute_test - -import ( - "context" - "fmt" - "slices" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/metric" - sdkMetric "go.opentelemetry.io/otel/sdk/metric" - "go.opentelemetry.io/otel/sdk/metric/metricdata" - - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" -) - -func TestMPWA(t *testing.T) { - reader := sdkMetric.NewManualReader() - mp1 := sdkMetric.NewMeterProvider(sdkMetric.WithReader(reader)) - - // Add attribute set - extraAttrs2 := attribute.NewSet( - attribute.String("extrakey2", "extraval2"), - ) - mp2 := componentattribute.MeterProviderWithAttributes(mp1, extraAttrs2) - - // Replace attribute set - extraAttrs3 := attribute.NewSet( - attribute.String("extrakey3", "extraval3"), - ) - mp3 := componentattribute.MeterProviderWithAttributes(mp2, extraAttrs3) - - noAttrs := attribute.NewSet() - // Add a standard attribute on top of the extra attributes - attrs4 := attribute.NewSet( - attribute.String("stdkey", "stdval"), - ) - expAttrs4 := attribute.NewSet(append(extraAttrs3.ToSlice(), attrs4.ToSlice()...)...) - // Overwrite the extra attribute - attrs5 := attribute.NewSet( - attribute.String("extrakey3", "customval"), - ) - - tests := []struct { - mp metric.MeterProvider - attrs attribute.Set - expAttrs attribute.Set - name string - }{ - {mp: mp1, attrs: noAttrs, expAttrs: noAttrs, name: "no extra attributes"}, - {mp: mp2, attrs: noAttrs, expAttrs: extraAttrs2, name: "set extra attributes"}, - {mp: mp3, attrs: noAttrs, expAttrs: extraAttrs3, name: "reset extra attributes"}, - {mp: mp3, attrs: attrs4, expAttrs: expAttrs4, name: "merge attributes"}, - {mp: mp3, attrs: attrs5, expAttrs: attrs5, name: "overwrite extra attribute"}, - } - - for i, test := range tests { - t.Run(test.name+"/send", func(t *testing.T) { - meterName := fmt.Sprintf("testmeter%d", i+1) - ctr, err := test.mp.Meter( - meterName, - metric.WithInstrumentationAttributes(test.attrs.ToSlice()...), - ).Int64Counter("testctr") - require.NoError(t, err) - ctr.Add(context.Background(), 42) - }) - } - - var rm metricdata.ResourceMetrics - require.NoError(t, reader.Collect(context.Background(), &rm)) - require.LessOrEqual(t, len(rm.ScopeMetrics), len(tests)) - - for i, test := range tests { - t.Run(test.name+"/check", func(t *testing.T) { - meterName := fmt.Sprintf("testmeter%d", i+1) - i := slices.IndexFunc(rm.ScopeMetrics, func(sm metricdata.ScopeMetrics) bool { - return sm.Scope.Name == meterName - }) - assert.NotEqual(t, -1, i) - assert.Equal(t, test.expAttrs, rm.ScopeMetrics[i].Scope.Attributes) - metrics := rm.ScopeMetrics[i].Metrics - require.Len(t, metrics, 1) - assert.Equal(t, "testctr", metrics[0].Name) - sum, ok := metrics[0].Data.(metricdata.Sum[int64]) - require.True(t, ok) - require.Len(t, sum.DataPoints, 1) - assert.Equal(t, int64(42), sum.DataPoints[0].Value) - }) - } -} diff --git a/internal/telemetry/componentattribute/tracer_provider.go b/internal/telemetry/componentattribute/tracer_provider.go deleted file mode 100644 index 5eac1a8bdf1..00000000000 --- a/internal/telemetry/componentattribute/tracer_provider.go +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package componentattribute // import "go.opentelemetry.io/collector/internal/telemetry/componentattribute" - -import ( - "slices" - - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/trace" -) - -type tracerProviderWithAttributes struct { - trace.TracerProvider - attrs []attribute.KeyValue -} - -// TracerProviderWithAttributes creates a TracerProvider with a new set of injected instrumentation scope attributes. -func TracerProviderWithAttributes(tp trace.TracerProvider, attrs attribute.Set) trace.TracerProvider { - if tpwa, ok := tp.(tracerProviderWithAttributes); ok { - tp = tpwa.TracerProvider - } - return tracerProviderWithAttributes{ - TracerProvider: tp, - attrs: attrs.ToSlice(), - } -} - -func tracerWithAttributes(tp trace.TracerProvider, attrs []attribute.KeyValue, name string, opts ...trace.TracerOption) trace.Tracer { - conf := trace.NewTracerConfig(opts...) - attrSet := conf.InstrumentationAttributes() - // prepend our attributes so they can be overwritten - newAttrs := append(slices.Clone(attrs), attrSet.ToSlice()...) - // append our attribute set option to overwrite the old one - opts = append(opts, trace.WithInstrumentationAttributes(newAttrs...)) - return tp.Tracer(name, opts...) -} - -func (tpwa tracerProviderWithAttributes) Tracer(name string, options ...trace.TracerOption) trace.Tracer { - return tracerWithAttributes(tpwa.TracerProvider, tpwa.attrs, name, options...) -} - -func (tpwa tracerProviderWithAttributes) Unwrap() trace.TracerProvider { - return tpwa.TracerProvider -} diff --git a/internal/telemetry/componentattribute/tracer_test.go b/internal/telemetry/componentattribute/tracer_test.go deleted file mode 100644 index 265ae372535..00000000000 --- a/internal/telemetry/componentattribute/tracer_test.go +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package componentattribute_test - -import ( - "context" - "fmt" - "slices" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "go.opentelemetry.io/otel/attribute" - sdkTrace "go.opentelemetry.io/otel/sdk/trace" - "go.opentelemetry.io/otel/sdk/trace/tracetest" - "go.opentelemetry.io/otel/trace" - "go.opentelemetry.io/otel/trace/embedded" - - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" -) - -// Emulate a TracerProvider from a non-official SDK -type customTracerProvider struct { - embedded.TracerProvider - tp *sdkTrace.TracerProvider -} - -func (ctp customTracerProvider) Tracer(name string, options ...trace.TracerOption) trace.Tracer { - return ctp.tp.Tracer(name, options...) -} - -var _ trace.TracerProvider = customTracerProvider{} - -func TestTPWA(t *testing.T) { - exporter := tracetest.NewInMemoryExporter() - tp1 := sdkTrace.NewTracerProvider(sdkTrace.WithSpanProcessor(sdkTrace.NewSimpleSpanProcessor(exporter))) - - // Add attribute set - extraAttrs2 := attribute.NewSet( - attribute.String("extrakey2", "extraval2"), - ) - tp2 := componentattribute.TracerProviderWithAttributes(tp1, extraAttrs2) - - // Replace attribute set - extraAttrs3 := attribute.NewSet( - attribute.String("extrakey3", "extraval3"), - ) - tp3 := componentattribute.TracerProviderWithAttributes(tp2, extraAttrs3) - - // The same thing, but with a non-official SDK Provider - tp4 := &customTracerProvider{tp: tp1} - tp5 := componentattribute.TracerProviderWithAttributes(tp4, extraAttrs2) - tp6 := componentattribute.TracerProviderWithAttributes(tp5, extraAttrs3) - - noAttrs := attribute.NewSet() - // Add a standard attribute on top of the extra attributes - attrs4 := attribute.NewSet( - attribute.String("stdkey", "stdval"), - ) - expAttrs4 := attribute.NewSet(append(extraAttrs3.ToSlice(), attrs4.ToSlice()...)...) - // Overwrite the extra attribute - attrs5 := attribute.NewSet( - attribute.String("extrakey3", "customval"), - ) - - tests := []struct { - tp trace.TracerProvider - attrs attribute.Set - expAttrs attribute.Set - name string - }{ - {tp: tp1, attrs: noAttrs, expAttrs: noAttrs, name: "no extra attributes"}, - {tp: tp2, attrs: noAttrs, expAttrs: extraAttrs2, name: "set extra attributes"}, - {tp: tp3, attrs: noAttrs, expAttrs: extraAttrs3, name: "reset extra attributes"}, - {tp: tp3, attrs: attrs4, expAttrs: expAttrs4, name: "merge attributes"}, - {tp: tp3, attrs: attrs5, expAttrs: attrs5, name: "overwrite extra attribute"}, - {tp: tp4, attrs: noAttrs, expAttrs: noAttrs, name: "no extra attributes, non-official SDK"}, - {tp: tp5, attrs: noAttrs, expAttrs: extraAttrs2, name: "set extra attributes, non-official SDK"}, - {tp: tp6, attrs: noAttrs, expAttrs: extraAttrs3, name: "reset extra attributes, non-official SDK"}, - } - - for i, test := range tests { - tracerName := fmt.Sprintf("testtracer%d", i+1) - _, span := test.tp.Tracer( - tracerName, - trace.WithInstrumentationAttributes(test.attrs.ToSlice()...), - ).Start(context.Background(), "testspan") - span.End() - } - - spans := exporter.GetSpans() - require.LessOrEqual(t, len(spans), len(tests)) - - for i, test := range tests { - t.Run(test.name+"/check", func(t *testing.T) { - tracerName := fmt.Sprintf("testtracer%d", i+1) - i := slices.IndexFunc(spans, func(s tracetest.SpanStub) bool { - return s.InstrumentationScope.Name == tracerName - }) - assert.NotEqual(t, -1, i) - span := spans[i] - assert.Equal(t, "testspan", span.Name) - assert.Equal(t, test.expAttrs, span.InstrumentationScope.Attributes) - }) - } -} diff --git a/internal/telemetry/go.mod b/internal/telemetry/go.mod index 97525473cd4..6fd3e22bb6d 100644 --- a/internal/telemetry/go.mod +++ b/internal/telemetry/go.mod @@ -4,34 +4,24 @@ go 1.24.0 require ( github.com/stretchr/testify v1.11.1 + go.opentelemetry.io/collector/component v1.43.0 go.opentelemetry.io/collector/featuregate v1.43.0 - go.opentelemetry.io/collector/pdata v1.43.0 - go.opentelemetry.io/collector/pipeline v1.43.0 - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 go.opentelemetry.io/otel v1.38.0 - go.opentelemetry.io/otel/log v0.14.0 - go.opentelemetry.io/otel/log/logtest v0.14.0 go.opentelemetry.io/otel/metric v1.38.0 - go.opentelemetry.io/otel/sdk v1.38.0 - go.opentelemetry.io/otel/sdk/metric v1.38.0 go.opentelemetry.io/otel/trace v1.38.0 - go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/google/go-cmp v0.7.0 // indirect - github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/collector/pdata v1.43.0 // indirect + go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.42.0 // indirect golang.org/x/sys v0.35.0 // indirect golang.org/x/text v0.27.0 // indirect @@ -41,8 +31,8 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace go.opentelemetry.io/collector/pipeline => ../../pipeline - replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/featuregate => ../../featuregate + +replace go.opentelemetry.io/collector/component => ../../component diff --git a/internal/telemetry/go.sum b/internal/telemetry/go.sum index afc0ef47254..1fb66343e32 100644 --- a/internal/telemetry/go.sum +++ b/internal/telemetry/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -43,18 +42,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/internal/telemetry/telemetry.go b/internal/telemetry/telemetry.go index 7fa0e2f584c..e792b0b1ae0 100644 --- a/internal/telemetry/telemetry.go +++ b/internal/telemetry/telemetry.go @@ -4,14 +4,13 @@ package telemetry // import "go.opentelemetry.io/collector/internal/telemetry" import ( - "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" "go.uber.org/zap" + "go.uber.org/zap/zapcore" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/featuregate" - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" - "go.opentelemetry.io/collector/pdata/pcommon" ) var NewPipelineTelemetryGate = featuregate.GlobalRegistry().MustRegister( @@ -22,42 +21,30 @@ var NewPipelineTelemetryGate = featuregate.GlobalRegistry().MustRegister( featuregate.WithRegisterDescription("Injects component-identifying scope attributes in internal Collector metrics"), ) -// IMPORTANT: This struct is reexported as part of the public API of -// go.opentelemetry.io/collector/component, a stable module. -// DO NOT MAKE BREAKING CHANGES TO EXPORTED FIELDS. -type TelemetrySettings struct { - // Logger that the factory can use during creation and can pass to the created - // component to be used later as well. - Logger *zap.Logger - - // TracerProvider that the factory can pass to other instrumented third-party libraries. - // - // The service may wrap this provider for attribute injection. The wrapper may implement an - // additional `Unwrap() trace.TracerProvider` method to grant access to the underlying SDK. - TracerProvider trace.TracerProvider - - // MeterProvider that the factory can pass to other instrumented third-party libraries. - MeterProvider metric.MeterProvider - - // Resource contains the resource attributes for the collector's telemetry. - Resource pcommon.Resource - - // Extra attributes added to instrumentation scopes - extraAttributes attribute.Set +type injectorCore interface { + DropInjectedAttributes(droppedAttrs ...string) zapcore.Core } -// The publicization of this API is tracked in https://github.com/open-telemetry/opentelemetry-collector/issues/12405 +type injectorTracerProvider interface { + DropInjectedAttributes(droppedAttrs ...string) trace.TracerProvider +} -func WithoutAttributes(ts TelemetrySettings, fields ...string) TelemetrySettings { - return WithAttributeSet(ts, componentattribute.RemoveAttributes(ts.extraAttributes, fields...)) +type injectorMeterProvider interface { + DropInjectedAttributes(droppedAttrs ...string) metric.MeterProvider } -func WithAttributeSet(ts TelemetrySettings, attrs attribute.Set) TelemetrySettings { - ts.extraAttributes = attrs - ts.Logger = componentattribute.ZapLoggerWithAttributes(ts.Logger, ts.extraAttributes) - ts.TracerProvider = componentattribute.TracerProviderWithAttributes(ts.TracerProvider, ts.extraAttributes) - if NewPipelineTelemetryGate.IsEnabled() { - ts.MeterProvider = componentattribute.MeterProviderWithAttributes(ts.MeterProvider, ts.extraAttributes) +func DropInjectedAttributes(ts component.TelemetrySettings, attrs ...string) component.TelemetrySettings { + ts.Logger = ts.Logger.WithOptions(zap.WrapCore(func(c zapcore.Core) zapcore.Core { + if ic, ok := c.(injectorCore); ok { + return ic.DropInjectedAttributes(attrs...) + } + return c + })) + if itp, ok := ts.TracerProvider.(injectorTracerProvider); ok { + ts.TracerProvider = itp.DropInjectedAttributes(attrs...) + } + if imp, ok := ts.MeterProvider.(injectorMeterProvider); ok { + ts.MeterProvider = imp.DropInjectedAttributes(attrs...) } return ts } diff --git a/internal/telemetry/telemetrytest/mock.go b/internal/telemetry/telemetrytest/mock.go new file mode 100644 index 00000000000..5cee0c6cd2d --- /dev/null +++ b/internal/telemetry/telemetrytest/mock.go @@ -0,0 +1,28 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package telemetrytest // import "go.opentelemetry.io/collector/internal/telemetry/telemetrytest" + +import ( + "go.uber.org/zap" + "go.uber.org/zap/zapcore" +) + +type mockInjectorCore struct { + zapcore.Core + dropped *[]string +} + +func (mic mockInjectorCore) DropInjectedAttributes(droppedAttrs ...string) zapcore.Core { + *mic.dropped = append(*mic.dropped, droppedAttrs...) + return mic +} + +func MockInjectorLogger(logger *zap.Logger, dropped *[]string) *zap.Logger { + return logger.WithOptions(zap.WrapCore(func(c zapcore.Core) zapcore.Core { + return mockInjectorCore{ + Core: c, + dropped: dropped, + } + })) +} diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 9e33189f42f..c3078d76004 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -46,12 +46,9 @@ require ( go.opentelemetry.io/collector/component/componentstatus v0.137.0 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect go.opentelemetry.io/collector/pipeline v1.43.0 // indirect go.opentelemetry.io/collector/processor/xprocessor v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect @@ -104,5 +101,3 @@ replace go.opentelemetry.io/collector/processor/processortest => ../processortes replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/consumererror replace go.opentelemetry.io/collector/featuregate => ../../featuregate - -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry diff --git a/processor/batchprocessor/go.sum b/processor/batchprocessor/go.sum index eb9803d4e95..0b7379d1cba 100644 --- a/processor/batchprocessor/go.sum +++ b/processor/batchprocessor/go.sum @@ -57,14 +57,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/processor/go.mod b/processor/go.mod index 4f311993846..4adb0288b57 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -13,23 +13,17 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -59,6 +53,4 @@ replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consu replace go.opentelemetry.io/collector/pipeline => ../pipeline -replace go.opentelemetry.io/collector/internal/telemetry => ../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../featuregate diff --git a/processor/go.sum b/processor/go.sum index afc0ef47254..1fb66343e32 100644 --- a/processor/go.sum +++ b/processor/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -43,18 +42,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/processor/memorylimiterprocessor/factory.go b/processor/memorylimiterprocessor/factory.go index ba913b8e8d1..c037ec88a70 100644 --- a/processor/memorylimiterprocessor/factory.go +++ b/processor/memorylimiterprocessor/factory.go @@ -14,7 +14,6 @@ import ( "go.opentelemetry.io/collector/consumer/xconsumer" "go.opentelemetry.io/collector/internal/memorylimiter" "go.opentelemetry.io/collector/internal/telemetry" - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" "go.opentelemetry.io/collector/processor" "go.opentelemetry.io/collector/processor/memorylimiterprocessor/internal/metadata" "go.opentelemetry.io/collector/processor/processorhelper" @@ -135,11 +134,11 @@ func (f *factory) getMemoryLimiter(set processor.Settings, cfg component.Config) return memLimiter, nil } - set.TelemetrySettings = telemetry.WithoutAttributes( + set.TelemetrySettings = telemetry.DropInjectedAttributes( set.TelemetrySettings, - componentattribute.SignalKey, - componentattribute.PipelineIDKey, - componentattribute.ComponentIDKey, + telemetry.SignalKey, + telemetry.PipelineIDKey, + telemetry.ComponentIDKey, ) set.Logger.Debug("created singleton logger") diff --git a/processor/memorylimiterprocessor/factory_test.go b/processor/memorylimiterprocessor/factory_test.go index 8dd63bbb6b5..84f3051b86f 100644 --- a/processor/memorylimiterprocessor/factory_test.go +++ b/processor/memorylimiterprocessor/factory_test.go @@ -10,16 +10,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/otel/attribute" - "go.uber.org/zap" - "go.uber.org/zap/zapcore" - "go.uber.org/zap/zaptest/observer" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/internal/telemetry" - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" - "go.opentelemetry.io/collector/pipeline" + "go.opentelemetry.io/collector/internal/telemetry/telemetrytest" "go.opentelemetry.io/collector/processor/processortest" ) @@ -44,15 +39,9 @@ func TestCreateProcessor(t *testing.T) { pCfg.MemorySpikeLimitMiB = 1907 pCfg.CheckInterval = 100 * time.Millisecond - core, observer := observer.New(zapcore.DebugLevel) - attrs := attribute.NewSet( - attribute.String(componentattribute.SignalKey, pipeline.SignalLogs.String()), - attribute.String(componentattribute.ComponentIDKey, "memorylimiter"), - attribute.String(componentattribute.PipelineIDKey, "logs/foo"), - ) set := processortest.NewNopSettings(factory.Type()) - set.Logger = zap.New(componentattribute.NewConsoleCoreWithAttributes(core, attribute.NewSet())) - set.TelemetrySettings = telemetry.WithAttributeSet(set.TelemetrySettings, attrs) + var droppedAttrs []string + set.Logger = telemetrytest.MockInjectorLogger(set.Logger, &droppedAttrs) tp, err := factory.CreateTraces(context.Background(), set, cfg, consumertest.NewNop()) require.NoError(t, err) @@ -74,7 +63,12 @@ func TestCreateProcessor(t *testing.T) { pp, err := factory.CreateProfiles(context.Background(), set, cfg, consumertest.NewNop()) require.NoError(t, err) assert.NotNil(t, pp) - assert.NoError(t, pp.Start(context.Background(), componenttest.NewNopHost())) + require.NoError(t, pp.Start(context.Background(), componenttest.NewNopHost())) + + // Test that we've dropped the relevant injected attributes exactly once + assert.ElementsMatch(t, droppedAttrs, []string{ + telemetry.SignalKey, telemetry.ComponentIDKey, telemetry.PipelineIDKey, + }) assert.NoError(t, lp.Shutdown(context.Background())) assert.NoError(t, tp.Shutdown(context.Background())) @@ -88,13 +82,4 @@ func TestCreateProcessor(t *testing.T) { assert.NoError(t, lp.Shutdown(context.Background())) // calling it again should throw no error require.NoError(t, lp.Shutdown(context.Background())) - - var createLoggerCount int - for _, log := range observer.All() { - if log.Message == "created singleton logger" { - createLoggerCount++ - assert.Empty(t, observer.All()[0].Context) - } - } - assert.Equal(t, 1, createLoggerCount) } diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index e22c7b43481..ded85be61e5 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -27,7 +27,6 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.38.0 go.opentelemetry.io/otel/trace v1.38.0 go.uber.org/goleak v1.3.0 - go.uber.org/zap v1.27.0 ) require ( @@ -60,10 +59,9 @@ require ( go.opentelemetry.io/collector/component/componentstatus v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.27.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/net v0.42.0 // indirect golang.org/x/sys v0.35.0 // indirect diff --git a/processor/memorylimiterprocessor/go.sum b/processor/memorylimiterprocessor/go.sum index c730fc085b1..95f584033a8 100644 --- a/processor/memorylimiterprocessor/go.sum +++ b/processor/memorylimiterprocessor/go.sum @@ -74,14 +74,8 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/processor/processorhelper/go.mod b/processor/processorhelper/go.mod index 64a216f17a5..7a1c556f321 100644 --- a/processor/processorhelper/go.mod +++ b/processor/processorhelper/go.mod @@ -36,12 +36,9 @@ require ( go.opentelemetry.io/collector/component/componentstatus v0.137.0 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.137.0 // indirect go.opentelemetry.io/collector/processor/xprocessor v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect @@ -78,6 +75,4 @@ replace go.opentelemetry.io/collector/consumer/xconsumer => ../../consumer/xcons replace go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/processor/processorhelper/go.sum b/processor/processorhelper/go.sum index afc0ef47254..1839d792534 100644 --- a/processor/processorhelper/go.sum +++ b/processor/processorhelper/go.sum @@ -43,14 +43,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/processor/processorhelper/xprocessorhelper/go.mod b/processor/processorhelper/xprocessorhelper/go.mod index b49fb838fc3..398ea700cc7 100644 --- a/processor/processorhelper/xprocessorhelper/go.mod +++ b/processor/processorhelper/xprocessorhelper/go.mod @@ -30,13 +30,10 @@ require ( go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/component/componentstatus v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.137.0 // indirect go.opentelemetry.io/collector/pipeline v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -80,6 +77,4 @@ replace go.opentelemetry.io/collector/processor/processorhelper => ../ replace go.opentelemetry.io/collector/processor/xprocessor => ../../xprocessor -replace go.opentelemetry.io/collector/internal/telemetry => ../../../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../../../featuregate diff --git a/processor/processorhelper/xprocessorhelper/go.sum b/processor/processorhelper/xprocessorhelper/go.sum index afc0ef47254..1839d792534 100644 --- a/processor/processorhelper/xprocessorhelper/go.sum +++ b/processor/processorhelper/xprocessorhelper/go.sum @@ -43,14 +43,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/processor/processortest/go.mod b/processor/processortest/go.mod index cac97ea914a..2cefc19f57d 100644 --- a/processor/processortest/go.mod +++ b/processor/processortest/go.mod @@ -32,10 +32,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -75,6 +72,4 @@ replace go.opentelemetry.io/collector/processor/xprocessor => ../../processor/xp replace go.opentelemetry.io/collector/pipeline => ../../pipeline -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/processor/processortest/go.sum b/processor/processortest/go.sum index afc0ef47254..1839d792534 100644 --- a/processor/processortest/go.sum +++ b/processor/processortest/go.sum @@ -43,14 +43,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/processor/xprocessor/go.mod b/processor/xprocessor/go.mod index 9c85b9962b9..9107ec9e1d0 100644 --- a/processor/xprocessor/go.mod +++ b/processor/xprocessor/go.mod @@ -13,23 +13,17 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/consumer v1.43.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -61,6 +55,4 @@ replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/co replace go.opentelemetry.io/collector/pipeline => ../../pipeline -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/processor/xprocessor/go.sum b/processor/xprocessor/go.sum index afc0ef47254..1fb66343e32 100644 --- a/processor/xprocessor/go.sum +++ b/processor/xprocessor/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -43,18 +42,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/receiver/go.mod b/receiver/go.mod index 9470b72fde9..08e635bc6fb 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -14,22 +14,16 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -61,6 +55,4 @@ retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module replace go.opentelemetry.io/collector/pipeline => ../pipeline -replace go.opentelemetry.io/collector/internal/telemetry => ../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../featuregate diff --git a/receiver/go.sum b/receiver/go.sum index afc0ef47254..1fb66343e32 100644 --- a/receiver/go.sum +++ b/receiver/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -43,18 +42,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index ca0ed6cbf84..8bc28cc4cc3 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -38,13 +38,10 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.137.0 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect go.opentelemetry.io/collector/pipeline v1.43.0 // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -89,5 +86,3 @@ replace go.opentelemetry.io/collector/pipeline => ../../pipeline replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/consumererror replace go.opentelemetry.io/collector/featuregate => ../../featuregate - -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry diff --git a/receiver/nopreceiver/go.sum b/receiver/nopreceiver/go.sum index eb9803d4e95..0b7379d1cba 100644 --- a/receiver/nopreceiver/go.sum +++ b/receiver/nopreceiver/go.sum @@ -57,14 +57,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/receiver/otlpreceiver/factory_test.go b/receiver/otlpreceiver/factory_test.go index 3c416c0076e..bd764bce062 100644 --- a/receiver/otlpreceiver/factory_test.go +++ b/receiver/otlpreceiver/factory_test.go @@ -9,10 +9,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/otel/attribute" - "go.uber.org/zap" - "go.uber.org/zap/zapcore" - "go.uber.org/zap/zaptest/observer" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configgrpc" @@ -23,7 +19,7 @@ import ( "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/consumer/xconsumer" "go.opentelemetry.io/collector/internal/telemetry" - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" + "go.opentelemetry.io/collector/internal/telemetry/telemetrytest" "go.opentelemetry.io/collector/internal/testutil" "go.opentelemetry.io/collector/receiver/otlpreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/receivertest" @@ -43,14 +39,10 @@ func TestCreateSameReceiver(t *testing.T) { cfg.GRPC.GetOrInsertDefault().NetAddr.Endpoint = testutil.GetAvailableLocalAddress(t) cfg.HTTP.GetOrInsertDefault().ServerConfig.Endpoint = testutil.GetAvailableLocalAddress(t) - core, observer := observer.New(zapcore.DebugLevel) - attrs := attribute.NewSet( - attribute.String(componentattribute.SignalKey, "traces"), // should be removed - attribute.String(componentattribute.ComponentIDKey, "otlp"), - ) creationSet := receivertest.NewNopSettings(factory.Type()) - creationSet.Logger = zap.New(componentattribute.NewConsoleCoreWithAttributes(core, attribute.NewSet())) - creationSet.TelemetrySettings = telemetry.WithAttributeSet(creationSet.TelemetrySettings, attrs) + var droppedAttrs []string + creationSet.Logger = telemetrytest.MockInjectorLogger(creationSet.Logger, &droppedAttrs) + tReceiver, err := factory.CreateTraces(context.Background(), creationSet, cfg, consumertest.NewNop()) assert.NotNil(t, tReceiver) require.NoError(t, err) @@ -71,16 +63,8 @@ func TestCreateSameReceiver(t *testing.T) { assert.Same(t, tReceiver, lReceiver) assert.Same(t, tReceiver, pReceiver) - var createLoggerCount int - for _, log := range observer.All() { - if log.Message == "created signal-agnostic logger" { - createLoggerCount++ - require.Len(t, log.Context, 1) - assert.Equal(t, componentattribute.ComponentIDKey, log.Context[0].Key) - assert.Equal(t, "otlp", log.Context[0].String) - } - } - assert.Equal(t, 1, createLoggerCount) + // Test that we've dropped the relevant injected attributes exactly once + assert.ElementsMatch(t, droppedAttrs, []string{telemetry.SignalKey}) } func TestCreateTraces(t *testing.T) { diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 07b8742b803..ce773a84be9 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -74,10 +74,8 @@ require ( go.opentelemetry.io/collector/extension/extensionmiddleware v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect go.opentelemetry.io/collector/pipeline v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect diff --git a/receiver/otlpreceiver/go.sum b/receiver/otlpreceiver/go.sum index 74a36e1c0a9..b5928200429 100644 --- a/receiver/otlpreceiver/go.sum +++ b/receiver/otlpreceiver/go.sum @@ -79,18 +79,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/receiver/otlpreceiver/otlp.go b/receiver/otlpreceiver/otlp.go index 7f06b89773d..907e6a0c561 100644 --- a/receiver/otlpreceiver/otlp.go +++ b/receiver/otlpreceiver/otlp.go @@ -19,7 +19,6 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/xconsumer" "go.opentelemetry.io/collector/internal/telemetry" - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" "go.opentelemetry.io/collector/pdata/plog/plogotlp" "go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp" "go.opentelemetry.io/collector/pdata/pprofile/pprofileotlp" @@ -54,7 +53,7 @@ type otlpReceiver struct { // responsibility to invoke the respective Start*Reception methods as well // as the various Stop*Reception methods to end it. func newOtlpReceiver(cfg *Config, set *receiver.Settings) (*otlpReceiver, error) { - set.TelemetrySettings = telemetry.WithoutAttributes(set.TelemetrySettings, componentattribute.SignalKey) + set.TelemetrySettings = telemetry.DropInjectedAttributes(set.TelemetrySettings, telemetry.SignalKey) set.Logger.Debug("created signal-agnostic logger") r := &otlpReceiver{ cfg: cfg, diff --git a/receiver/receiverhelper/go.mod b/receiver/receiverhelper/go.mod index 9d5f19c6343..1c6cfeeffff 100644 --- a/receiver/receiverhelper/go.mod +++ b/receiver/receiverhelper/go.mod @@ -30,11 +30,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/consumer v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect @@ -67,8 +64,6 @@ replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/co replace go.opentelemetry.io/collector/pipeline => ../../pipeline -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../../featuregate replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/consumererror diff --git a/receiver/receiverhelper/go.sum b/receiver/receiverhelper/go.sum index afc0ef47254..1839d792534 100644 --- a/receiver/receiverhelper/go.sum +++ b/receiver/receiverhelper/go.sum @@ -43,14 +43,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/receiver/receivertest/go.mod b/receiver/receivertest/go.mod index fb0dfb95943..c897992eccd 100644 --- a/receiver/receivertest/go.mod +++ b/receiver/receivertest/go.mod @@ -30,11 +30,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -74,6 +71,4 @@ replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/receiver/receivertest/go.sum b/receiver/receivertest/go.sum index afc0ef47254..1839d792534 100644 --- a/receiver/receivertest/go.sum +++ b/receiver/receivertest/go.sum @@ -43,14 +43,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/receiver/xreceiver/go.mod b/receiver/xreceiver/go.mod index 325b97b06ee..8f301b9471a 100644 --- a/receiver/xreceiver/go.mod +++ b/receiver/xreceiver/go.mod @@ -13,23 +13,17 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/consumer v1.43.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -61,6 +55,4 @@ replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/co replace go.opentelemetry.io/collector/pipeline => ../../pipeline -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/receiver/xreceiver/go.sum b/receiver/xreceiver/go.sum index afc0ef47254..1fb66343e32 100644 --- a/receiver/xreceiver/go.sum +++ b/receiver/xreceiver/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -43,18 +42,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= -go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= -go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= diff --git a/scraper/go.mod b/scraper/go.mod index 2b9010bbbba..08ef9d51cda 100644 --- a/scraper/go.mod +++ b/scraper/go.mod @@ -25,10 +25,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -51,6 +48,4 @@ replace go.opentelemetry.io/collector/component => ../component replace go.opentelemetry.io/collector/component/componenttest => ../component/componenttest -replace go.opentelemetry.io/collector/internal/telemetry => ../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../featuregate diff --git a/scraper/go.sum b/scraper/go.sum index afc0ef47254..1839d792534 100644 --- a/scraper/go.sum +++ b/scraper/go.sum @@ -43,14 +43,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/scraper/scraperhelper/go.mod b/scraper/scraperhelper/go.mod index 7d2cae531f1..c085732a611 100644 --- a/scraper/scraperhelper/go.mod +++ b/scraper/scraperhelper/go.mod @@ -40,11 +40,8 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.137.0 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.137.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.137.0 // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect golang.org/x/net v0.42.0 // indirect golang.org/x/sys v0.35.0 // indirect golang.org/x/text v0.27.0 // indirect @@ -84,6 +81,4 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/scraper/scraperhelper/go.sum b/scraper/scraperhelper/go.sum index afc0ef47254..1839d792534 100644 --- a/scraper/scraperhelper/go.sum +++ b/scraper/scraperhelper/go.sum @@ -43,14 +43,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/scraper/scrapertest/go.mod b/scraper/scrapertest/go.mod index 442255ef191..49ea9ddae2f 100644 --- a/scraper/scrapertest/go.mod +++ b/scraper/scrapertest/go.mod @@ -19,12 +19,9 @@ require ( github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect go.opentelemetry.io/collector/pipeline v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect @@ -49,6 +46,4 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/scraper => ../ -replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry - replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/scraper/scrapertest/go.sum b/scraper/scrapertest/go.sum index f166bdeb228..47b806f453c 100644 --- a/scraper/scrapertest/go.sum +++ b/scraper/scrapertest/go.sum @@ -37,14 +37,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/service/extensions/extensions.go b/service/extensions/extensions.go index 4786eed7126..cc9265ce7dd 100644 --- a/service/extensions/extensions.go +++ b/service/extensions/extensions.go @@ -17,10 +17,9 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/extension/extensioncapabilities" - "go.opentelemetry.io/collector/internal/telemetry" - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" "go.opentelemetry.io/collector/service/internal/attribute" "go.opentelemetry.io/collector/service/internal/builders" + "go.opentelemetry.io/collector/service/internal/componentattribute" "go.opentelemetry.io/collector/service/internal/status" "go.opentelemetry.io/collector/service/internal/zpages" ) @@ -40,8 +39,8 @@ type Extensions struct { func (bes *Extensions) Start(ctx context.Context, host component.Host) error { bes.telemetry.Logger.Info("Starting extensions...") for _, extID := range bes.extensionIDs { - extLogger := componentattribute.ZapLoggerWithAttributes(bes.telemetry.Logger, - *attribute.Extension(extID).Set()) + extLogger := componentattribute.LoggerWithAttributes(bes.telemetry.Logger, + attribute.Extension(extID).Set().ToSlice()) extLogger.Info("Extension is starting...") instanceID := bes.instanceIDs[extID] ext := bes.extMap[extID] @@ -214,7 +213,7 @@ func New(ctx context.Context, set Settings, cfg Config, options ...Option) (*Ext instanceID := componentstatus.NewInstanceID(extID, component.KindExtension) extSet := extension.Settings{ ID: extID, - TelemetrySettings: telemetry.WithAttributeSet(set.Telemetry, *attribute.Extension(extID).Set()), + TelemetrySettings: componentattribute.TelemetrySettingsWithAttributes(set.Telemetry, *attribute.Extension(extID).Set()), BuildInfo: set.BuildInfo, } diff --git a/service/go.mod b/service/go.mod index 0c6d7008fd7..fcb2ff54837 100644 --- a/service/go.mod +++ b/service/go.mod @@ -48,9 +48,11 @@ require ( go.opentelemetry.io/collector/receiver/xreceiver v0.137.0 go.opentelemetry.io/collector/service/hostcapabilities v0.137.0 go.opentelemetry.io/collector/service/telemetry/telemetrytest v0.0.0-20251010094443-567586048b9f + go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 go.opentelemetry.io/contrib/otelconf v0.18.0 go.opentelemetry.io/contrib/propagators/b3 v1.38.0 go.opentelemetry.io/otel v1.38.0 + go.opentelemetry.io/otel/log v0.14.0 go.opentelemetry.io/otel/metric v1.38.0 go.opentelemetry.io/otel/sdk v1.38.0 go.opentelemetry.io/otel/sdk/metric v1.38.0 @@ -115,7 +117,6 @@ require ( go.opentelemetry.io/collector/config/configtls v1.43.0 // indirect go.opentelemetry.io/collector/extension/extensionauth v1.43.0 // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect go.opentelemetry.io/contrib/zpages v0.63.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0 // indirect @@ -129,7 +130,6 @@ require ( go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.14.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/sdk/log v0.14.0 // indirect go.opentelemetry.io/proto/otlp v1.7.1 // indirect go.yaml.in/yaml/v2 v2.4.3 // indirect diff --git a/service/hostcapabilities/go.mod b/service/hostcapabilities/go.mod index 031e821ea31..c9d9b16800f 100644 --- a/service/hostcapabilities/go.mod +++ b/service/hostcapabilities/go.mod @@ -9,20 +9,14 @@ require ( ) require ( - github.com/go-logr/logr v1.4.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect - go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect go.opentelemetry.io/collector/pdata v1.43.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.14.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/service/hostcapabilities/go.sum b/service/hostcapabilities/go.sum index fb80d24861b..cf41f097c02 100644 --- a/service/hostcapabilities/go.sum +++ b/service/hostcapabilities/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= @@ -37,14 +36,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= -go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= diff --git a/service/internal/attribute/attribute.go b/service/internal/attribute/attribute.go index 107c38f82dd..97c467df3b4 100644 --- a/service/internal/attribute/attribute.go +++ b/service/internal/attribute/attribute.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" + "go.opentelemetry.io/collector/internal/telemetry" "go.opentelemetry.io/collector/pipeline" ) @@ -49,55 +49,55 @@ func (a Attributes) ID() int64 { func Receiver(pipelineType pipeline.Signal, id component.ID) Attributes { return newAttributes( - attribute.String(componentattribute.ComponentKindKey, strings.ToLower(component.KindReceiver.String())), - attribute.String(componentattribute.SignalKey, pipelineType.String()), - attribute.String(componentattribute.ComponentIDKey, id.String()), + attribute.String(telemetry.ComponentKindKey, strings.ToLower(component.KindReceiver.String())), + attribute.String(telemetry.SignalKey, pipelineType.String()), + attribute.String(telemetry.ComponentIDKey, id.String()), ) } func Processor(pipelineID pipeline.ID, id component.ID) Attributes { return newAttributes( - attribute.String(componentattribute.ComponentKindKey, strings.ToLower(component.KindProcessor.String())), - attribute.String(componentattribute.SignalKey, pipelineID.Signal().String()), - attribute.String(componentattribute.PipelineIDKey, pipelineID.String()), - attribute.String(componentattribute.ComponentIDKey, id.String()), + attribute.String(telemetry.ComponentKindKey, strings.ToLower(component.KindProcessor.String())), + attribute.String(telemetry.SignalKey, pipelineID.Signal().String()), + attribute.String(telemetry.PipelineIDKey, pipelineID.String()), + attribute.String(telemetry.ComponentIDKey, id.String()), ) } func Exporter(pipelineType pipeline.Signal, id component.ID) Attributes { return newAttributes( - attribute.String(componentattribute.ComponentKindKey, strings.ToLower(component.KindExporter.String())), - attribute.String(componentattribute.SignalKey, pipelineType.String()), - attribute.String(componentattribute.ComponentIDKey, id.String()), + attribute.String(telemetry.ComponentKindKey, strings.ToLower(component.KindExporter.String())), + attribute.String(telemetry.SignalKey, pipelineType.String()), + attribute.String(telemetry.ComponentIDKey, id.String()), ) } func Connector(exprPipelineType, rcvrPipelineType pipeline.Signal, id component.ID) Attributes { return newAttributes( - attribute.String(componentattribute.ComponentKindKey, strings.ToLower(component.KindConnector.String())), - attribute.String(componentattribute.SignalKey, exprPipelineType.String()), - attribute.String(componentattribute.SignalOutputKey, rcvrPipelineType.String()), - attribute.String(componentattribute.ComponentIDKey, id.String()), + attribute.String(telemetry.ComponentKindKey, strings.ToLower(component.KindConnector.String())), + attribute.String(telemetry.SignalKey, exprPipelineType.String()), + attribute.String(telemetry.SignalOutputKey, rcvrPipelineType.String()), + attribute.String(telemetry.ComponentIDKey, id.String()), ) } func Extension(id component.ID) Attributes { return newAttributes( - attribute.String(componentattribute.ComponentKindKey, strings.ToLower(component.KindExtension.String())), - attribute.String(componentattribute.ComponentIDKey, id.String()), + attribute.String(telemetry.ComponentKindKey, strings.ToLower(component.KindExtension.String())), + attribute.String(telemetry.ComponentIDKey, id.String()), ) } func Capabilities(pipelineID pipeline.ID) Attributes { return newAttributes( - attribute.String(componentattribute.ComponentKindKey, capabiltiesKind), - attribute.String(componentattribute.PipelineIDKey, pipelineID.String()), + attribute.String(telemetry.ComponentKindKey, capabiltiesKind), + attribute.String(telemetry.PipelineIDKey, pipelineID.String()), ) } func Fanout(pipelineID pipeline.ID) Attributes { return newAttributes( - attribute.String(componentattribute.ComponentKindKey, fanoutKind), - attribute.String(componentattribute.PipelineIDKey, pipelineID.String()), + attribute.String(telemetry.ComponentKindKey, fanoutKind), + attribute.String(telemetry.PipelineIDKey, pipelineID.String()), ) } diff --git a/service/internal/attribute/attribute_test.go b/service/internal/attribute/attribute_test.go index 7423600150d..bf10c48d75d 100644 --- a/service/internal/attribute/attribute_test.go +++ b/service/internal/attribute/attribute_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" + "go.opentelemetry.io/collector/internal/telemetry" "go.opentelemetry.io/collector/pipeline" "go.opentelemetry.io/collector/pipeline/xpipeline" "go.opentelemetry.io/collector/service/internal/attribute" @@ -45,15 +45,15 @@ func TestReceiver(t *testing.T) { for _, sig := range signals { for _, id := range cIDs { r := attribute.Receiver(sig, id) - componentKind, ok := r.Set().Value(componentattribute.ComponentKindKey) + componentKind, ok := r.Set().Value(telemetry.ComponentKindKey) require.True(t, ok) require.Equal(t, "receiver", componentKind.AsString()) - signal, ok := r.Set().Value(componentattribute.SignalKey) + signal, ok := r.Set().Value(telemetry.SignalKey) require.True(t, ok) require.Equal(t, sig.String(), signal.AsString()) - componentID, ok := r.Set().Value(componentattribute.ComponentIDKey) + componentID, ok := r.Set().Value(telemetry.ComponentIDKey) require.True(t, ok) require.Equal(t, id.String(), componentID.AsString()) } @@ -64,15 +64,15 @@ func TestProcessor(t *testing.T) { for _, pID := range pIDs { for _, id := range cIDs { p := attribute.Processor(pID, id) - componentKind, ok := p.Set().Value(componentattribute.ComponentKindKey) + componentKind, ok := p.Set().Value(telemetry.ComponentKindKey) require.True(t, ok) require.Equal(t, "processor", componentKind.AsString()) - pipelineID, ok := p.Set().Value(componentattribute.PipelineIDKey) + pipelineID, ok := p.Set().Value(telemetry.PipelineIDKey) require.True(t, ok) require.Equal(t, pID.String(), pipelineID.AsString()) - componentID, ok := p.Set().Value(componentattribute.ComponentIDKey) + componentID, ok := p.Set().Value(telemetry.ComponentIDKey) require.True(t, ok) require.Equal(t, id.String(), componentID.AsString()) } @@ -83,15 +83,15 @@ func TestExporter(t *testing.T) { for _, sig := range signals { for _, id := range cIDs { e := attribute.Exporter(sig, id) - componentKind, ok := e.Set().Value(componentattribute.ComponentKindKey) + componentKind, ok := e.Set().Value(telemetry.ComponentKindKey) require.True(t, ok) require.Equal(t, "exporter", componentKind.AsString()) - signal, ok := e.Set().Value(componentattribute.SignalKey) + signal, ok := e.Set().Value(telemetry.SignalKey) require.True(t, ok) require.Equal(t, sig.String(), signal.AsString()) - componentID, ok := e.Set().Value(componentattribute.ComponentIDKey) + componentID, ok := e.Set().Value(telemetry.ComponentIDKey) require.True(t, ok) require.Equal(t, id.String(), componentID.AsString()) } @@ -103,19 +103,19 @@ func TestConnector(t *testing.T) { for _, rcvrSig := range signals { for _, id := range cIDs { c := attribute.Connector(exprSig, rcvrSig, id) - componentKind, ok := c.Set().Value(componentattribute.ComponentKindKey) + componentKind, ok := c.Set().Value(telemetry.ComponentKindKey) require.True(t, ok) require.Equal(t, "connector", componentKind.AsString()) - signal, ok := c.Set().Value(componentattribute.SignalKey) + signal, ok := c.Set().Value(telemetry.SignalKey) require.True(t, ok) require.Equal(t, exprSig.String(), signal.AsString()) - signalOutput, ok := c.Set().Value(componentattribute.SignalOutputKey) + signalOutput, ok := c.Set().Value(telemetry.SignalOutputKey) require.True(t, ok) require.Equal(t, rcvrSig.String(), signalOutput.AsString()) - componentID, ok := c.Set().Value(componentattribute.ComponentIDKey) + componentID, ok := c.Set().Value(telemetry.ComponentIDKey) require.True(t, ok) require.Equal(t, id.String(), componentID.AsString()) } @@ -125,7 +125,7 @@ func TestConnector(t *testing.T) { func TestExtension(t *testing.T) { e := attribute.Extension(component.MustNewID("foo")) - componentKind, ok := e.Set().Value(componentattribute.ComponentKindKey) + componentKind, ok := e.Set().Value(telemetry.ComponentKindKey) require.True(t, ok) require.Equal(t, "extension", componentKind.AsString()) } diff --git a/service/internal/componentattribute/logger_zap.go b/service/internal/componentattribute/logger_zap.go new file mode 100644 index 00000000000..a9c52eb4577 --- /dev/null +++ b/service/internal/componentattribute/logger_zap.go @@ -0,0 +1,81 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package componentattribute // import "go.opentelemetry.io/collector/service/internal/componentattribute" + +import ( + "slices" + + "go.opentelemetry.io/otel/attribute" + "go.uber.org/zap" + "go.uber.org/zap/zapcore" + + "go.opentelemetry.io/collector/internal/telemetry" +) + +// This wrapper around zapcore.Field tells the Zap -> OTel bridge that the field +// should be turned into an instrumentation scope instead of a set of log record attributes. +type scopeAttributesField struct { + fields []zapcore.Field + attrs []attribute.KeyValue +} + +var _ zapcore.ObjectMarshaler = scopeAttributesField{} + +func (saf scopeAttributesField) MarshalLogObject(enc zapcore.ObjectEncoder) error { + for _, field := range saf.fields { + field.AddTo(enc) + } + return nil +} + +func makeScopeField(attrs []attribute.KeyValue) zap.Field { + return zap.Inline(scopeAttributesField{ + fields: telemetry.ToZapFields(attrs), + attrs: attrs, + }) +} + +func ExtractLogScopeAttributes(field zap.Field) ([]attribute.KeyValue, bool) { + if field.Type != zapcore.InlineMarshalerType { + return nil, false + } + saf, ok := field.Interface.(scopeAttributesField) + if !ok { + return nil, false + } + return saf.attrs, true +} + +type coreWithAttributes struct { + zapcore.Core + sourceCore zapcore.Core + attrs []attribute.KeyValue + withFields []zap.Field +} + +var _ zapcore.Core = coreWithAttributes{} + +func (cwa coreWithAttributes) With(fields []zapcore.Field) zapcore.Core { + cwa.withFields = append(cwa.withFields, fields...) + cwa.Core = cwa.Core.With(fields) + return cwa +} + +func LoggerWithAttributes(logger *zap.Logger, attrs []attribute.KeyValue) *zap.Logger { + return logger.WithOptions(zap.WrapCore(func(c zapcore.Core) zapcore.Core { + return coreWithAttributes{ + Core: c.With([]zap.Field{makeScopeField(attrs)}), + sourceCore: c, + attrs: attrs, + } + })) +} + +func (cwa coreWithAttributes) DropInjectedAttributes(droppedAttrs ...string) zapcore.Core { + cwa.attrs = slices.DeleteFunc(slices.Clone(cwa.attrs), func(kv attribute.KeyValue) bool { + return slices.Contains(droppedAttrs, string(kv.Key)) + }) + cwa.Core = cwa.sourceCore.With(append([]zap.Field{makeScopeField(cwa.attrs)}, cwa.withFields...)) + return cwa +} diff --git a/internal/telemetry/componentattribute/meter_provider.go b/service/internal/componentattribute/meter_provider.go similarity index 68% rename from internal/telemetry/componentattribute/meter_provider.go rename to service/internal/componentattribute/meter_provider.go index d17732dde58..2d6646dc6d3 100644 --- a/internal/telemetry/componentattribute/meter_provider.go +++ b/service/internal/componentattribute/meter_provider.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package componentattribute // import "go.opentelemetry.io/collector/internal/telemetry/componentattribute" +package componentattribute // import "go.opentelemetry.io/collector/service/internal/componentattribute" import ( "slices" @@ -15,17 +15,6 @@ type meterProviderWithAttributes struct { attrs []attribute.KeyValue } -// MeterProviderWithAttributes creates a MeterProvider with a new set of injected instrumentation scope attributes. -func MeterProviderWithAttributes(mp metric.MeterProvider, attrs attribute.Set) metric.MeterProvider { - if mpwa, ok := mp.(meterProviderWithAttributes); ok { - mp = mpwa.MeterProvider - } - return meterProviderWithAttributes{ - MeterProvider: mp, - attrs: attrs.ToSlice(), - } -} - func (mpwa meterProviderWithAttributes) Meter(name string, opts ...metric.MeterOption) metric.Meter { conf := metric.NewMeterConfig(opts...) attrSet := conf.InstrumentationAttributes() @@ -35,3 +24,12 @@ func (mpwa meterProviderWithAttributes) Meter(name string, opts ...metric.MeterO opts = append(opts, metric.WithInstrumentationAttributes(newAttrs...)) return mpwa.MeterProvider.Meter(name, opts...) } + +func (mpwa meterProviderWithAttributes) DropInjectedAttributes(droppedAttrs ...string) metric.MeterProvider { + return meterProviderWithAttributes{ + MeterProvider: mpwa.MeterProvider, + attrs: slices.DeleteFunc(slices.Clone(mpwa.attrs), func(kv attribute.KeyValue) bool { + return slices.Contains(droppedAttrs, string(kv.Key)) + }), + } +} diff --git a/service/internal/componentattribute/telemetry.go b/service/internal/componentattribute/telemetry.go new file mode 100644 index 00000000000..cea5df76450 --- /dev/null +++ b/service/internal/componentattribute/telemetry.go @@ -0,0 +1,27 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package componentattribute // import "go.opentelemetry.io/collector/service/internal/componentattribute" + +import ( + "go.opentelemetry.io/otel/attribute" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/internal/telemetry" +) + +func TelemetrySettingsWithAttributes(ts component.TelemetrySettings, attrSet attribute.Set) component.TelemetrySettings { + attrs := attrSet.ToSlice() + ts.Logger = LoggerWithAttributes(ts.Logger, attrs) + ts.TracerProvider = tracerProviderWithAttributes{ + TracerProvider: ts.TracerProvider, + attrs: attrs, + } + if telemetry.NewPipelineTelemetryGate.IsEnabled() { + ts.MeterProvider = meterProviderWithAttributes{ + MeterProvider: ts.MeterProvider, + attrs: attrs, + } + } + return ts +} diff --git a/service/internal/componentattribute/telemetry_test.go b/service/internal/componentattribute/telemetry_test.go new file mode 100644 index 00000000000..d7d167b2ec3 --- /dev/null +++ b/service/internal/componentattribute/telemetry_test.go @@ -0,0 +1,194 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package componentattribute_test + +import ( + "context" + "encoding/json" + "strings" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/metric" + metricSdk "go.opentelemetry.io/otel/sdk/metric" + "go.opentelemetry.io/otel/sdk/metric/metricdata" + traceSdk "go.opentelemetry.io/otel/sdk/trace" + "go.opentelemetry.io/otel/sdk/trace/tracetest" + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + "go.uber.org/zap/zapcore" + "go.uber.org/zap/zaptest/observer" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/internal/telemetry" + "go.opentelemetry.io/collector/service/internal/componentattribute" +) + +func findScopeAttributesField(context []zap.Field) ([]attribute.KeyValue, bool) { + for _, field := range context { + scope, ok := componentattribute.ExtractLogScopeAttributes(field) + if ok { + return scope, true + } + } + return nil, false +} + +func attributeSetJSON(t *testing.T, set attribute.Set) string { + scopeBuf, err := json.Marshal(set.MarshalLog()) + require.NoError(t, err) + return string(scopeBuf) +} + +func getLogScopeAndFields(t *testing.T, logObs *observer.ObservedLogs) (string, string) { + logs := logObs.TakeAll() + require.Len(t, logs, 1) + log := logs[0] + require.Equal(t, "test", log.Message) + + scope, ok := findScopeAttributesField(log.Context) + require.True(t, ok, "Failed to find ScopeAttributesField field") + scopeStr := attributeSetJSON(t, attribute.NewSet(scope...)) + + enc := zapcore.NewJSONEncoder(zapcore.EncoderConfig{}) + fieldsBuf, err := enc.EncodeEntry(log.Entry, log.Context) + require.NoError(t, err) + fieldsStr := strings.TrimSuffix(fieldsBuf.String(), "\n") + + return scopeStr, fieldsStr +} + +func getSpanScope(t *testing.T, spanObs *tracetest.InMemoryExporter) string { + spans := spanObs.GetSpans().Snapshots() + spanObs.Reset() + require.Len(t, spans, 1) + span := spans[0] + require.Equal(t, "test", span.Name()) + return attributeSetJSON(t, span.InstrumentationScope().Attributes) +} + +func getMetricScope(t *testing.T, metricObs *metricSdk.ManualReader) string { + rm := metricdata.ResourceMetrics{} + err := metricObs.Collect(t.Context(), &rm) + require.NoError(t, err) + require.Len(t, rm.ScopeMetrics, 1) + return attributeSetJSON(t, rm.ScopeMetrics[0].Scope.Attributes) +} + +type TestResults struct { + LogScope string + LogFields string + SpanScope string + MetricScope string +} + +func getScopes(t *testing.T, tswa component.TelemetrySettings, logObs *observer.ObservedLogs, spanObs *tracetest.InMemoryExporter, metricObs *metricSdk.ManualReader) TestResults { + // Create new tracer, meter, and metric instrument + tracer := tswa.TracerProvider.Tracer("test", trace.WithInstrumentationAttributes(attribute.String("after", "val"))) + meter := tswa.MeterProvider.Meter("test", metric.WithInstrumentationAttributes(attribute.String("after", "val"))) + gauge, err := meter.Int64Gauge("test") + require.NoError(t, err) + + // Emit a log, a span, and a metric point + tswa.Logger.Info("test", zap.String("manual", "val")) + logScope, logFields := getLogScopeAndFields(t, logObs) + + _, span := tracer.Start(t.Context(), "test") + span.End() + + gauge.Record(t.Context(), 1) + + // Check resulting scope attributes + return TestResults{ + LogScope: logScope, + LogFields: logFields, + SpanScope: getSpanScope(t, spanObs), + MetricScope: getMetricScope(t, metricObs), + } +} + +type tracerProviderWrapper struct { + trace.TracerProvider +} + +func testTelemetryWithAttributes(t *testing.T, useTraceSdk bool) { + prevState := telemetry.NewPipelineTelemetryGate.IsEnabled() + require.NoError(t, featuregate.GlobalRegistry().Set(telemetry.NewPipelineTelemetryGate.ID(), true)) + defer func() { + require.NoError(t, featuregate.GlobalRegistry().Set(telemetry.NewPipelineTelemetryGate.ID(), prevState)) + }() + + // Setup mock TelemetrySettings + core, logObs := observer.New(zap.DebugLevel) + logger := zap.New(core) + logger = logger.With(zap.String("before", "val")) + + spanObs := tracetest.NewInMemoryExporter() + var tracerProvider trace.TracerProvider = traceSdk.NewTracerProvider(traceSdk.WithSpanProcessor(traceSdk.NewSimpleSpanProcessor(spanObs))) + if !useTraceSdk { + tracerProvider = tracerProviderWrapper{TracerProvider: tracerProvider} + } + + // Use delta temporality so points from the first step are no longer exported in the second step + metricObs := metricSdk.NewManualReader(metricSdk.WithTemporalitySelector(func(metricSdk.InstrumentKind) metricdata.Temporality { + return metricdata.DeltaTemporality + })) + meterProvider := metricSdk.NewMeterProvider(metricSdk.WithReader(metricObs)) + + ts := component.TelemetrySettings{ + Logger: logger, + TracerProvider: tracerProvider, + MeterProvider: meterProvider, + } + + // Inject attributes + tswa := componentattribute.TelemetrySettingsWithAttributes(ts, attribute.NewSet( + attribute.String("injected1", "val"), + attribute.String("injected2", "val"), + )) + + // Check that SDK-only methods are accessible through Unwrap + wrapped, ok := tswa.TracerProvider.(interface { + Unwrap() trace.TracerProvider + }) + if assert.True(t, ok) { + _, ok := wrapped.Unwrap().(interface { + ForceFlush(ctx context.Context) error + }) + assert.Equal(t, useTraceSdk, ok) + } + + // Add extra log attribute + tswa.Logger = tswa.Logger.With(zap.String("after", "val")) + + assert.Equal(t, TestResults{ + LogScope: `{"injected1":"val","injected2":"val"}`, + LogFields: `{"before":"val","injected1":"val","injected2":"val","after":"val","manual":"val"}`, + SpanScope: `{"after":"val","injected1":"val","injected2":"val"}`, + MetricScope: `{"after":"val","injected1":"val","injected2":"val"}`, + }, getScopes(t, tswa, logObs, spanObs, metricObs)) + + // Drop one injected attribute + tswa = telemetry.DropInjectedAttributes(tswa, "injected1") + + // Check scopes again + assert.Equal(t, TestResults{ + LogScope: `{"injected2":"val"}`, + LogFields: `{"before":"val","injected2":"val","after":"val","manual":"val"}`, + SpanScope: `{"after":"val","injected2":"val"}`, + MetricScope: `{"after":"val","injected2":"val"}`, + }, getScopes(t, tswa, logObs, spanObs, metricObs)) +} + +func TestTelemetryWithAttributes(t *testing.T) { + t.Run("sdk", func(t *testing.T) { + testTelemetryWithAttributes(t, true) + }) + t.Run("generic", func(t *testing.T) { + testTelemetryWithAttributes(t, false) + }) +} diff --git a/service/internal/componentattribute/tracer_provider.go b/service/internal/componentattribute/tracer_provider.go new file mode 100644 index 00000000000..79ce3ca9766 --- /dev/null +++ b/service/internal/componentattribute/tracer_provider.go @@ -0,0 +1,39 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package componentattribute // import "go.opentelemetry.io/collector/service/internal/componentattribute" + +import ( + "slices" + + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/trace" +) + +type tracerProviderWithAttributes struct { + trace.TracerProvider + attrs []attribute.KeyValue +} + +func (tpwa tracerProviderWithAttributes) Tracer(name string, options ...trace.TracerOption) trace.Tracer { + conf := trace.NewTracerConfig(options...) + attrSet := conf.InstrumentationAttributes() + // prepend our attributes so they can be overwritten + newAttrs := append(slices.Clone(tpwa.attrs), attrSet.ToSlice()...) + // append our attribute set option to overwrite the old one + options = append(options, trace.WithInstrumentationAttributes(newAttrs...)) + return tpwa.TracerProvider.Tracer(name, options...) +} + +func (tpwa tracerProviderWithAttributes) Unwrap() trace.TracerProvider { + return tpwa.TracerProvider +} + +func (tpwa tracerProviderWithAttributes) DropInjectedAttributes(droppedAttrs ...string) trace.TracerProvider { + return tracerProviderWithAttributes{ + TracerProvider: tpwa.TracerProvider, + attrs: slices.DeleteFunc(slices.Clone(tpwa.attrs), func(kv attribute.KeyValue) bool { + return slices.Contains(droppedAttrs, string(kv.Key)) + }), + } +} diff --git a/service/internal/graph/connector.go b/service/internal/graph/connector.go index 837033599e1..426e88b9796 100644 --- a/service/internal/graph/connector.go +++ b/service/internal/graph/connector.go @@ -13,12 +13,12 @@ import ( "go.opentelemetry.io/collector/connector/xconnector" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/xconsumer" - "go.opentelemetry.io/collector/internal/telemetry" "go.opentelemetry.io/collector/pipeline" "go.opentelemetry.io/collector/pipeline/xpipeline" "go.opentelemetry.io/collector/service/internal/attribute" "go.opentelemetry.io/collector/service/internal/builders" "go.opentelemetry.io/collector/service/internal/capabilityconsumer" + "go.opentelemetry.io/collector/service/internal/componentattribute" "go.opentelemetry.io/collector/service/internal/metadata" "go.opentelemetry.io/collector/service/internal/obsconsumer" "go.opentelemetry.io/collector/service/internal/refconsumer" @@ -59,7 +59,7 @@ func (n *connectorNode) buildComponent( ) error { set := connector.Settings{ ID: n.componentID, - TelemetrySettings: telemetry.WithAttributeSet(tel, *n.Set()), + TelemetrySettings: componentattribute.TelemetrySettingsWithAttributes(tel, *n.Set()), BuildInfo: info, } diff --git a/service/internal/graph/exporter.go b/service/internal/graph/exporter.go index d21f860918f..42d5a648404 100644 --- a/service/internal/graph/exporter.go +++ b/service/internal/graph/exporter.go @@ -11,11 +11,11 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/xconsumer" "go.opentelemetry.io/collector/exporter" - "go.opentelemetry.io/collector/internal/telemetry" "go.opentelemetry.io/collector/pipeline" "go.opentelemetry.io/collector/pipeline/xpipeline" "go.opentelemetry.io/collector/service/internal/attribute" "go.opentelemetry.io/collector/service/internal/builders" + "go.opentelemetry.io/collector/service/internal/componentattribute" "go.opentelemetry.io/collector/service/internal/metadata" "go.opentelemetry.io/collector/service/internal/obsconsumer" "go.opentelemetry.io/collector/service/internal/refconsumer" @@ -53,7 +53,7 @@ func (n *exporterNode) buildComponent( ) error { set := exporter.Settings{ ID: n.componentID, - TelemetrySettings: telemetry.WithAttributeSet(tel, *n.Set()), + TelemetrySettings: componentattribute.TelemetrySettingsWithAttributes(tel, *n.Set()), BuildInfo: info, } diff --git a/service/internal/graph/processor.go b/service/internal/graph/processor.go index 9a8f5ceb046..c46eddbbccb 100644 --- a/service/internal/graph/processor.go +++ b/service/internal/graph/processor.go @@ -10,12 +10,12 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/xconsumer" - "go.opentelemetry.io/collector/internal/telemetry" "go.opentelemetry.io/collector/pipeline" "go.opentelemetry.io/collector/pipeline/xpipeline" "go.opentelemetry.io/collector/processor" "go.opentelemetry.io/collector/service/internal/attribute" "go.opentelemetry.io/collector/service/internal/builders" + "go.opentelemetry.io/collector/service/internal/componentattribute" "go.opentelemetry.io/collector/service/internal/metadata" "go.opentelemetry.io/collector/service/internal/obsconsumer" "go.opentelemetry.io/collector/service/internal/refconsumer" @@ -53,7 +53,7 @@ func (n *processorNode) buildComponent(ctx context.Context, ) error { set := processor.Settings{ ID: n.componentID, - TelemetrySettings: telemetry.WithAttributeSet(tel, *n.Set()), + TelemetrySettings: componentattribute.TelemetrySettingsWithAttributes(tel, *n.Set()), BuildInfo: info, } diff --git a/service/internal/graph/receiver.go b/service/internal/graph/receiver.go index 76ca2bae81b..e1c23fae458 100644 --- a/service/internal/graph/receiver.go +++ b/service/internal/graph/receiver.go @@ -11,12 +11,12 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/xconsumer" "go.opentelemetry.io/collector/internal/fanoutconsumer" - "go.opentelemetry.io/collector/internal/telemetry" "go.opentelemetry.io/collector/pipeline" "go.opentelemetry.io/collector/pipeline/xpipeline" "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/service/internal/attribute" "go.opentelemetry.io/collector/service/internal/builders" + "go.opentelemetry.io/collector/service/internal/componentattribute" "go.opentelemetry.io/collector/service/internal/metadata" "go.opentelemetry.io/collector/service/internal/obsconsumer" ) @@ -46,7 +46,7 @@ func (n *receiverNode) buildComponent(ctx context.Context, ) error { set := receiver.Settings{ ID: n.componentID, - TelemetrySettings: telemetry.WithAttributeSet(tel, *n.Set()), + TelemetrySettings: componentattribute.TelemetrySettingsWithAttributes(tel, *n.Set()), BuildInfo: info, } diff --git a/service/internal/obsconsumer/logs.go b/service/internal/obsconsumer/logs.go index c2fcdf066fe..ff58afda927 100644 --- a/service/internal/obsconsumer/logs.go +++ b/service/internal/obsconsumer/logs.go @@ -6,13 +6,11 @@ package obsconsumer // import "go.opentelemetry.io/collector/service/internal/ob import ( "context" - "go.opentelemetry.io/otel/attribute" "go.uber.org/zap" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/internal/telemetry" - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" "go.opentelemetry.io/collector/pdata/plog" ) @@ -34,7 +32,7 @@ func NewLogs(cons consumer.Logs, set Settings, opts ...Option) consumer.Logs { consumerSet := Settings{ ItemCounter: set.ItemCounter, SizeCounter: set.SizeCounter, - Logger: set.Logger.With(componentattribute.ToZapFields(attribute.NewSet(o.staticDataPointAttributes...))...), + Logger: set.Logger.With(telemetry.ToZapFields(o.staticDataPointAttributes)...), } return obsLogs{ diff --git a/service/internal/obsconsumer/metrics.go b/service/internal/obsconsumer/metrics.go index 7c56e89548c..bcbf4dec829 100644 --- a/service/internal/obsconsumer/metrics.go +++ b/service/internal/obsconsumer/metrics.go @@ -6,13 +6,11 @@ package obsconsumer // import "go.opentelemetry.io/collector/service/internal/ob import ( "context" - "go.opentelemetry.io/otel/attribute" "go.uber.org/zap" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/internal/telemetry" - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" "go.opentelemetry.io/collector/pdata/pmetric" ) @@ -34,7 +32,7 @@ func NewMetrics(cons consumer.Metrics, set Settings, opts ...Option) consumer.Me consumerSet := Settings{ ItemCounter: set.ItemCounter, SizeCounter: set.SizeCounter, - Logger: set.Logger.With(componentattribute.ToZapFields(attribute.NewSet(o.staticDataPointAttributes...))...), + Logger: set.Logger.With(telemetry.ToZapFields(o.staticDataPointAttributes)...), } return obsMetrics{ diff --git a/service/internal/obsconsumer/profiles.go b/service/internal/obsconsumer/profiles.go index f47b464dc2b..6c1f757b491 100644 --- a/service/internal/obsconsumer/profiles.go +++ b/service/internal/obsconsumer/profiles.go @@ -6,14 +6,12 @@ package obsconsumer // import "go.opentelemetry.io/collector/service/internal/ob import ( "context" - "go.opentelemetry.io/otel/attribute" "go.uber.org/zap" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/xconsumer" "go.opentelemetry.io/collector/internal/telemetry" - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" "go.opentelemetry.io/collector/pdata/pprofile" ) @@ -35,7 +33,7 @@ func NewProfiles(cons xconsumer.Profiles, set Settings, opts ...Option) xconsume consumerSet := Settings{ ItemCounter: set.ItemCounter, SizeCounter: set.SizeCounter, - Logger: set.Logger.With(componentattribute.ToZapFields(attribute.NewSet(o.staticDataPointAttributes...))...), + Logger: set.Logger.With(telemetry.ToZapFields(o.staticDataPointAttributes)...), } return obsProfiles{ diff --git a/service/internal/obsconsumer/traces.go b/service/internal/obsconsumer/traces.go index 0c32bcef01b..0fd89dd33fe 100644 --- a/service/internal/obsconsumer/traces.go +++ b/service/internal/obsconsumer/traces.go @@ -6,13 +6,11 @@ package obsconsumer // import "go.opentelemetry.io/collector/service/internal/ob import ( "context" - "go.opentelemetry.io/otel/attribute" "go.uber.org/zap" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/internal/telemetry" - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" "go.opentelemetry.io/collector/pdata/ptrace" ) @@ -34,7 +32,7 @@ func NewTraces(cons consumer.Traces, set Settings, opts ...Option) consumer.Trac consumerSet := Settings{ ItemCounter: set.ItemCounter, SizeCounter: set.SizeCounter, - Logger: set.Logger.With(componentattribute.ToZapFields(attribute.NewSet(o.staticDataPointAttributes...))...), + Logger: set.Logger.With(telemetry.ToZapFields(o.staticDataPointAttributes)...), } return obsTraces{ diff --git a/service/telemetry/otelconftelemetry/logger.go b/service/telemetry/otelconftelemetry/logger.go index 8af9830239a..6ff097d375f 100644 --- a/service/telemetry/otelconftelemetry/logger.go +++ b/service/telemetry/otelconftelemetry/logger.go @@ -7,12 +7,10 @@ import ( "context" otelconf "go.opentelemetry.io/contrib/otelconf/v0.3.0" - "go.opentelemetry.io/otel/attribute" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/internal/telemetry/componentattribute" "go.opentelemetry.io/collector/service/telemetry" ) @@ -89,19 +87,17 @@ func createLogger( return nil, nil, err } - // Wrap the zap.Logger with componentattribute so scope attributes + // Wrap the zap.Logger with a special zap.Core so scope attributes // can be added and removed dynamically, and tee logs to the // LoggerProvider. loggerProvider := sdk.LoggerProvider() logger = logger.WithOptions(zap.WrapCore(func(core zapcore.Core) zapcore.Core { - core = componentattribute.NewConsoleCoreWithAttributes(core, attribute.NewSet()) - core = componentattribute.NewOTelTeeCoreWithAttributes( - core, - loggerProvider, - "go.opentelemetry.io/collector/service", - attribute.NewSet(), - ) - return core + provider := zapCoreProvider{ + sourceCore: core, + lp: loggerProvider, + scopeName: "go.opentelemetry.io/collector/service", + } + return provider.newCore() })) return logger, sdk.Shutdown, nil diff --git a/service/telemetry/otelconftelemetry/logger_tee.go b/service/telemetry/otelconftelemetry/logger_tee.go new file mode 100644 index 00000000000..f5e6e119130 --- /dev/null +++ b/service/telemetry/otelconftelemetry/logger_tee.go @@ -0,0 +1,98 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otelconftelemetry // import "go.opentelemetry.io/collector/service/telemetry/otelconftelemetry" + +import ( + "slices" + + "go.opentelemetry.io/contrib/bridges/otelzap" + "go.opentelemetry.io/otel/log" + "go.uber.org/multierr" + "go.uber.org/zap" + "go.uber.org/zap/zapcore" + + "go.opentelemetry.io/collector/service/internal/componentattribute" +) + +type zapCoreProvider struct { + sourceCore zapcore.Core + lp log.LoggerProvider + scopeName string +} + +func (zcp *zapCoreProvider) newCore() zapCore { + return zapCore{ + sourceCore: zcp.sourceCore, + otelCore: otelzap.NewCore( + zcp.scopeName, + otelzap.WithLoggerProvider(zcp.lp), + ), + provider: zcp, + } +} + +// This struct wraps the original Zap core in order to copy logs to a [log.LoggerProvider] using [otelzap]. +// For the copied logs, component attributes are injected as instrumentation scope attributes. +// +// Note that we intentionally do not use zapcore.NewTee here, because it will simply duplicate all log entries +// to each core. The provided Zap core may have sampling or a minimum log level applied to it, so in order to +// maintain consistency, we need to ensure that only the logs accepted by the provided core are copied to the +// log.LoggerProvider. +type zapCore struct { + sourceCore zapcore.Core // regular Zap core (logs to stderr) + otelCore zapcore.Core // otelzap core (forwards to OTel Logger) + provider *zapCoreProvider + withFields []zap.Field // additional fields injected by the user using .With +} + +var _ zapcore.Core = zapCore{} + +func (zc zapCore) With(fields []zapcore.Field) zapcore.Core { + zc.sourceCore = zc.sourceCore.With(fields) + fields = slices.DeleteFunc(fields, func(field zapcore.Field) bool { + scope, ok := componentattribute.ExtractLogScopeAttributes(field) + if !ok { + return false + } + // Set scope attributes + zc.otelCore = otelzap.NewCore( + zc.provider.scopeName, + otelzap.WithLoggerProvider(zc.provider.lp), + otelzap.WithAttributes(scope...), + ).With(zc.withFields) + return true + }) + zc.otelCore = zc.otelCore.With(fields) + zc.withFields = append(slices.Clone(zc.withFields), fields...) + return zc +} + +func (zc zapCore) Enabled(level zapcore.Level) bool { + return zc.sourceCore.Enabled(level) +} + +func (zc zapCore) Check(entry zapcore.Entry, ce *zapcore.CheckedEntry) *zapcore.CheckedEntry { + ce = zc.sourceCore.Check(entry, ce) + if ce != nil { + // Only log to the otelzap core if the source core accepted the log entry. + ce = ce.AddCore(entry, zc.otelCore) + } + return ce +} + +// This function should never be called, since only the inner cores add themselves to the CheckedEntry. +// But like zapcore.multiCore, we still implement it for compatibility with non-conforming users. +func (zc zapCore) Write(entry zapcore.Entry, fields []zapcore.Field) error { + return multierr.Append( + zc.sourceCore.Write(entry, fields), + zc.otelCore.Write(entry, fields), + ) +} + +func (zc zapCore) Sync() error { + return multierr.Append( + zc.sourceCore.Sync(), + zc.otelCore.Sync(), + ) +} diff --git a/service/telemetry/otelconftelemetry/logger_test.go b/service/telemetry/otelconftelemetry/logger_test.go index 261e9a8d45a..287d9fd7d69 100644 --- a/service/telemetry/otelconftelemetry/logger_test.go +++ b/service/telemetry/otelconftelemetry/logger_test.go @@ -5,23 +5,29 @@ package otelconftelemetry // import "go.opentelemetry.io/collector/service/telem import ( "context" + "encoding/json" "errors" "io" "net/http" "net/http/httptest" + "strings" "testing" "time" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" config "go.opentelemetry.io/contrib/otelconf/v0.3.0" + "go.opentelemetry.io/otel/attribute" semconv "go.opentelemetry.io/otel/semconv/v1.18.0" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" + internalTelemetry "go.opentelemetry.io/collector/internal/telemetry" "go.opentelemetry.io/collector/pdata/plog/plogotlp" + "go.opentelemetry.io/collector/service/internal/componentattribute" "go.opentelemetry.io/collector/service/telemetry" ) @@ -271,16 +277,7 @@ func TestCreateLoggerWithResource(t *testing.T) { func TestLogger_OTLP(t *testing.T) { // Create a backend to receive the logs and assert the content receivedLogs := 0 - logger := newOTLPLogger(t, zapcore.InfoLevel, func(_ http.ResponseWriter, request *http.Request) { - body, err := io.ReadAll(request.Body) - assert.NoError(t, err) - defer request.Body.Close() - - // Unmarshal the protobuf body into logs - req := plogotlp.NewExportRequest() - err = req.UnmarshalProto(body) - assert.NoError(t, err) - + logger := newOTLPLogger(t, zapcore.InfoLevel, func(req plogotlp.ExportRequest) { logs := req.Logs() rl := logs.ResourceLogs().At(0) @@ -309,8 +306,8 @@ func TestLogger_OTLP(t *testing.T) { require.Equal(t, totalLogs, receivedLogs) } -func newOTLPLogger(t *testing.T, level zapcore.Level, handler http.HandlerFunc) *zap.Logger { - srv := createBackend("/v1/logs", handler) +func newOTLPLogger(t *testing.T, level zapcore.Level, handler func(plogotlp.ExportRequest)) *zap.Logger { + srv := createLogsBackend(t, "/v1/logs", handler) t.Cleanup(srv.Close) processors := []config.LogRecordProcessor{{ @@ -348,8 +345,107 @@ func newOTLPLogger(t *testing.T, level zapcore.Level, handler http.HandlerFunc) return logger } -func createBackend(endpoint string, handler func(http.ResponseWriter, *http.Request)) *httptest.Server { +func createLogsBackend(t *testing.T, endpoint string, handler func(plogotlp.ExportRequest)) *httptest.Server { mux := http.NewServeMux() - mux.HandleFunc(endpoint, handler) + mux.HandleFunc(endpoint, func(_ http.ResponseWriter, request *http.Request) { + body, err := io.ReadAll(request.Body) + assert.NoError(t, err) + defer request.Body.Close() + + // Unmarshal the protobuf body into logs + req := plogotlp.NewExportRequest() + err = req.UnmarshalProto(body) + assert.NoError(t, err) + + handler(req) + }) return httptest.NewServer(mux) } + +func TestLogAttributeInjection(t *testing.T) { + core, consoleLogs := observer.New(zapcore.DebugLevel) + + var otlpLogs []plogotlp.ExportRequest + srv := createLogsBackend(t, "/v1/logs", func(req plogotlp.ExportRequest) { + otlpLogs = append(otlpLogs, req) + }) + t.Cleanup(srv.Close) + + set := telemetry.LoggerSettings{ + ZapOptions: []zap.Option{ + // Redirect console logs to the observer core + zap.WrapCore(func(zapcore.Core) zapcore.Core { return core }), + }, + } + cfg := &Config{ + Resource: map[string]*string{ + "service.instance.id": nil, + "service.name": nil, + "service.version": nil, + }, + Logs: LogsConfig{ + Encoding: "json", + Processors: []config.LogRecordProcessor{{ + Simple: &config.SimpleLogRecordProcessor{ + Exporter: config.LogRecordExporter{ + OTLP: &config.OTLP{ + // Send OTLP logs to the mock backend + Endpoint: ptr(srv.URL), + Protocol: ptr("http/protobuf"), + Insecure: ptr(true), + }, + }, + }, + }}, + }, + } + + sourceLogger, loggerProvider, err := createLogger(t.Context(), set, cfg) + require.NoError(t, err) + defer func() { + assert.NoError(t, loggerProvider.Shutdown(t.Context())) + }() + + ts := componenttest.NewNopTelemetrySettings() + ts.Logger = sourceLogger + ts = componentattribute.TelemetrySettingsWithAttributes(ts, attribute.NewSet( + attribute.String("injected1", "val"), + attribute.String("injected2", "val"), + )) + ts.Logger = ts.Logger.With(zap.String("after", "val")) + + fields, scope := checkScopes(t, ts.Logger, consoleLogs, &otlpLogs) + assert.JSONEq(t, `{"injected1":"val","injected2":"val","after":"val","manual":"val"}`, fields) + assert.JSONEq(t, `{"injected1":"val","injected2":"val"}`, scope) + + ts = internalTelemetry.DropInjectedAttributes(ts, "injected1") + + fields, scope = checkScopes(t, ts.Logger, consoleLogs, &otlpLogs) + assert.JSONEq(t, `{"injected2":"val","after":"val","manual":"val"}`, fields) + assert.JSONEq(t, `{"injected2":"val"}`, scope) +} + +func checkScopes(t *testing.T, logger *zap.Logger, consoleLogs *observer.ObservedLogs, otlpLogs *[]plogotlp.ExportRequest) (string, string) { + logger.Info("Test log message", zap.String("manual", "val")) + + require.Len(t, consoleLogs.All(), 1) + log := consoleLogs.TakeAll()[0] + enc := zapcore.NewJSONEncoder(zapcore.EncoderConfig{}) + fieldsBuf, err := enc.EncodeEntry(log.Entry, log.Context) + require.NoError(t, err) + fieldsStr := strings.TrimSuffix(fieldsBuf.String(), "\n") + + require.Len(t, *otlpLogs, 1) + req := (*otlpLogs)[0] + *otlpLogs = nil + rls := req.Logs().ResourceLogs() + require.Equal(t, 1, rls.Len()) + sls := rls.At(0).ScopeLogs() + require.Equal(t, 1, sls.Len()) + attrs := sls.At(0).Scope().Attributes() + scopeBuf, err := json.Marshal(attrs.AsRaw()) + require.NoError(t, err) + scopeStr := string(scopeBuf) + + return fieldsStr, scopeStr +} diff --git a/service/telemetry/telemetrytest/go.mod b/service/telemetry/telemetrytest/go.mod index e90a0719a84..cb1e14cebe2 100644 --- a/service/telemetry/telemetrytest/go.mod +++ b/service/telemetry/telemetrytest/go.mod @@ -45,8 +45,6 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.137.0 // indirect go.opentelemetry.io/collector/confmap v1.43.0 // indirect go.opentelemetry.io/collector/featuregate v1.43.0 // indirect - go.opentelemetry.io/collector/internal/telemetry v0.137.0 // indirect - go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect go.opentelemetry.io/contrib/otelconf v0.18.0 // indirect go.opentelemetry.io/otel v1.38.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0 // indirect diff --git a/service/telemetry/telemetrytest/go.sum b/service/telemetry/telemetrytest/go.sum index 967a251acc8..bdf2abe34c3 100644 --- a/service/telemetry/telemetrytest/go.sum +++ b/service/telemetry/telemetrytest/go.sum @@ -83,8 +83,6 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 h1:aBKdhLVieqvwWe9A79UHI/0vgp2t/s2euY8X59pGRlw= -go.opentelemetry.io/contrib/bridges/otelzap v0.13.0/go.mod h1:SYqtxLQE7iINgh6WFuVi2AI70148B8EI35DSk0Wr8m4= go.opentelemetry.io/contrib/otelconf v0.18.0 h1:ciF2Gf00BWs0DnexKFZXcxg9kJ8r3SUW1LOzW3CsKA8= go.opentelemetry.io/contrib/otelconf v0.18.0/go.mod h1:FcP7k+JLwBLdOxS6qY6VQ/4b5VBntI6L6o80IMwhAeI= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= @@ -113,8 +111,6 @@ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 h1:kJxSDN4SgWWTjG/ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0/go.mod h1:mgIOzS7iZeKJdeB8/NYHrJ48fdGc71Llo5bJ1J4DWUE= go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM= go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno= -go.opentelemetry.io/otel/log/logtest v0.14.0 h1:BGTqNeluJDK2uIHAY8lRqxjVAYfqgcaTbVk1n3MWe5A= -go.opentelemetry.io/otel/log/logtest v0.14.0/go.mod h1:IuguGt8XVP4XA4d2oEEDMVDBBCesMg8/tSGWDjuKfoA= go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=