From 60288109420fac841666105ad6330f2b1e4e6188 Mon Sep 17 00:00:00 2001 From: Xuan Wang Date: Wed, 7 Feb 2024 12:23:54 -0800 Subject: [PATCH] [Python O11Y] Fix core header dependency issue (#35845) Core team [moved resolver code](https://github.com/grpc/grpc/pull/35804) to `src/core/resolver`, our build is failing because we have a dependency on it and the resolver folder is not copied to `observability/grpc_root`: * `call_tracer.h` -> `core_configuration.h` -> `lb_policy_registry.h` -> `lb_policy.h` -> `endpoint_addresses.h` To fix this issue and to prevent such issues from happening again, instead of subfolders, we'll copy all files from `src/core` to `observability/grpc_root/src/core`. Closes #35845 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35845 from XuanWang-Amos:fix_o11y_core_header_deps 3c9eb8c49934ead88425a01b823038c5d298dc3e PiperOrigin-RevId: 605063207 --- .../grpcio_observability/make_grpcio_observability.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/python/grpcio_observability/make_grpcio_observability.py b/src/python/grpcio_observability/make_grpcio_observability.py index 740cdfffc4a..e6646e2f8bb 100755 --- a/src/python/grpcio_observability/make_grpcio_observability.py +++ b/src/python/grpcio_observability/make_grpcio_observability.py @@ -66,11 +66,7 @@ GRPCIO_OBSERVABILITY_ROOT_PREFIX = "src/python/grpcio_observability/" COPY_FILES_SOURCE_TARGET_PAIRS = [ ("include", "grpc_root/include"), ("third_party/abseil-cpp/absl", "third_party/abseil-cpp/absl"), - ("src/core/lib", "grpc_root/src/core/lib"), - ( - "src/core/load_balancing", - "grpc_root/src/core/load_balancing", - ), + ("src/core", "grpc_root/src/core"), ] # grpc repo root