Skip to content

Commit

Permalink
[pkg/otlp, pkg/trace] Bump OpenTelemetry Collector dependencies to v0…
Browse files Browse the repository at this point in the history 
….61.0 (#13684)

* [pkg/otlp, pkg/trace] Bump OpenTelemetry dependency to v0.61.0

* Apply suggestions from code review

Co-authored-by: Austin Lai <[email protected]>

* Remove more deprecated method calls

Co-authored-by: Austin Lai <[email protected]>
  • Loading branch information
@mx-psi @alai97
mx-psi and alai97 authored Sep 30, 2022
1 parent c98c084 commit 72e24cd
Show file tree
Hide file tree
Showing 21 changed files with 225 additions and 293 deletions.
19 changes: 5 additions & 14 deletions LICENSE-3rdparty.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,7 @@ core,go.opentelemetry.io/collector/exporter/loggingexporter/internal/otlptext,Ap
core,go.opentelemetry.io/collector/exporter/otlpexporter,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/extension/ballastextension,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/extension/experimental/storage,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/featuregate,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/internal/cgroups,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/internal/iruntime,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/internal/obsreportconfig,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -859,7 +860,6 @@ core,go.opentelemetry.io/collector/semconv/v1.5.0,Apache-2.0,Copyright The OpenT
core,go.opentelemetry.io/collector/semconv/v1.6.1,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/extensions,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/featuregate,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/components,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/configunmarshaler,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -896,19 +896,10 @@ core,go.opentelemetry.io/otel/sdk/instrumentation,Apache-2.0,Copyright The OpenT
core,go.opentelemetry.io/otel/sdk/internal,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/internal/env,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/aggregator,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/aggregator/histogram,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/aggregator/lastvalue,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/aggregator/sum,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/controller/basic,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/controller/time,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/export,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/export/aggregation,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/number,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/processor/basic,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/registry,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/sdkapi,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/selector/simple,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/aggregation,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/internal,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/metricdata,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/metric/view,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/resource,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/sdk/trace,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/internal,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down
30 changes: 15 additions & 15 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ require (
github.com/olekukonko/tablewriter v0.0.5
github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852
github.com/open-policy-agent/opa v0.44.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.60.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.61.0
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
github.com/openshift/api v3.9.0+incompatible
Expand Down Expand Up @@ -172,8 +172,8 @@ require (
github.com/xeipuuv/gojsonschema v1.2.0
go.etcd.io/bbolt v1.3.6
go.etcd.io/etcd/client/v2 v2.306.0-alpha.0
go.opentelemetry.io/collector v0.60.0
go.opentelemetry.io/collector/pdata v0.60.0
go.opentelemetry.io/collector v0.61.0
go.opentelemetry.io/collector/pdata v0.61.0
go.uber.org/atomic v1.10.0
go.uber.org/automaxprocs v1.5.1
go.uber.org/multierr v1.8.0
Expand All @@ -188,7 +188,7 @@ require (
golang.org/x/time v0.0.0-20220411224347-583f2d630306
golang.org/x/tools v0.1.12
gomodules.xyz/jsonpatch/v3 v3.0.1
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd
google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc
google.golang.org/grpc v1.49.0
google.golang.org/protobuf v1.28.1
gopkg.in/DataDog/dd-trace-go.v1 v1.37.0
Expand Down Expand Up @@ -311,7 +311,7 @@ require (
github.com/josharian/native v1.0.0 // indirect
github.com/karrick/godirwalk v1.17.0 // indirect
github.com/kjk/lzma v0.0.0-20161016003348-3fd93898850d // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/klauspost/compress v1.15.10 // indirect
github.com/klauspost/pgzip v1.2.5 // indirect
github.com/knadh/koanf v1.4.3 // indirect
github.com/libp2p/go-reuseport v0.1.0 // indirect
Expand Down Expand Up @@ -379,16 +379,16 @@ require (
go.etcd.io/etcd/client/v3 v3.6.0-alpha.0 // indirect
go.etcd.io/etcd/server/v3 v3.6.0-alpha.0.0.20220522111935-c3bc4116dcd1 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/semconv v0.60.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.9.0 // indirect
go.opentelemetry.io/otel v1.9.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.31.0 // indirect
go.opentelemetry.io/otel/metric v0.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.9.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.31.0 // indirect
go.opentelemetry.io/otel/trace v1.9.0 // indirect
go.opentelemetry.io/collector/semconv v0.61.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.10.0 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.32.1 // indirect
go.opentelemetry.io/otel/metric v0.32.1 // indirect
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.32.1 // indirect
go.opentelemetry.io/otel/trace v1.10.0 // indirect
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
Expand Down
Loading

0 comments on commit 72e24cd

Please sign in to comment.