Skip to content

Commit b6951af

Browse files
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-operator into allow-non-identifying
2 parents 68c5e3b + 888eeda commit b6951af

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tests/test-e2e-apps/bridge-server/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ require (
1818
go.opentelemetry.io/otel v1.27.0 // indirect
1919
go.opentelemetry.io/otel/metric v1.27.0 // indirect
2020
go.opentelemetry.io/otel/trace v1.27.0 // indirect
21-
golang.org/x/net v0.33.0 // indirect
21+
golang.org/x/net v0.36.0 // indirect
2222
)

tests/test-e2e-apps/bridge-server/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0
3030
go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak=
3131
go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw=
3232
go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4=
33-
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
34-
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
33+
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
34+
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
3535
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
3636
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
3737
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

0 commit comments

Comments
 (0)