Skip to content

Commit 254d2d5

Browse files
bogdandrutubogdandrutu
authored
Upgrade otel-collector to v0.56.0, and otel-go to v1.8.0 (#463)
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
1 parent 4b18dd3 commit 254d2d5

27 files changed

Lines changed: 368 additions & 363 deletions

File tree

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,11 @@ gotidy:
178178
update-dep:
179179
$(MAKE) for-all-mod CMD="$(PWD)/internal/buildscripts/update-dep"
180180

181-
STABLE_OTEL_VERSION=v1.7.0
182-
UNSTABLE_OTEL_VERSION=v0.30.0
183-
UNSTABLE_CONTRIB_OTEL_VERSION=v0.32.0
184-
STABLE_CONTRIB_OTEL_VERSION=v1.7.1-0.20220615184843-c06769263cf3
185-
COLLECTOR_VERSION=v0.53.0
181+
STABLE_OTEL_VERSION=v1.8.0
182+
UNSTABLE_OTEL_VERSION=v0.31.0
183+
UNSTABLE_CONTRIB_OTEL_VERSION=v0.33.0
184+
STABLE_CONTRIB_OTEL_VERSION=v1.8.0
185+
COLLECTOR_VERSION=v0.56.0
186186

187187
.PHONY: update-otel
188188
update-otel:

‎e2e-test-server/go.mod‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ module github.com/GoogleCloudPlatform/opentelemetry-operations-go/e2e-test-serve
33
go 1.17
44

55
require (
6-
cloud.google.com/go/iam v0.1.1 // indirect
6+
cloud.google.com/go/iam v0.3.0 // indirect
77
cloud.google.com/go/pubsub v1.19.0
88
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.3
9-
go.opentelemetry.io/otel v1.7.0
10-
go.opentelemetry.io/otel/sdk v1.7.0
11-
go.opentelemetry.io/otel/trace v1.7.0
12-
google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3
9+
go.opentelemetry.io/otel v1.8.0
10+
go.opentelemetry.io/otel/sdk v1.8.0
11+
go.opentelemetry.io/otel/trace v1.8.0
12+
google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90
1313
)
1414

15-
require go.opentelemetry.io/contrib/detectors/gcp v1.7.1-0.20220615184843-c06769263cf3
15+
require go.opentelemetry.io/contrib/detectors/gcp v1.8.0
1616

1717
require (
18-
cloud.google.com/go v0.100.2 // indirect
19-
cloud.google.com/go/compute v1.6.1 // indirect
18+
cloud.google.com/go v0.102.0 // indirect
19+
cloud.google.com/go/compute v1.7.0 // indirect
2020
cloud.google.com/go/trace v1.2.0 // indirect
2121
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v0.32.3 // indirect
2222
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.3 // indirect
@@ -25,18 +25,19 @@ require (
2525
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2626
github.com/golang/protobuf v1.5.2 // indirect
2727
github.com/google/go-cmp v0.5.8 // indirect
28-
github.com/googleapis/gax-go/v2 v2.3.0 // indirect
28+
github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa // indirect
29+
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
2930
go.opencensus.io v0.23.0 // indirect
3031
go.uber.org/atomic v1.7.0 // indirect
3132
go.uber.org/multierr v1.8.0 // indirect
32-
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
33-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
34-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
35-
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
33+
golang.org/x/net v0.0.0-20220607020251-c690dde0001d // indirect
34+
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb // indirect
35+
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
36+
golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d // indirect
3637
golang.org/x/text v0.3.7 // indirect
37-
google.golang.org/api v0.75.0 // indirect
38+
google.golang.org/api v0.84.0 // indirect
3839
google.golang.org/appengine v1.6.7 // indirect
39-
google.golang.org/grpc v1.45.0 // indirect
40+
google.golang.org/grpc v1.47.0 // indirect
4041
google.golang.org/protobuf v1.28.0 // indirect
4142
)
4243

‎e2e-test-server/go.sum‎

Lines changed: 57 additions & 30 deletions
Large diffs are not rendered by default.

‎example/metric/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ replace github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metr
66

77
require (
88
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.32.3
9-
go.opentelemetry.io/otel v1.7.0
10-
go.opentelemetry.io/otel/metric v0.30.0
11-
go.opentelemetry.io/otel/sdk v1.7.0
12-
go.opentelemetry.io/otel/sdk/metric v0.30.0
9+
go.opentelemetry.io/otel v1.8.0
10+
go.opentelemetry.io/otel/metric v0.31.0
11+
go.opentelemetry.io/otel/sdk v1.8.0
12+
go.opentelemetry.io/otel/sdk/metric v0.31.0
1313
)
1414

1515
require (
@@ -19,10 +19,10 @@ require (
1919
github.com/go-logr/stdr v1.2.2 // indirect
2020
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2121
github.com/golang/protobuf v1.5.2 // indirect
22-
github.com/google/go-cmp v0.5.7 // indirect
22+
github.com/google/go-cmp v0.5.8 // indirect
2323
github.com/googleapis/gax-go/v2 v2.2.0 // indirect
2424
go.opencensus.io v0.23.0 // indirect
25-
go.opentelemetry.io/otel/trace v1.7.0 // indirect
25+
go.opentelemetry.io/otel/trace v1.8.0 // indirect
2626
golang.org/x/net v0.0.0-20220325170049-de3da57026de // indirect
2727
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
2828
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 // indirect

‎example/metric/go.sum‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
5656
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
5757
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
5858
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
59-
github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
6059
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
6160
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
6261
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -140,8 +139,9 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
140139
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
141140
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
142141
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
143-
github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
144142
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
143+
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
144+
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
145145
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
146146
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
147147
github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -192,7 +192,6 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
192192
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
193193
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
194194
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
195-
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
196195
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
197196
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
198197
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -206,16 +205,16 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
206205
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
207206
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
208207
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
209-
go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM=
210-
go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk=
211-
go.opentelemetry.io/otel/metric v0.30.0 h1:Hs8eQZ8aQgs0U49diZoaS6Uaxw3+bBE3lcMUKBFIk3c=
212-
go.opentelemetry.io/otel/metric v0.30.0/go.mod h1:/ShZ7+TS4dHzDFmfi1kSXMhMVubNoP0oIaBp70J6UXU=
213-
go.opentelemetry.io/otel/sdk v1.7.0 h1:4OmStpcKVOfvDOgCt7UriAPtKolwIhxpnSNI/yK+1B0=
214-
go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe374q6cZwUU=
215-
go.opentelemetry.io/otel/sdk/metric v0.30.0 h1:XTqQ4y3erR2Oj8xSAOL5ovO5011ch2ELg51z4fVkpME=
216-
go.opentelemetry.io/otel/sdk/metric v0.30.0/go.mod h1:8AKFRi5HyvTR0RRty3paN1aMC9HMT+NzcEhw/BLkLX8=
217-
go.opentelemetry.io/otel/trace v1.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o=
218-
go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU=
208+
go.opentelemetry.io/otel v1.8.0 h1:zcvBFizPbpa1q7FehvFiHbQwGzmPILebO0tyqIR5Djg=
209+
go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM=
210+
go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs=
211+
go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A=
212+
go.opentelemetry.io/otel/sdk v1.8.0 h1:xwu69/fNuwbSHWe/0PGS888RmjWY181OmcXDQKu7ZQk=
213+
go.opentelemetry.io/otel/sdk v1.8.0/go.mod h1:uPSfc+yfDH2StDM/Rm35WE8gXSNdvCg023J6HeGNO0c=
214+
go.opentelemetry.io/otel/sdk/metric v0.31.0 h1:2sZx4R43ZMhJdteKAlKoHvRgrMp53V1aRxvEf5lCq8Q=
215+
go.opentelemetry.io/otel/sdk/metric v0.31.0/go.mod h1:fl0SmNnX9mN9xgU6OLYLMBMrNAsaZQi7qBwprwO3abk=
216+
go.opentelemetry.io/otel/trace v1.8.0 h1:cSy0DF9eGI5WIfNwZ1q2iUyGj00tGzP24dE1lOlHrfY=
217+
go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4=
219218
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
220219
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
221220
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -363,7 +362,6 @@ golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7w
363362
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
364363
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
365364
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
366-
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
367365
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
368366
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
369367
golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -450,7 +448,6 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
450448
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
451449
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
452450
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
453-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
454451
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
455452
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
456453
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=

‎example/trace/http/go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@ replace github.com/GoogleCloudPlatform/opentelemetry-operations-go => ../../..
1111
require (
1212
github.com/GoogleCloudPlatform/opentelemetry-operations-go v0.32.3
1313
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.3
14-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0
15-
go.opentelemetry.io/otel v1.7.0
16-
go.opentelemetry.io/otel/sdk v1.7.0
17-
go.opentelemetry.io/otel/trace v1.7.0
14+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.33.0
15+
go.opentelemetry.io/otel v1.8.0
16+
go.opentelemetry.io/otel/sdk v1.8.0
17+
go.opentelemetry.io/otel/trace v1.8.0
1818
)
1919

2020
require (
2121
cloud.google.com/go/compute v1.5.0 // indirect
2222
cloud.google.com/go/trace v1.2.0 // indirect
2323
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.3 // indirect
24-
github.com/felixge/httpsnoop v1.0.2 // indirect
24+
github.com/felixge/httpsnoop v1.0.3 // indirect
2525
github.com/go-logr/logr v1.2.3 // indirect
2626
github.com/go-logr/stdr v1.2.2 // indirect
2727
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2828
github.com/golang/protobuf v1.5.2 // indirect
29-
github.com/google/go-cmp v0.5.7 // indirect
29+
github.com/google/go-cmp v0.5.8 // indirect
3030
github.com/googleapis/gax-go/v2 v2.2.0 // indirect
3131
go.opencensus.io v0.23.0 // indirect
32-
go.opentelemetry.io/otel/metric v0.30.0 // indirect
32+
go.opentelemetry.io/otel/metric v0.31.0 // indirect
3333
go.uber.org/atomic v1.7.0 // indirect
3434
go.uber.org/multierr v1.8.0 // indirect
3535
golang.org/x/net v0.0.0-20220325170049-de3da57026de // indirect

0 commit comments

Comments
 (0)