Skip to content
This repository was archived by the owner on Apr 2, 2024. It is now read-only.

Commit aecf5ad

Browse files
alejandrodnmalejandrodnm
committed
Update opentelemetry-collector-contrib
This version includes the changes to the Jaeger translator that support multi ChildOf references to the links. open-telemetry/opentelemetry-collector-contrib#14463 We used to do this before translating to OTEL and after translating from OTEL, in order to keep this information and pass the Jaeger certification tests.
1 parent 9ce3f73 commit aecf5ad

10 files changed

Lines changed: 160 additions & 274 deletions

File tree

‎go.mod‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -24,39 +24,40 @@ require (
2424
github.com/jackc/pgproto3/v2 v2.3.1
2525
github.com/jackc/pgtype v1.12.0
2626
github.com/jackc/pgx/v4 v4.17.0
27-
github.com/jaegertracing/jaeger v1.38.2-0.20221006002917-5bf8a28fe06d
28-
github.com/kr/pretty v0.3.0
27+
github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856
28+
github.com/mitchellh/mapstructure v1.5.0
2929
github.com/oklog/run v1.1.0
30-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.61.0
30+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.68.0
3131
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
3232
github.com/peterbourgon/ff/v3 v3.1.2
3333
github.com/pkg/errors v0.9.1
3434
github.com/prometheus/alertmanager v0.24.0
35-
github.com/prometheus/client_golang v1.13.0
36-
github.com/prometheus/client_model v0.2.0
35+
github.com/prometheus/client_golang v1.14.0
36+
github.com/prometheus/client_model v0.3.0
3737
github.com/prometheus/common v0.37.0
3838
github.com/prometheus/prometheus v1.8.2-0.20220308163432-03831554a519
3939
github.com/sergi/go-diff v1.2.0
4040
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
41+
github.com/spf13/viper v1.14.0
4142
github.com/spyzhov/ajson v0.7.1
42-
github.com/stretchr/testify v1.8.0
43+
github.com/stretchr/testify v1.8.1
4344
github.com/testcontainers/testcontainers-go v0.13.0
4445
github.com/thanos-io/thanos v0.26.0
4546
github.com/walle/targz v0.0.0-20140417120357-57fe4206da5a
46-
go.opentelemetry.io/collector/pdata v0.61.0
47-
go.opentelemetry.io/collector/semconv v0.61.0
48-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0
49-
go.opentelemetry.io/otel v1.10.0
47+
go.opentelemetry.io/collector/pdata v1.0.0-rc2
48+
go.opentelemetry.io/collector/semconv v0.68.0
49+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4
50+
go.opentelemetry.io/otel v1.11.1
5051
go.opentelemetry.io/otel/exporters/jaeger v1.7.0
5152
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.7.0
5253
go.opentelemetry.io/otel/sdk v1.7.0
53-
go.opentelemetry.io/otel/trace v1.10.0
54+
go.opentelemetry.io/otel/trace v1.11.1
5455
go.uber.org/atomic v1.10.0
5556
go.uber.org/automaxprocs v1.5.1
5657
go.uber.org/goleak v1.1.12
57-
golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664
58+
golang.org/x/sys v0.3.0
5859
golang.org/x/time v0.0.0-20220609170525-579cf78fd858
59-
google.golang.org/grpc v1.49.0
60+
google.golang.org/grpc v1.51.0
6061
google.golang.org/protobuf v1.28.1
6162
gopkg.in/yaml.v2 v2.4.0
6263
)
@@ -67,7 +68,7 @@ require (
6768
github.com/Microsoft/hcsshim v0.8.23 // indirect
6869
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
6970
github.com/apache/thrift v0.17.0 // indirect
70-
github.com/armon/go-metrics v0.3.10 // indirect
71+
github.com/armon/go-metrics v0.4.0 // indirect
7172
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
7273
github.com/aws/aws-sdk-go v1.44.20 // indirect
7374
github.com/beorn7/perks v1.0.1 // indirect
@@ -82,7 +83,7 @@ require (
8283
github.com/docker/go-units v0.4.0 // indirect
8384
github.com/fatih/color v1.13.0 // indirect
8485
github.com/felixge/httpsnoop v1.0.3 // indirect
85-
github.com/fsnotify/fsnotify v1.5.4 // indirect
86+
github.com/fsnotify/fsnotify v1.6.0 // indirect
8687
github.com/go-logfmt/logfmt v0.5.1 // indirect
8788
github.com/go-logr/logr v1.2.3 // indirect
8889
github.com/go-logr/stdr v1.2.2 // indirect
@@ -110,13 +111,13 @@ require (
110111
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
111112
github.com/hashicorp/go-msgpack v0.5.5 // indirect
112113
github.com/hashicorp/go-multierror v1.1.1 // indirect
113-
github.com/hashicorp/go-plugin v1.4.5 // indirect
114+
github.com/hashicorp/go-plugin v1.4.6 // indirect
114115
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
115116
github.com/hashicorp/golang-lru v0.5.4 // indirect
116117
github.com/hashicorp/hcl v1.0.0 // indirect
117118
github.com/hashicorp/memberlist v0.3.1 // indirect
118119
github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect
119-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
120+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
120121
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
121122
github.com/jackc/pgio v1.0.0 // indirect
122123
github.com/jackc/pgpassfile v1.0.0 // indirect
@@ -128,6 +129,7 @@ require (
128129
github.com/jpillora/backoff v1.0.0 // indirect
129130
github.com/json-iterator/go v1.1.12 // indirect
130131
github.com/julienschmidt/httprouter v1.3.0 // indirect
132+
github.com/kr/pretty v0.3.1 // indirect
131133
github.com/kr/text v0.2.0 // indirect
132134
github.com/magiconair/properties v1.8.6 // indirect
133135
github.com/mailru/easyjson v0.7.7 // indirect
@@ -136,7 +138,6 @@ require (
136138
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
137139
github.com/miekg/dns v1.1.49 // indirect
138140
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
139-
github.com/mitchellh/mapstructure v1.5.0 // indirect
140141
github.com/moby/sys/mount v0.2.0 // indirect
141142
github.com/moby/sys/mountinfo v0.5.0 // indirect
142143
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
@@ -145,7 +146,7 @@ require (
145146
github.com/morikuni/aec v1.0.0 // indirect
146147
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
147148
github.com/oklog/ulid v1.3.1 // indirect
148-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.61.0 // indirect
149+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.68.0 // indirect
149150
github.com/opencontainers/go-digest v1.0.0 // indirect
150151
github.com/opencontainers/image-spec v1.0.2 // indirect
151152
github.com/opencontainers/runc v1.0.2 // indirect
@@ -158,40 +159,38 @@ require (
158159
github.com/prometheus/common/sigv4 v0.1.0 // indirect
159160
github.com/prometheus/exporter-toolkit v0.7.1 // indirect
160161
github.com/prometheus/procfs v0.8.0 // indirect
161-
github.com/rogpeppe/go-internal v1.6.2 // indirect
162+
github.com/rogpeppe/go-internal v1.9.0 // indirect
162163
github.com/rs/cors v1.8.2 // indirect
163164
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
164165
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
165166
github.com/sirupsen/logrus v1.8.1 // indirect
166167
github.com/soheilhy/cmux v0.1.5 // indirect
167-
github.com/spf13/afero v1.8.2 // indirect
168+
github.com/spf13/afero v1.9.2 // indirect
168169
github.com/spf13/cast v1.5.0 // indirect
169-
github.com/spf13/cobra v1.5.0 // indirect
170+
github.com/spf13/cobra v1.6.1 // indirect
170171
github.com/spf13/jwalterweatherman v1.1.0 // indirect
171172
github.com/spf13/pflag v1.0.5 // indirect
172-
github.com/spf13/viper v1.13.0 // indirect
173173
github.com/subosito/gotenv v1.4.1 // indirect
174174
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
175175
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
176176
go.mongodb.org/mongo-driver v1.10.0 // indirect
177-
go.opencensus.io v0.23.0 // indirect
177+
go.opencensus.io v0.24.0 // indirect
178178
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 // indirect
179179
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.7.0 // indirect
180-
go.opentelemetry.io/otel/metric v0.32.1 // indirect
180+
go.opentelemetry.io/otel/metric v0.33.0 // indirect
181181
go.opentelemetry.io/proto/otlp v0.16.0 // indirect
182-
go.uber.org/multierr v1.8.0 // indirect
183-
go.uber.org/zap v1.23.0 // indirect
182+
go.uber.org/multierr v1.9.0 // indirect
183+
go.uber.org/zap v1.24.0 // indirect
184184
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
185185
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
186-
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
187-
golang.org/x/net v0.0.0-20220926192436-02166a98028e // indirect
188-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
189-
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
190-
golang.org/x/text v0.3.7 // indirect
191-
golang.org/x/tools v0.1.10 // indirect
192-
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
186+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
187+
golang.org/x/net v0.4.0 // indirect
188+
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
189+
golang.org/x/sync v0.1.0 // indirect
190+
golang.org/x/text v0.5.0 // indirect
191+
golang.org/x/tools v0.1.12 // indirect
193192
google.golang.org/appengine v1.6.7 // indirect
194-
google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
193+
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c // indirect
195194
gopkg.in/ini.v1 v1.67.0 // indirect
196195
gopkg.in/yaml.v3 v3.0.1 // indirect
197196
)

0 commit comments

Comments
 (0)