Merge remote-tracking branch 'upstream/master' into client_channel_su…

…bchannel_wrapper_work_serializer_at_orphan_rollforward
markdroth · Sep 13, 2023 · b9670a4 · b9670a4
2 parents 84db076 + d713427
commit b9670a4
Show file tree

Hide file tree

Showing 70 changed files with 1,341 additions and 140 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Makefile b/Makefile
diff --git a/Package.swift b/Package.swift
diff --git a/WORKSPACE b/WORKSPACE
@@ -102,6 +102,14 @@ load("@com_github_google_benchmark//:bazel/benchmark_deps.bzl", "benchmark_deps"
 
 benchmark_deps()
 
+load("@io_opentelemetry_cpp//bazel:repository.bzl", "opentelemetry_cpp_deps")
+
+opentelemetry_cpp_deps()
+
+load("@io_opentelemetry_cpp//bazel:extra_deps.bzl", "opentelemetry_extra_deps")
+
+opentelemetry_extra_deps()
+
 # TODO: Enable below once https://github.com/bazel-xcode/PodToBUILD/issues/232 is resolved
 #
 #http_archive(