Skip to content

Commit

Permalink
[chore][deps] Bump otel-collector to 0.113.0 and fix failing unit test (
Browse files Browse the repository at this point in the history 
#6197)

## Which problem is this PR solving?
- Continuation of #6175.
- There was a breaking change made in
open-telemetry/opentelemetry-collector#11575
that updates `ToClientConn` to use `DialContext` instead of `NewClient`
because of a bug. `DialContext` uses the `passthrough` scheme was
resulting in the following error when the endpoint is left empty. This
PR fixes the unit tests by setting the endpoint in the test configs to
be non-empty.
```
grpc storage builder failed to create a store: error creating traced remote storage client: failed to exit idle mode: passthrough: received empty target in Build()
```

## 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: dependabot[bot] <[email protected]>
Signed-off-by: Mahad Zaryab <[email protected]>
Signed-off-by: Mahad Zaryab <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
@mahadzaryab1 @dependabot
mahadzaryab1 and dependabot[bot] authored Nov 12, 2024
1 parent 81397e5 commit 7d637a6
Show file tree
Hide file tree
Showing 3 changed files with 289 additions and 272 deletions.
178 changes: 91 additions & 87 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ require (
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
github.com/kr/pretty v0.3.1
github.com/olivere/elastic v6.2.37+incompatible
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.112.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.113.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.113.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.113.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension v0.113.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.113.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.113.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.113.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.113.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.113.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.113.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.113.0
github.com/prometheus/client_golang v1.20.5
github.com/prometheus/client_model v0.6.1
github.com/prometheus/common v0.60.1
Expand All @@ -44,38 +44,38 @@ 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.112.0
go.opentelemetry.io/collector/component/componentstatus v0.112.0
go.opentelemetry.io/collector/config/configauth v0.112.0
go.opentelemetry.io/collector/config/configgrpc v0.112.0
go.opentelemetry.io/collector/config/confighttp v0.112.0
go.opentelemetry.io/collector/config/configretry v1.18.0
go.opentelemetry.io/collector/config/configtls v1.18.0
go.opentelemetry.io/collector/confmap v1.18.0
go.opentelemetry.io/collector/confmap/provider/envprovider v1.18.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.18.0
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.18.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.18.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.18.0
go.opentelemetry.io/collector/connector v0.112.0
go.opentelemetry.io/collector/connector/forwardconnector v0.112.0
go.opentelemetry.io/collector/consumer v0.112.0
go.opentelemetry.io/collector/consumer/consumertest v0.112.0
go.opentelemetry.io/collector/exporter v0.112.0
go.opentelemetry.io/collector/exporter/exportertest v0.112.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.112.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.112.0
go.opentelemetry.io/collector/extension v0.112.0
go.opentelemetry.io/collector/extension/zpagesextension v0.112.0
go.opentelemetry.io/collector/otelcol v0.112.0
go.opentelemetry.io/collector/pdata v1.18.0
go.opentelemetry.io/collector/pipeline v0.112.0
go.opentelemetry.io/collector/processor v0.112.0
go.opentelemetry.io/collector/processor/batchprocessor v0.112.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.112.0
go.opentelemetry.io/collector/processor/processortest v0.112.0
go.opentelemetry.io/collector/receiver v0.112.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.112.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componentstatus v0.113.0
go.opentelemetry.io/collector/config/configauth v0.113.0
go.opentelemetry.io/collector/config/configgrpc v0.113.0
go.opentelemetry.io/collector/config/confighttp v0.113.0
go.opentelemetry.io/collector/config/configretry v1.19.0
go.opentelemetry.io/collector/config/configtls v1.19.0
go.opentelemetry.io/collector/confmap v1.19.0
go.opentelemetry.io/collector/confmap/provider/envprovider v1.19.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.19.0
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.19.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.19.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.19.0
go.opentelemetry.io/collector/connector v0.113.0
go.opentelemetry.io/collector/connector/forwardconnector v0.113.0
go.opentelemetry.io/collector/consumer v0.113.0
go.opentelemetry.io/collector/consumer/consumertest v0.113.0
go.opentelemetry.io/collector/exporter v0.113.0
go.opentelemetry.io/collector/exporter/exportertest v0.113.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.113.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.113.0
go.opentelemetry.io/collector/extension v0.113.0
go.opentelemetry.io/collector/extension/zpagesextension v0.113.0
go.opentelemetry.io/collector/otelcol v0.113.0
go.opentelemetry.io/collector/pdata v1.19.0
go.opentelemetry.io/collector/pipeline v0.113.0
go.opentelemetry.io/collector/processor v0.113.0
go.opentelemetry.io/collector/processor/batchprocessor v0.113.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.113.0
go.opentelemetry.io/collector/processor/processortest v0.113.0
go.opentelemetry.io/collector/receiver v0.113.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.113.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0
go.opentelemetry.io/contrib/samplers/jaegerremote v0.26.0
Expand Down Expand Up @@ -103,15 +103,19 @@ require (
github.com/antchfx/xmlquery v1.4.2 // indirect
github.com/antchfx/xpath v1.3.2 // indirect
github.com/dgraph-io/ristretto/v2 v2.0.0 // indirect
github.com/ebitengine/purego v0.8.0 // indirect
github.com/ebitengine/purego v0.8.1 // indirect
github.com/expr-lang/expr v1.16.9 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.112.0 // indirect
go.opentelemetry.io/collector/connector/connectortest v0.112.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.112.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles v0.112.0 // indirect
go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles v0.112.0 // indirect
go.opentelemetry.io/collector/internal/memorylimiter v0.112.0 // indirect
go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.112.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.113.0 // indirect
go.opentelemetry.io/collector/connector/connectortest v0.113.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.113.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles v0.113.0 // indirect
go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles v0.113.0 // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.113.0 // indirect
go.opentelemetry.io/collector/internal/memorylimiter v0.113.0 // indirect
go.opentelemetry.io/collector/internal/sharedcomponent v0.113.0 // indirect
go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.113.0 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.113.0 // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect
)

require (
Expand Down Expand Up @@ -180,19 +184,19 @@ require (
github.com/mostynb/go-grpc-compression v1.2.3 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.112.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.112.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.112.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.112.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.112.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.112.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.112.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.112.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.112.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.112.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.112.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.112.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.112.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.113.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.113.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.113.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.113.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.113.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.113.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.113.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.113.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.113.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.113.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.113.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.113.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.113.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/openzipkin/zipkin-go v0.4.3 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
Expand All @@ -203,13 +207,13 @@ require (
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/relvacode/iso8601 v1.4.0 // indirect
github.com/relvacode/iso8601 v1.5.0 // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
github.com/rs/cors v1.11.1 // indirect
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.9 // indirect
github.com/shirou/gopsutil/v4 v4.24.10 // 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
Expand All @@ -223,27 +227,27 @@ 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.112.0 // indirect
go.opentelemetry.io/collector/client v1.18.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.18.0 // indirect
go.opentelemetry.io/collector/config/confignet v1.18.0
go.opentelemetry.io/collector/config/configopaque v1.18.0
go.opentelemetry.io/collector/config/configtelemetry v0.112.0
go.opentelemetry.io/collector/config/internal v0.112.0 // indirect
go.opentelemetry.io/collector/connector/connectorprofiles v0.112.0 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.112.0 // indirect
go.opentelemetry.io/collector/exporter/debugexporter v0.112.0
go.opentelemetry.io/collector/exporter/exporterprofiles v0.112.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.112.0 // indirect
go.opentelemetry.io/collector/extension/experimental/storage v0.112.0 // indirect
go.opentelemetry.io/collector/extension/extensioncapabilities v0.112.0
go.opentelemetry.io/collector/featuregate v1.18.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.112.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.112.0 // indirect
go.opentelemetry.io/collector/processor/processorprofiles v0.112.0 // indirect
go.opentelemetry.io/collector/receiver/receiverprofiles v0.112.0 // indirect
go.opentelemetry.io/collector/semconv v0.112.0 // indirect
go.opentelemetry.io/collector/service v0.112.0 // indirect
go.opentelemetry.io/collector v0.113.0 // indirect
go.opentelemetry.io/collector/client v1.19.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.19.0 // indirect
go.opentelemetry.io/collector/config/confignet v1.19.0
go.opentelemetry.io/collector/config/configopaque v1.19.0
go.opentelemetry.io/collector/config/configtelemetry v0.113.0
go.opentelemetry.io/collector/config/internal v0.113.0 // indirect
go.opentelemetry.io/collector/connector/connectorprofiles v0.113.0 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.113.0 // indirect
go.opentelemetry.io/collector/exporter/debugexporter v0.113.0
go.opentelemetry.io/collector/exporter/exporterprofiles v0.113.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.113.0 // indirect
go.opentelemetry.io/collector/extension/experimental/storage v0.113.0 // indirect
go.opentelemetry.io/collector/extension/extensioncapabilities v0.113.0
go.opentelemetry.io/collector/featuregate v1.19.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.113.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.113.0 // indirect
go.opentelemetry.io/collector/processor/processorprofiles v0.113.0 // indirect
go.opentelemetry.io/collector/receiver/receiverprofiles v0.113.0 // indirect
go.opentelemetry.io/collector/semconv v0.113.0 // indirect
go.opentelemetry.io/collector/service v0.113.0 // indirect
go.opentelemetry.io/contrib/config v0.10.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.31.0 // indirect
go.opentelemetry.io/contrib/zpages v0.56.0 // indirect
Expand Down
Loading

0 comments on commit 7d637a6

Please sign in to comment.