Merge branch 'main' into v1.3.1

open-telemetry · May 30, 2024 · 39cfd40 · 39cfd40
2 parents 5317dc5 + 4ef95d5
commit 39cfd40
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 11 deletions.
diff --git a/otlp/go.mod b/otlp/go.mod
@@ -3,15 +3,15 @@ module go.opentelemetry.io/proto/otlp
 go 1.17
 
 require (
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
-	google.golang.org/grpc v1.63.2
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
+	google.golang.org/grpc v1.64.0
 	google.golang.org/protobuf v1.34.1
 )
 
 require (
 	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
+	golang.org/x/text v0.15.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
 )