Skip to content

Commit

Permalink
[7.41.x] Revert OpenTelemetry Collector bumps (#14281)
Browse files Browse the repository at this point in the history 
* Revert "Bump OpenTelemetry Collector dependencies to v0.63.0 (#14067)"

This reverts commit 34610f5.

* Revert "Bump OpenTelemetry Collector dependencies to v0.62.0 (#13860)"

This reverts commit a5fe32e.

* Revert "[pkg/otlp] Make debug section aligned with logging exporter (#14072)"

This reverts commit 057e1f4.

* Revert "[pkg/trace] Remove deprecated function calls (#14086)"

This reverts commit 41e8a2f.
  • Loading branch information
@mx-psi
mx-psi authored Nov 11, 2022
1 parent 9d593a9 commit 38f1735
Show file tree
Hide file tree
Showing 31 changed files with 229 additions and 360 deletions.
8 changes: 4 additions & 4 deletions LICENSE-3rdparty.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ core,go.opentelemetry.io/collector/config/configtelemetry,Apache-2.0,Copyright T
core,go.opentelemetry.io/collector/config/configtls,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/confmap,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/confmap/converter/expandconverter,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/confmap/internal/mapstructure,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/confmap/converter/overwritepropertiesconverter,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/confmap/provider/envprovider,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/confmap/provider/fileprovider,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/confmap/provider/httpprovider,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -868,13 +868,14 @@ 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/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
core,go.opentelemetry.io/collector/service/internal/fanoutconsumer,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/grpclog,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/pipelines,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/proctelemetry,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/runtimeinfo,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/telemetry,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/telemetrylogs,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/internal/zpages,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/telemetry,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc,Apache-2.0,Copyright The OpenTelemetry Authors
Expand All @@ -887,7 +888,6 @@ core,go.opentelemetry.io/otel/baggage,Apache-2.0,Copyright The OpenTelemetry Aut
core,go.opentelemetry.io/otel/codes,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/exporters/prometheus,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/internal,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/internal/attribute,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/internal/baggage,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/internal/global,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/metric,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down
4 changes: 2 additions & 2 deletions cmd/trace-agent/test/testsuite/otlp_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ apm_config:
if err != nil {
log.Fatal("Error dialing: ", err)
}
client := ptraceotlp.NewGRPCClient(conn)
client := ptraceotlp.NewClient(conn)
now := uint64(time.Now().UnixNano())
pack := testutil.NewOTLPTracesRequest([]testutil.OTLPResourceSpan{
{
Expand Down Expand Up @@ -111,7 +111,7 @@ apm_config:
if err != nil {
log.Fatal("Error dialing: ", err)
}
client := ptraceotlp.NewGRPCClient(conn)
client := ptraceotlp.NewClient(conn)
now := uint64(time.Now().UnixNano())
pack := testutil.NewOTLPTracesRequest([]testutil.OTLPResourceSpan{
{
Expand Down
38 changes: 18 additions & 20 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,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.45.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.63.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 @@ -173,10 +173,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.63.0
go.opentelemetry.io/collector/exporter/loggingexporter v0.63.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.63.0
go.opentelemetry.io/collector/pdata v0.63.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 @@ -191,8 +189,8 @@ require (
golang.org/x/time v0.0.0-20220411224347-583f2d630306
golang.org/x/tools v0.2.0
gomodules.xyz/jsonpatch/v3 v3.0.1
google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55
google.golang.org/grpc v1.50.1
google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
google.golang.org/grpc v1.50.0
google.golang.org/protobuf v1.28.1
gopkg.in/DataDog/dd-trace-go.v1 v1.37.0
gopkg.in/yaml.v2 v2.4.0
Expand Down Expand Up @@ -314,9 +312,9 @@ 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.11 // indirect
github.com/klauspost/compress v1.15.10 // indirect
github.com/klauspost/pgzip v1.2.5 // indirect
github.com/knadh/koanf v1.4.4 // indirect
github.com/knadh/koanf v1.4.3 // indirect
github.com/libp2p/go-reuseport v0.1.0 // indirect
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
github.com/magiconair/properties v1.8.6 // indirect
Expand Down Expand Up @@ -347,7 +345,7 @@ require (
github.com/pierrec/lz4/v4 v4.1.15 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0
github.com/prometheus/statsd_exporter v0.22.7 // indirect
Expand Down Expand Up @@ -383,16 +381,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.63.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect
go.opentelemetry.io/otel v1.11.1 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect
go.opentelemetry.io/otel/metric v0.33.0 // indirect
go.opentelemetry.io/otel/sdk v1.11.1 // indirect
go.opentelemetry.io/otel/sdk/metric v0.33.0 // indirect
go.opentelemetry.io/otel/trace v1.11.1 // 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
go.uber.org/dig v1.15.0
go.uber.org/fx v1.18.2
golang.org/x/crypto v0.1.0 // indirect
Expand Down
Loading

0 comments on commit 38f1735

Please sign in to comment.