Skip to content

Commit 61a91f3

Browse files
justinsbjustinsb
committed
versionbump: otel libraries to v1.21.0
Includes an update to go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp
1 parent aff697d commit 61a91f3

File tree

4 files changed

+72
-76
lines changed

4 files changed

+72
-76
lines changed

‎porch/controllers/go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ require (
1717
github.com/GoogleContainerTools/kpt/porch/api v0.0.0-20230121152246-dc44dbd18a33
1818
github.com/google/cel-go v0.14.0
1919
github.com/google/go-containerregistry v0.14.0
20-
github.com/stretchr/testify v1.8.3
21-
go.opentelemetry.io/otel v1.16.0
22-
go.opentelemetry.io/otel/trace v1.16.0
20+
github.com/stretchr/testify v1.8.4
21+
go.opentelemetry.io/otel v1.21.0
22+
go.opentelemetry.io/otel/trace v1.21.0
2323
golang.org/x/exp v0.0.0-20220916125017-b168a2c6b86b
2424
golang.org/x/mod v0.9.0
2525
golang.org/x/oauth2 v0.12.0
@@ -63,7 +63,7 @@ require (
6363
github.com/go-git/gcfg v1.5.0 // indirect
6464
github.com/go-git/go-billy/v5 v5.3.1 // indirect
6565
github.com/go-git/go-git/v5 v5.4.3-0.20220408232334-4f916225cb2f // indirect
66-
github.com/go-logr/logr v1.2.4 // indirect
66+
github.com/go-logr/logr v1.3.0 // indirect
6767
github.com/go-logr/stdr v1.2.2 // indirect
6868
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6969
github.com/go-openapi/jsonreference v0.20.1 // indirect
@@ -73,7 +73,7 @@ require (
7373
github.com/golang/protobuf v1.5.3 // indirect
7474
github.com/google/btree v1.1.2 // indirect
7575
github.com/google/gnostic v0.6.9 // indirect
76-
github.com/google/go-cmp v0.5.9 // indirect
76+
github.com/google/go-cmp v0.6.0 // indirect
7777
github.com/google/gofuzz v1.2.0 // indirect
7878
github.com/google/s2a-go v0.1.7 // indirect
7979
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -115,12 +115,12 @@ require (
115115
github.com/vbatts/tar-split v0.11.2 // indirect
116116
github.com/xlab/treeprint v1.1.0 // indirect
117117
go.opencensus.io v0.24.0 // indirect
118-
go.opentelemetry.io/otel/metric v1.16.0 // indirect
118+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
119119
go.starlark.net v0.0.0-20210901212718-87f333178d59 // indirect
120120
golang.org/x/crypto v0.14.0 // indirect
121121
golang.org/x/net v0.17.0 // indirect
122122
golang.org/x/sync v0.3.0 // indirect
123-
golang.org/x/sys v0.13.0 // indirect
123+
golang.org/x/sys v0.14.0 // indirect
124124
golang.org/x/term v0.13.0 // indirect
125125
golang.org/x/text v0.13.0 // indirect
126126
golang.org/x/time v0.3.0 // indirect

‎porch/controllers/go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG
152152
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
153153
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
154154
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
155-
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
156-
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
155+
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
156+
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
157157
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
158158
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
159159
github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A=
@@ -217,8 +217,8 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
217217
github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
218218
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
219219
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
220-
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
221-
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
220+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
221+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
222222
github.com/google/go-containerregistry v0.14.0 h1:z58vMqHxuwvAsVwvKEkmVBz2TlgBgH5k6koEXBtlYkw=
223223
github.com/google/go-containerregistry v0.14.0/go.mod h1:aiJ2fp/SXvkWgmYHioXnbMdlgB8eXiiYOY55gfN91Wk=
224224
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -406,8 +406,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
406406
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
407407
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
408408
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
409-
github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
410-
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
409+
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
410+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
411411
github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
412412
github.com/vbatts/tar-split v0.11.2 h1:Via6XqJr0hceW4wff3QRzD5gAk/tatMw/4ZA7cTlIME=
413413
github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI=
@@ -428,12 +428,12 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
428428
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
429429
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
430430
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
431-
go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s=
432-
go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4=
433-
go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo=
434-
go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4=
435-
go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs=
436-
go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0=
431+
go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
432+
go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
433+
go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
434+
go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
435+
go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
436+
go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
437437
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
438438
go.starlark.net v0.0.0-20210901212718-87f333178d59 h1:F8ArBy9n1l7HE1JjzOIYqweEqoUlywy5+L3bR0tIa9g=
439439
go.starlark.net v0.0.0-20210901212718-87f333178d59/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0=
@@ -597,8 +597,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
597597
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
598598
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
599599
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
600-
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
601-
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
600+
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
601+
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
602602
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
603603
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
604604
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=

‎porch/go.mod

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ require (
2121
github.com/go-git/go-billy/v5 v5.3.1
2222
github.com/go-git/go-git/v5 v5.4.3-0.20220408232334-4f916225cb2f
2323
github.com/golang/protobuf v1.5.3
24-
github.com/google/go-cmp v0.5.9
24+
github.com/google/go-cmp v0.6.0
2525
github.com/google/go-containerregistry v0.14.0
2626
github.com/google/uuid v1.3.1
2727
github.com/hexops/gotextdiff v1.0.3
2828
github.com/spf13/cobra v1.6.1
2929
github.com/spf13/pflag v1.0.5
30-
github.com/stretchr/testify v1.8.3
31-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0
32-
go.opentelemetry.io/otel v1.16.0
33-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
34-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0
35-
go.opentelemetry.io/otel/sdk v1.16.0
36-
go.opentelemetry.io/otel/trace v1.16.0
30+
github.com/stretchr/testify v1.8.4
31+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1
32+
go.opentelemetry.io/otel v1.21.0
33+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0
34+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0
35+
go.opentelemetry.io/otel/sdk v1.21.0
36+
go.opentelemetry.io/otel/trace v1.21.0
3737
golang.org/x/mod v0.9.0
3838
golang.org/x/oauth2 v0.11.0
3939
golang.org/x/tools v0.7.0
@@ -90,11 +90,11 @@ require (
9090
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
9191
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
9292
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
93-
github.com/felixge/httpsnoop v1.0.3 // indirect
93+
github.com/felixge/httpsnoop v1.0.4 // indirect
9494
github.com/fsnotify/fsnotify v1.6.0 // indirect
9595
github.com/go-errors/errors v1.4.2 // indirect
9696
github.com/go-git/gcfg v1.5.0 // indirect
97-
github.com/go-logr/logr v1.2.4 // indirect
97+
github.com/go-logr/logr v1.3.0 // indirect
9898
github.com/go-logr/stdr v1.2.2 // indirect
9999
github.com/go-openapi/jsonpointer v0.19.6 // indirect
100100
github.com/go-openapi/jsonreference v0.20.1 // indirect
@@ -111,7 +111,7 @@ require (
111111
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
112112
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
113113
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
114-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
114+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
115115
github.com/imdario/mergo v0.3.12 // indirect
116116
github.com/inconshreveable/mousetrap v1.1.0 // indirect
117117
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -157,18 +157,17 @@ require (
157157
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
158158
go.opencensus.io v0.24.0 // indirect
159159
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
160-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
161-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
162-
go.opentelemetry.io/otel/metric v1.16.0 // indirect
163-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
160+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
161+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
162+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
164163
go.starlark.net v0.0.0-20210901212718-87f333178d59 // indirect
165164
go.uber.org/atomic v1.7.0 // indirect
166165
go.uber.org/multierr v1.6.0 // indirect
167166
go.uber.org/zap v1.24.0 // indirect
168167
golang.org/x/crypto v0.14.0 // indirect
169168
golang.org/x/net v0.17.0 // indirect
170169
golang.org/x/sync v0.3.0 // indirect
171-
golang.org/x/sys v0.13.0 // indirect
170+
golang.org/x/sys v0.14.0 // indirect
172171
golang.org/x/term v0.13.0 // indirect
173172
golang.org/x/text v0.13.0 // indirect
174173
golang.org/x/time v0.3.0 // indirect

0 commit comments

Comments
 (0)