From 47d1e8d185ec6bb461afdfc00f7945c62957ec50 Mon Sep 17 00:00:00 2001 From: Mahad Zaryab <43658574+mahadzaryab1@users.noreply.github.com> Date: Fri, 4 Oct 2024 21:13:53 -0400 Subject: [PATCH] [fix] Upgrade to otel-collector v0.111.0 and fix breaking changes (#6053) ## Which problem is this PR solving? - Resolves #6046 ## Description of the changes - The following breaking changes from otel-collector v0.111.0 were addressed in this PR - `exporterhelper.TimeoutSettings` was deprecated in favour of `exporterhelper.TimeoutConfig` - `ClientConfig.ToClientConnWithOptions` was deprecated in favour of `ClientConfig.ToClientConn` - `CreateTracesReceiver` was deprecated in favour of `CreateTraces` - `ServerConfig.ToServerWithOptions` was deprecated in favour `ServerConfig.ToServer` ## How was this change tested? - CI ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: Mahad Zaryab --- cmd/collector/app/handler/otlp_receiver.go | 2 +- .../app/handler/otlp_receiver_test.go | 2 +- cmd/collector/app/handler/zipkin_receiver.go | 2 +- .../app/handler/zipkin_receiver_test.go | 2 +- .../extension/remotesampling/extension.go | 2 +- .../processors/adaptivesampling/factory.go | 2 +- go.mod | 103 ++++----- go.sum | 206 +++++++++--------- plugin/storage/grpc/config.go | 8 +- plugin/storage/grpc/factory.go | 2 +- plugin/storage/grpc/factory_test.go | 2 +- plugin/storage/grpc/options.go | 2 +- plugin/storage/grpc/options_test.go | 4 +- 13 files changed, 169 insertions(+), 170 deletions(-) diff --git a/cmd/collector/app/handler/otlp_receiver.go b/cmd/collector/app/handler/otlp_receiver.go index 2bc2174e66c..8ddf42722e0 100644 --- a/cmd/collector/app/handler/otlp_receiver.go +++ b/cmd/collector/app/handler/otlp_receiver.go @@ -44,7 +44,7 @@ func StartOTLPReceiver(options *flags.CollectorOptions, logger *zap.Logger, span tm, otlpFactory, consumer.NewTraces, - otlpFactory.CreateTracesReceiver, + otlpFactory.CreateTraces, ) } diff --git a/cmd/collector/app/handler/otlp_receiver_test.go b/cmd/collector/app/handler/otlp_receiver_test.go index de96682578e..28f90e9c7e6 100644 --- a/cmd/collector/app/handler/otlp_receiver_test.go +++ b/cmd/collector/app/handler/otlp_receiver_test.go @@ -100,7 +100,7 @@ func TestStartOtlpReceiver_Error(t *testing.T) { return nil, errors.New("mock error") } f := otlpreceiver.NewFactory() - _, err = startOTLPReceiver(opts, logger, spanProcessor, &tenancy.Manager{}, f, newTraces, f.CreateTracesReceiver) + _, err = startOTLPReceiver(opts, logger, spanProcessor, &tenancy.Manager{}, f, newTraces, f.CreateTraces) require.Error(t, err) assert.Contains(t, err.Error(), "could not create the OTLP consumer") diff --git a/cmd/collector/app/handler/zipkin_receiver.go b/cmd/collector/app/handler/zipkin_receiver.go index 9c5d94a2c3e..983ee4bd2a5 100644 --- a/cmd/collector/app/handler/zipkin_receiver.go +++ b/cmd/collector/app/handler/zipkin_receiver.go @@ -37,7 +37,7 @@ func StartZipkinReceiver( tm, zipkinFactory, consumer.NewTraces, - zipkinFactory.CreateTracesReceiver, + zipkinFactory.CreateTraces, ) } diff --git a/cmd/collector/app/handler/zipkin_receiver_test.go b/cmd/collector/app/handler/zipkin_receiver_test.go index ee28d48a12b..2304e9c5392 100644 --- a/cmd/collector/app/handler/zipkin_receiver_test.go +++ b/cmd/collector/app/handler/zipkin_receiver_test.go @@ -148,7 +148,7 @@ func TestStartZipkinReceiver_Error(t *testing.T) { return nil, errors.New("mock error") } f := zipkinreceiver.NewFactory() - _, err = startZipkinReceiver(opts, logger, spanProcessor, tm, f, newTraces, f.CreateTracesReceiver) + _, err = startZipkinReceiver(opts, logger, spanProcessor, tm, f, newTraces, f.CreateTraces) require.Error(t, err) assert.Contains(t, err.Error(), "could not create Zipkin consumer") diff --git a/cmd/jaeger/internal/extension/remotesampling/extension.go b/cmd/jaeger/internal/extension/remotesampling/extension.go index e56eebfc59d..f88a6ae28d4 100644 --- a/cmd/jaeger/internal/extension/remotesampling/extension.go +++ b/cmd/jaeger/internal/extension/remotesampling/extension.go @@ -267,7 +267,7 @@ func (ext *rsExtension) startHTTPServer(ctx context.Context, host component.Host func (ext *rsExtension) startGRPCServer(ctx context.Context, host component.Host) error { var err error - if ext.grpcServer, err = ext.cfg.GRPC.ToServerWithOptions(ctx, host, ext.telemetry); err != nil { + if ext.grpcServer, err = ext.cfg.GRPC.ToServer(ctx, host, ext.telemetry); err != nil { return err } diff --git a/cmd/jaeger/internal/processors/adaptivesampling/factory.go b/cmd/jaeger/internal/processors/adaptivesampling/factory.go index 601dcd60317..b9b44efdfc2 100644 --- a/cmd/jaeger/internal/processors/adaptivesampling/factory.go +++ b/cmd/jaeger/internal/processors/adaptivesampling/factory.go @@ -36,7 +36,7 @@ func createTracesProcessor( ) (processor.Traces, error) { oCfg := cfg.(*Config) sp := newTraceProcessor(*oCfg, set.TelemetrySettings) - return processorhelper.NewTracesProcessor( + return processorhelper.NewTraces( ctx, set, cfg, diff --git a/go.mod b/go.mod index e5ad290a44a..9f45eeba32e 100644 --- a/go.mod +++ b/go.mod @@ -43,37 +43,37 @@ require ( github.com/stretchr/testify v1.9.0 github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/xdg-go/scram v1.1.2 - go.opentelemetry.io/collector/component v0.110.0 - go.opentelemetry.io/collector/component/componentstatus v0.110.0 - go.opentelemetry.io/collector/config/configauth v0.110.0 - go.opentelemetry.io/collector/config/configgrpc v0.110.0 - go.opentelemetry.io/collector/config/confighttp v0.110.0 - go.opentelemetry.io/collector/config/configretry v1.16.0 - go.opentelemetry.io/collector/config/configtls v1.16.0 + go.opentelemetry.io/collector/component v0.111.0 + go.opentelemetry.io/collector/component/componentstatus v0.111.0 + go.opentelemetry.io/collector/config/configauth v0.111.0 + go.opentelemetry.io/collector/config/configgrpc v0.111.0 + go.opentelemetry.io/collector/config/confighttp v0.111.0 + go.opentelemetry.io/collector/config/configretry v1.17.0 + go.opentelemetry.io/collector/config/configtls v1.17.0 go.opentelemetry.io/collector/confmap v1.17.0 go.opentelemetry.io/collector/confmap/provider/envprovider v1.16.0 go.opentelemetry.io/collector/confmap/provider/fileprovider v1.16.0 go.opentelemetry.io/collector/confmap/provider/httpprovider v1.17.0 go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.17.0 go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.17.0 - go.opentelemetry.io/collector/connector v0.110.0 - go.opentelemetry.io/collector/connector/forwardconnector v0.110.0 - go.opentelemetry.io/collector/consumer v0.110.0 - go.opentelemetry.io/collector/consumer/consumertest v0.110.0 - go.opentelemetry.io/collector/exporter v0.110.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.110.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.110.0 - go.opentelemetry.io/collector/extension v0.110.0 + go.opentelemetry.io/collector/connector v0.111.0 + go.opentelemetry.io/collector/connector/forwardconnector v0.111.0 + go.opentelemetry.io/collector/consumer v0.111.0 + go.opentelemetry.io/collector/consumer/consumertest v0.111.0 + go.opentelemetry.io/collector/exporter v0.111.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.111.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.111.0 + go.opentelemetry.io/collector/extension v0.111.0 go.opentelemetry.io/collector/extension/ballastextension v0.108.1 - go.opentelemetry.io/collector/extension/zpagesextension v0.110.0 - go.opentelemetry.io/collector/otelcol v0.110.0 - go.opentelemetry.io/collector/pdata v1.16.0 - go.opentelemetry.io/collector/pipeline v0.110.0 - go.opentelemetry.io/collector/processor v0.110.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.110.0 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.110.0 - go.opentelemetry.io/collector/receiver v0.110.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.110.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.111.0 + go.opentelemetry.io/collector/otelcol v0.111.0 + go.opentelemetry.io/collector/pdata v1.17.0 + go.opentelemetry.io/collector/pipeline v0.111.0 + go.opentelemetry.io/collector/processor v0.111.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.111.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.111.0 + go.opentelemetry.io/collector/receiver v0.111.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.111.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 go.opentelemetry.io/contrib/samplers/jaegerremote v0.24.0 @@ -97,6 +97,8 @@ require ( gopkg.in/yaml.v3 v3.0.1 ) +require github.com/ebitengine/purego v0.8.0 // indirect + require ( github.com/IBM/sarama v1.43.3 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect @@ -146,7 +148,7 @@ require ( github.com/jonboulle/clockwork v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/compress v1.17.10 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.1 // indirect @@ -193,8 +195,7 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect - github.com/shirou/gopsutil/v4 v4.24.8 // indirect - github.com/shoenig/go-m1cpu v0.1.6 // indirect + github.com/shirou/gopsutil/v4 v4.24.9 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect @@ -208,30 +209,30 @@ require ( github.com/xdg-go/stringprep v1.0.4 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.110.0 // indirect - go.opentelemetry.io/collector/client v1.16.0 // indirect - go.opentelemetry.io/collector/component/componentprofiles v0.110.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.16.0 // indirect - go.opentelemetry.io/collector/config/confignet v1.16.0 - go.opentelemetry.io/collector/config/configopaque v1.16.0 - go.opentelemetry.io/collector/config/configtelemetry v0.110.0 - go.opentelemetry.io/collector/config/internal v0.110.0 // indirect - go.opentelemetry.io/collector/connector/connectorprofiles v0.110.0 // indirect - go.opentelemetry.io/collector/consumer/consumerprofiles v0.110.0 // indirect - go.opentelemetry.io/collector/exporter/debugexporter v0.110.0 - go.opentelemetry.io/collector/exporter/exporterprofiles v0.110.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.110.0 // indirect - go.opentelemetry.io/collector/extension/experimental/storage v0.110.0 // indirect - go.opentelemetry.io/collector/extension/extensioncapabilities v0.110.0 - go.opentelemetry.io/collector/featuregate v1.16.0 // indirect - go.opentelemetry.io/collector/internal/globalgates v0.110.0 // indirect - go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.110.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.110.0 // indirect - go.opentelemetry.io/collector/processor/processorprofiles v0.110.0 // indirect - go.opentelemetry.io/collector/receiver/receiverprofiles v0.110.0 // indirect - go.opentelemetry.io/collector/semconv v0.110.0 // indirect - go.opentelemetry.io/collector/service v0.110.0 // indirect + go.opentelemetry.io/collector v0.111.0 // indirect + go.opentelemetry.io/collector/client v1.17.0 // indirect + go.opentelemetry.io/collector/component/componentprofiles v0.111.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.17.0 // indirect + go.opentelemetry.io/collector/config/confignet v1.17.0 + go.opentelemetry.io/collector/config/configopaque v1.17.0 + go.opentelemetry.io/collector/config/configtelemetry v0.111.0 + go.opentelemetry.io/collector/config/internal v0.111.0 // indirect + go.opentelemetry.io/collector/connector/connectorprofiles v0.111.0 // indirect + go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0 // indirect + go.opentelemetry.io/collector/exporter/debugexporter v0.111.0 + go.opentelemetry.io/collector/exporter/exporterprofiles v0.111.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.111.0 // indirect + go.opentelemetry.io/collector/extension/experimental/storage v0.111.0 // indirect + go.opentelemetry.io/collector/extension/extensioncapabilities v0.111.0 + go.opentelemetry.io/collector/featuregate v1.17.0 // indirect + go.opentelemetry.io/collector/internal/globalgates v0.111.0 // indirect + go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.111.0 // indirect + go.opentelemetry.io/collector/processor/processorprofiles v0.111.0 // indirect + go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 // indirect + go.opentelemetry.io/collector/semconv v0.111.0 // indirect + go.opentelemetry.io/collector/service v0.111.0 // indirect go.opentelemetry.io/contrib/config v0.10.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.30.0 // indirect go.opentelemetry.io/contrib/zpages v0.55.0 // indirect diff --git a/go.sum b/go.sum index 183ae421784..14d3216bd25 100644 --- a/go.sum +++ b/go.sum @@ -106,6 +106,8 @@ github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4A github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/ebitengine/purego v0.8.0 h1:JbqvnEzRvPpxhCJzJJ2y0RbiZ8nyjccVUrSM3q+GvvE= +github.com/ebitengine/purego v0.8.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA= github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= github.com/elastic/go-elasticsearch/v8 v8.15.0 h1:IZyJhe7t7WI3NEFdcHnf6IJXqpRf+8S8QWLtZYYyBYk= @@ -324,8 +326,8 @@ github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= +github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= @@ -510,12 +512,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29 h1:BkTk4gynLjguayxrYxZoMZjBnAOh7ntQvUkOFmkMqPU= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= -github.com/shirou/gopsutil/v4 v4.24.8 h1:pVQjIenQkIhqO81mwTaXjTzOMT7d3TZkf43PlVFHENI= -github.com/shirou/gopsutil/v4 v4.24.8/go.mod h1:wE0OrJtj4dG+hYkxqDH3QiBICdKSf04/npcvLLc/oRg= -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 v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= -github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= +github.com/shirou/gopsutil/v4 v4.24.9 h1:KIV+/HaHD5ka5f570RZq+2SaeFsb/pq+fp2DGNWYoOI= +github.com/shirou/gopsutil/v4 v4.24.9/go.mod h1:3fkaHNeYsUFCGZ8+9vZVWtbyM1k2eRnlL+bWO8Bxa/Q= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= @@ -579,36 +577,36 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.110.0 h1:v1muSqb80nTvzQa/4nR83JqvKISNRQn1zvi1EyhLTuk= -go.opentelemetry.io/collector v0.110.0/go.mod h1:N3tbcxHKHxBZcnsgM8l33/44rsZOABff5Hpo0aWg1cU= -go.opentelemetry.io/collector/client v1.16.0 h1:3m7HzWR41+4M8r9q7UvEDjMBTFMrik/BdvAuwCs0cV4= -go.opentelemetry.io/collector/client v1.16.0/go.mod h1:N01Alc/CouREl18hmxdaQXGfID7dBZrrbsBar7WHkZ0= -go.opentelemetry.io/collector/component v0.110.0 h1:z7uSY/1dcK+vTY2z3v0XxeCoi2wqgHTow/ds3Gozuz4= -go.opentelemetry.io/collector/component v0.110.0/go.mod h1:W99gZdfGtQ5Zg6Bhrwrcl/uZcCG+2qBnZ1z2JO5WCW0= -go.opentelemetry.io/collector/component/componentprofiles v0.110.0 h1:YH43aYKPYfnC0TqgI+WlbHsJkTvQPO3ImJybK3oyxQ8= -go.opentelemetry.io/collector/component/componentprofiles v0.110.0/go.mod h1:ZDVFaOhCt6ce2u/HHwqxoV5f+8P2dh0Xut8laYRu4+o= -go.opentelemetry.io/collector/component/componentstatus v0.110.0 h1:j+Fg88CgxmiCKL6cBCKRLHTduYbNE1OK1OYaXxGjuk4= -go.opentelemetry.io/collector/component/componentstatus v0.110.0/go.mod h1:UI3vOkwnI6JkRYxuWCrrlJe45ywTdlew426r4Wy4gH4= -go.opentelemetry.io/collector/config/configauth v0.110.0 h1:EtrWNvrYvQzj7zYiZQUxlgAkaXKp2j1tha5AP2YnN2E= -go.opentelemetry.io/collector/config/configauth v0.110.0/go.mod h1:G0xMfX6P2wf4hjsoDLdlV4J/fPpFp7Dpe8BNQ89+IiE= -go.opentelemetry.io/collector/config/configcompression v1.16.0 h1:bi9CJON53w+yYfnSaFgJ8Fb4zGKjFhPE5dnoSc1ag58= -go.opentelemetry.io/collector/config/configcompression v1.16.0/go.mod h1:pnxkFCLUZLKWzYJvfSwZnPrnm0twX14CYj2ADth5xiU= -go.opentelemetry.io/collector/config/configgrpc v0.110.0 h1:u4nZKYvfw3Wu/PDGrAPYjGF8+B0AILEjHHCpCmGN8R0= -go.opentelemetry.io/collector/config/configgrpc v0.110.0/go.mod h1:Wu3LMDxvFHBscmlRGArVm7lu/nQktrkZ94rjQ6a12wE= -go.opentelemetry.io/collector/config/confighttp v0.110.0 h1:Z7kog1Oxi6P/gX9DHr+c4xWTt7xeAG6F+pYgwbuIMAc= -go.opentelemetry.io/collector/config/confighttp v0.110.0/go.mod h1:nr0PbgQ1BXfqnPrbywMOCdzplp2CLaIIoujK4EOebnQ= -go.opentelemetry.io/collector/config/confignet v1.16.0 h1:RK8Sp/Up1HsI4WLSFFVeJ8o/QD5hqP9joZkynWBnH+E= -go.opentelemetry.io/collector/config/confignet v1.16.0/go.mod h1:o3v4joAEjvLwntqexg5ixMqRrU1+Vst+jWuCUaBNgOg= -go.opentelemetry.io/collector/config/configopaque v1.16.0 h1:83cVlPL151kHWrHLUAkdfwvnhp68x0XPxEkSBSfEapE= -go.opentelemetry.io/collector/config/configopaque v1.16.0/go.mod h1:6zlLIyOoRpJJ+0bEKrlZOZon3rOp5Jrz9fMdR4twOS4= -go.opentelemetry.io/collector/config/configretry v1.16.0 h1:GUjZO3uc35vJyMeccUUY2ozYSD8jLGR2Dt7d0NQN0C8= -go.opentelemetry.io/collector/config/configretry v1.16.0/go.mod h1:KvQF5cfphq1rQm1dKR4eLDNQYw6iI2fY72NMZVa+0N0= -go.opentelemetry.io/collector/config/configtelemetry v0.110.0 h1:V8Y/Xv7TJpnNGHLrheRKrMydcKBxWYAZ+dj71Kllyos= -go.opentelemetry.io/collector/config/configtelemetry v0.110.0/go.mod h1:R0MBUxjSMVMIhljuDHWIygzzJWQyZHXXWIgQNxcFwhc= -go.opentelemetry.io/collector/config/configtls v1.16.0 h1:seh/0Ph5Nkk8mdpG80o8+ExUvzdryB2UftyhnXLxv68= -go.opentelemetry.io/collector/config/configtls v1.16.0/go.mod h1:PrIG1ZamLBLdn880ud6FHv5C4/aEEVr+jPnxwdLdKeg= -go.opentelemetry.io/collector/config/internal v0.110.0 h1:yzCYmACC+lw0SIt2YjFTe0qygKXf88igitmsH6sCsXY= -go.opentelemetry.io/collector/config/internal v0.110.0/go.mod h1:yC7E4h1Uj0SubxcFImh6OvBHFTjMh99+A5PuyIgDWqc= +go.opentelemetry.io/collector v0.111.0 h1:D3LJTYrrK2ac94E2PXPSbVkArqxbklbCLsE4MAJQdRo= +go.opentelemetry.io/collector v0.111.0/go.mod h1:eZi4Z1DmHy+sVqbUI8dZNvhrH7HZIlX+0AKorOtv6nE= +go.opentelemetry.io/collector/client v1.17.0 h1:eJB4r4nPY0WrQ6IQEEbOPCOfQU7N15yzZud9y5fKfms= +go.opentelemetry.io/collector/client v1.17.0/go.mod h1:egG3tOG68zvC04hgl6cW2H/oWCUCCdDWtL4WpbcSUys= +go.opentelemetry.io/collector/component v0.111.0 h1:AiDIrhkq6sbHnU9Rhq6t4DC4Gal43bryd1+NTJNojAQ= +go.opentelemetry.io/collector/component v0.111.0/go.mod h1:wYwbRuhzK5bm5x1bX+ukm1tT50QXYLs4MKwzyfiVGoE= +go.opentelemetry.io/collector/component/componentprofiles v0.111.0 h1:yT3Sa833G9GMiXkAOuYi30afd/5vTmDQpZo6+X/XjXM= +go.opentelemetry.io/collector/component/componentprofiles v0.111.0/go.mod h1:v9cm6ndumcbCSqZDBs0vRReRW7KSYax1RZVhs/CiZCo= +go.opentelemetry.io/collector/component/componentstatus v0.111.0 h1:DojO8TbkysTtEoxzN6fJqhgCsu0QhxgJ9R+1bitnowM= +go.opentelemetry.io/collector/component/componentstatus v0.111.0/go.mod h1:wKozN6s9dykUB9aLSBXSPT9SJ2fckNvGSFZx4fRZbSY= +go.opentelemetry.io/collector/config/configauth v0.111.0 h1:0CcgX4TzK5iu2YtryIu3al8lNI+9fqjbGoyvAFk9ZCw= +go.opentelemetry.io/collector/config/configauth v0.111.0/go.mod h1:5oyYNL3gnYMYNdNsEjFvA2Tdc1yjG8L+HQFIjPo6kK8= +go.opentelemetry.io/collector/config/configcompression v1.17.0 h1:5CzLHTPOgHaKod1ZQLYs0o7GZDBhdsLQRm8Lcbo79vU= +go.opentelemetry.io/collector/config/configcompression v1.17.0/go.mod h1:pnxkFCLUZLKWzYJvfSwZnPrnm0twX14CYj2ADth5xiU= +go.opentelemetry.io/collector/config/configgrpc v0.111.0 h1:XwHBWCP0m/d6YZ0VZltzVvnz5hDB9ik7sPRjJIdmjUk= +go.opentelemetry.io/collector/config/configgrpc v0.111.0/go.mod h1:K9OLwZM8dGNL1Jul/FGxlRsnLd1umgDyA+yxq2BNXUs= +go.opentelemetry.io/collector/config/confighttp v0.111.0 h1:nZJFHKYYeCasyhhFC71iZf6GAs6pfFcNOga6b8+lFvc= +go.opentelemetry.io/collector/config/confighttp v0.111.0/go.mod h1:heE5JjcLDiH8fMULf55QL2oI9+8Ct58Vq/QfP7TV684= +go.opentelemetry.io/collector/config/confignet v1.17.0 h1:cBmDdiPuIVrHiecgCKyXhRYmDOz9Do5IM7O1JhbB3es= +go.opentelemetry.io/collector/config/confignet v1.17.0/go.mod h1:o3v4joAEjvLwntqexg5ixMqRrU1+Vst+jWuCUaBNgOg= +go.opentelemetry.io/collector/config/configopaque v1.17.0 h1:wHhUgJhmDgNd6M7GW8IU5HjWi/pNmBEe9jBhavoR45g= +go.opentelemetry.io/collector/config/configopaque v1.17.0/go.mod h1:6zlLIyOoRpJJ+0bEKrlZOZon3rOp5Jrz9fMdR4twOS4= +go.opentelemetry.io/collector/config/configretry v1.17.0 h1:9GaiNKgUDx5by+A0aHKojw1BilHSK+8wq2LOmnynN00= +go.opentelemetry.io/collector/config/configretry v1.17.0/go.mod h1:KvQF5cfphq1rQm1dKR4eLDNQYw6iI2fY72NMZVa+0N0= +go.opentelemetry.io/collector/config/configtelemetry v0.111.0 h1:Q3TJRM2A3FIDjIvzWa3uFArsdFN0I/0GzcWynHjC+oY= +go.opentelemetry.io/collector/config/configtelemetry v0.111.0/go.mod h1:R0MBUxjSMVMIhljuDHWIygzzJWQyZHXXWIgQNxcFwhc= +go.opentelemetry.io/collector/config/configtls v1.17.0 h1:5DPgmBgpKEopLGmkjaihZHVA/8yH0LGoOrUZlb86T0Q= +go.opentelemetry.io/collector/config/configtls v1.17.0/go.mod h1:xUV5/xAHJbwrCuT2rGurBGSUqyFFAVVBcQ5DJAENeCc= +go.opentelemetry.io/collector/config/internal v0.111.0 h1:HTrN9xCpX42xlyDskWbhA/2NkSjMasxNEuGkmjjq7Q8= +go.opentelemetry.io/collector/config/internal v0.111.0/go.mod h1:yC7E4h1Uj0SubxcFImh6OvBHFTjMh99+A5PuyIgDWqc= go.opentelemetry.io/collector/confmap v1.17.0 h1:5UKHtPGtzNGaOGBsJ6aFpvsKElNUXOVuErBfC0eTWLM= go.opentelemetry.io/collector/confmap v1.17.0/go.mod h1:GrIZ12P/9DPOuTpe2PIS51a0P/ZM6iKtByVee1Uf3+k= go.opentelemetry.io/collector/confmap/provider/envprovider v1.16.0 h1:UxygGtTW16zTTBOrZ5Fj9ZlAUcXSMP8ti3ydTbUWJKw= @@ -621,74 +619,74 @@ go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.17.0 h1:lI1uHXqT go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.17.0/go.mod h1:1Vhweh5dDeTUOmcw5WSGHPgHUwZzouf3y2dQr4yFWjA= go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.17.0 h1:FtKwwHS8NSNJWrhE7JsFlYhe+2GojENfOQbhQMSTyRo= go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.17.0/go.mod h1:9/R8ucfVQEEEHMv9b7M6rSB8nF2k+MfIO93vbDEsaMU= -go.opentelemetry.io/collector/connector v0.110.0 h1:gUUjgLzeipFAGAwDtKAqMtMRM4dULHiehiH+dq/0UkQ= -go.opentelemetry.io/collector/connector v0.110.0/go.mod h1:k4OjXus3SntyImXcEZzw2+6DS2MZAyBEfp/j2tbSNHU= -go.opentelemetry.io/collector/connector/connectorprofiles v0.110.0 h1:EHdVhXPRZ1IFwVfo5a9IiOs3RJ6wtbTL4W5f1p3Q3Vo= -go.opentelemetry.io/collector/connector/connectorprofiles v0.110.0/go.mod h1:VG1L8zbGZfWwJTlN4KYUcFMWVHXys86NfcshY+uVuLk= -go.opentelemetry.io/collector/connector/forwardconnector v0.110.0 h1:ftmYu+UExJLQ8U18xcgwwG0OjW8qsPctu7eNTdToJI8= -go.opentelemetry.io/collector/connector/forwardconnector v0.110.0/go.mod h1:YndfiFETIkjKQ9VygjK7IQXcBt1y0pcVSTlmup3HBMg= -go.opentelemetry.io/collector/consumer v0.110.0 h1:CnB83KSFQxhFAbNJwTM0blahg16xa6CyUnIIA5qPMbA= -go.opentelemetry.io/collector/consumer v0.110.0/go.mod h1:WlzhfwDfwKkEa5XFdN5x9+jjp9ZF5EUSmtOgVe69zm0= -go.opentelemetry.io/collector/consumer/consumerprofiles v0.110.0 h1:KlEGGPFmQN7CFbj8pkiD9J6L820kJgC0zYKqeSFGLEo= -go.opentelemetry.io/collector/consumer/consumerprofiles v0.110.0/go.mod h1:Br4qElhLqAYDMddroNox3CpNv+NxgPgNfGhxFXXxYIw= -go.opentelemetry.io/collector/consumer/consumertest v0.110.0 h1:/rOL4sJr4eSzOp5z6+R7MmuJ5UD6PFOs7S2FA7puE1g= -go.opentelemetry.io/collector/consumer/consumertest v0.110.0/go.mod h1:sKL3UwB6nyH/33JE173o755ekYPwlS/8fs8opTSgPiY= -go.opentelemetry.io/collector/exporter v0.110.0 h1:9XIzyk/xlNuSCfwEebJO9uiAlC4hjwhUSZbYv4JAXEE= -go.opentelemetry.io/collector/exporter v0.110.0/go.mod h1:Nr3aSDaak4j8tOCRqp4gUhsYloXwnhZnQ/sz0Qqb+yY= -go.opentelemetry.io/collector/exporter/debugexporter v0.110.0 h1:2noBvYU3ei0JfgMtEstYmvAOIqN/i9D9sKoNZxH5xZo= -go.opentelemetry.io/collector/exporter/debugexporter v0.110.0/go.mod h1:mfxNx4lUox65lVqB0IZ5WXF+S2hscyCcK0a3Vt+GH+8= -go.opentelemetry.io/collector/exporter/exporterprofiles v0.110.0 h1:zq3RDDYX7jKTNEJgFbbfAtjeOtMU+doabpZzIyRoRv0= -go.opentelemetry.io/collector/exporter/exporterprofiles v0.110.0/go.mod h1:dUMXYGiNnjaRvD120peFUe6XlJhk8LqbQq2C6sXBkgY= -go.opentelemetry.io/collector/exporter/otlpexporter v0.110.0 h1:+BNfN1cr9yqCcKPgduB0O11uZsvQNZSLVA8hbp4nMoI= -go.opentelemetry.io/collector/exporter/otlpexporter v0.110.0/go.mod h1:D/V89eH2UD7B0ahC6VhIb+Rx4N72Xq+/tzPx5zYjOdc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.110.0 h1:TSt1PD1KqpWTxJ5TSrkIHKVUQa3ejPpHfebl8zWI/OU= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.110.0/go.mod h1:MOhuAFKqLcLVH9hltbCnRFEDcO78SEx/K4UN0cRlyEM= -go.opentelemetry.io/collector/extension v0.110.0 h1:AYFk57W25f7xOo3I6pV0rWNWVtOLZsW+lzFCctnvCkU= -go.opentelemetry.io/collector/extension v0.110.0/go.mod h1:zD/pw9o83SFyn/DCbBdBcH0eUPyGtYgpMSAOqotFYRc= -go.opentelemetry.io/collector/extension/auth v0.110.0 h1:9SHC2sF/KR99LciHABDXRIsXLiujzIjTJpWHO0V8Bqg= -go.opentelemetry.io/collector/extension/auth v0.110.0/go.mod h1:NjpHds6mjeT8Zn2KJVxZtV9c59AoIr6RlBha1RpmScQ= +go.opentelemetry.io/collector/connector v0.111.0 h1:dOaJRO27LyX4ZnkZA51namo2V5idRWvWoMVf4b7obro= +go.opentelemetry.io/collector/connector v0.111.0/go.mod h1:gPwxA1SK+uraSTpX20MG/cNc+axhkBm8+B6z6hh6hYg= +go.opentelemetry.io/collector/connector/connectorprofiles v0.111.0 h1:tJ4+hcWRhknw+cRw6d6dI4CyX3/puqnd1Rg9+mWdwHU= +go.opentelemetry.io/collector/connector/connectorprofiles v0.111.0/go.mod h1:LdfE8hNYcEb+fI5kZp4w3ZGlTLFAmvHAPtTZxS6TZ38= +go.opentelemetry.io/collector/connector/forwardconnector v0.111.0 h1:+UuK8McQJCaI2sFLK5wWgibcEXVasVECJreu00zKVYc= +go.opentelemetry.io/collector/connector/forwardconnector v0.111.0/go.mod h1:c1njMtuI2jiB3k0DdlBrJFvVKRyljSQH8Bb1UwVz9vw= +go.opentelemetry.io/collector/consumer v0.111.0 h1:d2kRTDnu+p0q4D5fTU+Pk59KRm5F2JRYrk30Ep5j0xI= +go.opentelemetry.io/collector/consumer v0.111.0/go.mod h1:FjY9bPbVkFZLKKxnNbGsIqaz3lcFDKGf+7wxA1uCugs= +go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0 h1:w9kGdTaXdwD/ZtbxVOvuYQEFKBX3THQgEz/enQnMt9s= +go.opentelemetry.io/collector/consumer/consumerprofiles v0.111.0/go.mod h1:Ebt1jDdrQb3G2sNHrWHNr5wS3UJ9k3h8LHCqUPTbxLY= +go.opentelemetry.io/collector/consumer/consumertest v0.111.0 h1:ZEikGRPdrhVAq7xhJVc8WapRBVN/CdPnMEnXgpRGu1U= +go.opentelemetry.io/collector/consumer/consumertest v0.111.0/go.mod h1:EHPrn8ovcTGdTDlCEi1grOXSP3jUUYU0zvl92uA5L+4= +go.opentelemetry.io/collector/exporter v0.111.0 h1:NpiP6xXGOmSi59RlB5gGTB+PtCLldVeK3vCQBJPW0sU= +go.opentelemetry.io/collector/exporter v0.111.0/go.mod h1:FjO80zGWZjqXil8vM1MS8gyxxzZ29WmChTNV2y9xjHo= +go.opentelemetry.io/collector/exporter/debugexporter v0.111.0 h1:KiypGuW+JG1gV9l6pvSEIMKwn+MLJn0Ol62HMe5ytr4= +go.opentelemetry.io/collector/exporter/debugexporter v0.111.0/go.mod h1:7ihw3KDcvrY5kXIRNxB64Pz6kguf5Q0x9mJAvbBLT5Y= +go.opentelemetry.io/collector/exporter/exporterprofiles v0.111.0 h1:fpIRPzqsaEtbVip/wsU6h/GMGISo7UjiiYV61MOMEpQ= +go.opentelemetry.io/collector/exporter/exporterprofiles v0.111.0/go.mod h1:NGUTQd1fminFnw289fVQFN4dxdyedK4GTTrJUc9gCtw= +go.opentelemetry.io/collector/exporter/otlpexporter v0.111.0 h1:eOyd1InTuymfIP4oMzJki28JjpGQzOEK6Y0YlI6pwgA= +go.opentelemetry.io/collector/exporter/otlpexporter v0.111.0/go.mod h1:nOUveQ4KWFqlCA6b0L5DXMosZCcNtit8abEuLHwBaUM= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.111.0 h1:e7UHbu515LfkFKHdXdOvz0gQP6jXD+uuoKs1PRXHEw0= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.111.0/go.mod h1:0+TSVnAEw9hyF34b0eu36IFVLpAgpxOugAI2ZgNPX18= +go.opentelemetry.io/collector/extension v0.111.0 h1:oagGQS3k6Etnm5N5OEkfIWrX4/77t/ZP+B0xfTPUVm8= +go.opentelemetry.io/collector/extension v0.111.0/go.mod h1:ELCpDNpS2qb/31Z8pCMmqTkzfnUV3CanQZMwLW+GCMI= +go.opentelemetry.io/collector/extension/auth v0.111.0 h1:V9DfnMsKdVfsQMeGR5H/nAYHlZnr1Td75kkJOKbCevk= +go.opentelemetry.io/collector/extension/auth v0.111.0/go.mod h1:4O5JQqEdAWuq4giicIy6DKlgkKTC0qgVEJm44RhviZY= go.opentelemetry.io/collector/extension/ballastextension v0.108.1 h1:HmuvkGN2s5hnviVZ62CRM7XbGOWcVjlp3L6VOZEvaTc= go.opentelemetry.io/collector/extension/ballastextension v0.108.1/go.mod h1:Yu2jtjK7RD8Ie13N06rQMtGbLqWySmPEPEZoJdS9DT4= -go.opentelemetry.io/collector/extension/experimental/storage v0.110.0 h1:G1xkNGiBkdSrdhhU5VLE9+y7sZ5fU1/CHps92KSYDLc= -go.opentelemetry.io/collector/extension/experimental/storage v0.110.0/go.mod h1:0XFrIUcbqjsSycNI6Vu7ndMnjSkglMnD2YtUl2ZrzIU= -go.opentelemetry.io/collector/extension/extensioncapabilities v0.110.0 h1:VVqGHUh1A5ljEoQVeMCMUs1i7oLMKRQRpLCAim4WwpU= -go.opentelemetry.io/collector/extension/extensioncapabilities v0.110.0/go.mod h1:0T/UKqU5t5mUI3CkZfbyzsbEUbmMmmYUswDOsianqGg= -go.opentelemetry.io/collector/extension/zpagesextension v0.110.0 h1:94bbkfLmGYnV0eZpIiStVj9ZjBmAX6Su4cycKVJikEw= -go.opentelemetry.io/collector/extension/zpagesextension v0.110.0/go.mod h1:JVmfeCEje8El0n4iW+VpSv+adqTFqaoNI2DvrZ7F0M0= -go.opentelemetry.io/collector/featuregate v1.16.0 h1:mNA/ga+5FErnbJ/47KsGsF+CWqgQSOxTIseo6WuMcsc= -go.opentelemetry.io/collector/featuregate v1.16.0/go.mod h1:47xrISO71vJ83LSMm8+yIDsUbKktUp48Ovt7RR6VbRs= -go.opentelemetry.io/collector/internal/globalgates v0.110.0 h1:n+sxtzeXQyEkG7GpioNCFI0aNJjAwyUFWumlCXieEUU= -go.opentelemetry.io/collector/internal/globalgates v0.110.0/go.mod h1:fIPq3pHfDqXrUNQe5kxqYJaXemoVTcg+MM0S8zSkXSc= -go.opentelemetry.io/collector/internal/globalsignal v0.110.0 h1:S6bfFEiek8vJeXAbciWS7W8UR6ZrVJB3ftNyFTMHQaY= -go.opentelemetry.io/collector/internal/globalsignal v0.110.0/go.mod h1:GqMXodPWOxK5uqpX8MaMXC2389y2XJTa5nPwf8FYDK8= -go.opentelemetry.io/collector/otelcol v0.110.0 h1:nZjsCSQ6StXaJUxyFBH+VC35BQJ+Dp0sU5l7UP72bjs= -go.opentelemetry.io/collector/otelcol v0.110.0/go.mod h1:x7KFlMkEirBPp9P9oisM05oLztSqVFps9D7jPDuqr8A= -go.opentelemetry.io/collector/pdata v1.16.0 h1:g02K8jlRnmQ7TQDuXpdgVL6vIxIVqr5Gbb1qIR27rto= -go.opentelemetry.io/collector/pdata v1.16.0/go.mod h1:YZZJIt2ehxosYf/Y1pbvexjNWsIGNNrzzlCTO9jC1F4= -go.opentelemetry.io/collector/pdata/pprofile v0.110.0 h1:DknuOGOdjYIzVnromhVcW5rWyyjPahf65UAfgXz1xfo= -go.opentelemetry.io/collector/pdata/pprofile v0.110.0/go.mod h1:B3GxiEt40ixeGq2r30AOB3dgKdC281rLw39IqgSTwSM= -go.opentelemetry.io/collector/pdata/testdata v0.110.0 h1:XUXuaKVpD5G7VvTlBCBo/7CDpHvbeWRLXN4zjol94kg= -go.opentelemetry.io/collector/pdata/testdata v0.110.0/go.mod h1:lvpGoQcVDbRjuH3caNIkQ+pkU/+MLKVV4MdNFcp5mxU= -go.opentelemetry.io/collector/pipeline v0.110.0 h1:nArQj8lt2R6ajbbmZ0f7JqkzAzvIOSwxsxDEv9HGKHw= -go.opentelemetry.io/collector/pipeline v0.110.0/go.mod h1:qWk90kohDYBgI/1Kw4DQaQU82+y9GJY8MDse7H2JTWg= -go.opentelemetry.io/collector/processor v0.110.0 h1:i7/RB5otjkbrk1+c7WG1KbRpTqSbYnI+QDs1BULVKik= -go.opentelemetry.io/collector/processor v0.110.0/go.mod h1:+vzvc4F5VeoTjJe7jIHH8lIO9daSZE4+z8RGpSRoryg= -go.opentelemetry.io/collector/processor/batchprocessor v0.110.0 h1:7aeSb9YZ4BX/I35oqN4yzsNg+AFtfMrMXtuCmIPvdC8= -go.opentelemetry.io/collector/processor/batchprocessor v0.110.0/go.mod h1:pMVQTAnruhj7cyQvDWEdyEaYNR9f5EZFGbCJ33b6+4A= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.110.0 h1:e7VbrXkgksEImboeKJEAuUbHpaqY0MGZYH8k0MK+aN8= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.110.0/go.mod h1:culBjhsSPHeLZPf64gbn2MzrB6sBdGbPLwDMALsEGzk= -go.opentelemetry.io/collector/processor/processorprofiles v0.110.0 h1:bFzfDON5xPh+d83jn+pEz8yk8TldbGPt0z3ZF4SHCjU= -go.opentelemetry.io/collector/processor/processorprofiles v0.110.0/go.mod h1:psxTLRj+C+H91DG+KMnyycUCTKWtGMhOkGCpO0Pb3CA= -go.opentelemetry.io/collector/receiver v0.110.0 h1:uv+mCadEpWT7yoRvMil1bY44aZbZ7y4oAqsjvypf+t4= -go.opentelemetry.io/collector/receiver v0.110.0/go.mod h1:rTNskk6R+8bU4dlAB1IgdwkIiBl44+C6qcvdyarAyF0= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.110.0 h1:F1TsgyWimClOvAfP7nUbKChPfoNt8tThI64WNCutkAE= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.110.0/go.mod h1:MuLDagbS+v3iUwMSN/iJPWiDMLPEYxeYolzc+T2ElU0= -go.opentelemetry.io/collector/receiver/receiverprofiles v0.110.0 h1:QDbKYVQFlQJfo05qS8O0zyZghxeGmxlVUKIuIJQST6U= -go.opentelemetry.io/collector/receiver/receiverprofiles v0.110.0/go.mod h1:DsNqyNWfax62zb1y2ek2ERzrEAiaJocSfc+QLtHNnxI= -go.opentelemetry.io/collector/semconv v0.110.0 h1:KHQnOHe3gUz0zsxe8ph9kN5OTypCFD4V+06AiBTfeNk= -go.opentelemetry.io/collector/semconv v0.110.0/go.mod h1:zCJ5njhWpejR+A40kiEoeFm1xq1uzyZwMnRNX6/D82A= -go.opentelemetry.io/collector/service v0.110.0 h1:jeGdUi+5HQuH0Ho/Gd+VusY77MYJAUxUm0Vxh7aNbjQ= -go.opentelemetry.io/collector/service v0.110.0/go.mod h1:FDa4DFK49FhjNvLnin48bdxZ15IedaU86EcyD3BceqU= +go.opentelemetry.io/collector/extension/experimental/storage v0.111.0 h1:kUJSFjm6IQ6nmcJlfSFPvcEO/XeOP9gJY0Qz9O98DKg= +go.opentelemetry.io/collector/extension/experimental/storage v0.111.0/go.mod h1:qQGvl8Kz2W8b7QywtE8GNqWJMDBo47cjoiIXYuE+/zM= +go.opentelemetry.io/collector/extension/extensioncapabilities v0.111.0 h1:Ps2/2TUbAkxgZu1YxSxDweZDLJx5x7CyNKCINZkLFtY= +go.opentelemetry.io/collector/extension/extensioncapabilities v0.111.0/go.mod h1:q4kBSWsOX62hAp7si+Y0Y0ZXWyCpXjiRuWWz7IL/MDI= +go.opentelemetry.io/collector/extension/zpagesextension v0.111.0 h1:X+YXkJ3kX8c3xN/Mfiqc/gKB7NaQnG4Cge9R60lKOyw= +go.opentelemetry.io/collector/extension/zpagesextension v0.111.0/go.mod h1:v5u5Ots6HgbhKsvRXB+SF9cmVTgkUATNiejHbpsa0rY= +go.opentelemetry.io/collector/featuregate v1.17.0 h1:vpfXyWe7DFqCsDArsR9rAKKtVpt72PKjzjeqPegViws= +go.opentelemetry.io/collector/featuregate v1.17.0/go.mod h1:47xrISO71vJ83LSMm8+yIDsUbKktUp48Ovt7RR6VbRs= +go.opentelemetry.io/collector/internal/globalgates v0.111.0 h1:pPf/U401i/bEJ8ucbYMyqOdkujyZ92Gbm6RFkJrDvBc= +go.opentelemetry.io/collector/internal/globalgates v0.111.0/go.mod h1:HqIBKc8J5Vccn93gkN1uaVK42VbVsuVyjmo5b1MORZo= +go.opentelemetry.io/collector/internal/globalsignal v0.111.0 h1:oq0nSD+7K2Q1Fx5d3s6lPRdKZeTL0FEg4sIaR7ZJzIc= +go.opentelemetry.io/collector/internal/globalsignal v0.111.0/go.mod h1:GqMXodPWOxK5uqpX8MaMXC2389y2XJTa5nPwf8FYDK8= +go.opentelemetry.io/collector/otelcol v0.111.0 h1:RcS1/BDsEBGdI4YjosdElxYwsA2tTtiYEuWjEF0p8vk= +go.opentelemetry.io/collector/otelcol v0.111.0/go.mod h1:B/ri/CwsW7zeLXkCcB3XtarxjJ80eIC+z8guGhFFpis= +go.opentelemetry.io/collector/pdata v1.17.0 h1:z8cjjT2FThAehWu5fbF48OnZyK5q8xd1UhC4XszDo0w= +go.opentelemetry.io/collector/pdata v1.17.0/go.mod h1:yZaQ9KZAm/qie96LTygRKxOXMq0/54h8OW7330ycuvQ= +go.opentelemetry.io/collector/pdata/pprofile v0.111.0 h1:4if6rItcX8a6X4bIh6lwQnlE+ncKXQaIim7F5O7ZA58= +go.opentelemetry.io/collector/pdata/pprofile v0.111.0/go.mod h1:iBwrNFB6za1qspy46ZE41H3MmcxUogn2AuYbrWdoMd8= +go.opentelemetry.io/collector/pdata/testdata v0.111.0 h1:Fqyf1NJ0az+HbsvKSCNw8pfa1Y6c4FhZwlMK4ZulG0s= +go.opentelemetry.io/collector/pdata/testdata v0.111.0/go.mod h1:7SypOzbVtRsCkns6Yxa4GztnkVGkk7b9fW24Ow75q5s= +go.opentelemetry.io/collector/pipeline v0.111.0 h1:qENDGvWWnDXguEfmj8eO+5kr8Y6XFKytU5SuMinz3Ls= +go.opentelemetry.io/collector/pipeline v0.111.0/go.mod h1:ZZMU3019geEU283rTW5M/LkcqLqHp/YI2Nl6/Vp68PQ= +go.opentelemetry.io/collector/processor v0.111.0 h1:85Llb9ekzzvzAXgFaw/n7LHFJ5QAjeOulGJlDLEAR3g= +go.opentelemetry.io/collector/processor v0.111.0/go.mod h1:78Z4f96j9trPFZIRCiQk6nVRo6vua4cW9VYNfHTBsvo= +go.opentelemetry.io/collector/processor/batchprocessor v0.111.0 h1:JoBjX0LjmQ3n22o54sxAN9T6sgxumBLDqq0RElvYAVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.111.0/go.mod h1:8Dw89aInFh4dX3A0iyIcpbQ1A/8hVWtxjrJKyAOb9TQ= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.111.0 h1:Y5gMjXn6bbMiOgiGSaWvOFb4jbCVraG1/GjQsJjCEMI= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.111.0/go.mod h1:s42Gm7LMqietFs0Cpl+ma2sEYZP3RWHIlXlWimGW2cQ= +go.opentelemetry.io/collector/processor/processorprofiles v0.111.0 h1:QxnwbqClJvS7zDWgsIaqqDs5YsmHgFvmZKQsmoLTqJM= +go.opentelemetry.io/collector/processor/processorprofiles v0.111.0/go.mod h1:8qPd8Af0XX7Wlupe8JHmdhkKMiiJ5AO7OEFYW3fN0CQ= +go.opentelemetry.io/collector/receiver v0.111.0 h1:6cRHZ9cUxYfRPkArUCkIhoo7Byf6tq/2qvbMIKlhG3s= +go.opentelemetry.io/collector/receiver v0.111.0/go.mod h1:QSl/n9ikDP+6n39QcRY/VLjwQI0qbT1RQp512uBQl3g= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.111.0 h1:VsQ55DvHvjYop+wbpY6qCSF0cfoMNMZEd0pANa5l+9Y= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.111.0/go.mod h1:/zUX2GHa7CIeqGRl+hpQk3zQ1QCaUpBK42XGqrXAbzQ= +go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0 h1:oYLAdGMQQR7gB6wVkbV0G4EMsrmiOs3O0qf3hh/3avw= +go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.0/go.mod h1:M/OfdEGnvyB+fSTSW4RPKj5N06FXL8oKSIf60FlrKmM= +go.opentelemetry.io/collector/semconv v0.111.0 h1:ELleMtLBzeZ3xhfhYPmFcLc0hJMqRxhOB0eY60WLivw= +go.opentelemetry.io/collector/semconv v0.111.0/go.mod h1:zCJ5njhWpejR+A40kiEoeFm1xq1uzyZwMnRNX6/D82A= +go.opentelemetry.io/collector/service v0.111.0 h1:6yGjjbZvlYbir+vzi/9ACF965m8i96ScPTjpVvki3ms= +go.opentelemetry.io/collector/service v0.111.0/go.mod h1:tti8TAosPuRj51/bbrSvf6OIJoSyTkywEvTdY/fAuwY= go.opentelemetry.io/contrib/config v0.10.0 h1:2JknAzMaYjxrHkTnZh3eOme/Y2P5eHE2SWfhfV6Xd6c= go.opentelemetry.io/contrib/config v0.10.0/go.mod h1:aND2M6/KfNkntI5cyvHriR/zvZgPf8j9yETdSmvpfmc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 h1:hCq2hNMwsegUvPzI7sPOvtO9cqyy5GbWt/Ybp2xrx8Q= diff --git a/plugin/storage/grpc/config.go b/plugin/storage/grpc/config.go index 3f5834aba0b..37a5d293fa2 100644 --- a/plugin/storage/grpc/config.go +++ b/plugin/storage/grpc/config.go @@ -13,14 +13,14 @@ import ( // Config describes the options to customize the storage behavior type Config struct { - Tenancy tenancy.Options `mapstructure:"multi_tenancy"` - configgrpc.ClientConfig `mapstructure:",squash"` - exporterhelper.TimeoutSettings `mapstructure:",squash"` + Tenancy tenancy.Options `mapstructure:"multi_tenancy"` + configgrpc.ClientConfig `mapstructure:",squash"` + exporterhelper.TimeoutConfig `mapstructure:",squash"` } func DefaultConfig() Config { return Config{ - TimeoutSettings: exporterhelper.TimeoutConfig{ + TimeoutConfig: exporterhelper.TimeoutConfig{ Timeout: defaultConnectionTimeout, }, } diff --git a/plugin/storage/grpc/factory.go b/plugin/storage/grpc/factory.go index 49f0f5a45e3..c12cb370c75 100644 --- a/plugin/storage/grpc/factory.go +++ b/plugin/storage/grpc/factory.go @@ -98,7 +98,7 @@ func (f *Factory) Initialize(metricsFactory metrics.Factory, logger *zap.Logger) for _, opt := range opts { clientOpts = append(clientOpts, configgrpc.WithGrpcDialOption(opt)) } - return f.config.ToClientConnWithOptions(context.Background(), componenttest.NewNopHost(), telset, clientOpts...) + return f.config.ToClientConn(context.Background(), componenttest.NewNopHost(), telset, clientOpts...) } var err error diff --git a/plugin/storage/grpc/factory_test.go b/plugin/storage/grpc/factory_test.go index 8030ba23386..71adb34bbd3 100644 --- a/plugin/storage/grpc/factory_test.go +++ b/plugin/storage/grpc/factory_test.go @@ -166,7 +166,7 @@ func TestGRPCStorageFactoryWithConfig(t *testing.T) { ClientConfig: configgrpc.ClientConfig{ Endpoint: lis.Addr().String(), }, - TimeoutSettings: exporterhelper.TimeoutConfig{ + TimeoutConfig: exporterhelper.TimeoutConfig{ Timeout: 1 * time.Second, }, Tenancy: tenancy.Options{ diff --git a/plugin/storage/grpc/options.go b/plugin/storage/grpc/options.go index f5a08f4e1ce..59e0f6bf00c 100644 --- a/plugin/storage/grpc/options.go +++ b/plugin/storage/grpc/options.go @@ -42,7 +42,7 @@ func initFromViper(cfg *Config, v *viper.Viper) error { return fmt.Errorf("failed to parse gRPC storage TLS options: %w", err) } cfg.ClientConfig.TLSSetting = remoteTLS.ToOtelClientConfig() - cfg.TimeoutSettings.Timeout = v.GetDuration(remoteConnectionTimeout) + cfg.TimeoutConfig.Timeout = v.GetDuration(remoteConnectionTimeout) cfg.Tenancy = tenancy.InitFromViper(v) return nil } diff --git a/plugin/storage/grpc/options_test.go b/plugin/storage/grpc/options_test.go index 83e52364d16..a3e8953f098 100644 --- a/plugin/storage/grpc/options_test.go +++ b/plugin/storage/grpc/options_test.go @@ -45,7 +45,7 @@ func TestRemoteOptionsWithFlags(t *testing.T) { assert.Equal(t, "localhost:2001", cfg.ClientConfig.Endpoint) assert.False(t, cfg.ClientConfig.TLSSetting.Insecure) - assert.Equal(t, 60*time.Second, cfg.TimeoutSettings.Timeout) + assert.Equal(t, 60*time.Second, cfg.TimeoutConfig.Timeout) } func TestRemoteOptionsNoTLSWithFlags(t *testing.T) { @@ -61,7 +61,7 @@ func TestRemoteOptionsNoTLSWithFlags(t *testing.T) { assert.Equal(t, "localhost:2001", cfg.ClientConfig.Endpoint) assert.True(t, cfg.ClientConfig.TLSSetting.Insecure) - assert.Equal(t, 60*time.Second, cfg.TimeoutSettings.Timeout) + assert.Equal(t, 60*time.Second, cfg.TimeoutConfig.Timeout) } func TestFailedTLSFlags(t *testing.T) {