Merge branch 'main' into codeboten/bump-down-go-1.22

open-telemetry · Dec 18, 2024 · 2cc3669 · 2cc3669
2 parents 488f73b + d0c810e
commit 2cc3669
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/slim/otlp/go.mod b/slim/otlp/go.mod
@@ -2,6 +2,6 @@ module go.opentelemetry.io/proto/slim/otlp
 
 go 1.22.0
 
-require google.golang.org/protobuf v1.35.2
+require google.golang.org/protobuf v1.36.0
 
 require github.com/google/go-cmp v0.6.0 // indirect
diff --git a/slim/otlp/go.sum b/slim/otlp/go.sum
@@ -1,4 +1,4 @@
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ=
+google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=