From 2ab2b313cad97f184108adc7c5cd049d42d910d1 Mon Sep 17 00:00:00 2001 From: Joonsoo Won <68256369+won-js@users.noreply.github.com> Date: Tue, 24 Sep 2024 22:48:47 +0900 Subject: [PATCH] Fix linter errors from deprecations in OTEL 0.110 (#6016) --- cmd/collector/app/handler/otlp_receiver.go | 5 +- .../app/handler/otlp_receiver_test.go | 3 +- .../exporters/storageexporter/factory.go | 4 +- .../extension/remotesampling/extension.go | 2 +- go.mod | 126 ++++----- go.sum | 252 +++++++++--------- plugin/storage/grpc/config.go | 4 +- plugin/storage/grpc/factory.go | 7 +- plugin/storage/grpc/factory_test.go | 2 +- 9 files changed, 209 insertions(+), 196 deletions(-) diff --git a/cmd/collector/app/handler/otlp_receiver.go b/cmd/collector/app/handler/otlp_receiver.go index f72d9959aa9..2bc2174e66c 100644 --- a/cmd/collector/app/handler/otlp_receiver.go +++ b/cmd/collector/app/handler/otlp_receiver.go @@ -17,6 +17,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/pipeline" "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/otlpreceiver" "go.opentelemetry.io/otel/metric" @@ -192,7 +193,7 @@ func (h *otelHost) ReportFatalError(err error) { h.logger.Fatal("OTLP receiver error", zap.Error(err)) } -func (*otelHost) GetFactory(_ component.Kind, _ component.Type) component.Factory { +func (*otelHost) GetFactory(_ component.Kind, _ pipeline.Signal) component.Factory { return nil } @@ -200,7 +201,7 @@ func (*otelHost) GetExtensions() map[component.ID]extension.Extension { return nil } -func (*otelHost) GetExporters() map[component.DataType]map[component.ID]component.Component { +func (*otelHost) GetExporters() map[pipeline.Signal]map[component.ID]component.Component { return nil } diff --git a/cmd/collector/app/handler/otlp_receiver_test.go b/cmd/collector/app/handler/otlp_receiver_test.go index 763248c35b2..de96682578e 100644 --- a/cmd/collector/app/handler/otlp_receiver_test.go +++ b/cmd/collector/app/handler/otlp_receiver_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/pipeline" "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/otlpreceiver" @@ -138,7 +139,7 @@ func TestOtelHost_ReportFatalError(t *testing.T) { func TestOtelHost(t *testing.T) { host := &otelHost{} - assert.Nil(t, host.GetFactory(component.KindReceiver, component.DataTypeTraces)) + assert.Nil(t, host.GetFactory(component.KindReceiver, pipeline.SignalTraces)) assert.Nil(t, host.GetExtensions()) assert.Nil(t, host.GetExporters()) } diff --git a/cmd/jaeger/internal/exporters/storageexporter/factory.go b/cmd/jaeger/internal/exporters/storageexporter/factory.go index b7663170eda..d57a4f55b0e 100644 --- a/cmd/jaeger/internal/exporters/storageexporter/factory.go +++ b/cmd/jaeger/internal/exporters/storageexporter/factory.go @@ -39,9 +39,9 @@ func createTracesExporter(ctx context.Context, set exporter.Settings, config com ex.pushTraces, exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}), // Disable Timeout/RetryOnFailure and SendingQueue - exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}), + exporterhelper.WithTimeout(exporterhelper.TimeoutConfig{Timeout: 0}), exporterhelper.WithRetry(configretry.BackOffConfig{Enabled: false}), - exporterhelper.WithQueue(exporterhelper.QueueSettings{Enabled: false}), + exporterhelper.WithQueue(exporterhelper.QueueConfig{Enabled: false}), exporterhelper.WithStart(ex.start), exporterhelper.WithShutdown(ex.close), ) diff --git a/cmd/jaeger/internal/extension/remotesampling/extension.go b/cmd/jaeger/internal/extension/remotesampling/extension.go index f88a6ae28d4..e56eebfc59d 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.ToServer(ctx, host, ext.telemetry); err != nil { + if ext.grpcServer, err = ext.cfg.GRPC.ToServerWithOptions(ctx, host, ext.telemetry); err != nil { return err } diff --git a/go.mod b/go.mod index 6b8cc6938bc..b3000120f90 100644 --- a/go.mod +++ b/go.mod @@ -43,36 +43,36 @@ 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.109.0 - go.opentelemetry.io/collector/component/componentstatus v0.109.0 - go.opentelemetry.io/collector/config/configauth v0.109.0 - go.opentelemetry.io/collector/config/configgrpc v0.109.0 - go.opentelemetry.io/collector/config/confighttp v0.109.0 - go.opentelemetry.io/collector/config/configretry v1.15.0 - go.opentelemetry.io/collector/config/configtls v1.15.0 - go.opentelemetry.io/collector/confmap v1.15.0 - go.opentelemetry.io/collector/confmap/provider/envprovider v1.15.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.0 - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.109.0 - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.109.0 - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.109.0 - go.opentelemetry.io/collector/connector v0.109.0 - go.opentelemetry.io/collector/connector/forwardconnector v0.109.0 - go.opentelemetry.io/collector/consumer v0.109.0 - go.opentelemetry.io/collector/consumer/consumertest v0.109.0 - go.opentelemetry.io/collector/exporter v0.109.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.109.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.0 - go.opentelemetry.io/collector/extension v0.109.0 + 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/confmap v1.16.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 v0.110.0 + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.110.0 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.110.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/extension/ballastextension v0.108.1 - go.opentelemetry.io/collector/extension/zpagesextension v0.109.0 - go.opentelemetry.io/collector/otelcol v0.109.0 - go.opentelemetry.io/collector/pdata v1.15.0 - go.opentelemetry.io/collector/processor v0.109.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.109.0 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.109.0 - go.opentelemetry.io/collector/receiver v0.109.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.0 + 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/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/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 @@ -99,6 +99,8 @@ require ( require ( github.com/elastic/lunes v0.1.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.109.0 // indirect + go.opentelemetry.io/collector/internal/globalsignal v0.110.0 // indirect + go.opentelemetry.io/collector/pipeline v0.110.0 // indirect ) require ( @@ -208,39 +210,39 @@ 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.109.0 // indirect - go.opentelemetry.io/collector/client v1.15.0 // indirect - go.opentelemetry.io/collector/component/componentprofiles v0.109.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.15.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.109.0 - go.opentelemetry.io/collector/config/configopaque v1.15.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.109.0 - go.opentelemetry.io/collector/config/internal v0.109.0 // indirect - go.opentelemetry.io/collector/connector/connectorprofiles v0.109.0 // indirect - go.opentelemetry.io/collector/consumer/consumerprofiles v0.109.0 // indirect - go.opentelemetry.io/collector/exporter/debugexporter v0.109.0 - go.opentelemetry.io/collector/exporter/exporterprofiles v0.109.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.109.0 // indirect - go.opentelemetry.io/collector/extension/experimental/storage v0.109.0 // indirect - go.opentelemetry.io/collector/extension/extensioncapabilities v0.109.0 - go.opentelemetry.io/collector/featuregate v1.15.0 // indirect - go.opentelemetry.io/collector/internal/globalgates v0.109.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.109.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.109.0 // indirect - go.opentelemetry.io/collector/processor/processorprofiles v0.109.0 // indirect - go.opentelemetry.io/collector/receiver/receiverprofiles v0.109.0 // indirect - go.opentelemetry.io/collector/semconv v0.109.0 // indirect - go.opentelemetry.io/collector/service v0.109.0 // indirect - go.opentelemetry.io/contrib/config v0.9.0 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.29.0 // indirect - go.opentelemetry.io/contrib/zpages v0.54.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.5.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.29.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.29.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.5.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0 // indirect - go.opentelemetry.io/otel/log v0.5.0 // indirect - go.opentelemetry.io/otel/sdk/log v0.5.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 // indirect + 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/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/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 + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.6.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.30.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.30.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.6.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.30.0 // indirect + go.opentelemetry.io/otel/log v0.6.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.6.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/go.sum b/go.sum index 6ef6d12f1a2..92c9d5070fb 100644 --- a/go.sum +++ b/go.sum @@ -575,132 +575,136 @@ 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.109.0 h1:ULnMWuwcy4ix1oP5RFFRcmpEbaU5YabW6nWcLMQQRo0= -go.opentelemetry.io/collector v0.109.0/go.mod h1:gheyquSOc5E9Y+xsPmpA+PBrpPc+msVsIalY76/ZvnQ= -go.opentelemetry.io/collector/client v1.15.0 h1:SMUKTntljRmFvB8nCVf6KjbEQ/qm63wi+huDx+Bc/po= -go.opentelemetry.io/collector/client v1.15.0/go.mod h1:m0MdKbzRIVgyGu70qbJ6TwBmKtblk7cmPqspM45a5yY= -go.opentelemetry.io/collector/component v0.109.0 h1:AU6eubP1htO8Fvm86uWn66Kw0DMSFhgcRM2cZZTYfII= -go.opentelemetry.io/collector/component v0.109.0/go.mod h1:jRVFY86GY6JZ61SXvUN69n7CZoTjDTqWyNC+wJJvzOw= -go.opentelemetry.io/collector/component/componentprofiles v0.109.0 h1:W+IHaK1SdExcp3lmb454Y6v+JArsWHD0gsoBiX+dKNY= -go.opentelemetry.io/collector/component/componentprofiles v0.109.0/go.mod h1:rmD8l1mpJULa3UFi/2c62Mij3QNH00BzQ05ZkfQqNYc= -go.opentelemetry.io/collector/component/componentstatus v0.109.0 h1:LiyJOvkv1lVUqBECvolifM2lsXFEgVXHcIw0MWRf/1I= -go.opentelemetry.io/collector/component/componentstatus v0.109.0/go.mod h1:TBx2Leggcw1c1tM+Gt/rDYbqN9Unr3fMxHh2TbxLizI= -go.opentelemetry.io/collector/config/configauth v0.109.0 h1:6I2g1dcXD7KCmzXWHaL09I6RSmiCER4b+UARYkmMw3U= -go.opentelemetry.io/collector/config/configauth v0.109.0/go.mod h1:i36T9K3m7pLSlqMFdy+npY7JxfxSg3wQc8bHNpykLLE= -go.opentelemetry.io/collector/config/configcompression v1.15.0 h1:HHzus/ahJW2dA6h4S4vs1MwlbOck27Ivk/L3o0V94UA= -go.opentelemetry.io/collector/config/configcompression v1.15.0/go.mod h1:pnxkFCLUZLKWzYJvfSwZnPrnm0twX14CYj2ADth5xiU= -go.opentelemetry.io/collector/config/configgrpc v0.109.0 h1:LyaX6l7QhxaBzHJRNuZxtQ7P4iSu0/5pY9lt6En0RwQ= -go.opentelemetry.io/collector/config/configgrpc v0.109.0/go.mod h1:nrwFbaSSrRRb3VJPign40ALOZQ3LH4fOCYLJRZU4/1k= -go.opentelemetry.io/collector/config/confighttp v0.109.0 h1:6R2+zI1LqFarEnCL4k+1DCsFi+aVeUTbfFOQBk0JBh0= -go.opentelemetry.io/collector/config/confighttp v0.109.0/go.mod h1:fzvAO2nCnP9XRUiaCBh1AZ2whUf99iQTkEVFCyH+URk= -go.opentelemetry.io/collector/config/confignet v0.109.0 h1:/sBkAzkNtVFLWb38bfgkmkJXIBi4idayDmP4xaA2BDk= -go.opentelemetry.io/collector/config/confignet v0.109.0/go.mod h1:o3v4joAEjvLwntqexg5ixMqRrU1+Vst+jWuCUaBNgOg= -go.opentelemetry.io/collector/config/configopaque v1.15.0 h1:J1rmPR1WGro7BNCgni3o+VDoyB7ZqH2/SG1YK+6ujCw= -go.opentelemetry.io/collector/config/configopaque v1.15.0/go.mod h1:6zlLIyOoRpJJ+0bEKrlZOZon3rOp5Jrz9fMdR4twOS4= -go.opentelemetry.io/collector/config/configretry v1.15.0 h1:4ZUPrWWh4wiwdlGnss2lZDhvf1xkt8uwHEqmuqovMEs= -go.opentelemetry.io/collector/config/configretry v1.15.0/go.mod h1:KvQF5cfphq1rQm1dKR4eLDNQYw6iI2fY72NMZVa+0N0= -go.opentelemetry.io/collector/config/configtelemetry v0.109.0 h1:ItbYw3tgFMU+TqGcDVEOqJLKbbOpfQg3AHD8b22ygl8= -go.opentelemetry.io/collector/config/configtelemetry v0.109.0/go.mod h1:R0MBUxjSMVMIhljuDHWIygzzJWQyZHXXWIgQNxcFwhc= -go.opentelemetry.io/collector/config/configtls v1.15.0 h1:imUIYDu6lo7juxxgpJhoMQ+LJRxqQzKvjOcWTo4u0IY= -go.opentelemetry.io/collector/config/configtls v1.15.0/go.mod h1:T3pOF5UemLzmYgY7QpiZuDRrihJ8lyXB0cDe6j1F1Ek= -go.opentelemetry.io/collector/config/internal v0.109.0 h1:uAlmO9Gu4Ff5wXXWWn+7XRZKEBjwGE8YdkdJxOlodns= -go.opentelemetry.io/collector/config/internal v0.109.0/go.mod h1:JJJGJTz1hILaaT+01FxbCFcDvPf2otXqMcWk/s2KvlA= -go.opentelemetry.io/collector/confmap v1.15.0 h1:KaNVG6fBJXNqEI+/MgZasH0+aShAU1yAkSYunk6xC4E= -go.opentelemetry.io/collector/confmap v1.15.0/go.mod h1:GrIZ12P/9DPOuTpe2PIS51a0P/ZM6iKtByVee1Uf3+k= -go.opentelemetry.io/collector/confmap/provider/envprovider v1.15.0 h1:QK4S0CY3l7aJ3EJdrM1Bm4fVQoF285RgdrXdKKpMz1U= -go.opentelemetry.io/collector/confmap/provider/envprovider v1.15.0/go.mod h1:/syocs/ODZitkUDojxDNPSPWfEC84q+XGzrXq1bkb9k= -go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.0 h1:qO9sgYUYHeASlH+hqf9uUj6NcN+WjB2ZglhsU1VPb6M= -go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.0/go.mod h1:mPK7NOS3NCLpPM+g9vul6esU5bYttauDNi3lcC47jG8= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.109.0 h1:AXb7Sr5xKaQt3MPCvbpk2gv3cmjHZuQhhAbpjpMNod8= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.109.0/go.mod h1:TY9njdV+TW5jRUvCZUPOboKUNEr1xzB/e4ZjEPIPdTc= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.109.0 h1:7jusCkgboh3fx4zKk3HcL3pcEPa9zNwpLkQiv11YCSE= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.109.0/go.mod h1:OtdA/HxoRbcnn/Qx3pj14hRlBTcK9O51Yy1F/IaY+Z0= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.109.0 h1:5COuB/kJZM/O5Vb3UmKkRr7g3E69tP+ePvNmY+Au+Es= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.109.0/go.mod h1:QKnaYuai5C5wDRoPVtLSkaz9ruH+HAnUzr3zOG2hgKU= -go.opentelemetry.io/collector/connector v0.109.0 h1:5U6uJETP4x9pkYAJTJsN4S9c4cjmd0tLZwzdZ/8Mscc= -go.opentelemetry.io/collector/connector v0.109.0/go.mod h1:/OXMHga1Cu9wNp+AOxxgekMQeccMN42Q73xScm+C62M= -go.opentelemetry.io/collector/connector/connectorprofiles v0.109.0 h1:v0fl+nxF5AEC91v8jLgLZ07D4vv5lgJ9jGJdVyIMx10= -go.opentelemetry.io/collector/connector/connectorprofiles v0.109.0/go.mod h1:s+qrtOxWWsh631GmD5rhMAgWA0DWaOk0F310leKqN4Y= -go.opentelemetry.io/collector/connector/forwardconnector v0.109.0 h1:ZSF9U403F9o+0zW5TLJb1E1nPgrP2/nSm2QtUSnBHiI= -go.opentelemetry.io/collector/connector/forwardconnector v0.109.0/go.mod h1:6IJFX/+9f/DmAGR6PouBWpglG5OXVMHdl83JWYr+AuQ= -go.opentelemetry.io/collector/consumer v0.109.0 h1:fdXlJi5Rat/poHPiznM2mLiXjcv1gPy3fyqqeirri58= -go.opentelemetry.io/collector/consumer v0.109.0/go.mod h1:E7PZHnVe1DY9hYy37toNxr9/hnsO7+LmnsixW8akLQI= -go.opentelemetry.io/collector/consumer/consumerprofiles v0.109.0 h1:+WZ6MEWQRC6so3IRrW916XK58rI9NnrFHKW/P19jQvc= -go.opentelemetry.io/collector/consumer/consumerprofiles v0.109.0/go.mod h1:spZ9Dn1MRMPDHHThdXZA5TrFhdOL1wsl0Dw45EBVoVo= -go.opentelemetry.io/collector/consumer/consumertest v0.109.0 h1:v4w9G2MXGJ/eabCmX1DvQYmxzdysC8UqIxa/BWz7ACo= -go.opentelemetry.io/collector/consumer/consumertest v0.109.0/go.mod h1:lECt0qOrx118wLJbGijtqNz855XfvJv0xx9GSoJ8qSE= -go.opentelemetry.io/collector/exporter v0.109.0 h1:LsZ8/EB8cYvdgap3a8HWCEHYpVyH9A4d53Hy0W6n9KY= -go.opentelemetry.io/collector/exporter v0.109.0/go.mod h1:yk+qAB1ZJYoUYretkzbNt/onpy/VyQdTpPhvIbyh3Us= -go.opentelemetry.io/collector/exporter/debugexporter v0.109.0 h1:w/bKcIFy5HwjbtjyLtZ8lcKfKUs+E2o8Dk8qQcJrzpI= -go.opentelemetry.io/collector/exporter/debugexporter v0.109.0/go.mod h1:KN7xarQB/PgxQ0LazfWtx/ODmRVFNIoFFuWJWRZl2+k= -go.opentelemetry.io/collector/exporter/exporterprofiles v0.109.0 h1:px+iViqF0JB6+COJL6cTSa0HLpJRNlPmFUA6zjOCKMk= -go.opentelemetry.io/collector/exporter/exporterprofiles v0.109.0/go.mod h1:Zs5z/fdsRN3v9mChU2aYNGzUAJgY+2D+T7ZRGiZ3lmY= -go.opentelemetry.io/collector/exporter/otlpexporter v0.109.0 h1:T0yQXSxFnl0mN8tUpR9i3bgDWFQqXRg7N3VCvYQIFcc= -go.opentelemetry.io/collector/exporter/otlpexporter v0.109.0/go.mod h1:5UWl8qL4EbNqTFGvJ9y0GjYTap03UtJbMhuJO9LJGfM= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.0 h1:FTN1KRg4vZt5ZArEjHINTieHCX36kEk/QFHXo1Xs+/Q= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.0/go.mod h1:ejCuRQHv6D++sKco4K76nJwfS3gAqiZZQuStJ2y9TE4= -go.opentelemetry.io/collector/extension v0.109.0 h1:r/WkSCYGF1B/IpUgbrKTyJHcfn7+A5+mYfp5W7+B4U0= -go.opentelemetry.io/collector/extension v0.109.0/go.mod h1:WDE4fhiZnt2haxqSgF/2cqrr5H+QjgslN5tEnTBZuXc= -go.opentelemetry.io/collector/extension/auth v0.109.0 h1:yKUMCUG3IkjuOnHriNj0nqFU2DRdZn3Tvn9eqCI0eTg= -go.opentelemetry.io/collector/extension/auth v0.109.0/go.mod h1:wOIv49JhXIfol8CRmQvLve05ft3nZQUnTfcnuZKxdbo= +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/confmap v1.16.0 h1:0bWw/XSosX6xoE1sGsaD3glzRtSxanrF4sgib3jAYr4= +go.opentelemetry.io/collector/confmap v1.16.0/go.mod h1:GrIZ12P/9DPOuTpe2PIS51a0P/ZM6iKtByVee1Uf3+k= +go.opentelemetry.io/collector/confmap/provider/envprovider v1.16.0 h1:UxygGtTW16zTTBOrZ5Fj9ZlAUcXSMP8ti3ydTbUWJKw= +go.opentelemetry.io/collector/confmap/provider/envprovider v1.16.0/go.mod h1:quCDKd9REuufQ3yqVUSbFdCFOYvWP9I94uJRmUYGH9g= +go.opentelemetry.io/collector/confmap/provider/fileprovider v1.16.0 h1:Z1vNHogJr5POhZxjP8XJunCo1MbVS8tnc2DLa0d0Xcw= +go.opentelemetry.io/collector/confmap/provider/fileprovider v1.16.0/go.mod h1:danW43O0F/15a+0hggGi4HMcQilcHGbGVZ08XR9OPzA= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.110.0 h1:Vc0oPjc/ESlmycY9lDcUqDwnaInr0z7t5hH1Ucb1jOE= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.110.0/go.mod h1:Q39e6e7mwAda/q2rvpeGMUgGVuDITcGUS52sAecIAgE= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.110.0 h1:vqGxIBfb9kUbryx/ND6gopUhP+HrA3n5cc1fTlyt8nw= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.110.0/go.mod h1:ltR/ObS2dYTH1GtBiU72VfnPuY4guljbkinPoJp9AS8= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.110.0 h1:N6WCkXXm1Q0B7SKcMM3nldWPfCFj5WrbbNox76O+kTo= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.110.0/go.mod h1:GdhdHV3pi3vyYYbywCEgD5rsxrUye8bYnDvTnOSdudU= +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/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.109.0 h1:kIJiOXHHBgMCvuDNA602dS39PJKB+ryiclLE3V5DIvM= -go.opentelemetry.io/collector/extension/experimental/storage v0.109.0/go.mod h1:6cGr7MxnF72lAiA7nbkSC8wnfIk+L9CtMzJWaaII9vs= -go.opentelemetry.io/collector/extension/extensioncapabilities v0.109.0 h1:gwLiFySAlYvaaITqmF3EkblrxwcfaDxntUmflf3YdrA= -go.opentelemetry.io/collector/extension/extensioncapabilities v0.109.0/go.mod h1:4zf6xx0Qtv9OHJg599Ah48URgpNCPP6tiSakwIRcRfk= -go.opentelemetry.io/collector/extension/zpagesextension v0.109.0 h1:ckD3J8GIMagfAxwNOhwvdvZIK9ve5lXjWhauk/knSbo= -go.opentelemetry.io/collector/extension/zpagesextension v0.109.0/go.mod h1:bp2ZFqesXpE0omutODQoRaHcMsY+SjNAScfQurUb1lM= -go.opentelemetry.io/collector/featuregate v1.15.0 h1:8KRWaZaE9hLlyMXnMTvnWtUJnzrBuTI0aLIvxqe8QP0= -go.opentelemetry.io/collector/featuregate v1.15.0/go.mod h1:47xrISO71vJ83LSMm8+yIDsUbKktUp48Ovt7RR6VbRs= -go.opentelemetry.io/collector/internal/globalgates v0.109.0 h1:hBnxv0qtYJtsxZKr5evieX+VKZ7DcC22p5KFxeX1cGM= -go.opentelemetry.io/collector/internal/globalgates v0.109.0/go.mod h1:R5E97bZTG+IimHwxKbZBXMvooDXVboUjUMG1omkQti8= -go.opentelemetry.io/collector/otelcol v0.109.0 h1:x7hcrV3lnCg7Ub0Q5haLRFWmqS3mPiqEPOLkOS18VNg= -go.opentelemetry.io/collector/otelcol v0.109.0/go.mod h1:LR2qca0GFWd2yZFBaSTpTIPqnAXJM3gmes++nZNx4ms= -go.opentelemetry.io/collector/pdata v1.15.0 h1:q/T1sFpRKJnjDrUsHdJ6mq4uSqViR/f92yvGwDby/gY= -go.opentelemetry.io/collector/pdata v1.15.0/go.mod h1:2wcsTIiLAJSbqBq/XUUYbi+cP+N87d0jEJzmb9nT19U= -go.opentelemetry.io/collector/pdata/pprofile v0.109.0 h1:5lobQKeHk8p4WC7KYbzL6ZqqX3eSizsdmp5vM8pQFBs= -go.opentelemetry.io/collector/pdata/pprofile v0.109.0/go.mod h1:lXIifCdtR5ewO17JAYTUsclMqRp6h6dCowoXHhGyw8Y= -go.opentelemetry.io/collector/pdata/testdata v0.109.0 h1:gvIqy6juvqFET/6zi+zUOH1KZY/vtEDZW55u7gJ/hEo= -go.opentelemetry.io/collector/pdata/testdata v0.109.0/go.mod h1:zRttU/F5QMQ6ZXBMXCoSVG3EORTZLTK+UUS0VoMoT44= -go.opentelemetry.io/collector/processor v0.109.0 h1:Pgo9hib4ae1FSA47RB7TUUS26nConIlXcltzbxrjFg8= -go.opentelemetry.io/collector/processor v0.109.0/go.mod h1:Td43GwGMRCXin5JM/zAzMtLieobHTVVrD4Y7jSvsMtg= -go.opentelemetry.io/collector/processor/batchprocessor v0.109.0 h1:WqFGXId61sX91Og0VC7WjeR58Qv+YCsbLt3/Q1w3H8k= -go.opentelemetry.io/collector/processor/batchprocessor v0.109.0/go.mod h1:+aZMsL25etcyFTF6jIJwVv99OYE2JfnxQXGIKjIOY3M= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.109.0 h1:wXMvSe4OizuOPbp59xGj4CYYvvqGZaFcTtZSJ7RRnGw= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.109.0/go.mod h1:ewP8+ghUVT0O5+A6VU7SIlU5uDxkeiVwt/aI4Gbbpzs= -go.opentelemetry.io/collector/processor/processorprofiles v0.109.0 h1:+w0vqF30eOskfpcIuZLAJb1dCWcayBlGWoQCOUWKzf4= -go.opentelemetry.io/collector/processor/processorprofiles v0.109.0/go.mod h1:k7pJ76mOeU1Fx1hoVEJExMK9mhMre8xdSS3+cOKvdM4= -go.opentelemetry.io/collector/receiver v0.109.0 h1:DTOM7xaDl7FUGQIjvjmWZn03JUE+aG4mJzWWfb7S8zw= -go.opentelemetry.io/collector/receiver v0.109.0/go.mod h1:jeiCHaf3PE6aXoZfHF5Uexg7aztu+Vkn9LVw0YDKm6g= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.0 h1:zqDh6B9hgrrU5gnv7GBg5mvIcgYNc5plKcUzSm8ZvmU= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.0/go.mod h1:lRRYeYtzzNrY/Sy9FD59Hcw+RH3k+Wq110DYS5bfxgQ= -go.opentelemetry.io/collector/receiver/receiverprofiles v0.109.0 h1:KKzdIixE/XJWvqdCcNWAOtsEhNKu4waLKJjawjhnPLw= -go.opentelemetry.io/collector/receiver/receiverprofiles v0.109.0/go.mod h1:FKU+RFkSLWWB3tUUB6vifapZdFp1FoqVYVQ22jpHc8w= -go.opentelemetry.io/collector/semconv v0.109.0 h1:6CStOFOVhdrzlHg51kXpcPHRKPh5RtV7z/wz+c1TG1g= -go.opentelemetry.io/collector/semconv v0.109.0/go.mod h1:zCJ5njhWpejR+A40kiEoeFm1xq1uzyZwMnRNX6/D82A= -go.opentelemetry.io/collector/service v0.109.0 h1:kL0qiY1AJSpQgFdLSAZXb/vsyauWhNaBrQ3Uk/xAx3Q= -go.opentelemetry.io/collector/service v0.109.0/go.mod h1:lpOCtSftIcuiTZleqGPHWU2g7hpsJPrlwBT1a16sBew= -go.opentelemetry.io/contrib/config v0.9.0 h1:AJ1c6+vJ6SxvqBBhsi2RhLFMlc6SnJOg81Jp4toFyNw= -go.opentelemetry.io/contrib/config v0.9.0/go.mod h1:u/u2L6y/c8GKrq/AP51sfXV4Eu24btVlC3A5f867xwg= +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/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= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0/go.mod h1:LqaApwGx/oUmzsbqxkzuBvyoPpkxk3JQWnqfVrJ3wCA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 h1:ZIg3ZT/aQ7AfKqdwp7ECpOK6vHqquXXuyTjIO8ZdmPs= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0/go.mod h1:DQAwmETtZV00skUwgD6+0U89g80NKsJE3DCKeLLPQMI= -go.opentelemetry.io/contrib/propagators/b3 v1.29.0 h1:hNjyoRsAACnhoOLWupItUjABzeYmX3GTTZLzwJluJlk= -go.opentelemetry.io/contrib/propagators/b3 v1.29.0/go.mod h1:E76MTitU1Niwo5NSN+mVxkyLu4h4h7Dp/yh38F2WuIU= +go.opentelemetry.io/contrib/propagators/b3 v1.30.0 h1:vumy4r1KMyaoQRltX7cJ37p3nluzALX9nugCjNNefuY= +go.opentelemetry.io/contrib/propagators/b3 v1.30.0/go.mod h1:fRbvRsaeVZ82LIl3u0rIvusIel2UUf+JcaaIpy5taho= go.opentelemetry.io/contrib/samplers/jaegerremote v0.24.0 h1:LcynmmCFYwa0AySFI+yLEeZpwQi2yQdEkv5+zA3TwcI= go.opentelemetry.io/contrib/samplers/jaegerremote v0.24.0/go.mod h1:oPzwx3Gp7+u62wvez470Yq/Yu0O7hpVl5SFBRGI4964= -go.opentelemetry.io/contrib/zpages v0.54.0 h1:tSfm/LEK5E46sd5qx/Y9o4iQ65ipLubV0Una7veXFlA= -go.opentelemetry.io/contrib/zpages v0.54.0/go.mod h1:sbe4/RH3CFKkdM5zuGwfziKjvkqUOK9hSgLFckiVZUI= +go.opentelemetry.io/contrib/zpages v0.55.0 h1:F+xj261Ulwl79QC+2O+IO1b3NbwppUDwN+7LbDSdQcY= +go.opentelemetry.io/contrib/zpages v0.55.0/go.mod h1:dDqDGDfbXSjt/k9orZk4Huulvz1letX1YWTKts5GQpo= go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts= go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc= -go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.5.0 h1:4d++HQ+Ihdl+53zSjtsCUFDmNMju2FC9qFkUlTxPLqo= -go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.5.0/go.mod h1:mQX5dTO3Mh5ZF7bPKDkt5c/7C41u/SiDr9XgTpzXXn8= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.29.0 h1:k6fQVDQexDE+3jG2SfCQjnHS7OamcP73YMoxEVq5B6k= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.29.0/go.mod h1:t4BrYLHU450Zo9fnydWlIuswB1bm7rM8havDpWOJeDo= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.29.0 h1:xvhQxJ/C9+RTnAj5DpTg7LSM1vbbMTiXt7e9hsfqHNw= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.29.0/go.mod h1:Fcvs2Bz1jkDM+Wf5/ozBGmi3tQ/c9zPKLnsipnfhGAo= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.6.0 h1:QSKmLBzbFULSyHzOdO9JsN9lpE4zkrz1byYGmJecdVE= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.6.0/go.mod h1:sTQ/NH8Yrirf0sJ5rWqVu+oT82i4zL9FaF6rWcqnptM= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.30.0 h1:WypxHH02KX2poqqbaadmkMYalGyy/vil4HE4PM4nRJc= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.30.0/go.mod h1:U79SV99vtvGSEBeeHnpgGJfTsnsdkWLpPN/CcHAzBSI= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.30.0 h1:VrMAbeJz4gnVDg2zEzjHG4dEH86j4jO6VYB+NgtGD8s= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.30.0/go.mod h1:qqN/uFdpeitTvm+JDqqnjm517pmQRYxTORbETHq5tOc= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 h1:lsInsfvhVIfOI6qHVyysXMNDnjO9Npvl7tlDPJFBVd4= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0/go.mod h1:KQsVNh4OjgjTG0G6EiNi1jVpnaeeKsKMRwbLN+f1+8M= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0 h1:m0yTiGDLUvVYaTFbAvCkVYIYcvwKt3G7OLoN77NUs/8= @@ -709,20 +713,20 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.30.0 h1:umZgi go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.30.0/go.mod h1:4lVs6obhSVRb1EW5FhOuBTyiQhtRtAnnva9vD3yRfq8= go.opentelemetry.io/otel/exporters/prometheus v0.52.0 h1:kmU3H0b9ufFSi8IQCcxack+sWUblKkFbqWYs6YiACGQ= go.opentelemetry.io/otel/exporters/prometheus v0.52.0/go.mod h1:+wsAp2+JhuGXX7YRkjlkx6hyWY3ogFPfNA4x3nyiAh0= -go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.5.0 h1:ThVXnEsdwNcxdBO+r96ci1xbF+PgNjwlk457VNuJODo= -go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.5.0/go.mod h1:rHWcSmC4q2h3gje/yOq6sAOaq8+UHxN/Ru3BbmDXOfY= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0 h1:WDdP9acbMYjbKIyJUhTvtzj601sVJOqgWdUxSdR/Ysc= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0/go.mod h1:BLbf7zbNIONBLPwvFnwNHGj4zge8uTCM/UPIVW1Mq2I= +go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.6.0 h1:bZHOb8k/CwwSt0DgvgaoOhBXWNdWqFWaIsGTtg1H3KE= +go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.6.0/go.mod h1:XlV163j81kDdIt5b5BXCjdqVfqJFy/LJrHA697SorvQ= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.30.0 h1:IyFlqNsi8VT/nwYlLJfdM0y1gavxGpEvnf6FtVfZ6X4= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.30.0/go.mod h1:bxiX8eUeKoAEQmbq/ecUT8UqZwCjZW52yJrXJUSozsk= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.30.0 h1:kn1BudCgwtE7PxLqcZkErpD8GKqLZ6BSzeW9QihQJeM= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.30.0/go.mod h1:ljkUDtAMdleoi9tIG1R6dJUpVwDcYjw3J2Q6Q/SuiC0= -go.opentelemetry.io/otel/log v0.5.0 h1:x1Pr6Y3gnXgl1iFBwtGy1W/mnzENoK0w0ZoaeOI3i30= -go.opentelemetry.io/otel/log v0.5.0/go.mod h1:NU/ozXeGuOR5/mjCRXYbTC00NFJ3NYuraV/7O78F0rE= +go.opentelemetry.io/otel/log v0.6.0 h1:nH66tr+dmEgW5y+F9LanGJUBYPrRgP4g2EkmPE3LeK8= +go.opentelemetry.io/otel/log v0.6.0/go.mod h1:KdySypjQHhP069JX0z/t26VHwa8vSwzgaKmXtIB3fJM= go.opentelemetry.io/otel/metric v1.30.0 h1:4xNulvn9gjzo4hjg+wzIKG7iNFEaBMX00Qd4QIZs7+w= go.opentelemetry.io/otel/metric v1.30.0/go.mod h1:aXTfST94tswhWEb+5QjlSqG+cZlmyXy/u8jFpor3WqQ= go.opentelemetry.io/otel/sdk v1.30.0 h1:cHdik6irO49R5IysVhdn8oaiR9m8XluDaJAs4DfOrYE= go.opentelemetry.io/otel/sdk v1.30.0/go.mod h1:p14X4Ok8S+sygzblytT1nqG98QG2KYKv++HE0LY/mhg= -go.opentelemetry.io/otel/sdk/log v0.5.0 h1:A+9lSjlZGxkQOr7QSBJcuyyYBw79CufQ69saiJLey7o= -go.opentelemetry.io/otel/sdk/log v0.5.0/go.mod h1:zjxIW7sw1IHolZL2KlSAtrUi8JHttoeiQy43Yl3WuVQ= +go.opentelemetry.io/otel/sdk/log v0.6.0 h1:4J8BwXY4EeDE9Mowg+CyhWVBhTSLXVXodiXxS/+PGqI= +go.opentelemetry.io/otel/sdk/log v0.6.0/go.mod h1:L1DN8RMAduKkrwRAFDEX3E3TLOq46+XMGSbUfHU/+vE= go.opentelemetry.io/otel/sdk/metric v1.30.0 h1:QJLT8Pe11jyHBHfSAgYH7kEmT24eX792jZO1bo4BXkM= go.opentelemetry.io/otel/sdk/metric v1.30.0/go.mod h1:waS6P3YqFNzeP01kuo/MBBYqaoBJl7efRQHOaydhy1Y= go.opentelemetry.io/otel/trace v1.30.0 h1:7UBkkYzeg3C7kQX8VAidWh2biiQbtAKjyIML8dQ9wmc= diff --git a/plugin/storage/grpc/config.go b/plugin/storage/grpc/config.go index 3ce6a6dfcbb..c1242d641e0 100644 --- a/plugin/storage/grpc/config.go +++ b/plugin/storage/grpc/config.go @@ -30,7 +30,7 @@ type ConfigV2 struct { func DefaultConfigV2() ConfigV2 { return ConfigV2{ - TimeoutSettings: exporterhelper.TimeoutSettings{ + TimeoutSettings: exporterhelper.TimeoutConfig{ Timeout: defaultConnectionTimeout, }, } @@ -42,7 +42,7 @@ func (c *Configuration) TranslateToConfigV2() *ConfigV2 { Endpoint: c.RemoteServerAddr, TLSSetting: c.RemoteTLS.ToOtelClientConfig(), }, - TimeoutSettings: exporterhelper.TimeoutSettings{ + TimeoutSettings: exporterhelper.TimeoutConfig{ Timeout: c.RemoteConnectTimeout, }, } diff --git a/plugin/storage/grpc/factory.go b/plugin/storage/grpc/factory.go index 90df7128881..95c51f4490f 100644 --- a/plugin/storage/grpc/factory.go +++ b/plugin/storage/grpc/factory.go @@ -13,6 +13,7 @@ import ( "github.com/spf13/viper" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.opentelemetry.io/otel" @@ -102,7 +103,11 @@ func (f *Factory) Initialize(metricsFactory metrics.Factory, logger *zap.Logger) }, } newClientFn := func(opts ...grpc.DialOption) (conn *grpc.ClientConn, err error) { - return f.configV2.ToClientConn(context.Background(), componenttest.NewNopHost(), telset, opts...) + clientOpts := make([]configgrpc.ToClientConnOption, 0) + for _, opt := range opts { + clientOpts = append(clientOpts, configgrpc.WithGrpcDialOption(opt)) + } + return f.configV2.ToClientConnWithOptions(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 9d72134327d..0c03f6ab0bb 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.TimeoutSettings{ + TimeoutSettings: exporterhelper.TimeoutConfig{ Timeout: 1 * time.Second, }, Tenancy: tenancy.Options{