Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update opentelemetry-collector modules to v0.56.0 #8765

Merged
merged 5 commits into from
Aug 2, 2022
Merged

Update opentelemetry-collector modules to v0.56.0 #8765

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6983f4
Update opentelemetry-collector modules to v0.56.0
axw Aug 1, 2022
26df4b4
Adjust code to opentelemetry-collector changes
axw Aug 1, 2022
bff66c5
systemtest: update otel libraries
axw Aug 1, 2022
fcca335
Merge branch 'main' into update-otel-collector
axw Aug 2, 2022
207b05c
Merge branch 'main' into update-otel-collector
axw Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
537 changes: 254 additions & 283 deletions NOTICE.txt
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions changelogs/head.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,19 @@ https:/elastic/apm-server/compare/8.5\...main[View commits]

[float]
==== Breaking Changes
- `event.action` is no longer recorded for OTLP logs, due to breaking OTLP changes {pull}8765[8765]

[float]
==== Deprecations

[float]
==== Bug fixes
- Set `message` instead of `labels.event` for Jaeger span events {pull}8765[8765]

[float]
==== Intake API Changes

[float]
==== Added
- Set a default User-Agent field value when making HTTP requests {pull}8758[8758]
- OTLP support updated to opentelemetry-collector v0.56.0 {pull}8765[8765]
46 changes: 23 additions & 23 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ require (
github.com/gorilla/mux v1.8.0
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/golang-lru v0.5.4
github.com/jaegertracing/jaeger v1.30.0
github.com/jaegertracing/jaeger v1.36.0
github.com/json-iterator/go v1.1.12
github.com/libp2p/go-reuseport v0.0.2
github.com/modern-go/reflect2 v1.0.2
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.44.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.56.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/ryanuber/go-glob v1.0.0
github.com/spf13/cobra v1.3.0
github.com/spf13/cobra v1.5.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.1
github.com/stretchr/testify v1.8.0
github.com/tidwall/gjson v1.9.3
github.com/tidwall/sjson v1.1.1
github.com/xeipuuv/gojsonschema v1.2.0
Expand All @@ -44,8 +44,9 @@ require (
go.elastic.co/apm/module/apmzap/v2 v2.0.0
go.elastic.co/apm/v2 v2.1.0
go.elastic.co/fastjson v1.1.0
go.opentelemetry.io/collector v0.44.0
go.opentelemetry.io/collector/model v0.44.0
go.opentelemetry.io/collector v0.56.0
go.opentelemetry.io/collector/pdata v0.56.0
go.opentelemetry.io/collector/semconv v0.56.0
go.uber.org/automaxprocs v1.5.1
go.uber.org/zap v1.21.0
golang.org/x/net v0.0.0-20220728211354-c7608f3a8462
Expand All @@ -59,8 +60,8 @@ require (
require (
github.com/DataDog/zstd v1.4.4 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/Shopify/sarama v1.30.1 // indirect
github.com/apache/thrift v0.15.0 // indirect
github.com/Shopify/sarama v1.32.0 // indirect
github.com/apache/thrift v0.16.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/containerd/containerd v1.6.1 // indirect
Expand Down Expand Up @@ -90,7 +91,8 @@ require (
github.com/elastic/go-windows v1.0.1 // indirect
github.com/elastic/gosigar v0.14.2 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/frankban/quicktest v1.14.3 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
Expand All @@ -117,20 +119,20 @@ require (
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
github.com/jonboulle/clockwork v0.2.2 // indirect
github.com/klauspost/compress v1.14.2 // indirect
github.com/knadh/koanf v1.4.0 // indirect
github.com/klauspost/compress v1.15.8 // indirect
github.com/knadh/koanf v1.4.2 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/magefile/mage v1.13.0 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/miekg/dns v1.1.42 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/hashstructure v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/mostynb/go-grpc-compression v1.1.16 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.44.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.56.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
Expand All @@ -142,13 +144,12 @@ require (
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
github.com/shirou/gopsutil/v3 v3.21.12 // indirect
github.com/shirou/gopsutil/v3 v3.22.6 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/tklauser/go-sysconf v0.3.9 // indirect
github.com/tklauser/numcpus v0.3.0 // indirect
github.com/tklauser/go-sysconf v0.3.10 // indirect
github.com/tklauser/numcpus v0.4.0 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797 // indirect
Expand All @@ -160,12 +161,11 @@ require (
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.elastic.co/ecszap v1.0.1 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.28.0 // indirect
go.opentelemetry.io/otel v1.3.0 // indirect
go.opentelemetry.io/otel/internal/metric v0.26.0 // indirect
go.opentelemetry.io/otel/metric v0.26.0 // indirect
go.opentelemetry.io/otel/trace v1.3.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.33.0 // indirect
go.opentelemetry.io/otel v1.8.0 // indirect
go.opentelemetry.io/otel/metric v0.31.0 // indirect
go.opentelemetry.io/otel/trace v1.8.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
Expand Down
Loading