Merge branch 'main' into v150

open-telemetry · Dec 19, 2024 · f49fcad · f49fcad
2 parents 7c5f6a6 + 29792a3
commit f49fcad
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/internal/tools/go.mod b/internal/tools/go.mod
@@ -41,7 +41,7 @@ require (
 	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
 	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect

diff --git a/internal/tools/go.sum b/internal/tools/go.sum
@@ -138,8 +138,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

diff --git a/otlp/go.mod b/otlp/go.mod
@@ -3,7 +3,7 @@ module go.opentelemetry.io/proto/otlp
 go 1.22.0
 
 require (
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.1-0.20241217191332-ad43171ba0b7
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.1-0.20241219161738-df4d6666e470
 	google.golang.org/grpc v1.69.2
 	google.golang.org/protobuf v1.36.0
 )

diff --git a/otlp/go.sum b/otlp/go.sum
@@ -8,8 +8,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.1-0.20241217191332-ad43171ba0b7 h1:CZlpBG0S3YTieIdam8Db9Z0gBgU3JuzN9zFIo7t0WTc=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.1-0.20241217191332-ad43171ba0b7/go.mod h1:HYggR0B7Kaj6uEuVdg7PoQm51McagaPwlhggJHro8Ao=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.1-0.20241219161738-df4d6666e470 h1:Byq91FpFFKDtqBCGMAW1G9M9fDAOyXNb/pW8vo2xEZ0=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.1-0.20241219161738-df4d6666e470/go.mod h1:oMdpwGIhk3PMYollBz8X75QmXZTlxvgZ3swrJV4Ejxw=
 go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY=
 go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE=
 go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE=