Merge branch 'main' into iwyu

open-telemetry · Jul 5, 2023 · 40de7b7 · 40de7b7
2 parents 65c7326 + 60794ac
commit 40de7b7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/bazel/repository.bzl b/bazel/repository.bzl
@@ -100,10 +100,10 @@ def opentelemetry_cpp_deps():
         http_archive,
         name = "com_github_opentelemetry_proto",
         build_file = "@io_opentelemetry_cpp//bazel:opentelemetry_proto.BUILD",
-        sha256 = "6ab267cf82832ed60ad075d574c78da736193eecb9693e8a8d02f65d6d3f3520",
-        strip_prefix = "opentelemetry-proto-0.20.0",
+        sha256 = "a13a1a7b76a1f22a0ca2e6c293e176ffef031413ab8ba653a82a1dbc286a3a33",
+        strip_prefix = "opentelemetry-proto-1.0.0",
         urls = [
-            "https://github.com/open-telemetry/opentelemetry-proto/archive/v0.20.0.tar.gz",
+            "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.0.0.tar.gz",
         ],
     )
 

diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake
@@ -43,7 +43,7 @@ else()
     message(
       STATUS "opentelemetry-proto dependency satisfied by: github download")
     if("${opentelemetry-proto}" STREQUAL "")
-      set(opentelemetry-proto "v0.20.0")
+      set(opentelemetry-proto "v1.0.0")
     endif()
     include(ExternalProject)
     ExternalProject_Add(

diff --git a/third_party/opentelemetry-proto b/third_party/opentelemetry-proto
diff --git a/third_party_release b/third_party_release
@@ -19,7 +19,7 @@ benchmark=v1.7.1
 googletest=release-1.12.1
 ms-gsl=v3.1.0-67-g6f45293
 nlohmann-json=v3.11.2
-opentelemetry-proto=v0.20.0
+opentelemetry-proto=v1.0.0
 opentracing-cpp=v1.6.0
 prometheus-cpp=v1.1.0
 vcpkg=2022.08.15
+5 −1		CHANGELOG.md
+10 −10		README.md
+4 −4		docs/specification.md