[OTel] Add OTel C++ as a submodule (grpc#36032)

Closes grpc#36032 PiperOrigin-RevId: 611657802
erm-g · Mar 1, 2024 · 4ce4f4e · 4ce4f4e
1 parent 5043eb4
commit 4ce4f4e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -47,3 +47,6 @@
 	# generated file that makes Git consider the submodule dirty. This
 	# state can be ignored for day-to-day development on gRPC.
 	ignore = dirty
+[submodule "third_party/opentelemetry-cpp"]
+	path = third_party/opentelemetry-cpp
+	url = https://github.com/open-telemetry/opentelemetry-cpp
diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
@@ -517,11 +517,11 @@ def grpc_deps():
     if "io_opentelemetry_cpp" not in native.existing_rules():
         http_archive(
             name = "io_opentelemetry_cpp",
-            sha256 = "7735cc56507149686e6019e06f588317099d4522480be5f38a2a09ec69af1706",
-            strip_prefix = "opentelemetry-cpp-1.13.0",
+            sha256 = "ed681d20a684b7d485a49288e7cfb2d182bf882e5c112c5f2fa3f9e9da2278fc",
+            strip_prefix = "opentelemetry-cpp-4bd64c9a336fd438d6c4c9dad2e6b61b0585311f",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.13.0.tar.gz",
-                "https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.13.0.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/open-telemetry/opentelemetry-cpp/archive/4bd64c9a336fd438d6c4c9dad2e6b61b0585311f.tar.gz",
+                "https://github.com/open-telemetry/opentelemetry-cpp/archive/4bd64c9a336fd438d6c4c9dad2e6b61b0585311f.tar.gz",
             ],
         )
 

diff --git a/third_party/opentelemetry-cpp b/third_party/opentelemetry-cpp
diff --git a/tools/run_tests/sanity/check_bazel_workspace.py b/tools/run_tests/sanity/check_bazel_workspace.py
@@ -89,7 +89,6 @@
     "com_google_absl",
     "com_google_fuzztest",
     "io_opencensus_cpp",
-    "io_opentelemetry_cpp",
     # TODO(stanleycheung): remove when prometheus-cpp has new release
     "com_github_jupp0r_prometheus_cpp",
     _BAZEL_SKYLIB_DEP_NAME,

diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
@@ -35,6 +35,7 @@ third_party/googleapis 2f9af297c84c55c8b871ba4495e01ade42476c92
 third_party/googletest 2dd1c131950043a8ad5ab0d2dda0e0970596586a
 third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89
 third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df
+third_party/opentelemetry-cpp 4bd64c9a336fd438d6c4c9dad2e6b61b0585311f
 third_party/protobuf 7f94235e552599141950d7a4a3eaf93bc87d1b22
 third_party/protoc-gen-validate fab737efbb4b4d03e7c771393708f75594b121e4
 third_party/re2 0c5616df9c0aaa44c9440d87422012423d91c7d1