From 3c7ebe659046947ab090c99d60fa666d895440b2 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Wed, 14 Aug 2024 08:34:35 -0700 Subject: [PATCH] Do not expand env variables in our distro (#5206) Rely on the envprovider instead. This change resolves two blocked feature gates and prepares for 0.107.0 release --- CHANGELOG.md | 4 + go.mod | 84 ++++----- go.sum | 168 +++++++++--------- internal/configsource/settings.go | 23 ++- internal/configsource/settings_test.go | 6 +- internal/configsource/source.go | 99 ++++------- internal/configsource/source_test.go | 51 +----- .../testdata/envvar_cfgsrc_mix.yaml | 23 --- .../testdata/envvar_cfgsrc_mix_expected.yaml | 29 --- .../confmapprovider/configsource/provider.go | 22 +-- .../confmapprovider/discovery/discoverer.go | 6 +- internal/settings/settings.go | 6 +- internal/settings/settings_test.go | 18 +- internal/tools/go.mod | 14 +- internal/tools/go.sum | 28 +-- pkg/extension/smartagentextension/go.mod | 10 +- pkg/extension/smartagentextension/go.sum | 20 +-- pkg/processor/timestampprocessor/go.mod | 18 +- pkg/processor/timestampprocessor/go.sum | 32 ++-- pkg/receiver/smartagentreceiver/go.mod | 26 +-- pkg/receiver/smartagentreceiver/go.sum | 52 +++--- tests/general/default_config_test.go | 4 +- .../host_observer_discovery_test.go | 1 - .../env_config_source_labels_expected.yaml | 36 ++-- .../testdata/envvar_labels_expected.yaml | 120 ++++++------- tests/go.mod | 50 +++--- tests/go.sum | 104 +++++------ 27 files changed, 479 insertions(+), 575 deletions(-) delete mode 100644 internal/configsource/testdata/envvar_cfgsrc_mix.yaml delete mode 100644 internal/configsource/testdata/envvar_cfgsrc_mix_expected.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 590e0e795a..647c746f50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### 🛑 Breaking changes 🛑 + +- (Splunk) `confmap`: Do not expand special shell variable such as `$*` in configuration files. ([#5206](https://github.com/signalfx/splunk-otel-collector/pull/5206)) + ## v0.106.1 This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.106.1](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.106.1) and the [opentelemetry-collector-contrib v0.106.1](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.106.1) releases where appropriate. diff --git a/go.mod b/go.mod index d1813e59f9..a7bcfe9f23 100644 --- a/go.mod +++ b/go.mod @@ -120,31 +120,31 @@ require ( github.com/stretchr/testify v1.9.0 go.etcd.io/bbolt v1.3.10 go.etcd.io/etcd/client/v2 v2.305.15 - go.opentelemetry.io/collector/config/confighttp v0.106.1 - go.opentelemetry.io/collector/config/configtelemetry v0.106.1 - go.opentelemetry.io/collector/confmap v0.106.1 - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.106.1 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.1 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1 - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.106.1 - go.opentelemetry.io/collector/connector v0.106.1 - go.opentelemetry.io/collector/connector/forwardconnector v0.106.1 - go.opentelemetry.io/collector/consumer/consumertest v0.106.1 - go.opentelemetry.io/collector/exporter v0.106.1 - go.opentelemetry.io/collector/exporter/debugexporter v0.106.1 - go.opentelemetry.io/collector/exporter/loggingexporter v0.106.1 - go.opentelemetry.io/collector/exporter/otlpexporter v0.106.1 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.106.1 - go.opentelemetry.io/collector/extension v0.106.1 - go.opentelemetry.io/collector/extension/ballastextension v0.106.1 - go.opentelemetry.io/collector/extension/zpagesextension v0.106.1 - go.opentelemetry.io/collector/otelcol v0.106.1 + go.opentelemetry.io/collector/config/confighttp v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/connector v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/connector/forwardconnector v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/consumer/consumertest v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/exporter v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/exporter/debugexporter v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/exporter/loggingexporter v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/exporter/otlpexporter v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/extension v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/extension/ballastextension v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/extension/zpagesextension v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/otelcol v0.106.2-0.20240807203117-91d6525f52a4 go.opentelemetry.io/collector/pdata v1.12.0 - go.opentelemetry.io/collector/processor v0.106.1 - go.opentelemetry.io/collector/processor/batchprocessor v0.106.1 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.106.1 - go.opentelemetry.io/collector/receiver v0.106.1 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.1 + go.opentelemetry.io/collector/processor v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/processor/batchprocessor v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/receiver v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.2-0.20240807203117-91d6525f52a4 go.opentelemetry.io/otel/metric v1.28.0 go.opentelemetry.io/otel/trace v1.28.0 go.uber.org/atomic v1.11.0 @@ -299,7 +299,7 @@ require ( github.com/seccomp/libseccomp-golang v0.10.0 // indirect github.com/sethvargo/go-limiter v0.7.2 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect - github.com/shirou/gopsutil/v4 v4.24.6 // indirect + github.com/shirou/gopsutil/v4 v4.24.7 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/signalfx/golib/v3 v3.3.53 // indirect github.com/signalfx/signalfx-agent v1.0.1-0.20230222185249-54e5d1064c5b // indirect @@ -320,24 +320,24 @@ require ( github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.mongodb.org/mongo-driver v1.16.0 // indirect - go.opentelemetry.io/collector v0.106.1 // indirect - go.opentelemetry.io/collector/client v0.106.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.106.1 // indirect + go.opentelemetry.io/collector v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/client v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/component/componentprofiles v0.106.1 // indirect + go.opentelemetry.io/collector/config/configauth v0.106.2-0.20240807203117-91d6525f52a4 // indirect go.opentelemetry.io/collector/config/configcompression v1.12.0 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.106.1 // indirect - go.opentelemetry.io/collector/config/confignet v0.106.1 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/config/confignet v0.106.2-0.20240807203117-91d6525f52a4 // indirect go.opentelemetry.io/collector/config/configopaque v1.12.0 // indirect go.opentelemetry.io/collector/config/configretry v1.12.0 // indirect go.opentelemetry.io/collector/config/configtls v1.12.0 // indirect - go.opentelemetry.io/collector/config/internal v0.106.1 // indirect - go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.1 // indirect - go.opentelemetry.io/collector/extension/auth v0.106.1 // indirect - go.opentelemetry.io/collector/filter v0.106.1 // indirect - go.opentelemetry.io/collector/internal/globalgates v0.106.1 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.106.1 // indirect - go.opentelemetry.io/collector/service v0.106.1 // indirect + go.opentelemetry.io/collector/config/internal v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/extension/auth v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/filter v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/service v0.106.2-0.20240807203117-91d6525f52a4 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect - go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect @@ -593,10 +593,10 @@ require ( go.etcd.io/etcd/client/pkg/v3 v3.5.15 // indirect go.mongodb.org/atlas v0.36.0 // indirect go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.106.1 - go.opentelemetry.io/collector/consumer v0.106.1 + go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/consumer v0.106.2-0.20240807203117-91d6525f52a4 go.opentelemetry.io/collector/featuregate v1.12.0 // indirect - go.opentelemetry.io/collector/semconv v0.106.1 + go.opentelemetry.io/collector/semconv v0.106.2-0.20240807203117-91d6525f52a4 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect @@ -607,7 +607,7 @@ require ( golang.org/x/crypto v0.26.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 golang.org/x/mod v0.18.0 // indirect - golang.org/x/net v0.27.0 // indirect + golang.org/x/net v0.28.0 // indirect golang.org/x/oauth2 v0.21.0 // indirect golang.org/x/sync v0.8.0 // indirect golang.org/x/term v0.23.0 // indirect diff --git a/go.sum b/go.sum index e5a6273381..b87e8c36d4 100644 --- a/go.sum +++ b/go.sum @@ -1637,8 +1637,8 @@ github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKl github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= -github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64= -github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= +github.com/shirou/gopsutil/v4 v4.24.7 h1:V9UGTK4gQ8HvcnPKf6Zt3XHyQq/peaekfxpJ2HSocJk= +github.com/shirou/gopsutil/v4 v4.24.7/go.mod h1:0uW/073rP7FYLOkvxolUQM5rMOLTNmRXnFKafpb71rw= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v1.7.1 h1:UJcjSAI3aUKx52kfcfhblgyhZceouhvvs3OYdWgn+PY= @@ -1832,102 +1832,104 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.106.1 h1:ZSQMpFGzFP3RILe1/+K80kCCT2ahn3MKt5e3u0Yz7Rs= -go.opentelemetry.io/collector v0.106.1/go.mod h1:1FabMxWLluLNcC0dq8cI01GaE6t6fYxE6Oxuf8u7AGQ= -go.opentelemetry.io/collector/client v0.106.1 h1:aBasAp+t7F30lI+oQpT95ZgYMiNaUlYRlgyeEvEGwjk= -go.opentelemetry.io/collector/client v0.106.1/go.mod h1:QEmOGAu/8vNn2lhwcLVI3iEUIoQlXNGWsdCfENN5qDc= -go.opentelemetry.io/collector/component v0.106.1 h1:6Xp4tKqnd/JkJDG/C4p1hto+Y5zvk5FwqZIdMCPzZlA= -go.opentelemetry.io/collector/component v0.106.1/go.mod h1:KiVE/5ZayuLlDJTe7mHqHRCn/5LrmF99C7/mKe54mWA= -go.opentelemetry.io/collector/config/configauth v0.106.1 h1:ANwKV2vzJoAcif/T23s5AIlDt8kTa8bUMcSN6fYAruQ= -go.opentelemetry.io/collector/config/configauth v0.106.1/go.mod h1:nBTtlQ2KoMnUEp1PXa6hMCwcJpJ59poUdKyDq1fO/R4= +go.opentelemetry.io/collector v0.106.2-0.20240807203117-91d6525f52a4 h1:411LuynrXSf808xCwnovqzXR5ixNBzP6k3p5X1q6DNM= +go.opentelemetry.io/collector v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:BPBPZO+r4GdcF4xu+qR2pweusp/ZTM4t0tGVsMQDXrI= +go.opentelemetry.io/collector/client v0.106.2-0.20240807203117-91d6525f52a4 h1:IJRI0rzkTRxt69lGJiyQ9kBedBLRr2FYjToz+GlXf5k= +go.opentelemetry.io/collector/client v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:QEmOGAu/8vNn2lhwcLVI3iEUIoQlXNGWsdCfENN5qDc= +go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4 h1:wnl2GLoMX5Xbs6AA6otTOuyvz3773m2CydcVf7v90mg= +go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:KiVE/5ZayuLlDJTe7mHqHRCn/5LrmF99C7/mKe54mWA= +go.opentelemetry.io/collector/component/componentprofiles v0.106.1 h1:6CJrWcMKYdi7Nnuzf+0AU+xsx7XcVxhKiiEHas9Ouvg= +go.opentelemetry.io/collector/component/componentprofiles v0.106.1/go.mod h1:58YdSQRXLxbbJXl8ONJmWvlhvVRy16t6yknXgZF+m+w= +go.opentelemetry.io/collector/config/configauth v0.106.2-0.20240807203117-91d6525f52a4 h1:7+HIjxEcegsJigl5xF/xKM344Pf9Qy1DjjDRHmsqtf0= +go.opentelemetry.io/collector/config/configauth v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:nBTtlQ2KoMnUEp1PXa6hMCwcJpJ59poUdKyDq1fO/R4= go.opentelemetry.io/collector/config/configcompression v1.12.0 h1:RxqSDVZPJyL7I3v+gdVDvnJ/9tV0ZWgraRDX/gaddfA= go.opentelemetry.io/collector/config/configcompression v1.12.0/go.mod h1:6+m0GKCv7JKzaumn7u80A2dLNCuYf5wdR87HWreoBO0= -go.opentelemetry.io/collector/config/configgrpc v0.106.1 h1:J0w1o/1vvJE2MtQAs4j+iq8ZMVZqduhoiu30hlsZeDo= -go.opentelemetry.io/collector/config/configgrpc v0.106.1/go.mod h1:aKGBNu/A4b3MEUUi1nNEuTHHCm/FNw9t56oUvQcFXi4= -go.opentelemetry.io/collector/config/confighttp v0.106.1 h1:OBX21JpJOVRASDnkwor5JpNz85qGvWYjtCIFO+5cUb8= -go.opentelemetry.io/collector/config/confighttp v0.106.1/go.mod h1:kafsg9XCdSHbgwOJO96Xxv3VolmjUN8KOozrjZzrun4= -go.opentelemetry.io/collector/config/confignet v0.106.1 h1:h/Rgqp5+1uKKJgsZuuLeO6zmJhdGi5PJGE2BdrM0eis= -go.opentelemetry.io/collector/config/confignet v0.106.1/go.mod h1:pfOrCTfSZEB6H2rKtx41/3RN4dKs+X2EKQbw3MGRh0E= +go.opentelemetry.io/collector/config/configgrpc v0.106.2-0.20240807203117-91d6525f52a4 h1:yfZ0gKsvBgafvBMGXpu4YcJL/SBb0bCvt8mkutspBLU= +go.opentelemetry.io/collector/config/configgrpc v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:nQ1KYTU1pGQeKZg3+cHhovJsAucaVN3yfFtJ+KyoLOU= +go.opentelemetry.io/collector/config/confighttp v0.106.2-0.20240807203117-91d6525f52a4 h1:B5Tc1lwI+xl5HiwI7CD3nwq9pm8HVhUuM3ZY4Tf4/7w= +go.opentelemetry.io/collector/config/confighttp v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:zwUf3uFmcgfNtWTUtb7oZ6/A4A9BH63TV43QB3Z8SHU= +go.opentelemetry.io/collector/config/confignet v0.106.2-0.20240807203117-91d6525f52a4 h1:1pOwNYG16Bsuhwe6Ud0kKxPqlUtYo+8VthCP3g7Kohc= +go.opentelemetry.io/collector/config/confignet v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:pfOrCTfSZEB6H2rKtx41/3RN4dKs+X2EKQbw3MGRh0E= go.opentelemetry.io/collector/config/configopaque v1.12.0 h1:aIsp9NdcLZSiG4YDoFPGXhmma03Tk+6e89+n8GtU/Mc= go.opentelemetry.io/collector/config/configopaque v1.12.0/go.mod h1:0xURn2sOy5j4fbaocpEYfM97HPGsiffkkVudSPyTJlM= go.opentelemetry.io/collector/config/configretry v1.12.0 h1:tEBwueO4AIkwWosxz6NWqnghdZ7y5SfHcIzLrvh6kB8= go.opentelemetry.io/collector/config/configretry v1.12.0/go.mod h1:P+RA0IA+QoxnDn4072uyeAk1RIoYiCbxYsjpKX5eFC4= -go.opentelemetry.io/collector/config/configtelemetry v0.106.1 h1:A8nwYnI6brfur5KPFC8GtVX/49pByvVoKSgO4qPXBqg= -go.opentelemetry.io/collector/config/configtelemetry v0.106.1/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40= +go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4 h1:EF55TfKoNEaRrRhXCkxTjqEg8zStji3bxWEdsOccAJA= +go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40= go.opentelemetry.io/collector/config/configtls v1.12.0 h1:Px0+GE4LE/9sXMgkwBb5g8QHWvnrnuRg9BLSa+QtxgM= go.opentelemetry.io/collector/config/configtls v1.12.0/go.mod h1:aeCGPlvrWhc+EySpIKdelPAj4l9wXKzZPouQO3NIoTs= -go.opentelemetry.io/collector/config/internal v0.106.1 h1:cEENs6xIMi4wjGF18JZX5uTV70mHPGfHKg9XndOubBs= -go.opentelemetry.io/collector/config/internal v0.106.1/go.mod h1:cmhchMcN0o/upXM7bxGv5djhhSW8kAYjKJoqT+AOxy0= -go.opentelemetry.io/collector/confmap v0.106.1 h1:R7HQIPDRPOEwauBeJUlkT8Elc5f0KQr/s/kQfZi05t0= -go.opentelemetry.io/collector/confmap v0.106.1/go.mod h1:iWdWgvxRYSHdAt5ySgPJq/i6fQMKGNnP5Pt7jOfTXno= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.106.1 h1:3x3evX4GgLBOZKN/ns/TRKF14wys59Fbqk+2GNonuio= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.106.1/go.mod h1:FDDZwrjxrjT9GVmmUF1D1ez9mxLlaZfq2xlJOT4lUXk= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.1 h1:F+uMAyoN7t/QgxepPnhTvtK8Hi+QO2FdTOT6a1leRuE= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.1/go.mod h1:Q+uBM6DZ5QxvlpAj4Xsga+bHjIYn5L2O6r9oyKeXogI= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1 h1:pV+cf8ToRA8r/Vhjs5ZcMJx+JWksrquC9g6+t6htCn0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1/go.mod h1:elTjMrKqic6TEeJheIM50spM62dVI3bM9TrTJ98yZOg= +go.opentelemetry.io/collector/config/internal v0.106.2-0.20240807203117-91d6525f52a4 h1:gvuLvoDeVT40hfihdfvhMqtlcL8sF328Axj0fRh2Uo4= +go.opentelemetry.io/collector/config/internal v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:cmhchMcN0o/upXM7bxGv5djhhSW8kAYjKJoqT+AOxy0= +go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4 h1:DaUT+pwy36oRYjfmAVkS55IwIdpq/EXibHos5eAJYsA= +go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:iWdWgvxRYSHdAt5ySgPJq/i6fQMKGNnP5Pt7jOfTXno= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.106.2-0.20240807203117-91d6525f52a4 h1:UKHv9bAdSiZYGCakAVw6zIUib1/5VAZuK+Jkp3owt84= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:WvxjqBZ/96xxD9jOHNLjATZljKNbkCrD2VIxzdJIigU= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.2-0.20240807203117-91d6525f52a4 h1:1YbWmduejOtyC28cS6X0XiTO1mp3Qz2PmuhNpv9izGs= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:Q+uBM6DZ5QxvlpAj4Xsga+bHjIYn5L2O6r9oyKeXogI= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.2-0.20240807203117-91d6525f52a4 h1:HnnD3jitIKzer/+kSFE2RqwY3LGBkERGE1kMMI83zMA= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:elTjMrKqic6TEeJheIM50spM62dVI3bM9TrTJ98yZOg= go.opentelemetry.io/collector/confmap/provider/httpprovider v0.106.1 h1:9M0nFRNE//2cpo24udkOj7ywmL3LQjZojVvImI6S0tA= go.opentelemetry.io/collector/confmap/provider/httpprovider v0.106.1/go.mod h1:2YZHqOVsA1SD14YBd25mChfptUdp7NVdPJjBijdXDHQ= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.106.1 h1:QMZSrCkSz4bXFA20L2f21K6GaaN82cAfJYVQ3B16AqI= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.106.1/go.mod h1:UEY1GybNnd3pUd+7shEZH93naz+YAfgjz+iCV16nwpk= -go.opentelemetry.io/collector/connector v0.106.1 h1:sgPSyzqKBuxo7qz+kTfa6GxSAtt0T6H9mwdm9VDYObA= -go.opentelemetry.io/collector/connector v0.106.1/go.mod h1:HpQIfCV9j72XjdnF0g+V4W064dy0Qu63hlb84rAXPZ4= -go.opentelemetry.io/collector/connector/forwardconnector v0.106.1 h1:8zZkdhBRiv02TAxEPQdIXhDIqqh6ho5SSsjzSIXv1fQ= -go.opentelemetry.io/collector/connector/forwardconnector v0.106.1/go.mod h1:cIoEA8VA9y2z4PYwgQURA0mtEP3BoVxs0HNzPL+KAco= -go.opentelemetry.io/collector/consumer v0.106.1 h1:+AQ/Kmoc/g0WP8thwymNkXk1jeWsHDK6XyYfdezcxcc= -go.opentelemetry.io/collector/consumer v0.106.1/go.mod h1:oy6pR/v5o/N9cxsICskyt//bU8k8EG0JeOO1MTDfs5A= -go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.1 h1:uxQjWm2XE7d1OncQDM9tL1ha+otGt1HjoRYIcQRMOfQ= -go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.1/go.mod h1:xQScBf9/PORFaYM6JVPOr7/TcRVEuKcW5XbAXfJByRs= -go.opentelemetry.io/collector/consumer/consumertest v0.106.1 h1:hDdFeVjCLIJ6iLfbiYcV9s+4iboFXbkJ/k3h09qusPw= -go.opentelemetry.io/collector/consumer/consumertest v0.106.1/go.mod h1:WRTYnQ8bYHQrEN6eJZ80oC4pNI7VeDRdsTZI6xs9o5M= -go.opentelemetry.io/collector/exporter v0.106.1 h1:PIqLqWacxSFcCstiF/6kxI1GLiP+9pjG7XFujxZG1z0= -go.opentelemetry.io/collector/exporter v0.106.1/go.mod h1:aGIoEwT5UjCHzq+oFYMuc5Mt15AfqvgDeLdjWTYSqNo= -go.opentelemetry.io/collector/exporter/debugexporter v0.106.1 h1:c0Eu6sjnzKxuBFdQedqYm9bOpnuOD/cpW2cs2tzzqS0= -go.opentelemetry.io/collector/exporter/debugexporter v0.106.1/go.mod h1:hewf5d4DRIcwW7oAfJtC5oLLCzjqUihfkaxEYdpNZJU= -go.opentelemetry.io/collector/exporter/loggingexporter v0.106.1 h1:p4fBGFJOIfo792N2bDBun0etcA1lmgK4kqZ+p+wUuF0= -go.opentelemetry.io/collector/exporter/loggingexporter v0.106.1/go.mod h1:TQNli7S42ybuPoXx/oTZUxtChb4QHnb/zBEfLrEKsHY= -go.opentelemetry.io/collector/exporter/otlpexporter v0.106.1 h1:XZmroqROemurXiRWAg4WfO0KkoooIcvzTi2aUcW5A8Q= -go.opentelemetry.io/collector/exporter/otlpexporter v0.106.1/go.mod h1:e01tHm+agklfj9C3jnLZd6ar+FvLCOw9VT2u87ao9IQ= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.106.1 h1:59QOiywrJnzJrXJSpfGb7D1aa62E9KRxrKzr8dxG3Nw= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.106.1/go.mod h1:XRaekwlir4wGOcoT8h0Lm6cqRU+n5aF8LWgpbp4Fk6M= -go.opentelemetry.io/collector/extension v0.106.1 h1:HNV2eOxaSDy5gL5KYoPoTLlp6fdeWmuw4paxhi10VUo= -go.opentelemetry.io/collector/extension v0.106.1/go.mod h1:DCOGxD+WnIJiDveKWlvH5WwB9AgqlRUlnKgwhNCLrtQ= -go.opentelemetry.io/collector/extension/auth v0.106.1 h1:IJyY5zeC11H/jlEGVx2bfTW0oVui2k1AjV8DnC6tYhE= -go.opentelemetry.io/collector/extension/auth v0.106.1/go.mod h1:4VcPLz6QTNq3fbY6kH5tvTnF6tWtz4toK2LC1ydpnts= -go.opentelemetry.io/collector/extension/ballastextension v0.106.1 h1:xQhGIA++g2SYxXU2xRZX2UunwjfBgmW40GSVTgKOdQs= -go.opentelemetry.io/collector/extension/ballastextension v0.106.1/go.mod h1:phNqr8m/NAccNjWFE9HBBx1ma/DX+Gt6sRj4tzAydFQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.106.1 h1:y8Jm7r2UMiph6AQ9HU+9kUaTy2PkUwxLUZSGY8fa5BI= -go.opentelemetry.io/collector/extension/zpagesextension v0.106.1/go.mod h1:T/XBrOUQzQ0QnwViDbwPl4s3ltJi9GL/ilftQIUoyJ4= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.106.2-0.20240807203117-91d6525f52a4 h1:fsuxu/F/G10hiXJYLtJRjSeONq9gzsCBEXQr2fF4dnM= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:UEY1GybNnd3pUd+7shEZH93naz+YAfgjz+iCV16nwpk= +go.opentelemetry.io/collector/connector v0.106.2-0.20240807203117-91d6525f52a4 h1:OwyeRX4rpQXRhc45Uq0oOWex2niINTB0qWthxkDskSk= +go.opentelemetry.io/collector/connector v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:OD40UWogyfRQ/XHqa8eZX3nT3LZQLwPIfVN5huO4uJI= +go.opentelemetry.io/collector/connector/forwardconnector v0.106.2-0.20240807203117-91d6525f52a4 h1:fvnDGpbhsQzqs7agm7OhB12Atacll7rQOYsij/4GWn8= +go.opentelemetry.io/collector/connector/forwardconnector v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:3XEqWXW3NC7Wo1s+L+n8JmJLOrORtUoqzv5DzYnBNFY= +go.opentelemetry.io/collector/consumer v0.106.2-0.20240807203117-91d6525f52a4 h1:ZPPXh3LOQCWiVha/ONA0poj6gcc3xiYvuuJZYgwmU04= +go.opentelemetry.io/collector/consumer v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:oy6pR/v5o/N9cxsICskyt//bU8k8EG0JeOO1MTDfs5A= +go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.2-0.20240807203117-91d6525f52a4 h1:9vO1el0iyXOE1cSEozpt4EBsFFJA1DG8ayromSni4Ng= +go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:xQScBf9/PORFaYM6JVPOr7/TcRVEuKcW5XbAXfJByRs= +go.opentelemetry.io/collector/consumer/consumertest v0.106.2-0.20240807203117-91d6525f52a4 h1:hIm3ZnhSD3o4nbaccIe9Aip0wKVuLW2lHhaAuOrP0xo= +go.opentelemetry.io/collector/consumer/consumertest v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:WRTYnQ8bYHQrEN6eJZ80oC4pNI7VeDRdsTZI6xs9o5M= +go.opentelemetry.io/collector/exporter v0.106.2-0.20240807203117-91d6525f52a4 h1:RrUNq+0dreikPVSup51cWUu76r1Ijkh17o0HcH8lV1g= +go.opentelemetry.io/collector/exporter v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:BH3XtiJGIlnezwvfSTv+x5nBPmkiIWVhdBPo/81cI3I= +go.opentelemetry.io/collector/exporter/debugexporter v0.106.2-0.20240807203117-91d6525f52a4 h1:hTHeYrB9oINnX8/8QF/SUKe2hVj+nkPFkSBNPUgks1U= +go.opentelemetry.io/collector/exporter/debugexporter v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:5o6EMBjEXx3i1K/E2f3c8DaUYVVefprgrm1jriO1Ops= +go.opentelemetry.io/collector/exporter/loggingexporter v0.106.2-0.20240807203117-91d6525f52a4 h1:KqnKY+JxdXA/pJk7TVoxIaaYLtQ+3bfpCe8JT7CUYlY= +go.opentelemetry.io/collector/exporter/loggingexporter v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:W1p2Z5wwCABWh2hNJOtxOzcTe9jWR+KzZGIu9WobJf4= +go.opentelemetry.io/collector/exporter/otlpexporter v0.106.2-0.20240807203117-91d6525f52a4 h1:QgI7hM/TunO3Sf0tcnQm7CeJhP7UcdUuMWOCFU033Ck= +go.opentelemetry.io/collector/exporter/otlpexporter v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:ASsI5/a1Za6a3HRIoYr/QI0eu8gYV1Qv7rJyauly4sU= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.106.2-0.20240807203117-91d6525f52a4 h1:B29mNNf9byvHpTFxHPX/rScM/40+fJzZEdOLWh0cBtw= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:Euia4gGKL3DZ1ZplxHSithjiqidzo86ssOaiIVss2zo= +go.opentelemetry.io/collector/extension v0.106.2-0.20240807203117-91d6525f52a4 h1:Fnm6d1/mL42GKUKsj2neg59zQq+0154Ef1dmpSLBXTI= +go.opentelemetry.io/collector/extension v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:DCOGxD+WnIJiDveKWlvH5WwB9AgqlRUlnKgwhNCLrtQ= +go.opentelemetry.io/collector/extension/auth v0.106.2-0.20240807203117-91d6525f52a4 h1:6vnjFi9gNi/sYnVipjk2K2JsswuNvbmmf2mgdms7d80= +go.opentelemetry.io/collector/extension/auth v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:4VcPLz6QTNq3fbY6kH5tvTnF6tWtz4toK2LC1ydpnts= +go.opentelemetry.io/collector/extension/ballastextension v0.106.2-0.20240807203117-91d6525f52a4 h1:ehLfw173wFRxlowGiSJYUZdcyGagaGjzYsk8mmC5p/s= +go.opentelemetry.io/collector/extension/ballastextension v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:tRDqJbgBzR1umbtE3ju7qBw2+QEA8hGjjxnHeSldK6g= +go.opentelemetry.io/collector/extension/zpagesextension v0.106.2-0.20240807203117-91d6525f52a4 h1:ESQLtCbxBvtCGGSyvfP8nf5puYCCOIEsnq/rDy3M7+I= +go.opentelemetry.io/collector/extension/zpagesextension v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:v0oFBbFwV6zomCILjtpd8VXv8FkHD7J1lVTznslUko0= go.opentelemetry.io/collector/featuregate v1.12.0 h1:l5WbV2vMQd2bL8ubfGrbKNtZaeJRckE12CTHvRe47Tw= go.opentelemetry.io/collector/featuregate v1.12.0/go.mod h1:PsOINaGgTiFc+Tzu2K/X2jP+Ngmlp7YKGV1XrnBkH7U= -go.opentelemetry.io/collector/filter v0.106.1 h1:J95LA0kRsQaj2lPrB5GiGK88K/7X2s9vPzFhaaV5sLw= -go.opentelemetry.io/collector/filter v0.106.1/go.mod h1:Q2FqRhdM35xTO5nlqySPCoVXzb4DlPWzWeekZY2OVFg= -go.opentelemetry.io/collector/internal/globalgates v0.106.1 h1:0NQHTcykmYNDsNKObJ2XocGCv3WUAQZppfP3o6hZUIA= -go.opentelemetry.io/collector/internal/globalgates v0.106.1/go.mod h1:Z5US6O2xkZAtxVSSBnHAPFZwPhFoxlyKLUvS67Vx4gc= -go.opentelemetry.io/collector/otelcol v0.106.1 h1:2l8jPxCXD2eHdJ2ScAUE3PJEa9hs7lInVvUjoX9DYsI= -go.opentelemetry.io/collector/otelcol v0.106.1/go.mod h1:l9z6YZ3GaykIeUT0hrMlnF/uHhbPvXWEhLkd3yHSKNQ= +go.opentelemetry.io/collector/filter v0.106.2-0.20240807203117-91d6525f52a4 h1:FJL0E35CqEatw2xjoly4HS1U+hzlAhA44hrrUodzrfw= +go.opentelemetry.io/collector/filter v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:Q2FqRhdM35xTO5nlqySPCoVXzb4DlPWzWeekZY2OVFg= +go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4 h1:DKcDgtQ7/oPijKGvBj0kIq/aZ/IPXiL3Tc79CDiU/b4= +go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:Z5US6O2xkZAtxVSSBnHAPFZwPhFoxlyKLUvS67Vx4gc= +go.opentelemetry.io/collector/otelcol v0.106.2-0.20240807203117-91d6525f52a4 h1:tr8YkWDtHvM1uHNHmzqQkIRhiy55JYFKFPArvoXSZLE= +go.opentelemetry.io/collector/otelcol v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:QpBbT6uBCIh4JGLSz2pp8ahf96LUPgak2Cs2vIxG5/o= go.opentelemetry.io/collector/otelcol/otelcoltest v0.106.1 h1:25iSPGStiMMpyoJZVlpu0jGiJoFIBN7X1oJu93jeU+0= go.opentelemetry.io/collector/otelcol/otelcoltest v0.106.1/go.mod h1:gm7oBWyC+PcCYGbbF21s8cyUO9BrHIGI1OpzWkov8Js= go.opentelemetry.io/collector/pdata v1.12.0 h1:Xx5VK1p4VO0md8MWm2icwC1MnJ7f8EimKItMWw46BmA= go.opentelemetry.io/collector/pdata v1.12.0/go.mod h1:MYeB0MmMAxeM0hstCFrCqWLzdyeYySim2dG6pDT6nYI= -go.opentelemetry.io/collector/pdata/pprofile v0.106.1 h1:nOLo25YnluNi+zAbU7G24RN86cJ1/EZJc6VEayBlOPo= -go.opentelemetry.io/collector/pdata/pprofile v0.106.1/go.mod h1:chr7lMJIzyXkccnPRkIPhyXtqLZLSReZYhwsggOGEfg= +go.opentelemetry.io/collector/pdata/pprofile v0.106.2-0.20240807203117-91d6525f52a4 h1:3SjfsYDnsV94ToC+TEo/SMk/kSYvkAaXext1Zd6kEik= +go.opentelemetry.io/collector/pdata/pprofile v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:chr7lMJIzyXkccnPRkIPhyXtqLZLSReZYhwsggOGEfg= go.opentelemetry.io/collector/pdata/testdata v0.106.1 h1:JUyLAwKD8o/9jgkBi16zOClxOyY028A7XIXHPV4mNmM= go.opentelemetry.io/collector/pdata/testdata v0.106.1/go.mod h1:ghdz2RDEzsfigW0J+9oqA4fGmQJ/DJYUhE3vYU6JfhM= -go.opentelemetry.io/collector/processor v0.106.1 h1:W/SmNRkGLf6dOWjdqU5WlDnPLDQJRyHZxI6X8IQwFec= -go.opentelemetry.io/collector/processor v0.106.1/go.mod h1:D4Ni5zbK/QtkIxSbDEZanUcLN9zM3JnlU9hc3Qm/o6I= -go.opentelemetry.io/collector/processor/batchprocessor v0.106.1 h1:Y4UmOQ1Z7snZtUCcV4cMqZ4gTJIC1ZfFkX9syURAR94= -go.opentelemetry.io/collector/processor/batchprocessor v0.106.1/go.mod h1:GhItPJqVivS1zm1Y0/wGOnR0orr3joNfT2A2xZAR6Wk= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.106.1 h1:UnCZR1XrP54OQ+2NS5tD6Kzv4nK38G+oCQDuUDfJOso= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.106.1/go.mod h1:UgxhLwtAvVjrACkS6jcp3oSHyQWu/LAjVSTmW1/NjKs= -go.opentelemetry.io/collector/receiver v0.106.1 h1:9kDLDJmInnz+AzAV9oV/UGMoc1+oI1pwMMs7+uMiJq4= -go.opentelemetry.io/collector/receiver v0.106.1/go.mod h1:3j9asWz7mqsgE77rPaNhlNQhRwgFhRynf0UEPs/4rkM= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.1 h1:Z4wSuYpTpnrgUHq6XnG8eHNCXzSsF+yDODzZdVV2GmU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.1/go.mod h1:IE8RQoGF84xPW0UzRkyq6eT8mVbSu5vuXGRrKjK7iaM= -go.opentelemetry.io/collector/semconv v0.106.1 h1:x0OSXrQCFinqZNUPTKrHU0gnbwngOVOPyhedQCDyDoQ= -go.opentelemetry.io/collector/semconv v0.106.1/go.mod h1:yMVUCNoQPZVq/IPfrHrnntZTWsLf5YGZ7qwKulIl5hw= -go.opentelemetry.io/collector/service v0.106.1 h1:4J65Whf5PolHQpk4jYYSGWOHDx388WJVwCvSejEl80I= -go.opentelemetry.io/collector/service v0.106.1/go.mod h1:F0iQAF7tY2eYR8Gc9TSEFR2sNJtzrLwp89zAD7H2RJs= +go.opentelemetry.io/collector/processor v0.106.2-0.20240807203117-91d6525f52a4 h1:rzZGdwrLRTgJHcyaoYE16zoJF9pWWfh9xJE3NrfAJqA= +go.opentelemetry.io/collector/processor v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:p/yeFx4r8WQ/ajVhzjLHVqCeQfsQoxPJ3EKgrvwrgIY= +go.opentelemetry.io/collector/processor/batchprocessor v0.106.2-0.20240807203117-91d6525f52a4 h1:Eq9qR4GV3ZkWkW9oN5fw1gXI/Ki/1Wgj+TQfGiTnvgs= +go.opentelemetry.io/collector/processor/batchprocessor v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:d27ZhKFzL4i87I0lbMB0nJ439/6K0lBJdGoYVQbHWHE= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.106.2-0.20240807203117-91d6525f52a4 h1:CMuE6MQqXyBxwlMMZ6VHph4G2rFIbbi1eS1TiynYPu0= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:RTfhAGld68Vn/RaPM4uIIwFGzFTW2tFm2BwXYGef7hc= +go.opentelemetry.io/collector/receiver v0.106.2-0.20240807203117-91d6525f52a4 h1:TRNp92BWa9RruSJHgHZFMiuCKU+Y6VGETujakYzjOzc= +go.opentelemetry.io/collector/receiver v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:+J2FEg4eDYdUuaDW8Cn41SeqFiuKdvnZOZlXvbVdVaw= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.2-0.20240807203117-91d6525f52a4 h1:DcgwNnPh13PDWhnMH+6RMLc6CXPOCh+Pdf1KOv1isIk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:DMbSNrcZdmojheFNDF60uRIx5B+QdXlChkDfslkvASg= +go.opentelemetry.io/collector/semconv v0.106.2-0.20240807203117-91d6525f52a4 h1:SsC+Ek4l7QEAF3YHWu2aCY3JYxI19Y04m/vh3I/EYjM= +go.opentelemetry.io/collector/semconv v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:yMVUCNoQPZVq/IPfrHrnntZTWsLf5YGZ7qwKulIl5hw= +go.opentelemetry.io/collector/service v0.106.2-0.20240807203117-91d6525f52a4 h1:DsZDg1GjYWplU211DKNbcNVgdCvF5J1Nrb1sTFwrySI= +go.opentelemetry.io/collector/service v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:YvgW4yzyKgcK/jDLskQ9My7VuZy8xG8Vho4nUqT+PMM= go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= @@ -1940,8 +1942,6 @@ go.opentelemetry.io/contrib/zpages v0.53.0 h1:hGgaJ3nrescxEk383gOBHA5gNfoquHs8oV go.opentelemetry.io/contrib/zpages v0.53.0/go.mod h1:iOo8fpUxMAu5+4x9DSEQeUOCeY19KaN6v2OPSeIggz4= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= -go.opentelemetry.io/otel/bridge/opencensus v1.28.0 h1:/BcyAV1bUJjSVxoeKwTQL9cS4X1iC6izZ9mheeuVSCU= -go.opentelemetry.io/otel/bridge/opencensus v1.28.0/go.mod h1:FZp2xE+46yAyp3DfLFALze58nY0iIE8zs+mCgkPAzq0= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0/go.mod h1:gcj2fFjEsqpV3fXuzAA+0Ze1p2/4MJ4T7d77AmkvueQ= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= @@ -2117,8 +2117,8 @@ golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= diff --git a/internal/configsource/settings.go b/internal/configsource/settings.go index 688486e609..f4d1ffd582 100644 --- a/internal/configsource/settings.go +++ b/internal/configsource/settings.go @@ -86,7 +86,7 @@ func sourceSettings(ctx context.Context, v *confmap.Conf, factories Factories, c if err != nil { return nil, err } - splitMap[key] = value + splitMap[key] = escapeDollarSigns(value) } } settingsMap, err := confmap.NewFromStringMap(splitMap).Sub(configSourcesKey) @@ -97,6 +97,27 @@ func sourceSettings(ctx context.Context, v *confmap.Conf, factories Factories, c return loadSettings(settingsMap.ToStringMap(), factories) } +func escapeDollarSigns(val any) any { + switch v := val.(type) { + case string: + return strings.ReplaceAll(v, "$$", "$") + case []any: + nslice := make([]any, len(v)) + for i, x := range v { + nslice[i] = escapeDollarSigns(x) + } + return nslice + case map[string]any: + nmap := make(map[string]any, len(v)) + for k, x := range v { + nmap[k] = escapeDollarSigns(x) + } + return nmap + default: + return val + } +} + func loadSettings(settingsMap map[string]any, factories Factories) (map[string]Settings, error) { settings := make(map[string]Settings) diff --git a/internal/configsource/settings_test.go b/internal/configsource/settings_test.go index 656edc7d06..09b9036cbb 100644 --- a/internal/configsource/settings_test.go +++ b/internal/configsource/settings_test.go @@ -24,7 +24,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/provider/envprovider" ) func TestConfigSourceParser(t *testing.T) { @@ -122,7 +124,9 @@ func TestConfigSourceParser(t *testing.T) { }() } - cfgSrcSettings, splitConf, err := SettingsFromConf(ctx, v, tt.factories, nil) + cfgSrcSettings, splitConf, err := SettingsFromConf(ctx, v, tt.factories, map[string]confmap.Provider{ + "env": envprovider.NewFactory().Create(confmap.ProviderSettings{}), + }) if tt.wantErr != "" { require.ErrorContains(t, err, tt.wantErr) require.Nil(t, splitConf) diff --git a/internal/configsource/source.go b/internal/configsource/source.go index 77cb401d82..25c28cc3eb 100644 --- a/internal/configsource/source.go +++ b/internal/configsource/source.go @@ -19,7 +19,6 @@ import ( "fmt" "log" "net/url" - "os" "strings" "sync" @@ -334,37 +333,48 @@ func resolveStringValue(ctx context.Context, configSources map[string]ConfigSour buf = append(buf, s[i:j]...) var expandableContent, cfgSrcName string + var retrieved any w := 0 // number of bytes consumed on this pass var deprecatedFormUsed bool switch { case s[j+1] == '{': expandableContent, w, cfgSrcName = getBracketedExpandableContent(s, j+1) - default: + case 'a' <= s[j+1] && s[j+1] <= 'z' || 'A' <= s[j+1] && s[j+1] <= 'Z': deprecatedFormUsed = true expandableContent, w, cfgSrcName = getBareExpandableContent(s, j+1) + default: + // The next character cannot be used to start an expandable content, ignore it. + // $$ escaping is being handled upstream. + retrieved = s[j : j+2] + w = 1 } - // At this point expandableContent contains a string to be expanded, evaluate and expand it. - switch { - case cfgSrcName == "": - // Not a config source, expand as os.ExpandEnv - if deprecatedFormUsed { - printDeprecationWarningOnce(fmt.Sprintf( - "[WARNING] Variable substitution using $VAR has been deprecated in favor of ${VAR} and "+ - "${env:VAR}. Please update $%s in your configuration", expandableContent)) + if retrieved == nil { + // At this point expandableContent contains a string to be expanded, evaluate and expand it. + switch { + case cfgSrcName == "": + // Not a config source, expand as os.ExpandEnv + if deprecatedFormUsed { + printDeprecationWarningOnce(fmt.Sprintf( + "[WARNING] Variable substitution using $VAR has been deprecated in favor of ${VAR} and "+ + "${env:VAR}. Please update $%s in your configuration", expandableContent)) + } + cfgSrcName = "env" + expandableContent = fmt.Sprintf("env:%s", expandableContent) + default: + if deprecatedFormUsed { + printDeprecationWarningOnce(fmt.Sprintf( + "[WARNING] Config source expansion formatted as $uri:selector has been deprecated, "+ + "use ${uri:selector[?params]} instead. Please replace $%s with ${%s} in your configuration", + expandableContent, expandableContent)) + } } - buf = osExpandEnv(buf, expandableContent, w) - default: - if deprecatedFormUsed { - printDeprecationWarningOnce(fmt.Sprintf( - "[WARNING] Config source expansion formatted as $uri:selector has been deprecated, "+ - "use ${uri:selector[?params]} instead. Please replace $%s with ${%s} in your configuration", - expandableContent, expandableContent)) - } // A config source, retrieve and apply results. - retrieved, closeFunc, err := retrieveConfigSourceData(ctx, configSources, confmapProviders, cfgSrcName, expandableContent, watcher) + var closeFunc confmap.CloseFunc + var err error + retrieved, closeFunc, err = retrieveConfigSourceData(ctx, configSources, confmapProviders, cfgSrcName, expandableContent, watcher) if err != nil { return nil, nil, err } @@ -398,17 +408,17 @@ func resolveStringValue(ctx context.Context, configSources map[string]ConfigSour return retrieved, MergeCloseFuncs(closeFuncs), nil } + } - // Either there was a prefix already or there are still characters to be processed. - if retrieved == nil { - // Since this is going to be concatenated to a string use "" instead of nil, - // otherwise the string will end up with "". - retrieved = "" - } - - buf = append(buf, fmt.Sprintf("%v", retrieved)...) + // Either there was a prefix already or there are still characters to be processed. + if retrieved == nil { + // Since this is going to be concatenated to a string use "" instead of nil, + // otherwise the string will end up with "". + retrieved = "" } + buf = append(buf, fmt.Sprintf("%v", retrieved)...) + j += w // move the index of the char being checked (j) by the number of characters consumed (w) on this iteration. i = j + 1 // update start index (i) of next slice of bytes to be copied. } @@ -610,24 +620,6 @@ func parseParamsAsURLQuery(s string) (*confmap.Conf, error) { return confmap.NewFromStringMap(params), err } -// osExpandEnv replicate the internal behavior of os.ExpandEnv when handling env -// vars updating the buffer accordingly. -func osExpandEnv(buf []byte, name string, w int) []byte { - switch { - case name == "" && w > 0: - // Encountered invalid syntax; eat the - // characters. - case name == "" || name == "$": - // Valid syntax, but $ was not followed by a - // name. Leave the dollar character untouched. - buf = append(buf, expandPrefixChar) - default: - buf = append(buf, os.Getenv(name)...) - } - - return buf -} - // scanToClosingBracket consumes everything until a closing bracket '}' following the // same logic of function getShellName (os package, env.go) when handling environment // variables with the "${}" syntax. It returns the expression between brackets @@ -648,11 +640,6 @@ func scanToClosingBracket(s string) (string, int) { // variable or config source. It returns the name of the config source or environment // variable and the number of characters consumed from the original string. func getTokenName(s string) (string, int) { - if len(s) > 0 && isShellSpecialVar(s[0]) { - // Special shell character, treat it os.Expand function. - return s[0:1], 1 - } - var i int firstNameSepIdx := -1 for i = 0; i < len(s); i++ { @@ -684,18 +671,6 @@ func getTokenName(s string) (string, int) { return s[:i], i } -// Below are helper functions used by os.Expand, copied without changes from original sources (env.go). - -// isShellSpecialVar reports whether the character identifies a special -// shell variable such as $*. -func isShellSpecialVar(c uint8) bool { - switch c { - case '*', '#', '$', '@', '!', '?', '-', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - return true - } - return false -} - // isAlphaNum reports whether the byte is an ASCII letter, number, or underscore func isAlphaNum(c uint8) bool { return c == '_' || '0' <= c && c <= '9' || 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' diff --git a/internal/configsource/source_test.go b/internal/configsource/source_test.go index 96aca71467..1a183b085e 100644 --- a/internal/configsource/source_test.go +++ b/internal/configsource/source_test.go @@ -27,6 +27,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/provider/envprovider" "go.uber.org/zap" ) @@ -367,46 +368,6 @@ func TestConfigSourceManagerMultipleWatchForUpdate(t *testing.T) { assert.NoError(t, callClose(closeFunc)) } -func TestConfigSourceManagerEnvVarHandling(t *testing.T) { - require.NoError(t, os.Setenv("envvar", "envvar_value")) - defer func() { - assert.NoError(t, os.Unsetenv("envvar")) - }() - - tstCfgSrc := TestConfigSource{ - ValueMap: map[string]valueEntry{ - "int_key": {Value: 42}, - }, - } - - // Intercept "params_key" and create an entry with the params themselves. - tstCfgSrc.OnRetrieve = func(_ context.Context, selector string, paramsConfigMap *confmap.Conf) error { - var val any - if paramsConfigMap != nil { - val = paramsConfigMap.ToStringMap() - } - if selector == "params_key" { - tstCfgSrc.ValueMap[selector] = valueEntry{Value: val} - } - return nil - } - - file := path.Join("testdata", "envvar_cfgsrc_mix.yaml") - cp, err := confmaptest.LoadConf(file) - require.NoError(t, err) - - expectedFile := path.Join("testdata", "envvar_cfgsrc_mix_expected.yaml") - expectedParser, err := confmaptest.LoadConf(expectedFile) - require.NoError(t, err) - - res, closeFunc, err := ResolveWithConfigSources(context.Background(), map[string]ConfigSource{"tstcfgsrc": &tstCfgSrc}, nil, cp, func(_ *confmap.ChangeEvent) { - panic("must not be called") - }) - require.NoError(t, err) - assert.Equal(t, expectedParser.ToStringMap(), res.ToStringMap()) - assert.NoError(t, callClose(closeFunc)) -} - func TestManagerExpandString(t *testing.T) { ctx := context.Background() cfgSources := map[string]ConfigSource{ @@ -444,11 +405,6 @@ func TestManagerExpandString(t *testing.T) { input: "literal_string", want: "literal_string", }, - { - name: "escaped_$", - input: "$$tstcfgsrc:int_key$$envvar", - want: "$tstcfgsrc:int_key$envvar", - }, { name: "cfgsrc_int", input: "$tstcfgsrc:int_key", @@ -541,7 +497,10 @@ func TestManagerExpandString(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - got, closeFunc, err := resolveStringValue(ctx, cfgSources, nil, tt.input, func(_ *confmap.ChangeEvent) { + providers := map[string]confmap.Provider{ + "env": envprovider.NewFactory().Create(confmap.ProviderSettings{}), + } + got, closeFunc, err := resolveStringValue(ctx, cfgSources, providers, tt.input, func(_ *confmap.ChangeEvent) { panic("must not be called") }) if tt.wantErr != nil { diff --git a/internal/configsource/testdata/envvar_cfgsrc_mix.yaml b/internal/configsource/testdata/envvar_cfgsrc_mix.yaml deleted file mode 100644 index 134a76724f..0000000000 --- a/internal/configsource/testdata/envvar_cfgsrc_mix.yaml +++ /dev/null @@ -1,23 +0,0 @@ -envvar: $envvar -escapedDelim: $$envvar -envvar_bracketed: ${envvar}tests -envvar_legacy_00: $/not/valid$ -envvar_legacy_01: $not_found_envvar/test -envvar_legacy_02: ${}/test -envvar_legacy_03: ${/test -envvar_legacy_04: ${1}/test -envvar_legacy_05: $1/test -cfgsrc_suffix: prefix-$tstcfgsrc:int_key -cfgsrc_middle: prefix-${tstcfgsrc:int_key}-suffix -cfgsrc_in_str: integer ${tstcfgsrc:int_key} injected as string -cfgsrc_workaround_suffix: prefix-$$tstcfgsrc:int_key -cfgsrc_braces_workaround_suffix: prefix-$${ tstcfgsrc:int_key } -cfgsrc_braces_workaround_middle: prefix-$${tstcfgsrc:int_key}-suffix -cfgsrc_braces_workaround_in_str: integer $${ tstcfgsrc:int_key} injected as string -cfgsrc_params0: ${tstcfgsrc:params_key?p0=true&p1=$envvar&p2=42} -cfgsrc_params1: "${tstcfgsrc:params_key?p0=false&p1=42&p2=$envvar}" -cfgsrc_params2: $tstcfgsrc:params_key?p0=$$envvar -multi_line_envvars: | - $tstcfgsrc: params_key - p0: $envvar - p1: $${envvar} diff --git a/internal/configsource/testdata/envvar_cfgsrc_mix_expected.yaml b/internal/configsource/testdata/envvar_cfgsrc_mix_expected.yaml deleted file mode 100644 index 76de69c659..0000000000 --- a/internal/configsource/testdata/envvar_cfgsrc_mix_expected.yaml +++ /dev/null @@ -1,29 +0,0 @@ -envvar: envvar_value -escapedDelim: $envvar -envvar_bracketed: envvar_valuetests -envvar_legacy_00: $/not/valid$ -envvar_legacy_01: /test -envvar_legacy_02: /test -envvar_legacy_03: /test -envvar_legacy_04: /test -envvar_legacy_05: /test -cfgsrc_suffix: prefix-42 -cfgsrc_middle: prefix-42-suffix -cfgsrc_in_str: integer 42 injected as string -cfgsrc_workaround_suffix: prefix-$tstcfgsrc:int_key -cfgsrc_braces_workaround_suffix: prefix-${ tstcfgsrc:int_key } -cfgsrc_braces_workaround_middle: prefix-${tstcfgsrc:int_key}-suffix -cfgsrc_braces_workaround_in_str: integer ${ tstcfgsrc:int_key} injected as string -cfgsrc_params0: - p0: true - p1: envvar_value - p2: 42 -cfgsrc_params1: - p0: false - p1: 42 - p2: envvar_value -cfgsrc_params2: - p0: $envvar -multi_line_envvars: - p0: envvar_value - p1: ${envvar} diff --git a/internal/confmapprovider/configsource/provider.go b/internal/confmapprovider/configsource/provider.go index 4d5c338e79..a47a3a810d 100644 --- a/internal/confmapprovider/configsource/provider.go +++ b/internal/confmapprovider/configsource/provider.go @@ -139,18 +139,20 @@ func (pw *ProviderWrapper) ResolveForWrapped(ctx context.Context, uri string, on return nil, fmt.Errorf("configsource provider failed retrieving: %w", err) } - conf, err := retrieved.AsConf() - if err != nil { - // raw fallback attempt, or return AsConf() error - if raw, e := retrieved.AsRaw(); e == nil { - if rawRetrieved, ee := confmap.NewRetrieved(raw); ee == nil { - // raw confmap.Retrieved values shouldn't be further processed so return here - return rawRetrieved, nil - } - } - return nil, fmt.Errorf("failed retrieving from wrappedProvider: %w", err) + raw, arErr := retrieved.AsRaw() + if arErr != nil { + return nil, fmt.Errorf("configsource provider failed retrieving raw: %w", arErr) } + // Scalar or array values should be returned as-is. + if _, ok := raw.(map[string]any); !ok { + return retrieved, nil + } + + conf, acErr := retrieved.AsConf() + if acErr != nil { + return nil, fmt.Errorf("failed converting retrieved to conf: %w", acErr) + } if conf == nil { return nil, fmt.Errorf("retrieved confmap.Conf is unexpectedly nil") } diff --git a/internal/confmapprovider/discovery/discoverer.go b/internal/confmapprovider/discovery/discoverer.go index e330b32ef8..165d5e7c6b 100644 --- a/internal/confmapprovider/discovery/discoverer.go +++ b/internal/confmapprovider/discovery/discoverer.go @@ -125,9 +125,9 @@ func (d *discoverer) resolveConfig(discoveryReceiverRaw map[string]any) (*confma } uris := []string{fmt.Sprintf("yaml:%s", out)} resolver, err := confmap.NewResolver(confmap.ResolverSettings{ - URIs: uris, - ProviderFactories: []confmap.ProviderFactory{yamlprovider.NewFactory(), envprovider.NewFactory()}, - ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, + URIs: uris, + ProviderFactories: []confmap.ProviderFactory{yamlprovider.NewFactory(), envprovider.NewFactory()}, + DefaultScheme: "env", }) if err != nil { return nil, fmt.Errorf("failed to create a resolver from the given uris. %w", err) diff --git a/internal/settings/settings.go b/internal/settings/settings.go index aadcfb59d2..d402ac8103 100644 --- a/internal/settings/settings.go +++ b/internal/settings/settings.go @@ -78,11 +78,7 @@ var DefaultAgentConfigWindows = func() string { return filepath.Clean(path) }() -var defaultFeatureGates = []string{ - // Remove the feature gates once we deprecate our env var expansion mechanism and adopt the upstream one. - "-confmap.strictlyTypedInput", - "-confmap.unifyEnvVarExpansion", -} +var defaultFeatureGates = []string{} type Settings struct { discovery *discovery.Provider diff --git a/internal/settings/settings_test.go b/internal/settings/settings_test.go index 893a7a8c04..74e0ef6793 100644 --- a/internal/settings/settings_test.go +++ b/internal/settings/settings_test.go @@ -132,8 +132,7 @@ func TestNewSettingsNoConvertConfig(t *testing.T) { "splunk.property:splunk.discovery.receiver.receiver-type/name.config.field.two=val.two", }, settings.ResolverURIs()) require.Equal(t, 2, len(settings.ConfMapConverterFactories())) - require.Equal(t, []string{"--feature-gates", "foo", "--feature-gates", "-bar", "--feature-gates", - "-confmap.strictlyTypedInput", "--feature-gates", "-confmap.unifyEnvVarExpansion"}, settings.ColCoreArgs()) + require.Equal(t, []string{"--feature-gates", "foo", "--feature-gates", "-bar"}, settings.ColCoreArgs()) } func TestNewSettingsConvertConfig(t *testing.T) { @@ -158,8 +157,7 @@ func TestNewSettingsConvertConfig(t *testing.T) { require.Equal(t, []string{configPath, anotherConfigPath}, settings.ResolverURIs()) require.Equal(t, 12, len(settings.ConfMapConverterFactories())) - require.Equal(t, []string{"--feature-gates", "foo", "--feature-gates", "-bar", "--feature-gates", - "-confmap.strictlyTypedInput", "--feature-gates", "-confmap.unifyEnvVarExpansion"}, settings.ColCoreArgs()) + require.Equal(t, []string{"--feature-gates", "foo", "--feature-gates", "-bar"}, settings.ColCoreArgs()) } func TestSplunkConfigYamlUtilizedInResolverURIs(t *testing.T) { @@ -186,8 +184,7 @@ func TestNewSettingsWithValidate(t *testing.T) { settings, err := New([]string{"validate"}) require.NoError(t, err) require.NotNil(t, settings) - require.Equal(t, []string{"--feature-gates", "-confmap.strictlyTypedInput", "--feature-gates", - "-confmap.unifyEnvVarExpansion", "validate"}, settings.ColCoreArgs()) + require.Equal(t, []string{"validate"}, settings.ColCoreArgs()) } func TestCheckRuntimeParams_Default(t *testing.T) { @@ -342,14 +339,11 @@ func TestSetDefaultFeatureGatesRespectsOverrides(t *testing.T) { t.Cleanup(setRequiredEnvVars(t)) for _, args := range [][]string{ {"--feature-gates", "some-gate", "--feature-gates", "telemetry.useOtelForInternalMetrics", "--feature-gates", - "another-gate", "--feature-gates", "-confmap.strictlyTypedInput", "--feature-gates", - "-confmap.unifyEnvVarExpansion"}, + "another-gate"}, {"--feature-gates", "some-gate", "--feature-gates", "+telemetry.useOtelForInternalMetrics", - "--feature-gates", "another-gate", "--feature-gates", "-confmap.strictlyTypedInput", "--feature-gates", - "-confmap.unifyEnvVarExpansion"}, + "--feature-gates", "another-gate"}, {"--feature-gates", "some-gate", "--feature-gates", "-telemetry.useOtelForInternalMetrics", - "--feature-gates", "another-gate", "--feature-gates", "-confmap.strictlyTypedInput", "--feature-gates", - "-confmap.unifyEnvVarExpansion"}, + "--feature-gates", "another-gate"}, } { t.Run(strings.Join(args, " "), func(t *testing.T) { settings, err := New(args) diff --git a/internal/tools/go.mod b/internal/tools/go.mod index e5dfc0ca44..ed7b48d56d 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -12,7 +12,7 @@ require ( github.com/ory/go-acc v0.2.8 github.com/pavius/impi v0.0.3 github.com/tcnksm/ghr v0.16.2 - go.opentelemetry.io/collector/cmd/mdatagen v0.106.1 + go.opentelemetry.io/collector/cmd/mdatagen v0.106.2-0.20240807203117-91d6525f52a4 golang.org/x/tools v0.24.0 golang.org/x/vuln v1.1.3 ) @@ -201,13 +201,13 @@ require ( gitlab.com/bosi/decorder v0.4.2 // indirect go-simpler.org/musttag v0.12.2 // indirect go-simpler.org/sloglint v0.7.1 // indirect - go.opentelemetry.io/collector/component v0.106.1 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.106.1 // indirect - go.opentelemetry.io/collector/confmap v0.106.1 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1 // indirect + go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.2-0.20240807203117-91d6525f52a4 // indirect go.opentelemetry.io/collector/featuregate v1.12.0 // indirect - go.opentelemetry.io/collector/filter v0.106.1 // indirect - go.opentelemetry.io/collector/internal/globalgates v0.106.1 // indirect + go.opentelemetry.io/collector/filter v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4 // indirect go.opentelemetry.io/collector/pdata v1.12.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index d76e2398dc..ba575632fe 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -722,22 +722,22 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector/cmd/mdatagen v0.106.1 h1:cv/rvZbgsKmArswHHfoJ6pnsKk0XkEUUIuU3owfvZ18= -go.opentelemetry.io/collector/cmd/mdatagen v0.106.1/go.mod h1:6TFAgJ/+qVau3lbwFb487qVCf00NZtXh8RPnAVB5Ftg= -go.opentelemetry.io/collector/component v0.106.1 h1:6Xp4tKqnd/JkJDG/C4p1hto+Y5zvk5FwqZIdMCPzZlA= -go.opentelemetry.io/collector/component v0.106.1/go.mod h1:KiVE/5ZayuLlDJTe7mHqHRCn/5LrmF99C7/mKe54mWA= -go.opentelemetry.io/collector/config/configtelemetry v0.106.1 h1:A8nwYnI6brfur5KPFC8GtVX/49pByvVoKSgO4qPXBqg= -go.opentelemetry.io/collector/config/configtelemetry v0.106.1/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40= -go.opentelemetry.io/collector/confmap v0.106.1 h1:R7HQIPDRPOEwauBeJUlkT8Elc5f0KQr/s/kQfZi05t0= -go.opentelemetry.io/collector/confmap v0.106.1/go.mod h1:iWdWgvxRYSHdAt5ySgPJq/i6fQMKGNnP5Pt7jOfTXno= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1 h1:pV+cf8ToRA8r/Vhjs5ZcMJx+JWksrquC9g6+t6htCn0= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1/go.mod h1:elTjMrKqic6TEeJheIM50spM62dVI3bM9TrTJ98yZOg= +go.opentelemetry.io/collector/cmd/mdatagen v0.106.2-0.20240807203117-91d6525f52a4 h1:KI3v4GAMSmbWG2gGZK1Az5bE1Io8JVQg0cymS8ibE8w= +go.opentelemetry.io/collector/cmd/mdatagen v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:eNxKsz+4w05jjIwa4EDv5HW6yE2hIvj4J2HlFM8EK5g= +go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4 h1:wnl2GLoMX5Xbs6AA6otTOuyvz3773m2CydcVf7v90mg= +go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:KiVE/5ZayuLlDJTe7mHqHRCn/5LrmF99C7/mKe54mWA= +go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4 h1:EF55TfKoNEaRrRhXCkxTjqEg8zStji3bxWEdsOccAJA= +go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40= +go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4 h1:DaUT+pwy36oRYjfmAVkS55IwIdpq/EXibHos5eAJYsA= +go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:iWdWgvxRYSHdAt5ySgPJq/i6fQMKGNnP5Pt7jOfTXno= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.2-0.20240807203117-91d6525f52a4 h1:HnnD3jitIKzer/+kSFE2RqwY3LGBkERGE1kMMI83zMA= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:elTjMrKqic6TEeJheIM50spM62dVI3bM9TrTJ98yZOg= go.opentelemetry.io/collector/featuregate v1.12.0 h1:l5WbV2vMQd2bL8ubfGrbKNtZaeJRckE12CTHvRe47Tw= go.opentelemetry.io/collector/featuregate v1.12.0/go.mod h1:PsOINaGgTiFc+Tzu2K/X2jP+Ngmlp7YKGV1XrnBkH7U= -go.opentelemetry.io/collector/filter v0.106.1 h1:J95LA0kRsQaj2lPrB5GiGK88K/7X2s9vPzFhaaV5sLw= -go.opentelemetry.io/collector/filter v0.106.1/go.mod h1:Q2FqRhdM35xTO5nlqySPCoVXzb4DlPWzWeekZY2OVFg= -go.opentelemetry.io/collector/internal/globalgates v0.106.1 h1:0NQHTcykmYNDsNKObJ2XocGCv3WUAQZppfP3o6hZUIA= -go.opentelemetry.io/collector/internal/globalgates v0.106.1/go.mod h1:Z5US6O2xkZAtxVSSBnHAPFZwPhFoxlyKLUvS67Vx4gc= +go.opentelemetry.io/collector/filter v0.106.2-0.20240807203117-91d6525f52a4 h1:FJL0E35CqEatw2xjoly4HS1U+hzlAhA44hrrUodzrfw= +go.opentelemetry.io/collector/filter v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:Q2FqRhdM35xTO5nlqySPCoVXzb4DlPWzWeekZY2OVFg= +go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4 h1:DKcDgtQ7/oPijKGvBj0kIq/aZ/IPXiL3Tc79CDiU/b4= +go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:Z5US6O2xkZAtxVSSBnHAPFZwPhFoxlyKLUvS67Vx4gc= go.opentelemetry.io/collector/pdata v1.12.0 h1:Xx5VK1p4VO0md8MWm2icwC1MnJ7f8EimKItMWw46BmA= go.opentelemetry.io/collector/pdata v1.12.0/go.mod h1:MYeB0MmMAxeM0hstCFrCqWLzdyeYySim2dG6pDT6nYI= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= diff --git a/pkg/extension/smartagentextension/go.mod b/pkg/extension/smartagentextension/go.mod index 7a8171f349..d7364cce24 100644 --- a/pkg/extension/smartagentextension/go.mod +++ b/pkg/extension/smartagentextension/go.mod @@ -6,9 +6,9 @@ require ( github.com/signalfx/defaults v1.2.2-0.20180531161417-70562fe60657 github.com/signalfx/signalfx-agent v1.0.1-0.20230104182534-9eee411fe305 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.106.1 - go.opentelemetry.io/collector/confmap v0.106.1 - go.opentelemetry.io/collector/extension v0.106.1 + go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/extension v0.106.2-0.20240807203117-91d6525f52a4 gopkg.in/yaml.v2 v2.4.0 ) @@ -40,9 +40,9 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect github.com/signalfx/golib/v3 v3.3.53 // indirect github.com/sirupsen/logrus v1.9.3 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.106.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4 // indirect go.opentelemetry.io/collector/featuregate v1.12.0 // indirect - go.opentelemetry.io/collector/internal/globalgates v0.106.1 // indirect + go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4 // indirect go.opentelemetry.io/collector/pdata v1.12.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect diff --git a/pkg/extension/smartagentextension/go.sum b/pkg/extension/smartagentextension/go.sum index a721bbf27c..6d0d330ec6 100644 --- a/pkg/extension/smartagentextension/go.sum +++ b/pkg/extension/smartagentextension/go.sum @@ -301,18 +301,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector/component v0.106.1 h1:6Xp4tKqnd/JkJDG/C4p1hto+Y5zvk5FwqZIdMCPzZlA= -go.opentelemetry.io/collector/component v0.106.1/go.mod h1:KiVE/5ZayuLlDJTe7mHqHRCn/5LrmF99C7/mKe54mWA= -go.opentelemetry.io/collector/config/configtelemetry v0.106.1 h1:A8nwYnI6brfur5KPFC8GtVX/49pByvVoKSgO4qPXBqg= -go.opentelemetry.io/collector/config/configtelemetry v0.106.1/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40= -go.opentelemetry.io/collector/confmap v0.106.1 h1:R7HQIPDRPOEwauBeJUlkT8Elc5f0KQr/s/kQfZi05t0= -go.opentelemetry.io/collector/confmap v0.106.1/go.mod h1:iWdWgvxRYSHdAt5ySgPJq/i6fQMKGNnP5Pt7jOfTXno= -go.opentelemetry.io/collector/extension v0.106.1 h1:HNV2eOxaSDy5gL5KYoPoTLlp6fdeWmuw4paxhi10VUo= -go.opentelemetry.io/collector/extension v0.106.1/go.mod h1:DCOGxD+WnIJiDveKWlvH5WwB9AgqlRUlnKgwhNCLrtQ= +go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4 h1:wnl2GLoMX5Xbs6AA6otTOuyvz3773m2CydcVf7v90mg= +go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:KiVE/5ZayuLlDJTe7mHqHRCn/5LrmF99C7/mKe54mWA= +go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4 h1:EF55TfKoNEaRrRhXCkxTjqEg8zStji3bxWEdsOccAJA= +go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40= +go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4 h1:DaUT+pwy36oRYjfmAVkS55IwIdpq/EXibHos5eAJYsA= +go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:iWdWgvxRYSHdAt5ySgPJq/i6fQMKGNnP5Pt7jOfTXno= +go.opentelemetry.io/collector/extension v0.106.2-0.20240807203117-91d6525f52a4 h1:Fnm6d1/mL42GKUKsj2neg59zQq+0154Ef1dmpSLBXTI= +go.opentelemetry.io/collector/extension v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:DCOGxD+WnIJiDveKWlvH5WwB9AgqlRUlnKgwhNCLrtQ= go.opentelemetry.io/collector/featuregate v1.12.0 h1:l5WbV2vMQd2bL8ubfGrbKNtZaeJRckE12CTHvRe47Tw= go.opentelemetry.io/collector/featuregate v1.12.0/go.mod h1:PsOINaGgTiFc+Tzu2K/X2jP+Ngmlp7YKGV1XrnBkH7U= -go.opentelemetry.io/collector/internal/globalgates v0.106.1 h1:0NQHTcykmYNDsNKObJ2XocGCv3WUAQZppfP3o6hZUIA= -go.opentelemetry.io/collector/internal/globalgates v0.106.1/go.mod h1:Z5US6O2xkZAtxVSSBnHAPFZwPhFoxlyKLUvS67Vx4gc= +go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4 h1:DKcDgtQ7/oPijKGvBj0kIq/aZ/IPXiL3Tc79CDiU/b4= +go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:Z5US6O2xkZAtxVSSBnHAPFZwPhFoxlyKLUvS67Vx4gc= go.opentelemetry.io/collector/pdata v1.12.0 h1:Xx5VK1p4VO0md8MWm2icwC1MnJ7f8EimKItMWw46BmA= go.opentelemetry.io/collector/pdata v1.12.0/go.mod h1:MYeB0MmMAxeM0hstCFrCqWLzdyeYySim2dG6pDT6nYI= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= diff --git a/pkg/processor/timestampprocessor/go.mod b/pkg/processor/timestampprocessor/go.mod index 3aaa3ffba0..e1b7f28d3c 100644 --- a/pkg/processor/timestampprocessor/go.mod +++ b/pkg/processor/timestampprocessor/go.mod @@ -6,11 +6,11 @@ toolchain go1.21.12 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.106.1 - go.opentelemetry.io/collector/confmap v0.106.1 - go.opentelemetry.io/collector/consumer v0.106.1 + go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/consumer v0.106.2-0.20240807203117-91d6525f52a4 go.opentelemetry.io/collector/pdata v1.12.0 - go.opentelemetry.io/collector/processor v0.106.1 + go.opentelemetry.io/collector/processor v0.106.2-0.20240807203117-91d6525f52a4 go.uber.org/zap v1.27.0 ) @@ -28,16 +28,18 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect - go.opentelemetry.io/collector v0.106.1 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.106.1 // indirect + go.opentelemetry.io/collector v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.1 // indirect go.opentelemetry.io/collector/featuregate v1.12.0 // indirect - go.opentelemetry.io/collector/internal/globalgates v0.106.1 // indirect + go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.106.1 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.26.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect diff --git a/pkg/processor/timestampprocessor/go.sum b/pkg/processor/timestampprocessor/go.sum index a7a62bcd03..036453fbc3 100644 --- a/pkg/processor/timestampprocessor/go.sum +++ b/pkg/processor/timestampprocessor/go.sum @@ -267,32 +267,32 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.106.1 h1:ZSQMpFGzFP3RILe1/+K80kCCT2ahn3MKt5e3u0Yz7Rs= -go.opentelemetry.io/collector v0.106.1/go.mod h1:1FabMxWLluLNcC0dq8cI01GaE6t6fYxE6Oxuf8u7AGQ= -go.opentelemetry.io/collector/component v0.106.1 h1:6Xp4tKqnd/JkJDG/C4p1hto+Y5zvk5FwqZIdMCPzZlA= -go.opentelemetry.io/collector/component v0.106.1/go.mod h1:KiVE/5ZayuLlDJTe7mHqHRCn/5LrmF99C7/mKe54mWA= -go.opentelemetry.io/collector/config/configtelemetry v0.106.1 h1:A8nwYnI6brfur5KPFC8GtVX/49pByvVoKSgO4qPXBqg= -go.opentelemetry.io/collector/config/configtelemetry v0.106.1/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40= -go.opentelemetry.io/collector/confmap v0.106.1 h1:R7HQIPDRPOEwauBeJUlkT8Elc5f0KQr/s/kQfZi05t0= -go.opentelemetry.io/collector/confmap v0.106.1/go.mod h1:iWdWgvxRYSHdAt5ySgPJq/i6fQMKGNnP5Pt7jOfTXno= -go.opentelemetry.io/collector/consumer v0.106.1 h1:+AQ/Kmoc/g0WP8thwymNkXk1jeWsHDK6XyYfdezcxcc= -go.opentelemetry.io/collector/consumer v0.106.1/go.mod h1:oy6pR/v5o/N9cxsICskyt//bU8k8EG0JeOO1MTDfs5A= +go.opentelemetry.io/collector v0.106.2-0.20240807203117-91d6525f52a4 h1:411LuynrXSf808xCwnovqzXR5ixNBzP6k3p5X1q6DNM= +go.opentelemetry.io/collector v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:BPBPZO+r4GdcF4xu+qR2pweusp/ZTM4t0tGVsMQDXrI= +go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4 h1:wnl2GLoMX5Xbs6AA6otTOuyvz3773m2CydcVf7v90mg= +go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:KiVE/5ZayuLlDJTe7mHqHRCn/5LrmF99C7/mKe54mWA= +go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4 h1:EF55TfKoNEaRrRhXCkxTjqEg8zStji3bxWEdsOccAJA= +go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40= +go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4 h1:DaUT+pwy36oRYjfmAVkS55IwIdpq/EXibHos5eAJYsA= +go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:iWdWgvxRYSHdAt5ySgPJq/i6fQMKGNnP5Pt7jOfTXno= +go.opentelemetry.io/collector/consumer v0.106.2-0.20240807203117-91d6525f52a4 h1:ZPPXh3LOQCWiVha/ONA0poj6gcc3xiYvuuJZYgwmU04= +go.opentelemetry.io/collector/consumer v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:oy6pR/v5o/N9cxsICskyt//bU8k8EG0JeOO1MTDfs5A= go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.1 h1:uxQjWm2XE7d1OncQDM9tL1ha+otGt1HjoRYIcQRMOfQ= go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.1/go.mod h1:xQScBf9/PORFaYM6JVPOr7/TcRVEuKcW5XbAXfJByRs= go.opentelemetry.io/collector/consumer/consumertest v0.106.1 h1:hDdFeVjCLIJ6iLfbiYcV9s+4iboFXbkJ/k3h09qusPw= go.opentelemetry.io/collector/consumer/consumertest v0.106.1/go.mod h1:WRTYnQ8bYHQrEN6eJZ80oC4pNI7VeDRdsTZI6xs9o5M= go.opentelemetry.io/collector/featuregate v1.12.0 h1:l5WbV2vMQd2bL8ubfGrbKNtZaeJRckE12CTHvRe47Tw= go.opentelemetry.io/collector/featuregate v1.12.0/go.mod h1:PsOINaGgTiFc+Tzu2K/X2jP+Ngmlp7YKGV1XrnBkH7U= -go.opentelemetry.io/collector/internal/globalgates v0.106.1 h1:0NQHTcykmYNDsNKObJ2XocGCv3WUAQZppfP3o6hZUIA= -go.opentelemetry.io/collector/internal/globalgates v0.106.1/go.mod h1:Z5US6O2xkZAtxVSSBnHAPFZwPhFoxlyKLUvS67Vx4gc= +go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4 h1:DKcDgtQ7/oPijKGvBj0kIq/aZ/IPXiL3Tc79CDiU/b4= +go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:Z5US6O2xkZAtxVSSBnHAPFZwPhFoxlyKLUvS67Vx4gc= go.opentelemetry.io/collector/pdata v1.12.0 h1:Xx5VK1p4VO0md8MWm2icwC1MnJ7f8EimKItMWw46BmA= go.opentelemetry.io/collector/pdata v1.12.0/go.mod h1:MYeB0MmMAxeM0hstCFrCqWLzdyeYySim2dG6pDT6nYI= go.opentelemetry.io/collector/pdata/pprofile v0.106.1 h1:nOLo25YnluNi+zAbU7G24RN86cJ1/EZJc6VEayBlOPo= go.opentelemetry.io/collector/pdata/pprofile v0.106.1/go.mod h1:chr7lMJIzyXkccnPRkIPhyXtqLZLSReZYhwsggOGEfg= go.opentelemetry.io/collector/pdata/testdata v0.106.1 h1:JUyLAwKD8o/9jgkBi16zOClxOyY028A7XIXHPV4mNmM= go.opentelemetry.io/collector/pdata/testdata v0.106.1/go.mod h1:ghdz2RDEzsfigW0J+9oqA4fGmQJ/DJYUhE3vYU6JfhM= -go.opentelemetry.io/collector/processor v0.106.1 h1:W/SmNRkGLf6dOWjdqU5WlDnPLDQJRyHZxI6X8IQwFec= -go.opentelemetry.io/collector/processor v0.106.1/go.mod h1:D4Ni5zbK/QtkIxSbDEZanUcLN9zM3JnlU9hc3Qm/o6I= +go.opentelemetry.io/collector/processor v0.106.2-0.20240807203117-91d6525f52a4 h1:rzZGdwrLRTgJHcyaoYE16zoJF9pWWfh9xJE3NrfAJqA= +go.opentelemetry.io/collector/processor v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:p/yeFx4r8WQ/ajVhzjLHVqCeQfsQoxPJ3EKgrvwrgIY= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= @@ -389,8 +389,8 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= diff --git a/pkg/receiver/smartagentreceiver/go.mod b/pkg/receiver/smartagentreceiver/go.mod index 0dc378bb35..fb113407c1 100644 --- a/pkg/receiver/smartagentreceiver/go.mod +++ b/pkg/receiver/smartagentreceiver/go.mod @@ -14,14 +14,14 @@ require ( github.com/signalfx/splunk-otel-collector/pkg/extension/smartagentextension v0.83.0 github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.106.1 - go.opentelemetry.io/collector/confmap v0.106.1 - go.opentelemetry.io/collector/consumer v0.106.1 - go.opentelemetry.io/collector/consumer/consumertest v0.106.1 - go.opentelemetry.io/collector/exporter v0.106.1 - go.opentelemetry.io/collector/extension v0.106.1 + go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/consumer v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/consumer/consumertest v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/exporter v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/extension v0.106.2-0.20240807203117-91d6525f52a4 go.opentelemetry.io/collector/pdata v1.12.0 - go.opentelemetry.io/collector/receiver v0.106.1 + go.opentelemetry.io/collector/receiver v0.106.2-0.20240807203117-91d6525f52a4 go.opentelemetry.io/otel/metric v1.28.0 go.opentelemetry.io/otel/trace v1.28.0 go.uber.org/zap v1.27.0 @@ -195,13 +195,13 @@ require ( github.com/vmware/govmomi v0.39.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.106.1 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.106.1 // indirect - go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.1 // indirect + go.opentelemetry.io/collector v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.2-0.20240807203117-91d6525f52a4 // indirect go.opentelemetry.io/collector/featuregate v1.12.0 // indirect - go.opentelemetry.io/collector/internal/globalgates v0.106.1 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.106.1 // indirect - go.opentelemetry.io/collector/semconv v0.106.1 // indirect + go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/semconv v0.106.2-0.20240807203117-91d6525f52a4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect diff --git a/pkg/receiver/smartagentreceiver/go.sum b/pkg/receiver/smartagentreceiver/go.sum index 9142395ef4..503bbce1e2 100644 --- a/pkg/receiver/smartagentreceiver/go.sum +++ b/pkg/receiver/smartagentreceiver/go.sum @@ -774,40 +774,40 @@ github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxt go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.106.1 h1:ZSQMpFGzFP3RILe1/+K80kCCT2ahn3MKt5e3u0Yz7Rs= -go.opentelemetry.io/collector v0.106.1/go.mod h1:1FabMxWLluLNcC0dq8cI01GaE6t6fYxE6Oxuf8u7AGQ= -go.opentelemetry.io/collector/component v0.106.1 h1:6Xp4tKqnd/JkJDG/C4p1hto+Y5zvk5FwqZIdMCPzZlA= -go.opentelemetry.io/collector/component v0.106.1/go.mod h1:KiVE/5ZayuLlDJTe7mHqHRCn/5LrmF99C7/mKe54mWA= +go.opentelemetry.io/collector v0.106.2-0.20240807203117-91d6525f52a4 h1:411LuynrXSf808xCwnovqzXR5ixNBzP6k3p5X1q6DNM= +go.opentelemetry.io/collector v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:BPBPZO+r4GdcF4xu+qR2pweusp/ZTM4t0tGVsMQDXrI= +go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4 h1:wnl2GLoMX5Xbs6AA6otTOuyvz3773m2CydcVf7v90mg= +go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:KiVE/5ZayuLlDJTe7mHqHRCn/5LrmF99C7/mKe54mWA= go.opentelemetry.io/collector/config/configretry v1.12.0 h1:tEBwueO4AIkwWosxz6NWqnghdZ7y5SfHcIzLrvh6kB8= go.opentelemetry.io/collector/config/configretry v1.12.0/go.mod h1:P+RA0IA+QoxnDn4072uyeAk1RIoYiCbxYsjpKX5eFC4= -go.opentelemetry.io/collector/config/configtelemetry v0.106.1 h1:A8nwYnI6brfur5KPFC8GtVX/49pByvVoKSgO4qPXBqg= -go.opentelemetry.io/collector/config/configtelemetry v0.106.1/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40= -go.opentelemetry.io/collector/confmap v0.106.1 h1:R7HQIPDRPOEwauBeJUlkT8Elc5f0KQr/s/kQfZi05t0= -go.opentelemetry.io/collector/confmap v0.106.1/go.mod h1:iWdWgvxRYSHdAt5ySgPJq/i6fQMKGNnP5Pt7jOfTXno= -go.opentelemetry.io/collector/consumer v0.106.1 h1:+AQ/Kmoc/g0WP8thwymNkXk1jeWsHDK6XyYfdezcxcc= -go.opentelemetry.io/collector/consumer v0.106.1/go.mod h1:oy6pR/v5o/N9cxsICskyt//bU8k8EG0JeOO1MTDfs5A= -go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.1 h1:uxQjWm2XE7d1OncQDM9tL1ha+otGt1HjoRYIcQRMOfQ= -go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.1/go.mod h1:xQScBf9/PORFaYM6JVPOr7/TcRVEuKcW5XbAXfJByRs= -go.opentelemetry.io/collector/consumer/consumertest v0.106.1 h1:hDdFeVjCLIJ6iLfbiYcV9s+4iboFXbkJ/k3h09qusPw= -go.opentelemetry.io/collector/consumer/consumertest v0.106.1/go.mod h1:WRTYnQ8bYHQrEN6eJZ80oC4pNI7VeDRdsTZI6xs9o5M= -go.opentelemetry.io/collector/exporter v0.106.1 h1:PIqLqWacxSFcCstiF/6kxI1GLiP+9pjG7XFujxZG1z0= -go.opentelemetry.io/collector/exporter v0.106.1/go.mod h1:aGIoEwT5UjCHzq+oFYMuc5Mt15AfqvgDeLdjWTYSqNo= -go.opentelemetry.io/collector/extension v0.106.1 h1:HNV2eOxaSDy5gL5KYoPoTLlp6fdeWmuw4paxhi10VUo= -go.opentelemetry.io/collector/extension v0.106.1/go.mod h1:DCOGxD+WnIJiDveKWlvH5WwB9AgqlRUlnKgwhNCLrtQ= +go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4 h1:EF55TfKoNEaRrRhXCkxTjqEg8zStji3bxWEdsOccAJA= +go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40= +go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4 h1:DaUT+pwy36oRYjfmAVkS55IwIdpq/EXibHos5eAJYsA= +go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:iWdWgvxRYSHdAt5ySgPJq/i6fQMKGNnP5Pt7jOfTXno= +go.opentelemetry.io/collector/consumer v0.106.2-0.20240807203117-91d6525f52a4 h1:ZPPXh3LOQCWiVha/ONA0poj6gcc3xiYvuuJZYgwmU04= +go.opentelemetry.io/collector/consumer v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:oy6pR/v5o/N9cxsICskyt//bU8k8EG0JeOO1MTDfs5A= +go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.2-0.20240807203117-91d6525f52a4 h1:9vO1el0iyXOE1cSEozpt4EBsFFJA1DG8ayromSni4Ng= +go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:xQScBf9/PORFaYM6JVPOr7/TcRVEuKcW5XbAXfJByRs= +go.opentelemetry.io/collector/consumer/consumertest v0.106.2-0.20240807203117-91d6525f52a4 h1:hIm3ZnhSD3o4nbaccIe9Aip0wKVuLW2lHhaAuOrP0xo= +go.opentelemetry.io/collector/consumer/consumertest v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:WRTYnQ8bYHQrEN6eJZ80oC4pNI7VeDRdsTZI6xs9o5M= +go.opentelemetry.io/collector/exporter v0.106.2-0.20240807203117-91d6525f52a4 h1:RrUNq+0dreikPVSup51cWUu76r1Ijkh17o0HcH8lV1g= +go.opentelemetry.io/collector/exporter v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:BH3XtiJGIlnezwvfSTv+x5nBPmkiIWVhdBPo/81cI3I= +go.opentelemetry.io/collector/extension v0.106.2-0.20240807203117-91d6525f52a4 h1:Fnm6d1/mL42GKUKsj2neg59zQq+0154Ef1dmpSLBXTI= +go.opentelemetry.io/collector/extension v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:DCOGxD+WnIJiDveKWlvH5WwB9AgqlRUlnKgwhNCLrtQ= go.opentelemetry.io/collector/featuregate v1.12.0 h1:l5WbV2vMQd2bL8ubfGrbKNtZaeJRckE12CTHvRe47Tw= go.opentelemetry.io/collector/featuregate v1.12.0/go.mod h1:PsOINaGgTiFc+Tzu2K/X2jP+Ngmlp7YKGV1XrnBkH7U= -go.opentelemetry.io/collector/internal/globalgates v0.106.1 h1:0NQHTcykmYNDsNKObJ2XocGCv3WUAQZppfP3o6hZUIA= -go.opentelemetry.io/collector/internal/globalgates v0.106.1/go.mod h1:Z5US6O2xkZAtxVSSBnHAPFZwPhFoxlyKLUvS67Vx4gc= +go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4 h1:DKcDgtQ7/oPijKGvBj0kIq/aZ/IPXiL3Tc79CDiU/b4= +go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:Z5US6O2xkZAtxVSSBnHAPFZwPhFoxlyKLUvS67Vx4gc= go.opentelemetry.io/collector/pdata v1.12.0 h1:Xx5VK1p4VO0md8MWm2icwC1MnJ7f8EimKItMWw46BmA= go.opentelemetry.io/collector/pdata v1.12.0/go.mod h1:MYeB0MmMAxeM0hstCFrCqWLzdyeYySim2dG6pDT6nYI= -go.opentelemetry.io/collector/pdata/pprofile v0.106.1 h1:nOLo25YnluNi+zAbU7G24RN86cJ1/EZJc6VEayBlOPo= -go.opentelemetry.io/collector/pdata/pprofile v0.106.1/go.mod h1:chr7lMJIzyXkccnPRkIPhyXtqLZLSReZYhwsggOGEfg= +go.opentelemetry.io/collector/pdata/pprofile v0.106.2-0.20240807203117-91d6525f52a4 h1:3SjfsYDnsV94ToC+TEo/SMk/kSYvkAaXext1Zd6kEik= +go.opentelemetry.io/collector/pdata/pprofile v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:chr7lMJIzyXkccnPRkIPhyXtqLZLSReZYhwsggOGEfg= go.opentelemetry.io/collector/pdata/testdata v0.106.1 h1:JUyLAwKD8o/9jgkBi16zOClxOyY028A7XIXHPV4mNmM= go.opentelemetry.io/collector/pdata/testdata v0.106.1/go.mod h1:ghdz2RDEzsfigW0J+9oqA4fGmQJ/DJYUhE3vYU6JfhM= -go.opentelemetry.io/collector/receiver v0.106.1 h1:9kDLDJmInnz+AzAV9oV/UGMoc1+oI1pwMMs7+uMiJq4= -go.opentelemetry.io/collector/receiver v0.106.1/go.mod h1:3j9asWz7mqsgE77rPaNhlNQhRwgFhRynf0UEPs/4rkM= -go.opentelemetry.io/collector/semconv v0.106.1 h1:x0OSXrQCFinqZNUPTKrHU0gnbwngOVOPyhedQCDyDoQ= -go.opentelemetry.io/collector/semconv v0.106.1/go.mod h1:yMVUCNoQPZVq/IPfrHrnntZTWsLf5YGZ7qwKulIl5hw= +go.opentelemetry.io/collector/receiver v0.106.2-0.20240807203117-91d6525f52a4 h1:TRNp92BWa9RruSJHgHZFMiuCKU+Y6VGETujakYzjOzc= +go.opentelemetry.io/collector/receiver v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:+J2FEg4eDYdUuaDW8Cn41SeqFiuKdvnZOZlXvbVdVaw= +go.opentelemetry.io/collector/semconv v0.106.2-0.20240807203117-91d6525f52a4 h1:SsC+Ek4l7QEAF3YHWu2aCY3JYxI19Y04m/vh3I/EYjM= +go.opentelemetry.io/collector/semconv v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:yMVUCNoQPZVq/IPfrHrnntZTWsLf5YGZ7qwKulIl5hw= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= diff --git a/tests/general/default_config_test.go b/tests/general/default_config_test.go index 89c0f1002f..b5e0b6901a 100644 --- a/tests/general/default_config_test.go +++ b/tests/general/default_config_test.go @@ -110,7 +110,7 @@ func TestDefaultGatewayConfig(t *testing.T) { "batch": nil, "memory_limiter": map[string]any{ "check_interval": "2s", - "limit_mib": "460", + "limit_mib": 460, }, "resourcedetection/internal": map[string]any{ "detectors": []any{"gcp", "ecs", "ec2", "azure", "system"}, @@ -297,7 +297,7 @@ func TestDefaultAgentConfig(t *testing.T) { "batch": nil, "memory_limiter": map[string]any{ "check_interval": "2s", - "limit_mib": "460", + "limit_mib": 460, }, "resourcedetection": map[string]any{"detectors": []any{"gcp", "ecs", "ec2", "azure", "system"}, "override": true, diff --git a/tests/general/discoverymode/host_observer_discovery_test.go b/tests/general/discoverymode/host_observer_discovery_test.go index b212f8912f..d8bbd09891 100644 --- a/tests/general/discoverymode/host_observer_discovery_test.go +++ b/tests/general/discoverymode/host_observer_discovery_test.go @@ -192,7 +192,6 @@ func TestHostObserver(t *testing.T) { "receivers/splunk.discovery": []any{"receiver_creator/discovery"}, }, }, - "splunk.property": map[string]any{}, } require.Equal(t, expectedInitial, cc.InitialConfig(t, 55554)) diff --git a/tests/general/testdata/env_config_source_labels_expected.yaml b/tests/general/testdata/env_config_source_labels_expected.yaml index 595b8faf6e..de75ebfbce 100644 --- a/tests/general/testdata/env_config_source_labels_expected.yaml +++ b/tests/general/testdata/env_config_source_labels_expected.yaml @@ -12,13 +12,13 @@ resourceMetrics: attributes: - key: decuple-dollar value: - stringValue: $$$$an-envvar-value-suffix + stringValue: $$$$${env:AN_ENVVAR}-suffix - key: decuple-dollar-no-curly-braces value: stringValue: prefix-$$$$$env:AN_ENVVAR - key: double-dollar value: - stringValue: an-envvar-value-suffix + stringValue: ${env:AN_ENVVAR}-suffix - key: double-dollar-no-curly-braces value: stringValue: prefix-$env:AN_ENVVAR @@ -54,7 +54,7 @@ resourceMetrics: stringValue: prefix-$$$an-envvar-value - key: sextuple-dollar value: - stringValue: $$an-envvar-value-suffix + stringValue: $$${env:AN_ENVVAR}-suffix - key: sextuple-dollar-no-curly-braces value: stringValue: prefix-$$$env:AN_ENVVAR @@ -79,13 +79,13 @@ resourceMetrics: attributes: - key: decuple-dollar value: - stringValue: $$$$an-envvar-value-suffix + stringValue: $$$$${env:AN_ENVVAR}-suffix - key: decuple-dollar-no-curly-braces value: stringValue: prefix-$$$$$env:AN_ENVVAR - key: double-dollar value: - stringValue: an-envvar-value-suffix + stringValue: ${env:AN_ENVVAR}-suffix - key: double-dollar-no-curly-braces value: stringValue: prefix-$env:AN_ENVVAR @@ -121,7 +121,7 @@ resourceMetrics: stringValue: prefix-$$$an-envvar-value - key: sextuple-dollar value: - stringValue: $$an-envvar-value-suffix + stringValue: $$${env:AN_ENVVAR}-suffix - key: sextuple-dollar-no-curly-braces value: stringValue: prefix-$$$env:AN_ENVVAR @@ -146,13 +146,13 @@ resourceMetrics: attributes: - key: decuple-dollar value: - stringValue: $$$$an-envvar-value-suffix + stringValue: $$$$${env:AN_ENVVAR}-suffix - key: decuple-dollar-no-curly-braces value: stringValue: prefix-$$$$$env:AN_ENVVAR - key: double-dollar value: - stringValue: an-envvar-value-suffix + stringValue: ${env:AN_ENVVAR}-suffix - key: double-dollar-no-curly-braces value: stringValue: prefix-$env:AN_ENVVAR @@ -188,7 +188,7 @@ resourceMetrics: stringValue: prefix-$$$an-envvar-value - key: sextuple-dollar value: - stringValue: $$an-envvar-value-suffix + stringValue: $$${env:AN_ENVVAR}-suffix - key: sextuple-dollar-no-curly-braces value: stringValue: prefix-$$$env:AN_ENVVAR @@ -213,13 +213,13 @@ resourceMetrics: attributes: - key: decuple-dollar value: - stringValue: $$$$an-envvar-value-suffix + stringValue: $$$$${env:AN_ENVVAR}-suffix - key: decuple-dollar-no-curly-braces value: stringValue: prefix-$$$$$env:AN_ENVVAR - key: double-dollar value: - stringValue: an-envvar-value-suffix + stringValue: ${env:AN_ENVVAR}-suffix - key: double-dollar-no-curly-braces value: stringValue: prefix-$env:AN_ENVVAR @@ -255,7 +255,7 @@ resourceMetrics: stringValue: prefix-$$$an-envvar-value - key: sextuple-dollar value: - stringValue: $$an-envvar-value-suffix + stringValue: $$${env:AN_ENVVAR}-suffix - key: sextuple-dollar-no-curly-braces value: stringValue: prefix-$$$env:AN_ENVVAR @@ -280,13 +280,13 @@ resourceMetrics: attributes: - key: decuple-dollar value: - stringValue: $$$$an-envvar-value-suffix + stringValue: $$$$${env:AN_ENVVAR}-suffix - key: decuple-dollar-no-curly-braces value: stringValue: prefix-$$$$$env:AN_ENVVAR - key: double-dollar value: - stringValue: an-envvar-value-suffix + stringValue: ${env:AN_ENVVAR}-suffix - key: double-dollar-no-curly-braces value: stringValue: prefix-$env:AN_ENVVAR @@ -322,7 +322,7 @@ resourceMetrics: stringValue: prefix-$$$an-envvar-value - key: sextuple-dollar value: - stringValue: $$an-envvar-value-suffix + stringValue: $$${env:AN_ENVVAR}-suffix - key: sextuple-dollar-no-curly-braces value: stringValue: prefix-$$$env:AN_ENVVAR @@ -347,13 +347,13 @@ resourceMetrics: attributes: - key: decuple-dollar value: - stringValue: $$$$an-envvar-value-suffix + stringValue: $$$$${env:AN_ENVVAR}-suffix - key: decuple-dollar-no-curly-braces value: stringValue: prefix-$$$$$env:AN_ENVVAR - key: double-dollar value: - stringValue: an-envvar-value-suffix + stringValue: ${env:AN_ENVVAR}-suffix - key: double-dollar-no-curly-braces value: stringValue: prefix-$env:AN_ENVVAR @@ -389,7 +389,7 @@ resourceMetrics: stringValue: prefix-$$$an-envvar-value - key: sextuple-dollar value: - stringValue: $$an-envvar-value-suffix + stringValue: $$${env:AN_ENVVAR}-suffix - key: sextuple-dollar-no-curly-braces value: stringValue: prefix-$$$env:AN_ENVVAR diff --git a/tests/general/testdata/envvar_labels_expected.yaml b/tests/general/testdata/envvar_labels_expected.yaml index c8a6025800..13618b0644 100644 --- a/tests/general/testdata/envvar_labels_expected.yaml +++ b/tests/general/testdata/envvar_labels_expected.yaml @@ -24,10 +24,10 @@ resourceMetrics: stringValue: $AN_ENVVAR-$nonenvvar-$-suffix $ - key: nonuple-dollar-curly-braces value: - stringValue: $$$$an-envvar-value-$$$$-$$$$suffix $$$$$ + stringValue: $$$$an-envvar-value-$$$$-$$$$$-suffix $$$$$ - key: nonuple-dollar-no-curly-braces value: - stringValue: $$$$an-envvar-value-$$$$-$$$$suffix $$$$$ + stringValue: $$$$an-envvar-value-$$$$-$$$$$-suffix $$$$$ - key: octuple-dollar-curly-braces value: stringValue: $$$${AN_ENVVAR}-$$$$nonenvvar-$$$$-suffix $$$$ @@ -42,16 +42,16 @@ resourceMetrics: stringValue: $$AN_ENVVAR-$$nonenvvar-$$-suffix $$ - key: quintuple-dollar-curly-braces value: - stringValue: $$an-envvar-value-$$-$$suffix $$$ + stringValue: $$an-envvar-value-$$-$$$-suffix $$$ - key: quintuple-dollar-no-curly-braces value: - stringValue: $$an-envvar-value-$$-$$suffix $$$ + stringValue: $$an-envvar-value-$$-$$$-suffix $$$ - key: septuple-dollar-curly-braces value: - stringValue: $$$an-envvar-value-$$$-$$$suffix $$$$ + stringValue: $$$an-envvar-value-$$$-$$$$-suffix $$$$ - key: septuple-dollar-no-curly-braces value: - stringValue: $$$an-envvar-value-$$$-$$$suffix $$$$ + stringValue: $$$an-envvar-value-$$$-$$$$-suffix $$$$ - key: sextuple-dollar-curly-braces value: stringValue: $$${AN_ENVVAR}-$$$nonenvvar-$$$-suffix $$$ @@ -60,19 +60,19 @@ resourceMetrics: stringValue: $$$AN_ENVVAR-$$$nonenvvar-$$$-suffix $$$ - key: single-dollar-curly-braces value: - stringValue: an-envvar-value--suffix $ + stringValue: an-envvar-value--$-suffix $ - key: single-dollar-no-curly-braces value: - stringValue: an-envvar-value--suffix $ + stringValue: an-envvar-value--$-suffix $ - key: state value: stringValue: buffered - key: triple-dollar-curly-braces value: - stringValue: $an-envvar-value-$-$suffix $$ + stringValue: $an-envvar-value-$-$$-suffix $$ - key: triple-dollar-no-curly-braces value: - stringValue: $an-envvar-value-$-$suffix $$ + stringValue: $an-envvar-value-$-$$-suffix $$ startTimeUnixNano: "1000000" timeUnixNano: "2000000" - asInt: "4355420160" @@ -91,10 +91,10 @@ resourceMetrics: stringValue: $AN_ENVVAR-$nonenvvar-$-suffix $ - key: nonuple-dollar-curly-braces value: - stringValue: $$$$an-envvar-value-$$$$-$$$$suffix $$$$$ + stringValue: $$$$an-envvar-value-$$$$-$$$$$-suffix $$$$$ - key: nonuple-dollar-no-curly-braces value: - stringValue: $$$$an-envvar-value-$$$$-$$$$suffix $$$$$ + stringValue: $$$$an-envvar-value-$$$$-$$$$$-suffix $$$$$ - key: octuple-dollar-curly-braces value: stringValue: $$$${AN_ENVVAR}-$$$$nonenvvar-$$$$-suffix $$$$ @@ -109,16 +109,16 @@ resourceMetrics: stringValue: $$AN_ENVVAR-$$nonenvvar-$$-suffix $$ - key: quintuple-dollar-curly-braces value: - stringValue: $$an-envvar-value-$$-$$suffix $$$ + stringValue: $$an-envvar-value-$$-$$$-suffix $$$ - key: quintuple-dollar-no-curly-braces value: - stringValue: $$an-envvar-value-$$-$$suffix $$$ + stringValue: $$an-envvar-value-$$-$$$-suffix $$$ - key: septuple-dollar-curly-braces value: - stringValue: $$$an-envvar-value-$$$-$$$suffix $$$$ + stringValue: $$$an-envvar-value-$$$-$$$$-suffix $$$$ - key: septuple-dollar-no-curly-braces value: - stringValue: $$$an-envvar-value-$$$-$$$suffix $$$$ + stringValue: $$$an-envvar-value-$$$-$$$$-suffix $$$$ - key: sextuple-dollar-curly-braces value: stringValue: $$${AN_ENVVAR}-$$$nonenvvar-$$$-suffix $$$ @@ -127,19 +127,19 @@ resourceMetrics: stringValue: $$$AN_ENVVAR-$$$nonenvvar-$$$-suffix $$$ - key: single-dollar-curly-braces value: - stringValue: an-envvar-value--suffix $ + stringValue: an-envvar-value--$-suffix $ - key: single-dollar-no-curly-braces value: - stringValue: an-envvar-value--suffix $ + stringValue: an-envvar-value--$-suffix $ - key: state value: stringValue: cached - key: triple-dollar-curly-braces value: - stringValue: $an-envvar-value-$-$suffix $$ + stringValue: $an-envvar-value-$-$$-suffix $$ - key: triple-dollar-no-curly-braces value: - stringValue: $an-envvar-value-$-$suffix $$ + stringValue: $an-envvar-value-$-$$-suffix $$ startTimeUnixNano: "1000000" timeUnixNano: "2000000" - asInt: "3154911232" @@ -158,10 +158,10 @@ resourceMetrics: stringValue: $AN_ENVVAR-$nonenvvar-$-suffix $ - key: nonuple-dollar-curly-braces value: - stringValue: $$$$an-envvar-value-$$$$-$$$$suffix $$$$$ + stringValue: $$$$an-envvar-value-$$$$-$$$$$-suffix $$$$$ - key: nonuple-dollar-no-curly-braces value: - stringValue: $$$$an-envvar-value-$$$$-$$$$suffix $$$$$ + stringValue: $$$$an-envvar-value-$$$$-$$$$$-suffix $$$$$ - key: octuple-dollar-curly-braces value: stringValue: $$$${AN_ENVVAR}-$$$$nonenvvar-$$$$-suffix $$$$ @@ -176,16 +176,16 @@ resourceMetrics: stringValue: $$AN_ENVVAR-$$nonenvvar-$$-suffix $$ - key: quintuple-dollar-curly-braces value: - stringValue: $$an-envvar-value-$$-$$suffix $$$ + stringValue: $$an-envvar-value-$$-$$$-suffix $$$ - key: quintuple-dollar-no-curly-braces value: - stringValue: $$an-envvar-value-$$-$$suffix $$$ + stringValue: $$an-envvar-value-$$-$$$-suffix $$$ - key: septuple-dollar-curly-braces value: - stringValue: $$$an-envvar-value-$$$-$$$suffix $$$$ + stringValue: $$$an-envvar-value-$$$-$$$$-suffix $$$$ - key: septuple-dollar-no-curly-braces value: - stringValue: $$$an-envvar-value-$$$-$$$suffix $$$$ + stringValue: $$$an-envvar-value-$$$-$$$$-suffix $$$$ - key: sextuple-dollar-curly-braces value: stringValue: $$${AN_ENVVAR}-$$$nonenvvar-$$$-suffix $$$ @@ -194,19 +194,19 @@ resourceMetrics: stringValue: $$$AN_ENVVAR-$$$nonenvvar-$$$-suffix $$$ - key: single-dollar-curly-braces value: - stringValue: an-envvar-value--suffix $ + stringValue: an-envvar-value--$-suffix $ - key: single-dollar-no-curly-braces value: - stringValue: an-envvar-value--suffix $ + stringValue: an-envvar-value--$-suffix $ - key: state value: stringValue: free - key: triple-dollar-curly-braces value: - stringValue: $an-envvar-value-$-$suffix $$ + stringValue: $an-envvar-value-$-$$-suffix $$ - key: triple-dollar-no-curly-braces value: - stringValue: $an-envvar-value-$-$suffix $$ + stringValue: $an-envvar-value-$-$$-suffix $$ startTimeUnixNano: "1000000" timeUnixNano: "2000000" - asInt: "251011072" @@ -225,10 +225,10 @@ resourceMetrics: stringValue: $AN_ENVVAR-$nonenvvar-$-suffix $ - key: nonuple-dollar-curly-braces value: - stringValue: $$$$an-envvar-value-$$$$-$$$$suffix $$$$$ + stringValue: $$$$an-envvar-value-$$$$-$$$$$-suffix $$$$$ - key: nonuple-dollar-no-curly-braces value: - stringValue: $$$$an-envvar-value-$$$$-$$$$suffix $$$$$ + stringValue: $$$$an-envvar-value-$$$$-$$$$$-suffix $$$$$ - key: octuple-dollar-curly-braces value: stringValue: $$$${AN_ENVVAR}-$$$$nonenvvar-$$$$-suffix $$$$ @@ -243,16 +243,16 @@ resourceMetrics: stringValue: $$AN_ENVVAR-$$nonenvvar-$$-suffix $$ - key: quintuple-dollar-curly-braces value: - stringValue: $$an-envvar-value-$$-$$suffix $$$ + stringValue: $$an-envvar-value-$$-$$$-suffix $$$ - key: quintuple-dollar-no-curly-braces value: - stringValue: $$an-envvar-value-$$-$$suffix $$$ + stringValue: $$an-envvar-value-$$-$$$-suffix $$$ - key: septuple-dollar-curly-braces value: - stringValue: $$$an-envvar-value-$$$-$$$suffix $$$$ + stringValue: $$$an-envvar-value-$$$-$$$$-suffix $$$$ - key: septuple-dollar-no-curly-braces value: - stringValue: $$$an-envvar-value-$$$-$$$suffix $$$$ + stringValue: $$$an-envvar-value-$$$-$$$$-suffix $$$$ - key: sextuple-dollar-curly-braces value: stringValue: $$${AN_ENVVAR}-$$$nonenvvar-$$$-suffix $$$ @@ -261,19 +261,19 @@ resourceMetrics: stringValue: $$$AN_ENVVAR-$$$nonenvvar-$$$-suffix $$$ - key: single-dollar-curly-braces value: - stringValue: an-envvar-value--suffix $ + stringValue: an-envvar-value--$-suffix $ - key: single-dollar-no-curly-braces value: - stringValue: an-envvar-value--suffix $ + stringValue: an-envvar-value--$-suffix $ - key: state value: stringValue: slab_reclaimable - key: triple-dollar-curly-braces value: - stringValue: $an-envvar-value-$-$suffix $$ + stringValue: $an-envvar-value-$-$$-suffix $$ - key: triple-dollar-no-curly-braces value: - stringValue: $an-envvar-value-$-$suffix $$ + stringValue: $an-envvar-value-$-$$-suffix $$ startTimeUnixNano: "1000000" timeUnixNano: "2000000" - asInt: "73723904" @@ -292,10 +292,10 @@ resourceMetrics: stringValue: $AN_ENVVAR-$nonenvvar-$-suffix $ - key: nonuple-dollar-curly-braces value: - stringValue: $$$$an-envvar-value-$$$$-$$$$suffix $$$$$ + stringValue: $$$$an-envvar-value-$$$$-$$$$$-suffix $$$$$ - key: nonuple-dollar-no-curly-braces value: - stringValue: $$$$an-envvar-value-$$$$-$$$$suffix $$$$$ + stringValue: $$$$an-envvar-value-$$$$-$$$$$-suffix $$$$$ - key: octuple-dollar-curly-braces value: stringValue: $$$${AN_ENVVAR}-$$$$nonenvvar-$$$$-suffix $$$$ @@ -310,16 +310,16 @@ resourceMetrics: stringValue: $$AN_ENVVAR-$$nonenvvar-$$-suffix $$ - key: quintuple-dollar-curly-braces value: - stringValue: $$an-envvar-value-$$-$$suffix $$$ + stringValue: $$an-envvar-value-$$-$$$-suffix $$$ - key: quintuple-dollar-no-curly-braces value: - stringValue: $$an-envvar-value-$$-$$suffix $$$ + stringValue: $$an-envvar-value-$$-$$$-suffix $$$ - key: septuple-dollar-curly-braces value: - stringValue: $$$an-envvar-value-$$$-$$$suffix $$$$ + stringValue: $$$an-envvar-value-$$$-$$$$-suffix $$$$ - key: septuple-dollar-no-curly-braces value: - stringValue: $$$an-envvar-value-$$$-$$$suffix $$$$ + stringValue: $$$an-envvar-value-$$$-$$$$-suffix $$$$ - key: sextuple-dollar-curly-braces value: stringValue: $$${AN_ENVVAR}-$$$nonenvvar-$$$-suffix $$$ @@ -328,19 +328,19 @@ resourceMetrics: stringValue: $$$AN_ENVVAR-$$$nonenvvar-$$$-suffix $$$ - key: single-dollar-curly-braces value: - stringValue: an-envvar-value--suffix $ + stringValue: an-envvar-value--$-suffix $ - key: single-dollar-no-curly-braces value: - stringValue: an-envvar-value--suffix $ + stringValue: an-envvar-value--$-suffix $ - key: state value: stringValue: slab_unreclaimable - key: triple-dollar-curly-braces value: - stringValue: $an-envvar-value-$-$suffix $$ + stringValue: $an-envvar-value-$-$$-suffix $$ - key: triple-dollar-no-curly-braces value: - stringValue: $an-envvar-value-$-$suffix $$ + stringValue: $an-envvar-value-$-$$-suffix $$ startTimeUnixNano: "1000000" timeUnixNano: "2000000" - asInt: "4796518400" @@ -359,10 +359,10 @@ resourceMetrics: stringValue: $AN_ENVVAR-$nonenvvar-$-suffix $ - key: nonuple-dollar-curly-braces value: - stringValue: $$$$an-envvar-value-$$$$-$$$$suffix $$$$$ + stringValue: $$$$an-envvar-value-$$$$-$$$$$-suffix $$$$$ - key: nonuple-dollar-no-curly-braces value: - stringValue: $$$$an-envvar-value-$$$$-$$$$suffix $$$$$ + stringValue: $$$$an-envvar-value-$$$$-$$$$$-suffix $$$$$ - key: octuple-dollar-curly-braces value: stringValue: $$$${AN_ENVVAR}-$$$$nonenvvar-$$$$-suffix $$$$ @@ -377,16 +377,16 @@ resourceMetrics: stringValue: $$AN_ENVVAR-$$nonenvvar-$$-suffix $$ - key: quintuple-dollar-curly-braces value: - stringValue: $$an-envvar-value-$$-$$suffix $$$ + stringValue: $$an-envvar-value-$$-$$$-suffix $$$ - key: quintuple-dollar-no-curly-braces value: - stringValue: $$an-envvar-value-$$-$$suffix $$$ + stringValue: $$an-envvar-value-$$-$$$-suffix $$$ - key: septuple-dollar-curly-braces value: - stringValue: $$$an-envvar-value-$$$-$$$suffix $$$$ + stringValue: $$$an-envvar-value-$$$-$$$$-suffix $$$$ - key: septuple-dollar-no-curly-braces value: - stringValue: $$$an-envvar-value-$$$-$$$suffix $$$$ + stringValue: $$$an-envvar-value-$$$-$$$$-suffix $$$$ - key: sextuple-dollar-curly-braces value: stringValue: $$${AN_ENVVAR}-$$$nonenvvar-$$$-suffix $$$ @@ -395,19 +395,19 @@ resourceMetrics: stringValue: $$$AN_ENVVAR-$$$nonenvvar-$$$-suffix $$$ - key: single-dollar-curly-braces value: - stringValue: an-envvar-value--suffix $ + stringValue: an-envvar-value--$-suffix $ - key: single-dollar-no-curly-braces value: - stringValue: an-envvar-value--suffix $ + stringValue: an-envvar-value--$-suffix $ - key: state value: stringValue: used - key: triple-dollar-curly-braces value: - stringValue: $an-envvar-value-$-$suffix $$ + stringValue: $an-envvar-value-$-$$-suffix $$ - key: triple-dollar-no-curly-braces value: - stringValue: $an-envvar-value-$-$suffix $$ + stringValue: $an-envvar-value-$-$$-suffix $$ startTimeUnixNano: "1000000" timeUnixNano: "2000000" unit: By diff --git a/tests/go.mod b/tests/go.mod index 7432af82f4..03a851b3f6 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -13,17 +13,17 @@ require ( github.com/shirou/gopsutil/v3 v3.24.5 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.31.0 - go.opentelemetry.io/collector/component v0.106.1 - go.opentelemetry.io/collector/config/configgrpc v0.106.1 - go.opentelemetry.io/collector/config/confignet v0.106.1 + go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/config/configgrpc v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/config/confignet v0.106.2-0.20240807203117-91d6525f52a4 go.opentelemetry.io/collector/config/configtls v1.12.0 - go.opentelemetry.io/collector/confmap v0.106.1 - go.opentelemetry.io/collector/consumer/consumertest v0.106.1 - go.opentelemetry.io/collector/exporter v0.106.1 - go.opentelemetry.io/collector/exporter/otlpexporter v0.106.1 + go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/consumer/consumertest v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/exporter v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/exporter/otlpexporter v0.106.2-0.20240807203117-91d6525f52a4 go.opentelemetry.io/collector/pdata v1.12.0 - go.opentelemetry.io/collector/receiver v0.106.1 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.1 + go.opentelemetry.io/collector/receiver v0.106.2-0.20240807203117-91d6525f52a4 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.2-0.20240807203117-91d6525f52a4 go.opentelemetry.io/otel/metric v1.28.0 go.opentelemetry.io/otel/trace v1.28.0 go.uber.org/atomic v1.11.0 @@ -92,22 +92,22 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector v0.106.1 // indirect - go.opentelemetry.io/collector/client v0.106.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.106.1 // indirect + go.opentelemetry.io/collector v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/client v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/config/configauth v0.106.2-0.20240807203117-91d6525f52a4 // indirect go.opentelemetry.io/collector/config/configcompression v1.12.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.106.1 // indirect + go.opentelemetry.io/collector/config/confighttp v0.106.2-0.20240807203117-91d6525f52a4 // indirect go.opentelemetry.io/collector/config/configopaque v1.12.0 // indirect go.opentelemetry.io/collector/config/configretry v1.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.106.1 // indirect - go.opentelemetry.io/collector/config/internal v0.106.1 // indirect - go.opentelemetry.io/collector/consumer v0.106.1 // indirect - go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.1 // indirect - go.opentelemetry.io/collector/extension v0.106.1 // indirect - go.opentelemetry.io/collector/extension/auth v0.106.1 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/config/internal v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/consumer v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/extension v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/extension/auth v0.106.2-0.20240807203117-91d6525f52a4 // indirect go.opentelemetry.io/collector/featuregate v1.12.0 // indirect - go.opentelemetry.io/collector/internal/globalgates v0.106.1 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.106.1 // indirect + go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.106.2-0.20240807203117-91d6525f52a4 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect @@ -115,11 +115,11 @@ require ( go.opentelemetry.io/otel/sdk v1.28.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.25.0 // indirect + golang.org/x/crypto v0.26.0 // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.27.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/text v0.17.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/grpc v1.65.0 // indirect diff --git a/tests/go.sum b/tests/go.sum index efbebd591d..80d8895bfd 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -362,62 +362,62 @@ github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.106.1 h1:ZSQMpFGzFP3RILe1/+K80kCCT2ahn3MKt5e3u0Yz7Rs= -go.opentelemetry.io/collector v0.106.1/go.mod h1:1FabMxWLluLNcC0dq8cI01GaE6t6fYxE6Oxuf8u7AGQ= -go.opentelemetry.io/collector/client v0.106.1 h1:aBasAp+t7F30lI+oQpT95ZgYMiNaUlYRlgyeEvEGwjk= -go.opentelemetry.io/collector/client v0.106.1/go.mod h1:QEmOGAu/8vNn2lhwcLVI3iEUIoQlXNGWsdCfENN5qDc= -go.opentelemetry.io/collector/component v0.106.1 h1:6Xp4tKqnd/JkJDG/C4p1hto+Y5zvk5FwqZIdMCPzZlA= -go.opentelemetry.io/collector/component v0.106.1/go.mod h1:KiVE/5ZayuLlDJTe7mHqHRCn/5LrmF99C7/mKe54mWA= -go.opentelemetry.io/collector/config/configauth v0.106.1 h1:ANwKV2vzJoAcif/T23s5AIlDt8kTa8bUMcSN6fYAruQ= -go.opentelemetry.io/collector/config/configauth v0.106.1/go.mod h1:nBTtlQ2KoMnUEp1PXa6hMCwcJpJ59poUdKyDq1fO/R4= +go.opentelemetry.io/collector v0.106.2-0.20240807203117-91d6525f52a4 h1:411LuynrXSf808xCwnovqzXR5ixNBzP6k3p5X1q6DNM= +go.opentelemetry.io/collector v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:BPBPZO+r4GdcF4xu+qR2pweusp/ZTM4t0tGVsMQDXrI= +go.opentelemetry.io/collector/client v0.106.2-0.20240807203117-91d6525f52a4 h1:IJRI0rzkTRxt69lGJiyQ9kBedBLRr2FYjToz+GlXf5k= +go.opentelemetry.io/collector/client v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:QEmOGAu/8vNn2lhwcLVI3iEUIoQlXNGWsdCfENN5qDc= +go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4 h1:wnl2GLoMX5Xbs6AA6otTOuyvz3773m2CydcVf7v90mg= +go.opentelemetry.io/collector/component v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:KiVE/5ZayuLlDJTe7mHqHRCn/5LrmF99C7/mKe54mWA= +go.opentelemetry.io/collector/config/configauth v0.106.2-0.20240807203117-91d6525f52a4 h1:7+HIjxEcegsJigl5xF/xKM344Pf9Qy1DjjDRHmsqtf0= +go.opentelemetry.io/collector/config/configauth v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:nBTtlQ2KoMnUEp1PXa6hMCwcJpJ59poUdKyDq1fO/R4= go.opentelemetry.io/collector/config/configcompression v1.12.0 h1:RxqSDVZPJyL7I3v+gdVDvnJ/9tV0ZWgraRDX/gaddfA= go.opentelemetry.io/collector/config/configcompression v1.12.0/go.mod h1:6+m0GKCv7JKzaumn7u80A2dLNCuYf5wdR87HWreoBO0= -go.opentelemetry.io/collector/config/configgrpc v0.106.1 h1:J0w1o/1vvJE2MtQAs4j+iq8ZMVZqduhoiu30hlsZeDo= -go.opentelemetry.io/collector/config/configgrpc v0.106.1/go.mod h1:aKGBNu/A4b3MEUUi1nNEuTHHCm/FNw9t56oUvQcFXi4= -go.opentelemetry.io/collector/config/confighttp v0.106.1 h1:OBX21JpJOVRASDnkwor5JpNz85qGvWYjtCIFO+5cUb8= -go.opentelemetry.io/collector/config/confighttp v0.106.1/go.mod h1:kafsg9XCdSHbgwOJO96Xxv3VolmjUN8KOozrjZzrun4= -go.opentelemetry.io/collector/config/confignet v0.106.1 h1:h/Rgqp5+1uKKJgsZuuLeO6zmJhdGi5PJGE2BdrM0eis= -go.opentelemetry.io/collector/config/confignet v0.106.1/go.mod h1:pfOrCTfSZEB6H2rKtx41/3RN4dKs+X2EKQbw3MGRh0E= +go.opentelemetry.io/collector/config/configgrpc v0.106.2-0.20240807203117-91d6525f52a4 h1:yfZ0gKsvBgafvBMGXpu4YcJL/SBb0bCvt8mkutspBLU= +go.opentelemetry.io/collector/config/configgrpc v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:nQ1KYTU1pGQeKZg3+cHhovJsAucaVN3yfFtJ+KyoLOU= +go.opentelemetry.io/collector/config/confighttp v0.106.2-0.20240807203117-91d6525f52a4 h1:B5Tc1lwI+xl5HiwI7CD3nwq9pm8HVhUuM3ZY4Tf4/7w= +go.opentelemetry.io/collector/config/confighttp v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:zwUf3uFmcgfNtWTUtb7oZ6/A4A9BH63TV43QB3Z8SHU= +go.opentelemetry.io/collector/config/confignet v0.106.2-0.20240807203117-91d6525f52a4 h1:1pOwNYG16Bsuhwe6Ud0kKxPqlUtYo+8VthCP3g7Kohc= +go.opentelemetry.io/collector/config/confignet v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:pfOrCTfSZEB6H2rKtx41/3RN4dKs+X2EKQbw3MGRh0E= go.opentelemetry.io/collector/config/configopaque v1.12.0 h1:aIsp9NdcLZSiG4YDoFPGXhmma03Tk+6e89+n8GtU/Mc= go.opentelemetry.io/collector/config/configopaque v1.12.0/go.mod h1:0xURn2sOy5j4fbaocpEYfM97HPGsiffkkVudSPyTJlM= go.opentelemetry.io/collector/config/configretry v1.12.0 h1:tEBwueO4AIkwWosxz6NWqnghdZ7y5SfHcIzLrvh6kB8= go.opentelemetry.io/collector/config/configretry v1.12.0/go.mod h1:P+RA0IA+QoxnDn4072uyeAk1RIoYiCbxYsjpKX5eFC4= -go.opentelemetry.io/collector/config/configtelemetry v0.106.1 h1:A8nwYnI6brfur5KPFC8GtVX/49pByvVoKSgO4qPXBqg= -go.opentelemetry.io/collector/config/configtelemetry v0.106.1/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40= +go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4 h1:EF55TfKoNEaRrRhXCkxTjqEg8zStji3bxWEdsOccAJA= +go.opentelemetry.io/collector/config/configtelemetry v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40= go.opentelemetry.io/collector/config/configtls v1.12.0 h1:Px0+GE4LE/9sXMgkwBb5g8QHWvnrnuRg9BLSa+QtxgM= go.opentelemetry.io/collector/config/configtls v1.12.0/go.mod h1:aeCGPlvrWhc+EySpIKdelPAj4l9wXKzZPouQO3NIoTs= -go.opentelemetry.io/collector/config/internal v0.106.1 h1:cEENs6xIMi4wjGF18JZX5uTV70mHPGfHKg9XndOubBs= -go.opentelemetry.io/collector/config/internal v0.106.1/go.mod h1:cmhchMcN0o/upXM7bxGv5djhhSW8kAYjKJoqT+AOxy0= -go.opentelemetry.io/collector/confmap v0.106.1 h1:R7HQIPDRPOEwauBeJUlkT8Elc5f0KQr/s/kQfZi05t0= -go.opentelemetry.io/collector/confmap v0.106.1/go.mod h1:iWdWgvxRYSHdAt5ySgPJq/i6fQMKGNnP5Pt7jOfTXno= -go.opentelemetry.io/collector/consumer v0.106.1 h1:+AQ/Kmoc/g0WP8thwymNkXk1jeWsHDK6XyYfdezcxcc= -go.opentelemetry.io/collector/consumer v0.106.1/go.mod h1:oy6pR/v5o/N9cxsICskyt//bU8k8EG0JeOO1MTDfs5A= -go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.1 h1:uxQjWm2XE7d1OncQDM9tL1ha+otGt1HjoRYIcQRMOfQ= -go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.1/go.mod h1:xQScBf9/PORFaYM6JVPOr7/TcRVEuKcW5XbAXfJByRs= -go.opentelemetry.io/collector/consumer/consumertest v0.106.1 h1:hDdFeVjCLIJ6iLfbiYcV9s+4iboFXbkJ/k3h09qusPw= -go.opentelemetry.io/collector/consumer/consumertest v0.106.1/go.mod h1:WRTYnQ8bYHQrEN6eJZ80oC4pNI7VeDRdsTZI6xs9o5M= -go.opentelemetry.io/collector/exporter v0.106.1 h1:PIqLqWacxSFcCstiF/6kxI1GLiP+9pjG7XFujxZG1z0= -go.opentelemetry.io/collector/exporter v0.106.1/go.mod h1:aGIoEwT5UjCHzq+oFYMuc5Mt15AfqvgDeLdjWTYSqNo= -go.opentelemetry.io/collector/exporter/otlpexporter v0.106.1 h1:XZmroqROemurXiRWAg4WfO0KkoooIcvzTi2aUcW5A8Q= -go.opentelemetry.io/collector/exporter/otlpexporter v0.106.1/go.mod h1:e01tHm+agklfj9C3jnLZd6ar+FvLCOw9VT2u87ao9IQ= -go.opentelemetry.io/collector/extension v0.106.1 h1:HNV2eOxaSDy5gL5KYoPoTLlp6fdeWmuw4paxhi10VUo= -go.opentelemetry.io/collector/extension v0.106.1/go.mod h1:DCOGxD+WnIJiDveKWlvH5WwB9AgqlRUlnKgwhNCLrtQ= -go.opentelemetry.io/collector/extension/auth v0.106.1 h1:IJyY5zeC11H/jlEGVx2bfTW0oVui2k1AjV8DnC6tYhE= -go.opentelemetry.io/collector/extension/auth v0.106.1/go.mod h1:4VcPLz6QTNq3fbY6kH5tvTnF6tWtz4toK2LC1ydpnts= +go.opentelemetry.io/collector/config/internal v0.106.2-0.20240807203117-91d6525f52a4 h1:gvuLvoDeVT40hfihdfvhMqtlcL8sF328Axj0fRh2Uo4= +go.opentelemetry.io/collector/config/internal v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:cmhchMcN0o/upXM7bxGv5djhhSW8kAYjKJoqT+AOxy0= +go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4 h1:DaUT+pwy36oRYjfmAVkS55IwIdpq/EXibHos5eAJYsA= +go.opentelemetry.io/collector/confmap v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:iWdWgvxRYSHdAt5ySgPJq/i6fQMKGNnP5Pt7jOfTXno= +go.opentelemetry.io/collector/consumer v0.106.2-0.20240807203117-91d6525f52a4 h1:ZPPXh3LOQCWiVha/ONA0poj6gcc3xiYvuuJZYgwmU04= +go.opentelemetry.io/collector/consumer v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:oy6pR/v5o/N9cxsICskyt//bU8k8EG0JeOO1MTDfs5A= +go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.2-0.20240807203117-91d6525f52a4 h1:9vO1el0iyXOE1cSEozpt4EBsFFJA1DG8ayromSni4Ng= +go.opentelemetry.io/collector/consumer/consumerprofiles v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:xQScBf9/PORFaYM6JVPOr7/TcRVEuKcW5XbAXfJByRs= +go.opentelemetry.io/collector/consumer/consumertest v0.106.2-0.20240807203117-91d6525f52a4 h1:hIm3ZnhSD3o4nbaccIe9Aip0wKVuLW2lHhaAuOrP0xo= +go.opentelemetry.io/collector/consumer/consumertest v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:WRTYnQ8bYHQrEN6eJZ80oC4pNI7VeDRdsTZI6xs9o5M= +go.opentelemetry.io/collector/exporter v0.106.2-0.20240807203117-91d6525f52a4 h1:RrUNq+0dreikPVSup51cWUu76r1Ijkh17o0HcH8lV1g= +go.opentelemetry.io/collector/exporter v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:BH3XtiJGIlnezwvfSTv+x5nBPmkiIWVhdBPo/81cI3I= +go.opentelemetry.io/collector/exporter/otlpexporter v0.106.2-0.20240807203117-91d6525f52a4 h1:QgI7hM/TunO3Sf0tcnQm7CeJhP7UcdUuMWOCFU033Ck= +go.opentelemetry.io/collector/exporter/otlpexporter v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:ASsI5/a1Za6a3HRIoYr/QI0eu8gYV1Qv7rJyauly4sU= +go.opentelemetry.io/collector/extension v0.106.2-0.20240807203117-91d6525f52a4 h1:Fnm6d1/mL42GKUKsj2neg59zQq+0154Ef1dmpSLBXTI= +go.opentelemetry.io/collector/extension v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:DCOGxD+WnIJiDveKWlvH5WwB9AgqlRUlnKgwhNCLrtQ= +go.opentelemetry.io/collector/extension/auth v0.106.2-0.20240807203117-91d6525f52a4 h1:6vnjFi9gNi/sYnVipjk2K2JsswuNvbmmf2mgdms7d80= +go.opentelemetry.io/collector/extension/auth v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:4VcPLz6QTNq3fbY6kH5tvTnF6tWtz4toK2LC1ydpnts= go.opentelemetry.io/collector/featuregate v1.12.0 h1:l5WbV2vMQd2bL8ubfGrbKNtZaeJRckE12CTHvRe47Tw= go.opentelemetry.io/collector/featuregate v1.12.0/go.mod h1:PsOINaGgTiFc+Tzu2K/X2jP+Ngmlp7YKGV1XrnBkH7U= -go.opentelemetry.io/collector/internal/globalgates v0.106.1 h1:0NQHTcykmYNDsNKObJ2XocGCv3WUAQZppfP3o6hZUIA= -go.opentelemetry.io/collector/internal/globalgates v0.106.1/go.mod h1:Z5US6O2xkZAtxVSSBnHAPFZwPhFoxlyKLUvS67Vx4gc= +go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4 h1:DKcDgtQ7/oPijKGvBj0kIq/aZ/IPXiL3Tc79CDiU/b4= +go.opentelemetry.io/collector/internal/globalgates v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:Z5US6O2xkZAtxVSSBnHAPFZwPhFoxlyKLUvS67Vx4gc= go.opentelemetry.io/collector/pdata v1.12.0 h1:Xx5VK1p4VO0md8MWm2icwC1MnJ7f8EimKItMWw46BmA= go.opentelemetry.io/collector/pdata v1.12.0/go.mod h1:MYeB0MmMAxeM0hstCFrCqWLzdyeYySim2dG6pDT6nYI= -go.opentelemetry.io/collector/pdata/pprofile v0.106.1 h1:nOLo25YnluNi+zAbU7G24RN86cJ1/EZJc6VEayBlOPo= -go.opentelemetry.io/collector/pdata/pprofile v0.106.1/go.mod h1:chr7lMJIzyXkccnPRkIPhyXtqLZLSReZYhwsggOGEfg= +go.opentelemetry.io/collector/pdata/pprofile v0.106.2-0.20240807203117-91d6525f52a4 h1:3SjfsYDnsV94ToC+TEo/SMk/kSYvkAaXext1Zd6kEik= +go.opentelemetry.io/collector/pdata/pprofile v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:chr7lMJIzyXkccnPRkIPhyXtqLZLSReZYhwsggOGEfg= go.opentelemetry.io/collector/pdata/testdata v0.106.1 h1:JUyLAwKD8o/9jgkBi16zOClxOyY028A7XIXHPV4mNmM= go.opentelemetry.io/collector/pdata/testdata v0.106.1/go.mod h1:ghdz2RDEzsfigW0J+9oqA4fGmQJ/DJYUhE3vYU6JfhM= -go.opentelemetry.io/collector/receiver v0.106.1 h1:9kDLDJmInnz+AzAV9oV/UGMoc1+oI1pwMMs7+uMiJq4= -go.opentelemetry.io/collector/receiver v0.106.1/go.mod h1:3j9asWz7mqsgE77rPaNhlNQhRwgFhRynf0UEPs/4rkM= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.1 h1:Z4wSuYpTpnrgUHq6XnG8eHNCXzSsF+yDODzZdVV2GmU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.1/go.mod h1:IE8RQoGF84xPW0UzRkyq6eT8mVbSu5vuXGRrKjK7iaM= +go.opentelemetry.io/collector/receiver v0.106.2-0.20240807203117-91d6525f52a4 h1:TRNp92BWa9RruSJHgHZFMiuCKU+Y6VGETujakYzjOzc= +go.opentelemetry.io/collector/receiver v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:+J2FEg4eDYdUuaDW8Cn41SeqFiuKdvnZOZlXvbVdVaw= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.2-0.20240807203117-91d6525f52a4 h1:DcgwNnPh13PDWhnMH+6RMLc6CXPOCh+Pdf1KOv1isIk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.106.2-0.20240807203117-91d6525f52a4/go.mod h1:DMbSNrcZdmojheFNDF60uRIx5B+QdXlChkDfslkvASg= go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= @@ -474,8 +474,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= -golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= @@ -506,8 +506,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -520,8 +520,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -561,16 +561,16 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= -golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=