Automated change: Fix sanity tests

[experiments] Set call_status_override_on_cancellation default to `false` from `debug`
2024-02-13 17:06:52 +00:00 · 2024-02-13 08:58:30 -08:00
3823 changed files with 115435 additions and 161131 deletions
--- a/.bazelignore
+++ b/.bazelignore
@ -14,12 +14,10 @@ third_party/envoy-api
 third_party/googleapis
 third_party/googletest
 third_party/opencensus-proto
 third_party/opentelemetry-cpp
 third_party/protobuf
 third_party/protoc-gen-validate
 third_party/re2
 third_party/upb
 third_party/utf8_range
 third_party/xds
 test/distrib/bazel/cpp
--- a/.bazelversion
+++ b/.bazelversion
@ -1 +1 @@
-7.1.0
+6.4.0
--- a/.clang-format
+++ b/.clang-format
@ -5,6 +5,9 @@ DerivePointerAlignment: false
 PointerAlignment: Left
 IncludeBlocks: Regroup
 IncludeCategories:
  # port_platform.h is before almost everything
  - Regex: '^<grpc/(support|impl/codegen)/port_platform.h>'
    Priority: -100
  # ruby.h is even more first if it's included
  - Regex: '^<ruby/ruby.h>'
    Priority: -200
--- a/.gitattributes
+++ b/.gitattributes
@ -12,8 +12,10 @@ gRPC-ProtoRPC.podspec linguist-generated=true
 gRPC-RxLibrary.podspec linguist-generated=true
 gRPC.podspec linguist-generated=true
 grpc.gemspec linguist-generated=true
 grpc.gyp linguist-generated=true
 grpc.def linguist-generated=true
 package.xml linguist-generated=true
 binding.gyp linguist-generated=true
 Package.swift linguist-generated=true
 src/python/grpcio/grpc_core_dependencies.py linguist-generated=true
 src/ruby/ext/grpc/rb_grpc_imports.generated.h linguist-generated=true
@ -29,13 +31,9 @@ tools/run_tests/tests.json linguist-generated=true
 tools/run_tests/generated/tests.json linguist-generated=true
 tools/run_tests/generated/sources_and_headers.json linguist-generated=true
 src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h linguist-generated=true
-src/core/telemetry/stats_data.h linguist-generated=true
+src/core/lib/debug/stats_data.h linguist-generated=true
-src/core/telemetry/stats_data.cc linguist-generated=true
+src/core/lib/debug/stats_data.cc linguist-generated=true
 src/core/lib/experiments/experiments.h linguist-generated=true
 src/core/lib/experiments/experiments.cc linguist-generated=true
 bazel/experiments.bzl linguist-generated=true
 test/cpp/microbenchmarks/huffman_geometries/** linguist-generated=true
 doc/trace_flags.md linguist-generated=true
 src/core/lib/debug/trace_flags.h linguist-generated=true
 src/core/lib/debug/trace_flags.cc linguist-generated=true
 src/python/grpcio_observability/observability_lib_deps.py linguist-generated=true
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -1,12 +1,11 @@
 /**/OWNERS @markdroth @a11r
 /bazel/** @veblush @gnossen
 /bazel/experiments.yaml
 /cmake/** @veblush @apolcyn
-/src/core/client_channel/** @markdroth
+/src/core/ext/filters/client_channel/** @markdroth
 /src/core/ext/transport/chttp2/transport/** @ctiller
-/src/core/load_balancing/** @markdroth
+/src/core/ext/xds/** @markdroth
-/src/core/resolver/** @markdroth
+/src/core/lib/resolver/** @markdroth
-/src/core/server/xds* @markdroth
+/src/core/lib/service_config/** @markdroth
 /src/core/service_config/** @markdroth
 /src/core/xds/** @markdroth
 /tools/dockerfile/** @drfloob @apolcyn @gnossen
 /tools/run_tests/xds_k8s_test_driver/** @sergiitk @XuanWang-Amos @gnossen
--- a/.github/workflows/pr-auto-fix.yaml
+++ b/.github/workflows/pr-auto-fix.yaml
@ -22,14 +22,14 @@ jobs:
        with:
          format: YYYYWWd
      - name: Cache bazel
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
        env:
          cache-name: bazel-cache
        with:
          path: ~/.cache/bazel
          # formattedTime here is like 2021323 - the year concatenated with the week then
          # the day of that week.
-          # As this changes every day, we cycle to a new cache once per day, with lookup
+          # As this changes every day, we cycle to a new cache once per day, with lookup 
          # across the week (and then the year).
          key: ${{ runner.os }}-${{ steps.current-time-with-day.outputs.formattedTime }}
          restore-keys: |
@ -48,13 +48,13 @@ jobs:
        with:
          script: |
            // If you'd like not to run this code on your commits, add your github user id here:
-            const NO_AUTOFIX_USERS = ["copybara-service[bot]"];
+            NO_AUTOFIX_USERS = ["copybara-service[bot]"]
-            const { owner, repo } = context.repo;
+            const { owner, repo } = context.repo
            console.log("Actor: " + context.actor);
            if (NO_AUTOFIX_USERS.includes(context.actor)) {
              console.log('Cancelling');
              const run_id = "${{ github.run_id }}";
-              await github.rest.actions.cancelWorkflowRun({ owner, repo, run_id });
+              await github.actions.cancelWorkflowRun({ owner, repo, run_id });
              return 'go';
            } else {
              return 'stay';
@ -66,7 +66,7 @@ jobs:
        run: test "${{ steps.check.outputs.result }}" = "stay"
      # Setup to run sanity suite
      - name: Install Python Interpreter
-        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
+        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
        with:
          python-version: 3.8
      - name: Install Python Packages
@ -75,7 +75,7 @@ jobs:
          sudo apt-get update
          sudo apt-get install python3-dev
      - name: Check out repository code
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
        with:
          submodules: True
      - name: Get the upstream code
@ -90,7 +90,7 @@ jobs:
        run: ANDROID_NDK_HOME= ${{ github.workspace }}/tools/distrib/sanitize.sh
      # Report back with a PR if things are broken
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
+        uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 # v6.0.0
        with:
          delete-branch: true
          branch-suffix: short-commit-hash
--- a/.gitmodules
+++ b/.gitmodules
@ -47,6 +47,3 @@
 	# 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
--- a/1343
+++ b/1343
--- a/BoringSSL-Package.swift
+++ b/BoringSSL-Package.swift
@ -1,323 +0,0 @@
 // swift-tools-version:5.5
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 import PackageDescription
 import Foundation
 let basePath = "third_party/boringssl-with-bazel"
 let privacyInfoPath = "../../src/objective-c/PrivacyInfo.xcprivacy"
 let testPath = "test/boringssl_spm_build"
 let package = Package(
  name: "BoringSSL-GRPC",
  products: [
    .library(
      name: "openssl_grpc",
      targets: ["openssl_grpc"]
    )
  ],
  targets: [
    .target(
      name: "openssl_grpc",
      path: basePath,
      exclude: [
      ],
      sources: [
        "src/crypto/asn1/a_bitstr.c",
        "src/crypto/asn1/a_bool.c",
        "src/crypto/asn1/a_d2i_fp.c",
        "src/crypto/asn1/a_dup.c",
        "src/crypto/asn1/a_gentm.c",
        "src/crypto/asn1/a_i2d_fp.c",
        "src/crypto/asn1/a_int.c",
        "src/crypto/asn1/a_mbstr.c",
        "src/crypto/asn1/a_object.c",
        "src/crypto/asn1/a_octet.c",
        "src/crypto/asn1/a_strex.c",
        "src/crypto/asn1/a_strnid.c",
        "src/crypto/asn1/a_time.c",
        "src/crypto/asn1/a_type.c",
        "src/crypto/asn1/a_utctm.c",
        "src/crypto/asn1/asn1_lib.c",
        "src/crypto/asn1/asn1_par.c",
        "src/crypto/asn1/asn_pack.c",
        "src/crypto/asn1/f_int.c",
        "src/crypto/asn1/f_string.c",
        "src/crypto/asn1/posix_time.c",
        "src/crypto/asn1/tasn_dec.c",
        "src/crypto/asn1/tasn_enc.c",
        "src/crypto/asn1/tasn_fre.c",
        "src/crypto/asn1/tasn_new.c",
        "src/crypto/asn1/tasn_typ.c",
        "src/crypto/asn1/tasn_utl.c",
        "src/crypto/base64/base64.c",
        "src/crypto/bio/bio.c",
        "src/crypto/bio/bio_mem.c",
        "src/crypto/bio/connect.c",
        "src/crypto/bio/errno.c",
        "src/crypto/bio/fd.c",
        "src/crypto/bio/file.c",
        "src/crypto/bio/hexdump.c",
        "src/crypto/bio/pair.c",
        "src/crypto/bio/printf.c",
        "src/crypto/bio/socket.c",
        "src/crypto/bio/socket_helper.c",
        "src/crypto/blake2/blake2.c",
        "src/crypto/bn_extra/bn_asn1.c",
        "src/crypto/bn_extra/convert.c",
        "src/crypto/buf/buf.c",
        "src/crypto/bytestring/asn1_compat.c",
        "src/crypto/bytestring/ber.c",
        "src/crypto/bytestring/cbb.c",
        "src/crypto/bytestring/cbs.c",
        "src/crypto/bytestring/unicode.c",
        "src/crypto/chacha/chacha.c",
        "src/crypto/cipher_extra/cipher_extra.c",
        "src/crypto/cipher_extra/derive_key.c",
        "src/crypto/cipher_extra/e_aesctrhmac.c",
        "src/crypto/cipher_extra/e_aesgcmsiv.c",
        "src/crypto/cipher_extra/e_chacha20poly1305.c",
        "src/crypto/cipher_extra/e_des.c",
        "src/crypto/cipher_extra/e_null.c",
        "src/crypto/cipher_extra/e_rc2.c",
        "src/crypto/cipher_extra/e_rc4.c",
        "src/crypto/cipher_extra/e_tls.c",
        "src/crypto/cipher_extra/tls_cbc.c",
        "src/crypto/conf/conf.c",
        "src/crypto/cpu_aarch64_apple.c",
        "src/crypto/cpu_aarch64_fuchsia.c",
        "src/crypto/cpu_aarch64_linux.c",
        "src/crypto/cpu_aarch64_openbsd.c",
        "src/crypto/cpu_aarch64_sysreg.c",
        "src/crypto/cpu_aarch64_win.c",
        "src/crypto/cpu_arm_freebsd.c",
        "src/crypto/cpu_arm_linux.c",
        "src/crypto/cpu_intel.c",
        "src/crypto/crypto.c",
        "src/crypto/curve25519/curve25519.c",
        "src/crypto/curve25519/curve25519_64_adx.c",
        "src/crypto/curve25519/spake25519.c",
        "src/crypto/des/des.c",
        "src/crypto/dh_extra/dh_asn1.c",
        "src/crypto/dh_extra/params.c",
        "src/crypto/digest_extra/digest_extra.c",
        "src/crypto/dilithium/dilithium.c",
        "src/crypto/dsa/dsa.c",
        "src/crypto/dsa/dsa_asn1.c",
        "src/crypto/ec_extra/ec_asn1.c",
        "src/crypto/ec_extra/ec_derive.c",
        "src/crypto/ec_extra/hash_to_curve.c",
        "src/crypto/ecdh_extra/ecdh_extra.c",
        "src/crypto/ecdsa_extra/ecdsa_asn1.c",
        "src/crypto/engine/engine.c",
        "src/crypto/err/err.c",
        "src/crypto/evp/evp.c",
        "src/crypto/evp/evp_asn1.c",
        "src/crypto/evp/evp_ctx.c",
        "src/crypto/evp/p_dh.c",
        "src/crypto/evp/p_dh_asn1.c",
        "src/crypto/evp/p_dsa_asn1.c",
        "src/crypto/evp/p_ec.c",
        "src/crypto/evp/p_ec_asn1.c",
        "src/crypto/evp/p_ed25519.c",
        "src/crypto/evp/p_ed25519_asn1.c",
        "src/crypto/evp/p_hkdf.c",
        "src/crypto/evp/p_rsa.c",
        "src/crypto/evp/p_rsa_asn1.c",
        "src/crypto/evp/p_x25519.c",
        "src/crypto/evp/p_x25519_asn1.c",
        "src/crypto/evp/pbkdf.c",
        "src/crypto/evp/print.c",
        "src/crypto/evp/scrypt.c",
        "src/crypto/evp/sign.c",
        "src/crypto/ex_data.c",
        "src/crypto/fipsmodule/bcm.c",
        "src/crypto/fipsmodule/fips_shared_support.c",
        "src/crypto/hpke/hpke.c",
        "src/crypto/hrss/hrss.c",
        "src/crypto/keccak/keccak.c",
        "src/crypto/kyber/kyber.c",
        "src/crypto/lhash/lhash.c",
        "src/crypto/mem.c",
        "src/crypto/obj/obj.c",
        "src/crypto/obj/obj_xref.c",
        "src/crypto/pem/pem_all.c",
        "src/crypto/pem/pem_info.c",
        "src/crypto/pem/pem_lib.c",
        "src/crypto/pem/pem_oth.c",
        "src/crypto/pem/pem_pk8.c",
        "src/crypto/pem/pem_pkey.c",
        "src/crypto/pem/pem_x509.c",
        "src/crypto/pem/pem_xaux.c",
        "src/crypto/pkcs7/pkcs7.c",
        "src/crypto/pkcs7/pkcs7_x509.c",
        "src/crypto/pkcs8/p5_pbev2.c",
        "src/crypto/pkcs8/pkcs8.c",
        "src/crypto/pkcs8/pkcs8_x509.c",
        "src/crypto/poly1305/poly1305.c",
        "src/crypto/poly1305/poly1305_arm.c",
        "src/crypto/poly1305/poly1305_vec.c",
        "src/crypto/pool/pool.c",
        "src/crypto/rand_extra/deterministic.c",
        "src/crypto/rand_extra/forkunsafe.c",
        "src/crypto/rand_extra/getentropy.c",
        "src/crypto/rand_extra/ios.c",
        "src/crypto/rand_extra/passive.c",
        "src/crypto/rand_extra/rand_extra.c",
        "src/crypto/rand_extra/trusty.c",
        "src/crypto/rand_extra/windows.c",
        "src/crypto/rc4/rc4.c",
        "src/crypto/refcount.c",
        "src/crypto/rsa_extra/rsa_asn1.c",
        "src/crypto/rsa_extra/rsa_crypt.c",
        "src/crypto/rsa_extra/rsa_print.c",
        "src/crypto/siphash/siphash.c",
        "src/crypto/spx/address.c",
        "src/crypto/spx/fors.c",
        "src/crypto/spx/merkle.c",
        "src/crypto/spx/spx.c",
        "src/crypto/spx/spx_util.c",
        "src/crypto/spx/thash.c",
        "src/crypto/spx/wots.c",
        "src/crypto/stack/stack.c",
        "src/crypto/thread.c",
        "src/crypto/thread_none.c",
        "src/crypto/thread_pthread.c",
        "src/crypto/thread_win.c",
        "src/crypto/trust_token/pmbtoken.c",
        "src/crypto/trust_token/trust_token.c",
        "src/crypto/trust_token/voprf.c",
        "src/crypto/x509/a_digest.c",
        "src/crypto/x509/a_sign.c",
        "src/crypto/x509/a_verify.c",
        "src/crypto/x509/algorithm.c",
        "src/crypto/x509/asn1_gen.c",
        "src/crypto/x509/by_dir.c",
        "src/crypto/x509/by_file.c",
        "src/crypto/x509/i2d_pr.c",
        "src/crypto/x509/name_print.c",
        "src/crypto/x509/policy.c",
        "src/crypto/x509/rsa_pss.c",
        "src/crypto/x509/t_crl.c",
        "src/crypto/x509/t_req.c",
        "src/crypto/x509/t_x509.c",
        "src/crypto/x509/t_x509a.c",
        "src/crypto/x509/v3_akey.c",
        "src/crypto/x509/v3_akeya.c",
        "src/crypto/x509/v3_alt.c",
        "src/crypto/x509/v3_bcons.c",
        "src/crypto/x509/v3_bitst.c",
        "src/crypto/x509/v3_conf.c",
        "src/crypto/x509/v3_cpols.c",
        "src/crypto/x509/v3_crld.c",
        "src/crypto/x509/v3_enum.c",
        "src/crypto/x509/v3_extku.c",
        "src/crypto/x509/v3_genn.c",
        "src/crypto/x509/v3_ia5.c",
        "src/crypto/x509/v3_info.c",
        "src/crypto/x509/v3_int.c",
        "src/crypto/x509/v3_lib.c",
        "src/crypto/x509/v3_ncons.c",
        "src/crypto/x509/v3_ocsp.c",
        "src/crypto/x509/v3_pcons.c",
        "src/crypto/x509/v3_pmaps.c",
        "src/crypto/x509/v3_prn.c",
        "src/crypto/x509/v3_purp.c",
        "src/crypto/x509/v3_skey.c",
        "src/crypto/x509/v3_utl.c",
        "src/crypto/x509/x509.c",
        "src/crypto/x509/x509_att.c",
        "src/crypto/x509/x509_cmp.c",
        "src/crypto/x509/x509_d2.c",
        "src/crypto/x509/x509_def.c",
        "src/crypto/x509/x509_ext.c",
        "src/crypto/x509/x509_lu.c",
        "src/crypto/x509/x509_obj.c",
        "src/crypto/x509/x509_req.c",
        "src/crypto/x509/x509_set.c",
        "src/crypto/x509/x509_trs.c",
        "src/crypto/x509/x509_txt.c",
        "src/crypto/x509/x509_v3.c",
        "src/crypto/x509/x509_vfy.c",
        "src/crypto/x509/x509_vpm.c",
        "src/crypto/x509/x509cset.c",
        "src/crypto/x509/x509name.c",
        "src/crypto/x509/x509rset.c",
        "src/crypto/x509/x509spki.c",
        "src/crypto/x509/x_algor.c",
        "src/crypto/x509/x_all.c",
        "src/crypto/x509/x_attrib.c",
        "src/crypto/x509/x_crl.c",
        "src/crypto/x509/x_exten.c",
        "src/crypto/x509/x_name.c",
        "src/crypto/x509/x_pubkey.c",
        "src/crypto/x509/x_req.c",
        "src/crypto/x509/x_sig.c",
        "src/crypto/x509/x_spki.c",
        "src/crypto/x509/x_val.c",
        "src/crypto/x509/x_x509.c",
        "src/crypto/x509/x_x509a.c",
        "src/gen/crypto/err_data.c",
        "src/ssl/bio_ssl.cc",
        "src/ssl/d1_both.cc",
        "src/ssl/d1_lib.cc",
        "src/ssl/d1_pkt.cc",
        "src/ssl/d1_srtp.cc",
        "src/ssl/dtls_method.cc",
        "src/ssl/dtls_record.cc",
        "src/ssl/encrypted_client_hello.cc",
        "src/ssl/extensions.cc",
        "src/ssl/handoff.cc",
        "src/ssl/handshake.cc",
        "src/ssl/handshake_client.cc",
        "src/ssl/handshake_server.cc",
        "src/ssl/s3_both.cc",
        "src/ssl/s3_lib.cc",
        "src/ssl/s3_pkt.cc",
        "src/ssl/ssl_aead_ctx.cc",
        "src/ssl/ssl_asn1.cc",
        "src/ssl/ssl_buffer.cc",
        "src/ssl/ssl_cert.cc",
        "src/ssl/ssl_cipher.cc",
        "src/ssl/ssl_credential.cc",
        "src/ssl/ssl_file.cc",
        "src/ssl/ssl_key_share.cc",
        "src/ssl/ssl_lib.cc",
        "src/ssl/ssl_privkey.cc",
        "src/ssl/ssl_session.cc",
        "src/ssl/ssl_stat.cc",
        "src/ssl/ssl_transcript.cc",
        "src/ssl/ssl_versions.cc",
        "src/ssl/ssl_x509.cc",
        "src/ssl/t1_enc.cc",
        "src/ssl/tls13_both.cc",
        "src/ssl/tls13_client.cc",
        "src/ssl/tls13_enc.cc",
        "src/ssl/tls13_server.cc",
        "src/ssl/tls_method.cc",
        "src/ssl/tls_record.cc",
      ],
      resources: [
        .copy(privacyInfoPath),
      ],
      publicHeadersPath: "src/include",
      cSettings: [
        .define("OPENSSL_NO_ASM", to: "1"),
        .headerSearchPath("./"),
        .headerSearchPath("include/"),
      ]
    ),
    .testTarget(
      name: "build-test",
      dependencies: [
        "openssl_grpc",
      ],
      path: testPath
    ),
  ],
  cxxLanguageStandard: .cxx14
 )
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@ -31,7 +31,6 @@ for general contribution guidelines.
 - [pfreixes](https://github.com/pfreixes), Skyscanner Ltd
 - [ran-su](https://github.com/ran-su), Google LLC
 - [sanjaypujare](https://github.com/sanjaypujare), Google LLC
 - [sastryvp](https://github.com/sastryvp), Google LLC
 - [sergiitk](https://github.com/sergiitk), Google LLC
 - [soheilhy](https://github.com/soheilhy), Google LLC
 - [stanley-cheung](https://github.com/stanley-cheung), Google LLC
@ -41,7 +40,6 @@ for general contribution guidelines.
 - [vishalpowar](https://github.com/vishalpowar), Google LLC
 - [wenbozhu](https://github.com/wenbozhu), Google LLC
 - [yashykt](https://github.com/yashykt), Google LLC
 - [yijiem](https://github.com/yijiem), Google LLC
 - [ZhouyihaiDing](https://github.com/ZhouyihaiDing), Google LLC
 <!-- go/keep-sorted end -->
--- a/2421
+++ b/2421
--- a/Package.swift
+++ b/Package.swift
@ -23,8 +23,8 @@ let package = Package(
  ],
  dependencies: [
-    .package(url: "https://github.com/firebase/abseil-cpp-SwiftPM.git", "0.20240116.1"..<"0.20240117.0"),
+    .package(url: "https://github.com/firebase/abseil-cpp-SwiftPM.git", "0.20230802.0"..<"0.20230803.0"),
-    .package(url: "https://github.com/firebase/boringssl-SwiftPM.git", "0.32.0"..<"0.33.0"),
+    .package(url: "https://github.com/firebase/boringssl-SwiftPM.git", "0.9.0"..<"0.10.0"),
  ],
  targets: [
@ -45,7 +45,6 @@ let package = Package(
        "include/grpc/byte_buffer_reader.h",
        "include/grpc/census.h",
        "include/grpc/compression.h",
        "include/grpc/credentials.h",
        "include/grpc/event_engine/endpoint_config.h",
        "include/grpc/event_engine/event_engine.h",
        "include/grpc/event_engine/extensible.h",
@ -93,7 +92,6 @@ let package = Package(
        "include/grpc/impl/propagation_bits.h",
        "include/grpc/impl/slice_type.h",
        "include/grpc/load_reporting.h",
        "include/grpc/passive_listener.h",
        "include/grpc/slice.h",
        "include/grpc/slice_buffer.h",
        "include/grpc/status.h",
@ -106,7 +104,6 @@ let package = Package(
        "include/grpc/support/json.h",
        "include/grpc/support/log.h",
        "include/grpc/support/log_windows.h",
        "include/grpc/support/metrics.h",
        "include/grpc/support/port_platform.h",
        "include/grpc/support/string_util.h",
        "include/grpc/support/sync.h",
@ -118,16 +115,13 @@ let package = Package(
        "include/grpc/support/thd_id.h",
        "include/grpc/support/time.h",
        "include/grpc/support/workaround_list.h",
-        "src/core/channelz/channel_trace.cc",
+        "src/core/client_channel/backend_metric.cc",
-        "src/core/channelz/channel_trace.h",
+        "src/core/client_channel/backend_metric.h",
        "src/core/channelz/channelz.cc",
        "src/core/channelz/channelz.h",
        "src/core/channelz/channelz_registry.cc",
        "src/core/channelz/channelz_registry.h",
        "src/core/client_channel/backup_poller.cc",
        "src/core/client_channel/backup_poller.h",
-        "src/core/client_channel/client_channel.cc",
+        "src/core/client_channel/channel_connectivity.cc",
-        "src/core/client_channel/client_channel.h",
+        "src/core/client_channel/client_channel_channelz.cc",
        "src/core/client_channel/client_channel_channelz.h",
        "src/core/client_channel/client_channel_factory.cc",
        "src/core/client_channel/client_channel_factory.h",
        "src/core/client_channel/client_channel_filter.cc",
@ -143,8 +137,8 @@ let package = Package(
        "src/core/client_channel/dynamic_filters.h",
        "src/core/client_channel/global_subchannel_pool.cc",
        "src/core/client_channel/global_subchannel_pool.h",
-        "src/core/client_channel/load_balanced_call_destination.cc",
+        "src/core/client_channel/http_proxy_mapper.cc",
-        "src/core/client_channel/load_balanced_call_destination.h",
+        "src/core/client_channel/http_proxy_mapper.h",
        "src/core/client_channel/local_subchannel_pool.cc",
        "src/core/client_channel/local_subchannel_pool.h",
        "src/core/client_channel/retry_filter.cc",
@ -155,6 +149,7 @@ let package = Package(
        "src/core/client_channel/retry_service_config.h",
        "src/core/client_channel/retry_throttle.cc",
        "src/core/client_channel/retry_throttle.h",
        "src/core/client_channel/service_config_channel_arg_filter.cc",
        "src/core/client_channel/subchannel.cc",
        "src/core/client_channel/subchannel.h",
        "src/core/client_channel/subchannel_interface_internal.h",
@ -166,10 +161,14 @@ let package = Package(
        "src/core/ext/filters/backend_metrics/backend_metric_filter.h",
        "src/core/ext/filters/backend_metrics/backend_metric_provider.h",
        "src/core/ext/filters/census/grpc_context.cc",
        "src/core/ext/filters/channel_idle/channel_idle_filter.cc",
        "src/core/ext/filters/channel_idle/channel_idle_filter.h",
        "src/core/ext/filters/channel_idle/idle_filter_state.cc",
        "src/core/ext/filters/channel_idle/idle_filter_state.h",
        "src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc",
        "src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h",
        "src/core/ext/filters/deadline/deadline_filter.cc",
        "src/core/ext/filters/deadline/deadline_filter.h",
        "src/core/ext/filters/fault_injection/fault_injection_filter.cc",
        "src/core/ext/filters/fault_injection/fault_injection_filter.h",
        "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc",
@ -181,6 +180,8 @@ let package = Package(
        "src/core/ext/filters/http/http_filters_plugin.cc",
        "src/core/ext/filters/http/message_compress/compression_filter.cc",
        "src/core/ext/filters/http/message_compress/compression_filter.h",
        "src/core/ext/filters/http/message_compress/legacy_compression_filter.cc",
        "src/core/ext/filters/http/message_compress/legacy_compression_filter.h",
        "src/core/ext/filters/http/server/http_server_filter.cc",
        "src/core/ext/filters/http/server/http_server_filter.h",
        "src/core/ext/filters/message_size/message_size_filter.cc",
@ -189,10 +190,15 @@ let package = Package(
        "src/core/ext/filters/rbac/rbac_filter.h",
        "src/core/ext/filters/rbac/rbac_service_config_parser.cc",
        "src/core/ext/filters/rbac/rbac_service_config_parser.h",
        "src/core/ext/filters/server_config_selector/server_config_selector.h",
        "src/core/ext/filters/server_config_selector/server_config_selector_filter.cc",
        "src/core/ext/filters/server_config_selector/server_config_selector_filter.h",
        "src/core/ext/filters/stateful_session/stateful_session_filter.cc",
        "src/core/ext/filters/stateful_session/stateful_session_filter.h",
        "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc",
        "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h",
        "src/core/ext/gcp/metadata_query.cc",
        "src/core/ext/gcp/metadata_query.h",
        "src/core/ext/transport/chttp2/alpn/alpn.cc",
        "src/core/ext/transport/chttp2/alpn/alpn.h",
        "src/core/ext/transport/chttp2/client/chttp2_connector.cc",
@ -237,6 +243,8 @@ let package = Package(
        "src/core/ext/transport/chttp2/transport/hpack_parser_table.h",
        "src/core/ext/transport/chttp2/transport/http2_settings.cc",
        "src/core/ext/transport/chttp2/transport/http2_settings.h",
        "src/core/ext/transport/chttp2/transport/http_trace.cc",
        "src/core/ext/transport/chttp2/transport/http_trace.h",
        "src/core/ext/transport/chttp2/transport/huffsyms.cc",
        "src/core/ext/transport/chttp2/transport/huffsyms.h",
        "src/core/ext/transport/chttp2/transport/internal.h",
@ -256,6 +264,7 @@ let package = Package(
        "src/core/ext/transport/chttp2/transport/write_size_policy.cc",
        "src/core/ext/transport/chttp2/transport/write_size_policy.h",
        "src/core/ext/transport/chttp2/transport/writing.cc",
        "src/core/ext/transport/inproc/inproc_plugin.cc",
        "src/core/ext/transport/inproc/inproc_transport.cc",
        "src/core/ext/transport/inproc/inproc_transport.h",
        "src/core/ext/transport/inproc/legacy_inproc_transport.cc",
@ -1059,26 +1068,62 @@ let package = Package(
        "src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h",
        "src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c",
        "src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h",
-        "src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc",
+        "src/core/ext/xds/certificate_provider_store.cc",
-        "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h",
+        "src/core/ext/xds/certificate_provider_store.h",
-        "src/core/handshaker/handshaker.cc",
+        "src/core/ext/xds/file_watcher_certificate_provider_factory.cc",
-        "src/core/handshaker/handshaker.h",
+        "src/core/ext/xds/file_watcher_certificate_provider_factory.h",
-        "src/core/handshaker/handshaker_factory.h",
+        "src/core/ext/xds/upb_utils.h",
-        "src/core/handshaker/handshaker_registry.cc",
+        "src/core/ext/xds/xds_api.cc",
-        "src/core/handshaker/handshaker_registry.h",
+        "src/core/ext/xds/xds_api.h",
-        "src/core/handshaker/http_connect/http_connect_handshaker.cc",
+        "src/core/ext/xds/xds_audit_logger_registry.cc",
-        "src/core/handshaker/http_connect/http_connect_handshaker.h",
+        "src/core/ext/xds/xds_audit_logger_registry.h",
-        "src/core/handshaker/http_connect/http_proxy_mapper.cc",
+        "src/core/ext/xds/xds_bootstrap.cc",
-        "src/core/handshaker/http_connect/http_proxy_mapper.h",
+        "src/core/ext/xds/xds_bootstrap.h",
-        "src/core/handshaker/proxy_mapper.h",
+        "src/core/ext/xds/xds_bootstrap_grpc.cc",
-        "src/core/handshaker/proxy_mapper_registry.cc",
+        "src/core/ext/xds/xds_bootstrap_grpc.h",
-        "src/core/handshaker/proxy_mapper_registry.h",
+        "src/core/ext/xds/xds_certificate_provider.cc",
-        "src/core/handshaker/security/secure_endpoint.cc",
+        "src/core/ext/xds/xds_certificate_provider.h",
-        "src/core/handshaker/security/secure_endpoint.h",
+        "src/core/ext/xds/xds_channel_args.h",
-        "src/core/handshaker/security/security_handshaker.cc",
+        "src/core/ext/xds/xds_channel_stack_modifier.cc",
-        "src/core/handshaker/security/security_handshaker.h",
+        "src/core/ext/xds/xds_channel_stack_modifier.h",
-        "src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc",
+        "src/core/ext/xds/xds_client.cc",
-        "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h",
+        "src/core/ext/xds/xds_client.h",
        "src/core/ext/xds/xds_client_grpc.cc",
        "src/core/ext/xds/xds_client_grpc.h",
        "src/core/ext/xds/xds_client_stats.cc",
        "src/core/ext/xds/xds_client_stats.h",
        "src/core/ext/xds/xds_cluster.cc",
        "src/core/ext/xds/xds_cluster.h",
        "src/core/ext/xds/xds_cluster_specifier_plugin.cc",
        "src/core/ext/xds/xds_cluster_specifier_plugin.h",
        "src/core/ext/xds/xds_common_types.cc",
        "src/core/ext/xds/xds_common_types.h",
        "src/core/ext/xds/xds_endpoint.cc",
        "src/core/ext/xds/xds_endpoint.h",
        "src/core/ext/xds/xds_health_status.cc",
        "src/core/ext/xds/xds_health_status.h",
        "src/core/ext/xds/xds_http_fault_filter.cc",
        "src/core/ext/xds/xds_http_fault_filter.h",
        "src/core/ext/xds/xds_http_filters.cc",
        "src/core/ext/xds/xds_http_filters.h",
        "src/core/ext/xds/xds_http_rbac_filter.cc",
        "src/core/ext/xds/xds_http_rbac_filter.h",
        "src/core/ext/xds/xds_http_stateful_session_filter.cc",
        "src/core/ext/xds/xds_http_stateful_session_filter.h",
        "src/core/ext/xds/xds_lb_policy_registry.cc",
        "src/core/ext/xds/xds_lb_policy_registry.h",
        "src/core/ext/xds/xds_listener.cc",
        "src/core/ext/xds/xds_listener.h",
        "src/core/ext/xds/xds_resource_type.h",
        "src/core/ext/xds/xds_resource_type_impl.h",
        "src/core/ext/xds/xds_route_config.cc",
        "src/core/ext/xds/xds_route_config.h",
        "src/core/ext/xds/xds_routing.cc",
        "src/core/ext/xds/xds_routing.h",
        "src/core/ext/xds/xds_server_config_fetcher.cc",
        "src/core/ext/xds/xds_transport.h",
        "src/core/ext/xds/xds_transport_grpc.cc",
        "src/core/ext/xds/xds_transport_grpc.h",
        "src/core/lib/address_utils/parse_address.cc",
        "src/core/lib/address_utils/parse_address.h",
        "src/core/lib/address_utils/sockaddr_utils.cc",
@ -1089,6 +1134,8 @@ let package = Package(
        "src/core/lib/backoff/random_early_detection.cc",
        "src/core/lib/backoff/random_early_detection.h",
        "src/core/lib/channel/call_finalization.h",
        "src/core/lib/channel/call_tracer.cc",
        "src/core/lib/channel/call_tracer.h",
        "src/core/lib/channel/channel_args.cc",
        "src/core/lib/channel/channel_args.h",
        "src/core/lib/channel/channel_args_preconditioning.cc",
@ -1100,12 +1147,23 @@ let package = Package(
        "src/core/lib/channel/channel_stack_builder.h",
        "src/core/lib/channel/channel_stack_builder_impl.cc",
        "src/core/lib/channel/channel_stack_builder_impl.h",
        "src/core/lib/channel/channel_stack_trace.cc",
        "src/core/lib/channel/channel_stack_trace.h",
        "src/core/lib/channel/channel_trace.cc",
        "src/core/lib/channel/channel_trace.h",
        "src/core/lib/channel/channelz.cc",
        "src/core/lib/channel/channelz.h",
        "src/core/lib/channel/channelz_registry.cc",
        "src/core/lib/channel/channelz_registry.h",
        "src/core/lib/channel/connected_channel.cc",
        "src/core/lib/channel/connected_channel.h",
        "src/core/lib/channel/context.h",
        "src/core/lib/channel/promise_based_filter.cc",
        "src/core/lib/channel/promise_based_filter.h",
        "src/core/lib/channel/server_call_tracer_filter.cc",
        "src/core/lib/channel/status_util.cc",
        "src/core/lib/channel/status_util.h",
        "src/core/lib/channel/tcp_tracer.h",
        "src/core/lib/compression/compression.cc",
        "src/core/lib/compression/compression_internal.cc",
        "src/core/lib/compression/compression_internal.h",
@ -1120,11 +1178,14 @@ let package = Package(
        "src/core/lib/config/load_config.h",
        "src/core/lib/debug/event_log.cc",
        "src/core/lib/debug/event_log.h",
        "src/core/lib/debug/histogram_view.cc",
        "src/core/lib/debug/histogram_view.h",
        "src/core/lib/debug/stats.cc",
        "src/core/lib/debug/stats.h",
        "src/core/lib/debug/stats_data.cc",
        "src/core/lib/debug/stats_data.h",
        "src/core/lib/debug/trace.cc",
        "src/core/lib/debug/trace.h",
        "src/core/lib/debug/trace_flags.cc",
        "src/core/lib/debug/trace_flags.h",
        "src/core/lib/debug/trace_impl.h",
        "src/core/lib/event_engine/ares_resolver.cc",
        "src/core/lib/event_engine/ares_resolver.h",
        "src/core/lib/event_engine/cf_engine/cf_engine.cc",
@ -1142,11 +1203,8 @@ let package = Package(
        "src/core/lib/event_engine/default_event_engine_factory.cc",
        "src/core/lib/event_engine/default_event_engine_factory.h",
        "src/core/lib/event_engine/event_engine.cc",
        "src/core/lib/event_engine/event_engine_context.h",
        "src/core/lib/event_engine/extensions/can_track_errors.h",
        "src/core/lib/event_engine/extensions/chaotic_good_extension.h",
        "src/core/lib/event_engine/extensions/supports_fd.h",
        "src/core/lib/event_engine/extensions/tcp_trace.h",
        "src/core/lib/event_engine/forkable.cc",
        "src/core/lib/event_engine/forkable.h",
        "src/core/lib/event_engine/grpc_polled_fd.h",
@ -1217,6 +1275,7 @@ let package = Package(
        "src/core/lib/event_engine/thready_event_engine/thready_event_engine.h",
        "src/core/lib/event_engine/time_util.cc",
        "src/core/lib/event_engine/time_util.h",
        "src/core/lib/event_engine/trace.cc",
        "src/core/lib/event_engine/trace.h",
        "src/core/lib/event_engine/utils.cc",
        "src/core/lib/event_engine/utils.h",
@ -1241,6 +1300,40 @@ let package = Package(
        "src/core/lib/experiments/config.h",
        "src/core/lib/experiments/experiments.cc",
        "src/core/lib/experiments/experiments.h",
        "src/core/lib/gpr/alloc.cc",
        "src/core/lib/gpr/alloc.h",
        "src/core/lib/gpr/android/log.cc",
        "src/core/lib/gpr/atm.cc",
        "src/core/lib/gpr/iphone/cpu.cc",
        "src/core/lib/gpr/linux/cpu.cc",
        "src/core/lib/gpr/linux/log.cc",
        "src/core/lib/gpr/log.cc",
        "src/core/lib/gpr/log_internal.h",
        "src/core/lib/gpr/msys/tmpfile.cc",
        "src/core/lib/gpr/posix/cpu.cc",
        "src/core/lib/gpr/posix/log.cc",
        "src/core/lib/gpr/posix/string.cc",
        "src/core/lib/gpr/posix/sync.cc",
        "src/core/lib/gpr/posix/time.cc",
        "src/core/lib/gpr/posix/tmpfile.cc",
        "src/core/lib/gpr/spinlock.h",
        "src/core/lib/gpr/string.cc",
        "src/core/lib/gpr/string.h",
        "src/core/lib/gpr/sync.cc",
        "src/core/lib/gpr/sync_abseil.cc",
        "src/core/lib/gpr/time.cc",
        "src/core/lib/gpr/time_precise.cc",
        "src/core/lib/gpr/time_precise.h",
        "src/core/lib/gpr/tmpfile.h",
        "src/core/lib/gpr/useful.h",
        "src/core/lib/gpr/windows/cpu.cc",
        "src/core/lib/gpr/windows/log.cc",
        "src/core/lib/gpr/windows/string.cc",
        "src/core/lib/gpr/windows/string_util.cc",
        "src/core/lib/gpr/windows/sync.cc",
        "src/core/lib/gpr/windows/time.cc",
        "src/core/lib/gpr/windows/tmpfile.cc",
        "src/core/lib/gpr/wrap_memcpy.cc",
        "src/core/lib/gprpp/atomic_utils.h",
        "src/core/lib/gprpp/bitset.h",
        "src/core/lib/gprpp/chunked_vector.h",
@ -1252,15 +1345,11 @@ let package = Package(
        "src/core/lib/gprpp/directory_reader.h",
        "src/core/lib/gprpp/down_cast.h",
        "src/core/lib/gprpp/dual_ref_counted.h",
        "src/core/lib/gprpp/dump_args.cc",
        "src/core/lib/gprpp/dump_args.h",
        "src/core/lib/gprpp/env.h",
        "src/core/lib/gprpp/examine_stack.cc",
        "src/core/lib/gprpp/examine_stack.h",
        "src/core/lib/gprpp/fork.cc",
        "src/core/lib/gprpp/fork.h",
        "src/core/lib/gprpp/glob.cc",
        "src/core/lib/gprpp/glob.h",
        "src/core/lib/gprpp/host_port.cc",
        "src/core/lib/gprpp/host_port.h",
        "src/core/lib/gprpp/if_list.h",
@ -1307,8 +1396,6 @@ let package = Package(
        "src/core/lib/gprpp/time_util.h",
        "src/core/lib/gprpp/type_list.h",
        "src/core/lib/gprpp/unique_type_name.h",
        "src/core/lib/gprpp/uuid_v4.cc",
        "src/core/lib/gprpp/uuid_v4.h",
        "src/core/lib/gprpp/validation_errors.cc",
        "src/core/lib/gprpp/validation_errors.h",
        "src/core/lib/gprpp/windows/directory_reader.cc",
@ -1318,6 +1405,17 @@ let package = Package(
        "src/core/lib/gprpp/work_serializer.cc",
        "src/core/lib/gprpp/work_serializer.h",
        "src/core/lib/gprpp/xxhash_inline.h",
        "src/core/lib/handshaker/proxy_mapper.h",
        "src/core/lib/handshaker/proxy_mapper_registry.cc",
        "src/core/lib/handshaker/proxy_mapper_registry.h",
        "src/core/lib/http/format_request.cc",
        "src/core/lib/http/format_request.h",
        "src/core/lib/http/httpcli.cc",
        "src/core/lib/http/httpcli.h",
        "src/core/lib/http/httpcli_security_connector.cc",
        "src/core/lib/http/httpcli_ssl_credentials.h",
        "src/core/lib/http/parser.cc",
        "src/core/lib/http/parser.h",
        "src/core/lib/iomgr/block_annotate.h",
        "src/core/lib/iomgr/buffer_list.cc",
        "src/core/lib/iomgr/buffer_list.h",
@ -1350,6 +1448,7 @@ let package = Package(
        "src/core/lib/iomgr/ev_poll_posix.h",
        "src/core/lib/iomgr/ev_posix.cc",
        "src/core/lib/iomgr/ev_posix.h",
        "src/core/lib/iomgr/ev_windows.cc",
        "src/core/lib/iomgr/event_engine_shims/closure.cc",
        "src/core/lib/iomgr/event_engine_shims/closure.h",
        "src/core/lib/iomgr/event_engine_shims/endpoint.cc",
@ -1459,6 +1558,17 @@ let package = Package(
        "src/core/lib/iomgr/wakeup_fd_pipe.h",
        "src/core/lib/iomgr/wakeup_fd_posix.cc",
        "src/core/lib/iomgr/wakeup_fd_posix.h",
        "src/core/lib/json/json.h",
        "src/core/lib/json/json_args.h",
        "src/core/lib/json/json_channel_args.h",
        "src/core/lib/json/json_object_loader.cc",
        "src/core/lib/json/json_object_loader.h",
        "src/core/lib/json/json_reader.cc",
        "src/core/lib/json/json_reader.h",
        "src/core/lib/json/json_util.cc",
        "src/core/lib/json/json_util.h",
        "src/core/lib/json/json_writer.cc",
        "src/core/lib/json/json_writer.h",
        "src/core/lib/matchers/matchers.cc",
        "src/core/lib/matchers/matchers.h",
        "src/core/lib/promise/activity.cc",
@ -1480,7 +1590,6 @@ let package = Package(
        "src/core/lib/promise/latch.h",
        "src/core/lib/promise/loop.h",
        "src/core/lib/promise/map.h",
        "src/core/lib/promise/observable.h",
        "src/core/lib/promise/party.cc",
        "src/core/lib/promise/party.h",
        "src/core/lib/promise/pipe.h",
@ -1492,14 +1601,14 @@ let package = Package(
        "src/core/lib/promise/sleep.cc",
        "src/core/lib/promise/sleep.h",
        "src/core/lib/promise/status_flag.h",
        "src/core/lib/promise/trace.cc",
        "src/core/lib/promise/trace.h",
        "src/core/lib/promise/try_join.h",
        "src/core/lib/promise/try_seq.h",
        "src/core/lib/resource_quota/api.cc",
        "src/core/lib/resource_quota/api.h",
        "src/core/lib/resource_quota/arena.cc",
        "src/core/lib/resource_quota/arena.h",
        "src/core/lib/resource_quota/connection_quota.cc",
        "src/core/lib/resource_quota/connection_quota.h",
        "src/core/lib/resource_quota/memory_quota.cc",
        "src/core/lib/resource_quota/memory_quota.h",
        "src/core/lib/resource_quota/periodic_update.cc",
@ -1508,6 +1617,8 @@ let package = Package(
        "src/core/lib/resource_quota/resource_quota.h",
        "src/core/lib/resource_quota/thread_quota.cc",
        "src/core/lib/resource_quota/thread_quota.h",
        "src/core/lib/resource_quota/trace.cc",
        "src/core/lib/resource_quota/trace.h",
        "src/core/lib/security/authorization/audit_logging.cc",
        "src/core/lib/security/authorization/audit_logging.h",
        "src/core/lib/security/authorization/authorization_engine.h",
@ -1613,7 +1724,6 @@ let package = Package(
        "src/core/lib/security/security_connector/load_system_roots_fallback.cc",
        "src/core/lib/security/security_connector/load_system_roots_supported.cc",
        "src/core/lib/security/security_connector/load_system_roots_supported.h",
        "src/core/lib/security/security_connector/load_system_roots_windows.cc",
        "src/core/lib/security/security_connector/local/local_security_connector.cc",
        "src/core/lib/security/security_connector/local/local_security_connector.h",
        "src/core/lib/security/security_connector/security_connector.cc",
@ -1626,9 +1736,18 @@ let package = Package(
        "src/core/lib/security/security_connector/tls/tls_security_connector.h",
        "src/core/lib/security/transport/auth_filters.h",
        "src/core/lib/security/transport/client_auth_filter.cc",
        "src/core/lib/security/transport/legacy_server_auth_filter.cc",
        "src/core/lib/security/transport/secure_endpoint.cc",
        "src/core/lib/security/transport/secure_endpoint.h",
        "src/core/lib/security/transport/security_handshaker.cc",
        "src/core/lib/security/transport/security_handshaker.h",
        "src/core/lib/security/transport/server_auth_filter.cc",
        "src/core/lib/security/transport/tsi_error.cc",
        "src/core/lib/security/transport/tsi_error.h",
        "src/core/lib/security/util/json_util.cc",
        "src/core/lib/security/util/json_util.h",
        "src/core/lib/slice/b64.cc",
        "src/core/lib/slice/b64.h",
        "src/core/lib/slice/percent_encoding.cc",
        "src/core/lib/slice/percent_encoding.h",
        "src/core/lib/slice/slice.cc",
@ -1636,10 +1755,14 @@ let package = Package(
        "src/core/lib/slice/slice_buffer.cc",
        "src/core/lib/slice/slice_buffer.h",
        "src/core/lib/slice/slice_internal.h",
        "src/core/lib/slice/slice_refcount.cc",
        "src/core/lib/slice/slice_refcount.h",
        "src/core/lib/slice/slice_string_helpers.cc",
        "src/core/lib/slice/slice_string_helpers.h",
        "src/core/lib/surface/api_trace.cc",
        "src/core/lib/surface/api_trace.h",
        "src/core/lib/surface/builtins.cc",
        "src/core/lib/surface/builtins.h",
        "src/core/lib/surface/byte_buffer.cc",
        "src/core/lib/surface/byte_buffer_reader.cc",
        "src/core/lib/surface/call.cc",
@ -1647,49 +1770,47 @@ let package = Package(
        "src/core/lib/surface/call_details.cc",
        "src/core/lib/surface/call_log_batch.cc",
        "src/core/lib/surface/call_test_only.h",
-        "src/core/lib/surface/call_utils.cc",
+        "src/core/lib/surface/call_trace.cc",
-        "src/core/lib/surface/call_utils.h",
+        "src/core/lib/surface/call_trace.h",
        "src/core/lib/surface/channel.cc",
        "src/core/lib/surface/channel.h",
        "src/core/lib/surface/channel_create.cc",
        "src/core/lib/surface/channel_create.h",
        "src/core/lib/surface/channel_init.cc",
        "src/core/lib/surface/channel_init.h",
        "src/core/lib/surface/channel_ping.cc",
        "src/core/lib/surface/channel_stack_type.cc",
        "src/core/lib/surface/channel_stack_type.h",
        "src/core/lib/surface/client_call.cc",
        "src/core/lib/surface/client_call.h",
        "src/core/lib/surface/completion_queue.cc",
        "src/core/lib/surface/completion_queue.h",
        "src/core/lib/surface/completion_queue_factory.cc",
        "src/core/lib/surface/completion_queue_factory.h",
        "src/core/lib/surface/event_string.cc",
        "src/core/lib/surface/event_string.h",
        "src/core/lib/surface/filter_stack_call.cc",
        "src/core/lib/surface/filter_stack_call.h",
        "src/core/lib/surface/init.cc",
        "src/core/lib/surface/init.h",
        "src/core/lib/surface/init_internally.cc",
        "src/core/lib/surface/init_internally.h",
        "src/core/lib/surface/lame_client.cc",
        "src/core/lib/surface/lame_client.h",
        "src/core/lib/surface/legacy_channel.cc",
        "src/core/lib/surface/legacy_channel.h",
        "src/core/lib/surface/metadata_array.cc",
-        "src/core/lib/surface/server_call.cc",
+        "src/core/lib/surface/server.cc",
-        "src/core/lib/surface/server_call.h",
+        "src/core/lib/surface/server.h",
        "src/core/lib/surface/validate_metadata.cc",
        "src/core/lib/surface/validate_metadata.h",
        "src/core/lib/surface/version.cc",
        "src/core/lib/surface/wait_for_cq_end_op.cc",
        "src/core/lib/surface/wait_for_cq_end_op.h",
        "src/core/lib/transport/batch_builder.cc",
        "src/core/lib/transport/batch_builder.h",
        "src/core/lib/transport/bdp_estimator.cc",
        "src/core/lib/transport/bdp_estimator.h",
-        "src/core/lib/transport/call_arena_allocator.cc",
+        "src/core/lib/transport/call_factory.cc",
-        "src/core/lib/transport/call_arena_allocator.h",
+        "src/core/lib/transport/call_factory.h",
        "src/core/lib/transport/call_destination.h",
        "src/core/lib/transport/call_filters.cc",
        "src/core/lib/transport/call_filters.h",
        "src/core/lib/transport/call_final_info.cc",
        "src/core/lib/transport/call_final_info.h",
        "src/core/lib/transport/call_size_estimator.cc",
        "src/core/lib/transport/call_size_estimator.h",
        "src/core/lib/transport/call_spine.cc",
        "src/core/lib/transport/call_spine.h",
        "src/core/lib/transport/connectivity_state.cc",
@ -1697,9 +1818,14 @@ let package = Package(
        "src/core/lib/transport/custom_metadata.h",
        "src/core/lib/transport/error_utils.cc",
        "src/core/lib/transport/error_utils.h",
        "src/core/lib/transport/handshaker.cc",
        "src/core/lib/transport/handshaker.h",
        "src/core/lib/transport/handshaker_factory.h",
        "src/core/lib/transport/handshaker_registry.cc",
        "src/core/lib/transport/handshaker_registry.h",
        "src/core/lib/transport/http2_errors.h",
-        "src/core/lib/transport/interception_chain.cc",
+        "src/core/lib/transport/http_connect_handshaker.cc",
-        "src/core/lib/transport/interception_chain.h",
+        "src/core/lib/transport/http_connect_handshaker.h",
        "src/core/lib/transport/message.cc",
        "src/core/lib/transport/message.h",
        "src/core/lib/transport/metadata.cc",
@ -1707,13 +1833,13 @@ let package = Package(
        "src/core/lib/transport/metadata_batch.cc",
        "src/core/lib/transport/metadata_batch.h",
        "src/core/lib/transport/metadata_compression_traits.h",
        "src/core/lib/transport/metadata_info.cc",
        "src/core/lib/transport/metadata_info.h",
        "src/core/lib/transport/parsed_metadata.cc",
        "src/core/lib/transport/parsed_metadata.h",
        "src/core/lib/transport/simple_slice_based_metadata.h",
        "src/core/lib/transport/status_conversion.cc",
        "src/core/lib/transport/status_conversion.h",
        "src/core/lib/transport/tcp_connect_handshaker.cc",
        "src/core/lib/transport/tcp_connect_handshaker.h",
        "src/core/lib/transport/timeout_encoding.cc",
        "src/core/lib/transport/timeout_encoding.h",
        "src/core/lib/transport/transport.cc",
@ -1725,8 +1851,6 @@ let package = Package(
        "src/core/load_balancing/address_filtering.cc",
        "src/core/load_balancing/address_filtering.h",
        "src/core/load_balancing/backend_metric_data.h",
        "src/core/load_balancing/backend_metric_parser.cc",
        "src/core/load_balancing/backend_metric_parser.h",
        "src/core/load_balancing/child_policy_handler.cc",
        "src/core/load_balancing/child_policy_handler.h",
        "src/core/load_balancing/delegating_helper.h",
@ -1761,14 +1885,13 @@ let package = Package(
        "src/core/load_balancing/ring_hash/ring_hash.cc",
        "src/core/load_balancing/ring_hash/ring_hash.h",
        "src/core/load_balancing/rls/rls.cc",
        "src/core/load_balancing/rls/rls.h",
        "src/core/load_balancing/round_robin/round_robin.cc",
        "src/core/load_balancing/subchannel_interface.h",
        "src/core/load_balancing/subchannel_list.h",
        "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc",
        "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h",
        "src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc",
        "src/core/load_balancing/weighted_target/weighted_target.cc",
        "src/core/load_balancing/weighted_target/weighted_target.h",
        "src/core/load_balancing/xds/cds.cc",
        "src/core/load_balancing/xds/xds_channel_args.h",
        "src/core/load_balancing/xds/xds_cluster_impl.cc",
@ -1814,35 +1937,14 @@ let package = Package(
        "src/core/resolver/xds/xds_dependency_manager.h",
        "src/core/resolver/xds/xds_resolver.cc",
        "src/core/resolver/xds/xds_resolver_attributes.h",
-        "src/core/server/server.cc",
+        "src/core/resolver/xds/xds_resolver_trace.cc",
-        "src/core/server/server.h",
+        "src/core/resolver/xds/xds_resolver_trace.h",
        "src/core/server/server_call_tracer_filter.cc",
        "src/core/server/server_call_tracer_filter.h",
        "src/core/server/server_config_selector.h",
        "src/core/server/server_config_selector_filter.cc",
        "src/core/server/server_config_selector_filter.h",
        "src/core/server/server_interface.h",
        "src/core/server/xds_channel_stack_modifier.cc",
        "src/core/server/xds_channel_stack_modifier.h",
        "src/core/server/xds_server_config_fetcher.cc",
        "src/core/service_config/service_config.h",
        "src/core/service_config/service_config_call_data.h",
        "src/core/service_config/service_config_channel_arg_filter.cc",
        "src/core/service_config/service_config_impl.cc",
        "src/core/service_config/service_config_impl.h",
        "src/core/service_config/service_config_parser.cc",
        "src/core/service_config/service_config_parser.h",
        "src/core/telemetry/call_tracer.cc",
        "src/core/telemetry/call_tracer.h",
        "src/core/telemetry/histogram_view.cc",
        "src/core/telemetry/histogram_view.h",
        "src/core/telemetry/metrics.cc",
        "src/core/telemetry/metrics.h",
        "src/core/telemetry/stats.cc",
        "src/core/telemetry/stats.h",
        "src/core/telemetry/stats_data.cc",
        "src/core/telemetry/stats_data.h",
        "src/core/telemetry/tcp_tracer.h",
        "src/core/tsi/alts/crypt/aes_gcm.cc",
        "src/core/tsi/alts/crypt/gsec.cc",
        "src/core/tsi/alts/crypt/gsec.h",
@ -1901,113 +2003,6 @@ let package = Package(
        "src/core/tsi/transport_security_grpc.cc",
        "src/core/tsi/transport_security_grpc.h",
        "src/core/tsi/transport_security_interface.h",
        "src/core/util/alloc.cc",
        "src/core/util/alloc.h",
        "src/core/util/android/log.cc",
        "src/core/util/atm.cc",
        "src/core/util/gcp_metadata_query.cc",
        "src/core/util/gcp_metadata_query.h",
        "src/core/util/http_client/format_request.cc",
        "src/core/util/http_client/format_request.h",
        "src/core/util/http_client/httpcli.cc",
        "src/core/util/http_client/httpcli.h",
        "src/core/util/http_client/httpcli_security_connector.cc",
        "src/core/util/http_client/httpcli_ssl_credentials.h",
        "src/core/util/http_client/parser.cc",
        "src/core/util/http_client/parser.h",
        "src/core/util/iphone/cpu.cc",
        "src/core/util/json/json.h",
        "src/core/util/json/json_args.h",
        "src/core/util/json/json_channel_args.h",
        "src/core/util/json/json_object_loader.cc",
        "src/core/util/json/json_object_loader.h",
        "src/core/util/json/json_reader.cc",
        "src/core/util/json/json_reader.h",
        "src/core/util/json/json_util.cc",
        "src/core/util/json/json_util.h",
        "src/core/util/json/json_writer.cc",
        "src/core/util/json/json_writer.h",
        "src/core/util/linux/cpu.cc",
        "src/core/util/linux/log.cc",
        "src/core/util/log.cc",
        "src/core/util/msys/tmpfile.cc",
        "src/core/util/posix/cpu.cc",
        "src/core/util/posix/log.cc",
        "src/core/util/posix/string.cc",
        "src/core/util/posix/sync.cc",
        "src/core/util/posix/time.cc",
        "src/core/util/posix/tmpfile.cc",
        "src/core/util/spinlock.h",
        "src/core/util/string.cc",
        "src/core/util/string.h",
        "src/core/util/sync.cc",
        "src/core/util/sync_abseil.cc",
        "src/core/util/time.cc",
        "src/core/util/time_precise.cc",
        "src/core/util/time_precise.h",
        "src/core/util/tmpfile.h",
        "src/core/util/useful.h",
        "src/core/util/windows/cpu.cc",
        "src/core/util/windows/log.cc",
        "src/core/util/windows/string.cc",
        "src/core/util/windows/string_util.cc",
        "src/core/util/windows/sync.cc",
        "src/core/util/windows/time.cc",
        "src/core/util/windows/tmpfile.cc",
        "src/core/xds/grpc/certificate_provider_store.cc",
        "src/core/xds/grpc/certificate_provider_store.h",
        "src/core/xds/grpc/file_watcher_certificate_provider_factory.cc",
        "src/core/xds/grpc/file_watcher_certificate_provider_factory.h",
        "src/core/xds/grpc/upb_utils.h",
        "src/core/xds/grpc/xds_audit_logger_registry.cc",
        "src/core/xds/grpc/xds_audit_logger_registry.h",
        "src/core/xds/grpc/xds_bootstrap_grpc.cc",
        "src/core/xds/grpc/xds_bootstrap_grpc.h",
        "src/core/xds/grpc/xds_certificate_provider.cc",
        "src/core/xds/grpc/xds_certificate_provider.h",
        "src/core/xds/grpc/xds_client_grpc.cc",
        "src/core/xds/grpc/xds_client_grpc.h",
        "src/core/xds/grpc/xds_cluster.cc",
        "src/core/xds/grpc/xds_cluster.h",
        "src/core/xds/grpc/xds_cluster_specifier_plugin.cc",
        "src/core/xds/grpc/xds_cluster_specifier_plugin.h",
        "src/core/xds/grpc/xds_common_types.cc",
        "src/core/xds/grpc/xds_common_types.h",
        "src/core/xds/grpc/xds_endpoint.cc",
        "src/core/xds/grpc/xds_endpoint.h",
        "src/core/xds/grpc/xds_health_status.cc",
        "src/core/xds/grpc/xds_health_status.h",
        "src/core/xds/grpc/xds_http_fault_filter.cc",
        "src/core/xds/grpc/xds_http_fault_filter.h",
        "src/core/xds/grpc/xds_http_filters.cc",
        "src/core/xds/grpc/xds_http_filters.h",
        "src/core/xds/grpc/xds_http_rbac_filter.cc",
        "src/core/xds/grpc/xds_http_rbac_filter.h",
        "src/core/xds/grpc/xds_http_stateful_session_filter.cc",
        "src/core/xds/grpc/xds_http_stateful_session_filter.h",
        "src/core/xds/grpc/xds_lb_policy_registry.cc",
        "src/core/xds/grpc/xds_lb_policy_registry.h",
        "src/core/xds/grpc/xds_listener.cc",
        "src/core/xds/grpc/xds_listener.h",
        "src/core/xds/grpc/xds_route_config.cc",
        "src/core/xds/grpc/xds_route_config.h",
        "src/core/xds/grpc/xds_routing.cc",
        "src/core/xds/grpc/xds_routing.h",
        "src/core/xds/grpc/xds_transport_grpc.cc",
        "src/core/xds/grpc/xds_transport_grpc.h",
        "src/core/xds/xds_client/xds_api.cc",
        "src/core/xds/xds_client/xds_api.h",
        "src/core/xds/xds_client/xds_bootstrap.cc",
        "src/core/xds/xds_client/xds_bootstrap.h",
        "src/core/xds/xds_client/xds_channel_args.h",
        "src/core/xds/xds_client/xds_client.cc",
        "src/core/xds/xds_client/xds_client.h",
        "src/core/xds/xds_client/xds_client_stats.cc",
        "src/core/xds/xds_client/xds_client_stats.h",
        "src/core/xds/xds_client/xds_metrics.h",
        "src/core/xds/xds_client/xds_resource_type.h",
        "src/core/xds/xds_client/xds_resource_type_impl.h",
        "src/core/xds/xds_client/xds_transport.h",
        "third_party/re2/re2/bitmap256.h",
        "third_party/re2/re2/bitstate.cc",
        "third_party/re2/re2/compile.cc",
@ -2052,13 +2047,11 @@ let package = Package(
        "third_party/re2/util/utf.h",
        "third_party/re2/util/util.h",
        "third_party/upb/upb/base/descriptor_constants.h",
        "third_party/upb/upb/base/internal/endian.h",
        "third_party/upb/upb/base/internal/log2.h",
        "third_party/upb/upb/base/status.c",
        "third_party/upb/upb/base/status.h",
        "third_party/upb/upb/base/status.hpp",
        "third_party/upb/upb/base/string_view.h",
        "third_party/upb/upb/base/upcast.h",
        "third_party/upb/upb/generated_code_support.h",
        "third_party/upb/upb/hash/common.c",
        "third_party/upb/upb/hash/common.h",
@ -2086,20 +2079,13 @@ let package = Package(
        "third_party/upb/upb/message/accessors.h",
        "third_party/upb/upb/message/array.c",
        "third_party/upb/upb/message/array.h",
        "third_party/upb/upb/message/compat.c",
        "third_party/upb/upb/message/compat.h",
        "third_party/upb/upb/message/copy.c",
        "third_party/upb/upb/message/copy.h",
        "third_party/upb/upb/message/internal/accessors.h",
        "third_party/upb/upb/message/internal/array.h",
        "third_party/upb/upb/message/internal/extension.c",
        "third_party/upb/upb/message/internal/extension.h",
        "third_party/upb/upb/message/internal/map.h",
        "third_party/upb/upb/message/internal/map_entry.h",
        "third_party/upb/upb/message/internal/map_sorter.h",
        "third_party/upb/upb/message/internal/message.c",
        "third_party/upb/upb/message/internal/message.h",
        "third_party/upb/upb/message/internal/tagged_ptr.h",
        "third_party/upb/upb/message/internal/types.h",
        "third_party/upb/upb/message/map.c",
        "third_party/upb/upb/message/map.h",
@ -2108,6 +2094,7 @@ let package = Package(
        "third_party/upb/upb/message/message.c",
        "third_party/upb/upb/message/message.h",
        "third_party/upb/upb/message/tagged_ptr.h",
        "third_party/upb/upb/message/types.h",
        "third_party/upb/upb/message/value.h",
        "third_party/upb/upb/mini_descriptor/build_enum.c",
        "third_party/upb/upb/mini_descriptor/build_enum.h",
@ -2135,7 +2122,6 @@ let package = Package(
        "third_party/upb/upb/mini_table/internal/file.h",
        "third_party/upb/upb/mini_table/internal/message.c",
        "third_party/upb/upb/mini_table/internal/message.h",
        "third_party/upb/upb/mini_table/internal/size_log2.h",
        "third_party/upb/upb/mini_table/internal/sub.h",
        "third_party/upb/upb/mini_table/message.c",
        "third_party/upb/upb/mini_table/message.h",
@ -2181,7 +2167,6 @@ let package = Package(
        "third_party/upb/upb/reflection/internal/service_def.h",
        "third_party/upb/upb/reflection/internal/strdup2.c",
        "third_party/upb/upb/reflection/internal/strdup2.h",
        "third_party/upb/upb/reflection/internal/upb_edition_defaults.h",
        "third_party/upb/upb/reflection/message.c",
        "third_party/upb/upb/reflection/message.h",
        "third_party/upb/upb/reflection/message.hpp",
@ -2199,19 +2184,21 @@ let package = Package(
        "third_party/upb/upb/text/encode.h",
        "third_party/upb/upb/wire/decode.c",
        "third_party/upb/upb/wire/decode.h",
        "third_party/upb/upb/wire/decode_fast.c",
        "third_party/upb/upb/wire/decode_fast.h",
        "third_party/upb/upb/wire/encode.c",
        "third_party/upb/upb/wire/encode.h",
        "third_party/upb/upb/wire/eps_copy_input_stream.c",
        "third_party/upb/upb/wire/eps_copy_input_stream.h",
        "third_party/upb/upb/wire/internal/constants.h",
-        "third_party/upb/upb/wire/internal/decode_fast.c",
+        "third_party/upb/upb/wire/internal/decode.h",
-        "third_party/upb/upb/wire/internal/decode_fast.h",
+        "third_party/upb/upb/wire/internal/swap.h",
        "third_party/upb/upb/wire/internal/decoder.h",
        "third_party/upb/upb/wire/internal/reader.h",
        "third_party/upb/upb/wire/reader.c",
        "third_party/upb/upb/wire/reader.h",
        "third_party/upb/upb/wire/types.h",
-        "third_party/utf8_range/utf8_range.c",
+        "third_party/utf8_range/naive.c",
        "third_party/utf8_range/range2-neon.c",
        "third_party/utf8_range/range2-sse.c",
        "third_party/utf8_range/utf8_range.h",
        "third_party/xxhash/xxhash.h",
      ],
--- a/1
+++ b/1
@ -109,6 +109,7 @@ task 'dlls', [:plat] do |t, args|
  env += 'SYSTEM=MINGW32 '
  env += 'EMBED_ZLIB=true '
  env += 'EMBED_OPENSSL=true '
  env += 'EMBED_CARES=true '
  env += 'BUILDDIR=/tmp '
  env += "V=#{verbose} "
  env += "GRPC_RUBY_BUILD_PROCS=#{nproc_override} "
--- a/TROUBLESHOOTING.md
+++ b/TROUBLESHOOTING.md
@ -4,27 +4,16 @@ This guide is for troubleshooting gRPC implementations based on C core library (
 ## Enabling extra logging and tracing
-Extra logging can be very useful for diagnosing problems. It can be used to increase the amount of information
+Extra logging can be very useful for diagnosing problems. All gRPC implementations based on C core library support
 the `GRPC_VERBOSITY` and `GRPC_TRACE` environment variables that can be used to increase the amount of information
 that gets printed to stderr.
 ## GRPC_VERBOSITY
-<!-- BEGIN_GOOGLE_INTERNAL_DOCUMENTATION
+`GRPC_VERBOSITY` is used to set the minimum level of log messages printed by gRPC (supported values are `DEBUG`, `INFO` and `ERROR`). If this environment variable is unset, only `ERROR` logs will be printed.
 GRPC_VERBOSITY has been disabled for internal usage and will not work anymore.
 If anyone wants to debug, we need to set verbose logs using absl.
 END_GOOGLE_INTERNAL_DOCUMENTATION -->
 <!-- BEGIN_OPEN_SOURCE_DOCUMENTATION -->
 `GRPC_VERBOSITY` is used to set the minimum level of log messages printed by gRPC (supported values are `DEBUG`, `INFO` and `ERROR`). If this environment variable is unset, only `ERROR` logs will be printed. `ERROR` is recomeded for production systems.
 <!-- END_OPEN_SOURCE_DOCUMENTATION -->
 ## GRPC_TRACE
 <!-- BEGIN_GOOGLE_INTERNAL_DOCUMENTATION
 GRPC_VERBOSITY has been disabled for internal usage and will not work anymore.
 If anyone wants to debug, we need to set verbose logs using absl.
 END_GOOGLE_INTERNAL_DOCUMENTATION -->
 `GRPC_TRACE` can be used to enable extra logging for some internal gRPC components. Enabling the right traces can be invaluable
 for diagnosing for what is going wrong when things aren't working as intended. Possible values for `GRPC_TRACE` are listed in [Environment Variables Overview](doc/environment_variables.md).
 Multiple traces can be enabled at once (use comma as separator).
--- a/43
+++ b/43
@ -27,34 +27,19 @@ custom_exec_properties(
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
-    name = "platforms",
+    name = "build_bazel_rules_android",
-    sha256 = "8150406605389ececb6da07cbcb509d5637a3ab9a24bc69b1101531367d89d74",
+    sha256 = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806",
-    urls = ["https://github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz"],
+    strip_prefix = "rules_android-0.1.1",
    urls = ["https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip"],
 )
-RULES_ANDROID_NDK_COMMIT = "010f4f17dd13a8baaaacc28ba6c8c2c75f54c68b"
+load("//third_party/android:android_configure.bzl", "android_configure")
-RULES_ANDROID_NDK_SHA = "2ab6a97748772f289331d75caaaee0593825935d1d9d982231a437fb8ab5a14d"
+android_configure(name = "local_config_android")
-http_archive(
+load("@local_config_android//:android_configure.bzl", "android_workspace")
    name = "rules_android_ndk",
    sha256 = RULES_ANDROID_NDK_SHA,
    strip_prefix = "rules_android_ndk-%s" % RULES_ANDROID_NDK_COMMIT,
    url = "https://github.com/bazelbuild/rules_android_ndk/archive/%s.zip" % RULES_ANDROID_NDK_COMMIT,
 )
-android_sdk_repository(
+android_workspace()
    name = "androidsdk",
    build_tools_version = "34.0.0",
 )
 load("@rules_android_ndk//:rules.bzl", "android_ndk_repository")
 android_ndk_repository(name = "androidndk")
 # Note that we intentionally avoid calling `register_toolchains("@androidndk//:all")`
 # here, because the toolchain rule fails when $ANDROID_NDK_HOME is not set.
 # Use `--extra_toolchains=@androidndk//:all` to manually register it when building for Android.
 # Prevents bazel's '...' expansion from including the following folder.
 # This is required because the BUILD file in the following folder
@ -128,12 +113,6 @@ load("@com_github_google_benchmark//:bazel/benchmark_deps.bzl", "benchmark_deps"
 benchmark_deps()
 # This is a transitive dependency from google_cloud_cpp
 bind(
    name = "cares",
    actual = "@com_github_cares_cares//:ares",
 )
 load("@io_opentelemetry_cpp//bazel:repository.bzl", "opentelemetry_cpp_deps")
 opentelemetry_cpp_deps()
@ -142,12 +121,6 @@ load("@io_opentelemetry_cpp//bazel:extra_deps.bzl", "opentelemetry_extra_deps")
 opentelemetry_extra_deps()
 # Transitive dependency of opentelemetry_extra_deps()
 bind(
    name = "madler_zlib",
    actual = "@zlib//:zlib",
 )
 # TODO: Enable below once https://github.com/bazel-xcode/PodToBUILD/issues/232 is resolved
 #
 #http_archive(
--- a/_metadata.py
+++ b/_metadata.py
@ -14,4 +14,4 @@
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!!
-__version__ = """1.65.0.dev0"""
+__version__ = """1.62.0.dev0"""
--- a/bazel/copts.bzl
+++ b/bazel/copts.bzl
@ -57,107 +57,7 @@ GRPC_LLVM_WARNING_FLAGS = [
    "-Wno-unused-function",
 ]
 GRPC_LLVM_WINDOWS_WARNING_FLAGS = GRPC_LLVM_WARNING_FLAGS + [
    ### Some checks that are missing with clang-cl
    "-Wthread-safety",
    "-Wreorder-ctor",
    ### Avoid some checks that are default on clang-cl
    "-Wno-c++98-compat-pedantic",
    "-Wno-missing-prototypes",
    "-Wno-thread-safety-precise",  # too many aliases
    # abseil offenses
    "-Wno-comma",
    "-Wno-deprecated-redundant-constexpr-static-def",
    "-Wno-deprecated",  # remove when the above works in all clang versions we test with
    "-Wno-float-equal",
    "-Wno-gcc-compat",
    "-Wno-reserved-identifier",
    "-Wno-thread-safety-negative",
    "-Wno-sign-compare",
    # re2 offenses
    "-Wno-zero-as-null-pointer-constant",
    # ares offenses
    "-Wno-macro-redefined",
    # protobuf offenses
    "-Wno-cast-align",
    "-Wno-inconsistent-missing-destructor-override",
    # xxhash offenses
    "-Wno-disabled-macro-expansion",
    # benchmark offenses
    "-Wno-shift-sign-overflow",
    # Evidently nodiscard is inappropriately pinned as a C++17 feature
    "-Wno-c++17-attribute-extensions",
    # declarations are not used in many places
    "-Wno-missing-variable-declarations",
    # TODO: delete iomgr
    "-Wno-old-style-cast",
    "-Wno-cast-qual",
    "-Wno-unused-member-function",
    "-Wno-unused-template",
    # TODO(hork): see if the TraceFlag offense can be removed
    "-Wno-global-constructors",
    # TODO(hork): clean up EE offenses
    "-Wno-missing-field-initializers",
    "-Wno-non-virtual-dtor",
    "-Wno-thread-safety-reference-return",
    # TODO(ctiller): offense: dump_args. signed to unsigned
    "-Wno-sign-conversion",
    "-Wno-shorten-64-to-32",
    # TODO: general cleanup required. Maybe new developer or rainy day projects.
    "-Wno-unreachable-code-break",
    "-Wno-unreachable-code-return",
    "-Wno-unreachable-code",
    "-Wno-used-but-marked-unused",
    "-Wno-newline-eof",
    "-Wno-unused-const-variable",
    "-Wno-extra-semi",
    "-Wno-extra-semi-stmt",
    "-Wno-suggest-destructor-override",
    "-Wno-shadow",
    "-Wno-missing-noreturn",
    "-Wno-nested-anon-types",
    "-Wno-gnu-anonymous-struct",
    "-Wno-nonportable-system-include-path",
    "-Wno-microsoft-cast",
    "-Wno-exit-time-destructors",
    "-Wno-undef",  # #if <MACRO_NAME> to #ifdef <MACRO_NAME>
    "-Wno-unused-macros",
    "-Wno-redundant-parens",
    "-Wno-undefined-func-template",
    "-Wno-gnu-zero-variadic-macro-arguments",
    "-Wno-double-promotion",
    "-Wno-implicit-float-conversion",
    "-Wno-implicit-int-conversion",
    "-Wno-float-conversion",
    "-Wno-unused-parameter",
    "-Wno-suggest-override",
    "-Wno-documentation",
    "-Wno-documentation-unknown-command",
    "-Wno-unsafe-buffer-usage",
    ### possibly bad warnings for this codebase
    "-Wno-covered-switch-default",
    "-Wno-switch-default",
    "-Wno-switch-enum",
    "-Wno-c99-extensions",
    "-Wno-unused-private-field",  # GRPC_UNUSED does not appear to work for private fields
 ]
 GRPC_DEFAULT_COPTS = select({
    "//:use_strict_warning": GRPC_LLVM_WARNING_FLAGS + ["-DUSE_STRICT_WARNING=1"],
    "//:use_strict_warning_windows": GRPC_LLVM_WINDOWS_WARNING_FLAGS + ["-DUSE_STRICT_WARNING=1"],
    "//conditions:default": [],
 })
--- a/bazel/experiments.bzl
+++ b/bazel/experiments.bzl
@ -18,7 +18,9 @@
 EXPERIMENT_ENABLES = {
    "call_status_override_on_cancellation": "call_status_override_on_cancellation",
    "call_v3": "call_v3",
    "canary_client_privacy": "canary_client_privacy",
    "client_idleness": "client_idleness",
    "client_privacy": "client_privacy",
    "event_engine_client": "event_engine_client",
    "event_engine_dns": "event_engine_dns",
@ -27,12 +29,18 @@ EXPERIMENT_ENABLES = {
    "http2_stats_fix": "http2_stats_fix",
    "keepalive_fix": "keepalive_fix",
    "keepalive_server_fix": "keepalive_server_fix",
    "max_pings_wo_data_throttle": "max_pings_wo_data_throttle",
    "monitoring_experiment": "monitoring_experiment",
    "multiping": "multiping",
    "peer_state_based_framing": "peer_state_based_framing",
-    "pick_first_new": "pick_first_new",
+    "pending_queue_cap": "pending_queue_cap",
-    "promise_based_inproc_transport": "promise_based_inproc_transport",
+    "pick_first_happy_eyeballs": "pick_first_happy_eyeballs",
    "promise_based_client_call": "event_engine_client,event_engine_listener,promise_based_client_call",
    "promise_based_server_call": "promise_based_server_call",
    "chaotic_good": "chaotic_good,event_engine_client,event_engine_listener,promise_based_client_call,promise_based_server_call",
    "registered_method_lookup_in_transport": "registered_method_lookup_in_transport",
    "promise_based_inproc_transport": "event_engine_client,event_engine_listener,promise_based_client_call,promise_based_inproc_transport,promise_based_server_call,registered_method_lookup_in_transport",
    "rfc_max_concurrent_streams": "rfc_max_concurrent_streams",
    "round_robin_delegate_to_pick_first": "round_robin_delegate_to_pick_first",
    "rstpit": "rstpit",
    "schedule_cancellation_over_write": "schedule_cancellation_over_write",
    "server_privacy": "server_privacy",
@ -40,8 +48,15 @@ EXPERIMENT_ENABLES = {
    "tcp_rcv_lowat": "tcp_rcv_lowat",
    "trace_record_callops": "trace_record_callops",
    "unconstrained_max_quota_buffer_size": "unconstrained_max_quota_buffer_size",
    "v3_backend_metric_filter": "v3_backend_metric_filter",
    "v3_channel_idle_filters": "v3_channel_idle_filters",
    "v3_compression_filter": "v3_compression_filter",
    "v3_server_auth_filter": "v3_server_auth_filter",
    "work_serializer_clears_time_cache": "work_serializer_clears_time_cache",
    "work_serializer_dispatch": "work_serializer_dispatch",
    "write_size_policy": "write_size_policy",
    "write_size_cap": "write_size_cap,write_size_policy",
    "wrr_delegate_to_pick_first": "wrr_delegate_to_pick_first",
 }
 EXPERIMENT_POLLERS = [
@ -55,6 +70,22 @@ EXPERIMENTS = {
        "dbg": {
        },
        "off": {
            "bad_client_test": [
                "rfc_max_concurrent_streams",
            ],
            "compression_test": [
                "v3_compression_filter",
            ],
            "core_end2end_test": [
                "chaotic_good",
                "promise_based_client_call",
                "promise_based_server_call",
                "work_serializer_dispatch",
            ],
            "cpp_end2end_test": [
                "promise_based_server_call",
                "work_serializer_dispatch",
            ],
            "endpoint_test": [
                "tcp_frame_size_tuning",
                "tcp_rcv_lowat",
@ -66,36 +97,52 @@ EXPERIMENTS = {
                "tcp_frame_size_tuning",
                "tcp_rcv_lowat",
            ],
            "lame_client_test": [
                "promise_based_client_call",
            ],
            "lb_unit_test": [
                "work_serializer_dispatch",
            ],
            "logging_test": [
                "promise_based_server_call",
            ],
            "resource_quota_test": [
                "free_large_allocator",
                "unconstrained_max_quota_buffer_size",
            ],
            "xds_end2end_test": [
                "promise_based_server_call",
                "work_serializer_dispatch",
            ],
        },
        "on": {
            "cancel_ares_query_test": [
                "event_engine_dns",
            ],
            "core_end2end_test": [
                "event_engine_client",
                "event_engine_listener",
            ],
            "cpp_lb_end2end_test": [
-                "pick_first_new",
+                "pick_first_happy_eyeballs",
-            ],
+                "round_robin_delegate_to_pick_first",
-            "event_engine_client_test": [
+                "wrr_delegate_to_pick_first",
                "event_engine_client",
            ],
            "event_engine_listener_test": [
                "event_engine_listener",
            ],
-            "lb_unit_test": [
+            "flow_control_test": [
-                "pick_first_new",
+                "write_size_cap",
                "write_size_policy",
            ],
-            "resolver_component_tests_runner_invoker": [
+            "lb_unit_test": [
-                "event_engine_dns",
+                "pick_first_happy_eyeballs",
                "round_robin_delegate_to_pick_first",
                "wrr_delegate_to_pick_first",
            ],
            "surface_registered_method_lookup": [
                "registered_method_lookup_in_transport",
            ],
            "xds_end2end_test": [
-                "pick_first_new",
+                "pick_first_happy_eyeballs",
                "round_robin_delegate_to_pick_first",
                "wrr_delegate_to_pick_first",
            ],
        },
    },
@ -103,6 +150,22 @@ EXPERIMENTS = {
        "dbg": {
        },
        "off": {
            "bad_client_test": [
                "rfc_max_concurrent_streams",
            ],
            "compression_test": [
                "v3_compression_filter",
            ],
            "core_end2end_test": [
                "chaotic_good",
                "promise_based_client_call",
                "promise_based_server_call",
                "work_serializer_dispatch",
            ],
            "cpp_end2end_test": [
                "promise_based_server_call",
                "work_serializer_dispatch",
            ],
            "endpoint_test": [
                "tcp_frame_size_tuning",
                "tcp_rcv_lowat",
@ -114,20 +177,46 @@ EXPERIMENTS = {
                "tcp_frame_size_tuning",
                "tcp_rcv_lowat",
            ],
            "lame_client_test": [
                "promise_based_client_call",
            ],
            "lb_unit_test": [
                "work_serializer_dispatch",
            ],
            "logging_test": [
                "promise_based_server_call",
            ],
            "resource_quota_test": [
                "free_large_allocator",
                "unconstrained_max_quota_buffer_size",
            ],
            "xds_end2end_test": [
                "promise_based_server_call",
                "work_serializer_dispatch",
            ],
        },
        "on": {
            "cpp_lb_end2end_test": [
-                "pick_first_new",
+                "pick_first_happy_eyeballs",
                "round_robin_delegate_to_pick_first",
                "wrr_delegate_to_pick_first",
            ],
            "flow_control_test": [
                "write_size_cap",
                "write_size_policy",
            ],
            "lb_unit_test": [
-                "pick_first_new",
+                "pick_first_happy_eyeballs",
                "round_robin_delegate_to_pick_first",
                "wrr_delegate_to_pick_first",
            ],
            "surface_registered_method_lookup": [
                "registered_method_lookup_in_transport",
            ],
            "xds_end2end_test": [
-                "pick_first_new",
+                "pick_first_happy_eyeballs",
                "round_robin_delegate_to_pick_first",
                "wrr_delegate_to_pick_first",
            ],
        },
    },
@ -135,8 +224,25 @@ EXPERIMENTS = {
        "dbg": {
        },
        "off": {
            "bad_client_test": [
                "rfc_max_concurrent_streams",
            ],
            "cancel_ares_query_test": [
                "event_engine_dns",
            ],
            "compression_test": [
                "v3_compression_filter",
            ],
            "core_end2end_test": [
                "chaotic_good",
                "event_engine_client",
                "promise_based_client_call",
                "promise_based_server_call",
                "work_serializer_dispatch",
            ],
            "cpp_end2end_test": [
                "promise_based_server_call",
                "work_serializer_dispatch",
            ],
            "endpoint_test": [
                "tcp_frame_size_tuning",
@ -152,39 +258,56 @@ EXPERIMENTS = {
                "tcp_frame_size_tuning",
                "tcp_rcv_lowat",
            ],
-            "resource_quota_test": [
+            "lame_client_test": [
-                "free_large_allocator",
+                "promise_based_client_call",
                "unconstrained_max_quota_buffer_size",
            ],
        },
        "on": {
            "cancel_ares_query_test": [
                "event_engine_dns",
            ],
            "core_end2end_test": [
                "event_engine_listener",
                "work_serializer_dispatch",
            ],
            "cpp_end2end_test": [
                "work_serializer_dispatch",
            ],
            "cpp_lb_end2end_test": [
                "pick_first_new",
            ],
            "event_engine_listener_test": [
                "event_engine_listener",
            ],
            "lb_unit_test": [
                "pick_first_new",
                "work_serializer_dispatch",
            ],
            "logging_test": [
                "promise_based_server_call",
            ],
            "resolver_component_tests_runner_invoker": [
                "event_engine_dns",
            ],
            "resource_quota_test": [
                "free_large_allocator",
                "unconstrained_max_quota_buffer_size",
            ],
            "xds_end2end_test": [
-                "pick_first_new",
+                "promise_based_server_call",
                "work_serializer_dispatch",
            ],
        },
        "on": {
            "core_end2end_test": [
                "event_engine_listener",
            ],
            "cpp_lb_end2end_test": [
                "pick_first_happy_eyeballs",
                "round_robin_delegate_to_pick_first",
                "wrr_delegate_to_pick_first",
            ],
            "event_engine_listener_test": [
                "event_engine_listener",
            ],
            "flow_control_test": [
                "write_size_cap",
                "write_size_policy",
            ],
            "lb_unit_test": [
                "pick_first_happy_eyeballs",
                "round_robin_delegate_to_pick_first",
                "wrr_delegate_to_pick_first",
            ],
            "surface_registered_method_lookup": [
                "registered_method_lookup_in_transport",
            ],
            "xds_end2end_test": [
                "pick_first_happy_eyeballs",
                "round_robin_delegate_to_pick_first",
                "wrr_delegate_to_pick_first",
            ],
        },
    },
 }
--- a/bazel/generate_cc.bzl
+++ b/bazel/generate_cc.bzl
@ -187,7 +187,7 @@ _generate_cc = rule(
            mandatory = False,
        ),
        "_protoc": attr.label(
-            default = Label("@com_google_protobuf//:protoc"),
+            default = Label("//external:protocol_compiler"),
            executable = True,
            cfg = "exec",
        ),
--- a/bazel/generate_objc.bzl
+++ b/bazel/generate_objc.bzl
@ -180,7 +180,7 @@ generate_objc = rule(
            default = "@com_google_protobuf//:well_known_type_protos",
        ),
        "_protoc": attr.label(
-            default = Label("@com_google_protobuf//:protoc"),
+            default = Label("//external:protocol_compiler"),
            executable = True,
            cfg = "exec",
        ),
--- a/bazel/grpc_build_system.bzl
+++ b/bazel/grpc_build_system.bzl
@ -27,13 +27,13 @@
 Contains macros used throughout the repo.
 """
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl", "ios_test_runner")
 load("@com_google_protobuf//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library")
 load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
 load("//bazel:copts.bzl", "GRPC_DEFAULT_COPTS")
 load("//bazel:experiments.bzl", "EXPERIMENTS", "EXPERIMENT_ENABLES", "EXPERIMENT_POLLERS")
 load("//bazel:test_experiments.bzl", "TEST_EXPERIMENTS", "TEST_EXPERIMENT_ENABLES", "TEST_EXPERIMENT_POLLERS")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl", "ios_test_runner")
 load("@com_google_protobuf//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library")
 # The set of pollers to test against if a test exercises polling
 POLLERS = ["epoll1", "poll"]
@ -45,7 +45,6 @@ def if_not_windows(a):
    return select({
        "//:windows": [],
        "//:windows_msvc": [],
        "//:windows_clang": [],
        "//conditions:default": a,
    })
@ -53,23 +52,20 @@ def if_windows(a):
    return select({
        "//:windows": a,
        "//:windows_msvc": a,
        "//:windows_clang": a,
        "//conditions:default": [],
    })
 def _get_external_deps(external_deps):
    ret = []
    for dep in external_deps:
-        if dep.startswith("@"):
+        if dep == "address_sorting":
            ret.append(dep)
        elif dep == "address_sorting":
            ret.append("//third_party/address_sorting")
        elif dep == "xxhash":
            ret.append("//third_party/xxhash")
        elif dep == "cares":
            ret += select({
                "//:grpc_no_ares": [],
-                "//conditions:default": ["//third_party:cares"],
+                "//conditions:default": ["//external:cares"],
            })
        elif dep == "cronet_c_for_grpc":
            ret.append("//third_party/objective_c/Cronet:cronet_c_for_grpc")
@ -81,10 +77,8 @@ def _get_external_deps(external_deps):
            ret.append(dep.replace("otel/", "@io_opentelemetry_cpp//"))
        elif dep.startswith("google_cloud_cpp"):
            ret.append(dep.replace("google_cloud_cpp", "@google_cloud_cpp//"))
        elif dep == "libprotobuf_mutator":
            ret.append("@com_google_libprotobuf_mutator//:libprotobuf_mutator")
        else:
-            ret.append("//third_party:" + dep)
+            ret.append("//external:" + dep)
    return ret
 def _update_visibility(visibility):
@ -104,25 +98,20 @@ def _update_visibility(visibility):
        "chaotic_good": PRIVATE,
        "client_channel": PRIVATE,
        "cli": PRIVATE,
        "core_credentials": PRIVATE,
        "debug_location": PRIVATE,
        "endpoint_tests": PRIVATE,
        "exec_ctx": PRIVATE,
        "gpr_public_hdrs": PRIVATE,
        "grpclb": PRIVATE,
        "grpc_experiments": PRIVATE,
        "grpc_opencensus_plugin": PUBLIC,
        "grpc_public_hdrs": PRIVATE,
        "grpcpp_gcp_observability": PUBLIC,
        "grpc_resolver_fake": PRIVATE,
        "grpc++_public_hdrs": PUBLIC,
        "grpc++_test": PRIVATE,
        "http": PRIVATE,
        "httpcli": PRIVATE,
        "iomgr_internal_errqueue": PRIVATE,
        "iomgr_buffer_list": PRIVATE,
        "json_reader_legacy": PRIVATE,
        "otel_plugin": PRIVATE,
        "public": PUBLIC,
        "ref_counted_ptr": PRIVATE,
        "tcp_tracer": PRIVATE,
@ -131,7 +120,6 @@ def _update_visibility(visibility):
        "tsi": PRIVATE,
        "xds": PRIVATE,
        "xds_client_core": PRIVATE,
        "xds_end2end_test_utils": PRIVATE,
        "grpc_python_observability": PRIVATE,
        "event_engine_base_hdrs": PRIVATE,
        "useful": PRIVATE,
@ -216,6 +204,7 @@ def grpc_cc_library(
        testonly = testonly,
        linkopts = linkopts,
        includes = [
            "api/include",
            "include",
            "src/core/ext/upb-gen",  # Once upb code-gen issue is resolved, remove this.
            "src/core/ext/upbdefs-gen",  # Once upb code-gen issue is resolved, remove this.
@ -237,7 +226,6 @@ def grpc_proto_library(
        name,
        srcs = [],
        deps = [],
        visibility = None,
        well_known_protos = False,
        has_services = True,
        use_external = False,
@ -246,7 +234,6 @@ def grpc_proto_library(
        name = name,
        srcs = srcs,
        deps = deps,
        visibility = visibility,
        well_known_protos = well_known_protos,
        proto_only = not has_services,
        use_external = use_external,
@ -543,7 +530,7 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data
    if language.upper() == "C":
        copts = copts + if_not_windows(["-std=c11"])
-    core_deps = deps + _get_external_deps(external_deps) + ["//test/core/test_util:grpc_suppressions"]
+    core_deps = deps + _get_external_deps(external_deps) + ["//test/core/util:grpc_suppressions"]
    # Test args for all tests
    test_args = {
@ -569,22 +556,11 @@ def grpc_cc_test(name, srcs = [], deps = [], external_deps = [], args = [], data
            **test_args
        )
    native.cc_library(
        name = "%s_TEST_LIBRARY" % name,
        testonly = 1,
        srcs = srcs,
        deps = core_deps,
        tags = tags,
    )
    for poller_config in expand_tests(name, srcs, core_deps, tags, args, exclude_pollers, uses_polling, uses_event_engine, flaky):
        if poller_config["srcs"] != srcs:
            fail("srcs changed")
        if poller_config["deps"] != core_deps:
            fail("deps changed: %r --> %r" % (deps, poller_config["deps"]))
        native.cc_test(
            name = poller_config["name"],
-            deps = ["%s_TEST_LIBRARY" % name],
+            srcs = poller_config["srcs"],
            deps = poller_config["deps"],
            tags = poller_config["tags"],
            args = poller_config["args"],
            env = poller_config["env"],
@ -621,7 +597,7 @@ def grpc_cc_binary(name, srcs = [], deps = [], external_deps = [], args = [], da
        data = data,
        testonly = testonly,
        linkshared = linkshared,
-        deps = deps + _get_external_deps(external_deps) + ["//test/core/test_util:grpc_suppressions"],
+        deps = deps + _get_external_deps(external_deps) + ["//test/core/util:grpc_suppressions"],
        copts = GRPC_DEFAULT_COPTS + copts,
        linkopts = if_not_windows(["-pthread"]) + linkopts,
        tags = tags,
@ -739,13 +715,6 @@ def grpc_package(name, visibility = "private", features = []):
            features = features,
        )
 def grpc_filegroup(name, srcs, **kwargs):
    native.filegroup(
        name = name,
        srcs = srcs,
        **kwargs
    )
 def grpc_objc_library(
        name,
        srcs = [],
@ -804,22 +773,3 @@ def python_config_settings():
        name = "python3",
        flag_values = {"@bazel_tools//tools/python:python_version": "PY3"},
    )
 # buildifier: disable=unnamed-macro
 def grpc_clang_cl_settings():
    native.platform(
        name = "x64_windows-clang-cl",
        constraint_values = [
            "@platforms//cpu:x86_64",
            "@platforms//os:windows",
            "@bazel_tools//tools/cpp:clang-cl",
        ],
    )
    native.config_setting(
        name = "windows_clang",
        constraint_values = [
            "@platforms//cpu:x86_64",
            "@platforms//os:windows",
            "@bazel_tools//tools/cpp:clang-cl",
        ],
    )
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@ -14,12 +14,217 @@
 """Load dependencies needed to compile and test the grpc library as a 3rd-party consumer."""
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("//bazel:grpc_python_deps.bzl", "grpc_python_deps")
+load("@com_github_grpc_grpc//bazel:grpc_python_deps.bzl", "grpc_python_deps")
 # buildifier: disable=unnamed-macro
 def grpc_deps():
    """Loads dependencies need to compile and test the grpc library."""
    native.bind(
        name = "upb_amalgamation_lib",
        actual = "@com_google_protobuf//upb:amalgamation",
    )
    native.bind(
        name = "upb_base_lib",
        actual = "@com_google_protobuf//upb/base",
    )
    native.bind(
        name = "upb_message_lib",
        actual = "@com_google_protobuf//upb:message",
    )
    native.bind(
        name = "upb_mem_lib",
        actual = "@com_google_protobuf//upb/mem",
    )
    native.bind(
        name = "upb_reflection",
        actual = "@com_google_protobuf//upb:reflection",
    )
    native.bind(
        name = "upb_lib_descriptor",
        actual = "@com_google_protobuf//upb:descriptor_upb_proto",
    )
    native.bind(
        name = "upb_lib_descriptor_reflection",
        actual = "@com_google_protobuf//upb:descriptor_upb_proto_reflection",
    )
    native.bind(
        name = "upb_textformat_lib",
        actual = "@com_google_protobuf//upb/text",
    )
    native.bind(
        name = "upb_json_lib",
        actual = "@com_google_protobuf//upb/json",
    )
    native.bind(
        name = "upb_generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
        actual = "@com_google_protobuf//upb:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
    )
    native.bind(
        name = "libssl",
        actual = "@boringssl//:ssl",
    )
    native.bind(
        name = "libcrypto",
        actual = "@boringssl//:crypto",
    )
    native.bind(
        name = "madler_zlib",
        actual = "@zlib//:zlib",
    )
    native.bind(
        name = "protobuf",
        actual = "@com_google_protobuf//:protobuf",
    )
    native.bind(
        name = "protobuf_clib",
        actual = "@com_google_protobuf//:protoc_lib",
    )
    native.bind(
        name = "protobuf_headers",
        actual = "@com_google_protobuf//:protobuf_headers",
    )
    native.bind(
        name = "protocol_compiler",
        actual = "@com_google_protobuf//:protoc",
    )
    native.bind(
        name = "cares",
        actual = "@com_github_cares_cares//:ares",
    )
    native.bind(
        name = "gtest",
        actual = "@com_google_googletest//:gtest",
    )
    native.bind(
        name = "fuzztest",
        actual = "@com_google_fuzztest//fuzztest",
    )
    native.bind(
        name = "fuzztest_main",
        actual = "@com_google_fuzztest//fuzztest:fuzztest_gtest_main",
    )
    native.bind(
        name = "benchmark",
        actual = "@com_github_google_benchmark//:benchmark",
    )
    native.bind(
        name = "re2",
        actual = "@com_googlesource_code_re2//:re2",
    )
    native.bind(
        name = "grpc_cpp_plugin",
        actual = "@com_github_grpc_grpc//src/compiler:grpc_cpp_plugin",
    )
    native.bind(
        name = "grpc++_codegen_proto",
        actual = "@com_github_grpc_grpc//:grpc++_codegen_proto",
    )
    native.bind(
        name = "opencensus-context",
        actual = "@io_opencensus_cpp//opencensus/context:context",
    )
    native.bind(
        name = "opencensus-trace",
        actual = "@io_opencensus_cpp//opencensus/trace:trace",
    )
    native.bind(
        name = "opencensus-trace-context_util",
        actual = "@io_opencensus_cpp//opencensus/trace:context_util",
    )
    native.bind(
        name = "opencensus-trace-propagation",
        actual = "@io_opencensus_cpp//opencensus/trace:grpc_trace_bin",
    )
    native.bind(
        name = "opencensus-trace-span_context",
        actual = "@io_opencensus_cpp//opencensus/trace:span_context",
    )
    native.bind(
        name = "opencensus-stats",
        actual = "@io_opencensus_cpp//opencensus/stats:stats",
    )
    native.bind(
        name = "opencensus-stats-test",
        actual = "@io_opencensus_cpp//opencensus/stats:test_utils",
    )
    native.bind(
        name = "opencensus-with-tag-map",
        actual = "@io_opencensus_cpp//opencensus/tags:with_tag_map",
    )
    native.bind(
        name = "opencensus-tags",
        actual = "@io_opencensus_cpp//opencensus/tags:tags",
    )
    native.bind(
        name = "opencensus-tags-context_util",
        actual = "@io_opencensus_cpp//opencensus/tags:context_util",
    )
    native.bind(
        name = "opencensus-trace-stackdriver_exporter",
        actual = "@io_opencensus_cpp//opencensus/exporters/trace/stackdriver:stackdriver_exporter",
    )
    native.bind(
        name = "opencensus-stats-stackdriver_exporter",
        actual = "@io_opencensus_cpp//opencensus/exporters/stats/stackdriver:stackdriver_exporter",
    )
    native.bind(
        name = "googleapis_trace_grpc_service",
        actual = "@com_google_googleapis//google/devtools/cloudtrace/v2:cloudtrace_cc_grpc",
    )
    native.bind(
        name = "googleapis_monitoring_grpc_service",
        actual = "@com_google_googleapis//google/monitoring/v3:monitoring_cc_grpc",
    )
    native.bind(
        name = "googleapis_logging_grpc_service",
        actual = "@com_google_googleapis//google/logging/v2:logging_cc_grpc",
    )
    native.bind(
        name = "googleapis_logging_cc_proto",
        actual = "@com_google_googleapis//google/logging/v2:logging_cc_proto",
    )
    if "platforms" not in native.existing_rules():
        http_archive(
            name = "platforms",
@ -35,11 +240,11 @@ def grpc_deps():
            name = "boringssl",
            # Use github mirror instead of https://boringssl.googlesource.com/boringssl
            # to obtain a boringssl archive with consistent sha256
-            sha256 = "9f441d72fccb9a3faf96470478c8ccfaaeb8db1cffd4d78b698f782124dad1b0",
+            sha256 = "057f662b0e85931a84945b2e89ba201fd44b0583da827c948fe443593690fb83",
-            strip_prefix = "boringssl-b8a2bffc598f230484ff48a247526a9820facfc2",
+            strip_prefix = "boringssl-ae72a4514c7afd150596b0a80947f3ca9b8363b5",
            urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/b8a2bffc598f230484ff48a247526a9820facfc2.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/ae72a4514c7afd150596b0a80947f3ca9b8363b5.tar.gz",
-                "https://github.com/google/boringssl/archive/b8a2bffc598f230484ff48a247526a9820facfc2.tar.gz",
+                "https://github.com/google/boringssl/archive/ae72a4514c7afd150596b0a80947f3ca9b8363b5.tar.gz",
            ],
        )
@ -58,16 +263,15 @@ def grpc_deps():
    if "com_google_protobuf" not in native.existing_rules():
        http_archive(
            name = "com_google_protobuf",
-            sha256 = "387478260190c540388839a3449c635a69708d92fc38ea6e2364b1196db90ea5",
+            sha256 = "70f480fe9cb0c6829dbf6be3c388103313aacb65de667b86d981bbc9eaedb905",
-            strip_prefix = "protobuf-2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5",
+            strip_prefix = "protobuf-7f94235e552599141950d7a4a3eaf93bc87d1b22",
            urls = [
-                # https://github.com/protocolbuffers/protobuf/commits/v26.1
+                # https://github.com/protocolbuffers/protobuf/commits/v25.0
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/7f94235e552599141950d7a4a3eaf93bc87d1b22.tar.gz",
-                "https://github.com/protocolbuffers/protobuf/archive/2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5.tar.gz",
+                "https://github.com/protocolbuffers/protobuf/archive/7f94235e552599141950d7a4a3eaf93bc87d1b22.tar.gz",
            ],
            patches = [
                "@com_github_grpc_grpc//third_party:protobuf.patch",
                "@com_github_grpc_grpc//third_party:protobuf.10007.patch",
            ],
            patch_args = ["-p1"],
        )
@ -252,10 +456,10 @@ def grpc_deps():
    if "bazel_gazelle" not in native.existing_rules():
        http_archive(
            name = "bazel_gazelle",
-            sha256 = "d76bf7a60fd8b050444090dfa2837a4eaf9829e1165618ee35dceca5cbdf58d5",
+            sha256 = "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb",
            urls = [
-                "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.37.0/bazel-gazelle-v0.37.0.tar.gz",
+                "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz",
-                "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.37.0/bazel-gazelle-v0.37.0.tar.gz",
+                "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz",
            ],
        )
@ -313,11 +517,11 @@ def grpc_deps():
    if "io_opentelemetry_cpp" not in native.existing_rules():
        http_archive(
            name = "io_opentelemetry_cpp",
-            sha256 = "ed681d20a684b7d485a49288e7cfb2d182bf882e5c112c5f2fa3f9e9da2278fc",
+            sha256 = "7735cc56507149686e6019e06f588317099d4522480be5f38a2a09ec69af1706",
-            strip_prefix = "opentelemetry-cpp-4bd64c9a336fd438d6c4c9dad2e6b61b0585311f",
+            strip_prefix = "opentelemetry-cpp-1.13.0",
            urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/open-telemetry/opentelemetry-cpp/archive/4bd64c9a336fd438d6c4c9dad2e6b61b0585311f.tar.gz",
+                "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/4bd64c9a336fd438d6c4c9dad2e6b61b0585311f.tar.gz",
+                "https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.13.0.tar.gz",
            ],
        )
@ -341,6 +545,15 @@ def grpc_test_only_deps():
    Loads dependencies that are only needed to run grpc library's tests.
    """
    native.bind(
        name = "twisted",
        actual = "@com_github_twisted_twisted//:twisted",
    )
    native.bind(
        name = "yaml",
        actual = "@com_github_yaml_pyyaml//:yaml",
    )
    if "com_github_twisted_twisted" not in native.existing_rules():
        http_archive(
@ -405,11 +618,11 @@ def grpc_test_only_deps():
    if "com_google_libprotobuf_mutator" not in native.existing_rules():
        http_archive(
            name = "com_google_libprotobuf_mutator",
-            sha256 = "9c8f800aed088cdf89adc3eaaa66b56b4da7da041f26338aa71a2ab43d860d46",
+            sha256 = "11ab4c57b4051977d8fedb86dba5c9092e578bc293c47be146e0b0596b6a0bdc",
            urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/libprotobuf-mutator/archive/1f95f8083066f5b38fd2db172e7e7f9aa7c49d2d.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/libprotobuf-mutator/archive/c390388561be36f94a559a4aed7e2fe60470f60b.tar.gz",
-                "https://github.com/google/libprotobuf-mutator/archive/1f95f8083066f5b38fd2db172e7e7f9aa7c49d2d.tar.gz",
+                "https://github.com/google/libprotobuf-mutator/archive/c390388561be36f94a559a4aed7e2fe60470f60b.tar.gz",
            ],
-            strip_prefix = "libprotobuf-mutator-1f95f8083066f5b38fd2db172e7e7f9aa7c49d2d",
+            strip_prefix = "libprotobuf-mutator-c390388561be36f94a559a4aed7e2fe60470f60b",
            build_file = "@com_github_grpc_grpc//third_party:libprotobuf_mutator.BUILD",
        )
--- a/bazel/grpc_extra_deps.bzl
+++ b/bazel/grpc_extra_deps.bzl
@ -52,7 +52,7 @@ def grpc_extra_deps(ignore_version_differences = False):
    api_dependencies()
    go_rules_dependencies()
-    go_register_toolchains(version = "1.20")
+    go_register_toolchains(version = "1.18")
    gazelle_dependencies()
    # Pull-in the go 3rd party dependencies for protoc_gen_validate, which is
--- a/bazel/platforms/android/BUILD
+++ b/bazel/platforms/android/BUILD
@ -1,37 +0,0 @@
 # Copyright 2024 gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 platform(
    name = "x86_64",
    constraint_values = [
        "@platforms//os:android",
        "@platforms//cpu:x86_64",
    ],
 )
 platform(
    name = "arm64-v8a",
    constraint_values = [
        "@platforms//os:android",
        "@platforms//cpu:arm64",
    ],
 )
 platform(
    name = "armeabi-v7a",
    constraint_values = [
        "@platforms//os:android",
        "@platforms//cpu:armv7",
    ],
 )
--- a/bazel/python_rules.bzl
+++ b/bazel/python_rules.bzl
@ -110,7 +110,7 @@ _gen_py_aspect = aspect(
    fragments = ["py"],
    attrs = {
        "_protoc": attr.label(
-            default = Label("@com_google_protobuf//:protoc"),
+            default = Label("//external:protocol_compiler"),
            providers = ["files_to_run"],
            executable = True,
            cfg = "exec",
@ -166,7 +166,7 @@ py_proto_library = rule(
            aspects = [_gen_py_aspect],
        ),
        "_protoc": attr.label(
-            default = Label("@com_google_protobuf//:protoc"),
+            default = Label("//external:protocol_compiler"),
            providers = ["files_to_run"],
            executable = True,
            cfg = "exec",
@ -222,11 +222,11 @@ def _generate_pb2_grpc_src_impl(context):
    py_info = _merge_pyinfos(
        [
            p,
-            context.attr.grpc_library[PyInfo],
+            context.attr._grpc_library[PyInfo],
        ] + [dep[PyInfo] for dep in context.attr.py_deps],
    )
-    runfiles = context.runfiles(files = out_files, transitive_files = py_info.transitive_sources).merge(context.attr.grpc_library[DefaultInfo].data_runfiles)
+    runfiles = context.runfiles(files = out_files, transitive_files = py_info.transitive_sources).merge(context.attr._grpc_library[DefaultInfo].data_runfiles)
    return [
        DefaultInfo(
@ -259,9 +259,9 @@ _generate_pb2_grpc_src = rule(
            executable = True,
            providers = ["files_to_run"],
            cfg = "exec",
-            default = Label("@com_google_protobuf//:protoc"),
+            default = Label("//external:protocol_compiler"),
        ),
-        "grpc_library": attr.label(
+        "_grpc_library": attr.label(
            default = Label("//src/python/grpcio/grpc:grpcio"),
            providers = [PyInfo],
        ),
@ -274,7 +274,6 @@ def py_grpc_library(
        srcs,
        deps,
        strip_prefixes = [],
        grpc_library = Label("//src/python/grpcio/grpc:grpcio"),
        **kwargs):
    """Generate python code for gRPC services defined in a protobuf.
@ -288,9 +287,6 @@ def py_grpc_library(
        stripped from the beginning of foo_pb2 modules imported by the
        generated stubs. This is useful in combination with the `imports`
        attribute of the `py_library` rule.
      grpc_library: (`label`) a single `py_library` target representing the
        python gRPC library target to be depended upon. This can be used to
        generate code that depends on `grpcio` from the Python Package Index.
      **kwargs: Additional arguments to be supplied to the invocation of
        py_library.
    """
@ -305,6 +301,5 @@ def py_grpc_library(
        deps = srcs,
        py_deps = deps,
        strip_prefixes = strip_prefixes,
        grpc_library = grpc_library,
        **kwargs
    )
--- a/bazel/supported_versions.txt
+++ b/bazel/supported_versions.txt
@ -1,2 +1,2 @@
-7.1.0
+6.4.0
-6.5.0
+7.0.0
--- a/bazel/update_mirror.sh
+++ b/bazel/update_mirror.sh
@ -57,12 +57,12 @@ function upload {
 # upload "github.com/google/boringssl/archive/1c2769383f027befac5b75b6cedd25daf3bf4dcf.tar.gz"
 # bazel binaries used by the tools/bazel wrapper script
-upload github.com/bazelbuild/bazel/releases/download/6.5.0/bazel-6.5.0-linux-x86_64
+upload github.com/bazelbuild/bazel/releases/download/6.4.0/bazel-6.4.0-linux-x86_64
-upload github.com/bazelbuild/bazel/releases/download/6.5.0/bazel-6.5.0-darwin-x86_64
+upload github.com/bazelbuild/bazel/releases/download/6.4.0/bazel-6.4.0-darwin-x86_64
-upload github.com/bazelbuild/bazel/releases/download/6.5.0/bazel-6.5.0-windows-x86_64.exe
+upload github.com/bazelbuild/bazel/releases/download/6.4.0/bazel-6.4.0-windows-x86_64.exe
-upload github.com/bazelbuild/bazel/releases/download/7.1.0/bazel-7.1.0-linux-x86_64
+upload github.com/bazelbuild/bazel/releases/download/7.0.0/bazel-7.0.0-linux-x86_64
-upload github.com/bazelbuild/bazel/releases/download/7.1.0/bazel-7.1.0-darwin-x86_64
+upload github.com/bazelbuild/bazel/releases/download/7.0.0/bazel-7.0.0-darwin-x86_64
-upload github.com/bazelbuild/bazel/releases/download/7.1.0/bazel-7.1.0-windows-x86_64.exe
+upload github.com/bazelbuild/bazel/releases/download/7.0.0/bazel-7.0.0-windows-x86_64.exe
 # Collect the github archives to mirror from grpc_deps.bzl
 grep -o '"https://github.com/[^"]*"' bazel/grpc_deps.bzl | sed 's/^"https:\/\///' | sed 's/"$//' | while read -r line ; do
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
--- a/build_config.rb
+++ b/build_config.rb
@ -13,5 +13,5 @@
 # limitations under the License.
 module GrpcBuildConfig
-  CORE_WINDOWS_DLL = '/tmp/libs/opt/grpc-42.dll'
+  CORE_WINDOWS_DLL = '/tmp/libs/opt/grpc-39.dll'
 end
--- a/build_handwritten.yaml
+++ b/build_handwritten.yaml
@ -12,11 +12,11 @@ settings:
  '#08': Use "-preN" suffixes to identify pre-release versions
  '#09': Per-language overrides are possible with (eg) ruby_version tag here
  '#10': See the expand_version.py for all the quirks here
-  core_version: 42.0.0
+  core_version: 39.0.0
  csharp_major_version: 2
-  g_stands_for: gnarly
+  g_stands_for: guardian
-  protobuf_version: 3.26.1
+  protobuf_version: 3.25.1
-  version: 1.65.0-dev
+  version: 1.62.0-dev
 configs:
  asan:
    CC: clang
@ -29,7 +29,7 @@ configs:
    compile_the_world: true
    test_environ:
      ASAN_OPTIONS: detect_leaks=1:color=always
-      LSAN_OPTIONS: suppressions=test/core/test_util/lsan_suppressions.txt:report_objects=1
+      LSAN_OPTIONS: suppressions=test/core/util/lsan_suppressions.txt:report_objects=1
  asan-noleaks:
    CC: clang
    CPPFLAGS: -O0 -fsanitize-coverage=edge,trace-pc-guard -fsanitize=address -fno-omit-frame-pointer
@ -53,7 +53,7 @@ configs:
    compile_the_world: true
    test_environ:
      ASAN_OPTIONS: detect_leaks=1:color=always
-      LSAN_OPTIONS: suppressions=test/core/test_util/lsan_suppressions.txt:report_objects=1
+      LSAN_OPTIONS: suppressions=test/core/util/lsan_suppressions.txt:report_objects=1
  c++-compat:
    CFLAGS: -Wc++-compat
    CPPFLAGS: -O0
@ -115,7 +115,7 @@ configs:
    LDXX: clang++
    compile_the_world: true
    test_environ:
-      TSAN_OPTIONS: suppressions=test/core/test_util/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1
+      TSAN_OPTIONS: suppressions=test/core/util/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1
  ubsan:
    CC: clang
    CPPFLAGS: -O0 -stdlib=libc++ -fsanitize-coverage=edge,trace-pc-guard -fsanitize=undefined
@ -127,8 +127,12 @@ configs:
    LDXX: clang++
    compile_the_world: true
    test_environ:
-      UBSAN_OPTIONS: halt_on_error=1:print_stacktrace=1:suppressions=test/core/test_util/ubsan_suppressions.txt
+      UBSAN_OPTIONS: halt_on_error=1:print_stacktrace=1:suppressions=test/core/util/ubsan_suppressions.txt
 defaults:
  abseil:
    CPPFLAGS: -g -Ithird_party/abseil-cpp
  benchmark:
    CPPFLAGS: -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX
  boringssl:
    CFLAGS: -g
    CPPFLAGS: -Ithird_party/boringssl-with-bazel/src/include -fvisibility=hidden -DOPENSSL_NO_ASM
@ -146,8 +150,7 @@ defaults:
    COREFLAGS: -fno-exceptions
    CPPFLAGS: -g -Wall -Wextra -DOSATOMIC_USE_INLINED=1 -Ithird_party/abseil-cpp -Ithird_party/re2
      -Ithird_party/upb -Isrc/core/ext/upb-gen -Isrc/core/ext/upbdefs-gen -Ithird_party/utf8_range
-      -Ithird_party/xxhash -Ithird_party/cares/cares/include -Ithird_party/cares -Ithird_party/cares/cares
+      -Ithird_party/xxhash
      -Ithird_party/address_sorting/include
    LDFLAGS: -g
  zlib:
    CFLAGS: -fvisibility=hidden
@ -199,9 +202,6 @@ ruby_gem:
  - boringssl
  - re2
  - z
 swift_boringssl_package:
  deps:
  - boringssl
 swift_package:
  deps:
  - grpc
--- a/cmake/gRPCConfig.cmake.in
+++ b/cmake/gRPCConfig.cmake.in
@ -8,7 +8,6 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
@_gRPC_FIND_CARES@
@_gRPC_FIND_ABSL@
@_gRPC_FIND_RE2@
@_gRPC_FIND_OPENTELEMETRY@
 # Targets
 include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake)
--- a/cmake/opentelemetry-cpp.cmake
+++ b/cmake/opentelemetry-cpp.cmake
@ -1,44 +0,0 @@
 # Copyright 2024 gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 if(TARGET opentelemetry-cpp::api)
  # If opentelemetry is included already, skip including it.
 # OpenTelemetry does not work with "module" mode at present.
 # elseif(gRPC_OPENTELEMETRY_PROVIDER STREQUAL "module")
 #  if(NOT OPENTELEMETRY_ROOT_DIR)
 #    set(OPENTELEMETRY_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/opentelemetry-cpp)
 #  endif()
 #  set(BUILD_TESTING OFF)
 #  if(NOT gRPC_BUILD_TESTS)
 #    set(WITH_API_ONLY ON)
 #  endif()
 #  set(WITH_ABSEIL ON)
 #  include_directories(${OPENTELEMETRY_ROOT_DIR} "${OPENTELEMETRY_ROOT_DIR}/api/include")
 #  add_subdirectory(${OPENTELEMETRY_ROOT_DIR} third_party/opentelemetry-cpp)
 #  if(EXISTS "${OPENTELEMETRY_ROOT_DIR}/CMakeLists.txt")
    # Unclear whether we should install OpenTelemetry along with gRPC
    # if(gRPC_INSTALL  AND _gRPC_INSTALL_SUPPORTED_FROM_MODULE)
    #  set(OPENTELEMETRY_INSTALL ON)
    # endif()
 #  else()
 #    message(WARNING "gRPC_OPENTELEMETRY_PROVIDER is \"module\" but OPENTELEMETRY_ROOT_DIR is wrong")
 #  endif()
 #  if(gRPC_INSTALL AND NOT _gRPC_INSTALL_SUPPORTED_FROM_MODULE)
 #    message(WARNING "gRPC_INSTALL will be forced to FALSE because gRPC_OPENTELEMETRY_PROVIDER is \"module\" and CMake version (${CMAKE_VERSION}) is less than 3.13.")
 #    set(gRPC_INSTALL FALSE)
 #  endif()
 elseif(gRPC_OPENTELEMETRY_PROVIDER STREQUAL "package")
  find_package(opentelemetry-cpp CONFIG REQUIRED)
 endif()
 set(_gRPC_FIND_OPENTELEMETRY "if(NOT TARGET opentelemetry-cpp::opentelemetry_api)\n  find_package(opentelemetry-cpp)\nendif()")
--- a/cmake/systemd.cmake
+++ b/cmake/systemd.cmake
@ -12,20 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
-set(gRPC_USE_SYSTEMD "AUTO" CACHE STRING "Build with libsystemd support if available. Can be ON, OFF or AUTO")
+find_package(systemd)
-
+if(TARGET systemd)
-if (NOT gRPC_USE_SYSTEMD STREQUAL "OFF")
+  set(_gRPC_SYSTEMD_LIBRARIES systemd ${SYSTEMD_LINK_LIBRARIES})
-  if (gRPC_USE_SYSTEMD STREQUAL "ON")
+  add_definitions(-DHAVE_LIBSYSTEMD)
    find_package(systemd REQUIRED)
  elseif (gRPC_USE_SYSTEMD STREQUAL "AUTO")
    find_package(systemd)
  else()
    message(FATAL_ERROR "Unknown value for gRPC_USE_SYSTEMD = ${gRPC_USE_SYSTEMD}")
  endif()
  if(TARGET systemd)
    set(_gRPC_SYSTEMD_LIBRARIES systemd ${SYSTEMD_LINK_LIBRARIES})
    add_definitions(-DHAVE_LIBSYSTEMD)
  endif()
  set(_gRPC_FIND_SYSTEMD "if(NOT systemd_FOUND)\n  find_package(systemd)\nendif()")
 endif()
 set(_gRPC_FIND_SYSTEMD "if(NOT systemd_FOUND)\n  find_package(systemd)\nendif()")
--- a/config.m4
+++ b/config.m4
@ -41,11 +41,10 @@ if test "$PHP_GRPC" != "no"; then
  PHP_SUBST(GRPC_SHARED_LIBADD)
  PHP_NEW_EXTENSION(grpc,
-    src/core/channelz/channel_trace.cc \
+    src/core/client_channel/backend_metric.cc \
    src/core/channelz/channelz.cc \
    src/core/channelz/channelz_registry.cc \
    src/core/client_channel/backup_poller.cc \
-    src/core/client_channel/client_channel.cc \
+    src/core/client_channel/channel_connectivity.cc \
    src/core/client_channel/client_channel_channelz.cc \
    src/core/client_channel/client_channel_factory.cc \
    src/core/client_channel/client_channel_filter.cc \
    src/core/client_channel/client_channel_plugin.cc \
@ -53,31 +52,37 @@ if test "$PHP_GRPC" != "no"; then
    src/core/client_channel/config_selector.cc \
    src/core/client_channel/dynamic_filters.cc \
    src/core/client_channel/global_subchannel_pool.cc \
-    src/core/client_channel/load_balanced_call_destination.cc \
+    src/core/client_channel/http_proxy_mapper.cc \
    src/core/client_channel/local_subchannel_pool.cc \
    src/core/client_channel/retry_filter.cc \
    src/core/client_channel/retry_filter_legacy_call_data.cc \
    src/core/client_channel/retry_service_config.cc \
    src/core/client_channel/retry_throttle.cc \
    src/core/client_channel/service_config_channel_arg_filter.cc \
    src/core/client_channel/subchannel.cc \
    src/core/client_channel/subchannel_pool_interface.cc \
    src/core/client_channel/subchannel_stream_client.cc \
    src/core/ext/filters/backend_metrics/backend_metric_filter.cc \
    src/core/ext/filters/census/grpc_context.cc \
    src/core/ext/filters/channel_idle/channel_idle_filter.cc \
    src/core/ext/filters/channel_idle/idle_filter_state.cc \
    src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
    src/core/ext/filters/fault_injection/fault_injection_filter.cc \
    src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc \
    src/core/ext/filters/http/client/http_client_filter.cc \
    src/core/ext/filters/http/client_authority_filter.cc \
    src/core/ext/filters/http/http_filters_plugin.cc \
    src/core/ext/filters/http/message_compress/compression_filter.cc \
    src/core/ext/filters/http/message_compress/legacy_compression_filter.cc \
    src/core/ext/filters/http/server/http_server_filter.cc \
    src/core/ext/filters/message_size/message_size_filter.cc \
    src/core/ext/filters/rbac/rbac_filter.cc \
    src/core/ext/filters/rbac/rbac_service_config_parser.cc \
    src/core/ext/filters/server_config_selector/server_config_selector_filter.cc \
    src/core/ext/filters/stateful_session/stateful_session_filter.cc \
    src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc \
    src/core/ext/gcp/metadata_query.cc \
    src/core/ext/transport/chttp2/alpn/alpn.cc \
    src/core/ext/transport/chttp2/client/chttp2_connector.cc \
    src/core/ext/transport/chttp2/server/chttp2_server.cc \
@ -99,6 +104,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/transport/chttp2/transport/hpack_parser.cc \
    src/core/ext/transport/chttp2/transport/hpack_parser_table.cc \
    src/core/ext/transport/chttp2/transport/http2_settings.cc \
    src/core/ext/transport/chttp2/transport/http_trace.cc \
    src/core/ext/transport/chttp2/transport/huffsyms.cc \
    src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.cc \
    src/core/ext/transport/chttp2/transport/parsing.cc \
@ -109,6 +115,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/transport/chttp2/transport/varint.cc \
    src/core/ext/transport/chttp2/transport/write_size_policy.cc \
    src/core/ext/transport/chttp2/transport/writing.cc \
    src/core/ext/transport/inproc/inproc_plugin.cc \
    src/core/ext/transport/inproc/inproc_transport.cc \
    src/core/ext/transport/inproc/legacy_inproc_transport.cc \
    src/core/ext/upb-gen/envoy/admin/v3/certs.upb_minitable.c \
@ -428,26 +435,49 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c \
    src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \
    src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \
-    src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
+    src/core/ext/xds/certificate_provider_store.cc \
-    src/core/handshaker/handshaker.cc \
+    src/core/ext/xds/file_watcher_certificate_provider_factory.cc \
-    src/core/handshaker/handshaker_registry.cc \
+    src/core/ext/xds/xds_api.cc \
-    src/core/handshaker/http_connect/http_connect_handshaker.cc \
+    src/core/ext/xds/xds_audit_logger_registry.cc \
-    src/core/handshaker/http_connect/http_proxy_mapper.cc \
+    src/core/ext/xds/xds_bootstrap.cc \
-    src/core/handshaker/proxy_mapper_registry.cc \
+    src/core/ext/xds/xds_bootstrap_grpc.cc \
-    src/core/handshaker/security/secure_endpoint.cc \
+    src/core/ext/xds/xds_certificate_provider.cc \
-    src/core/handshaker/security/security_handshaker.cc \
+    src/core/ext/xds/xds_channel_stack_modifier.cc \
-    src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \
+    src/core/ext/xds/xds_client.cc \
    src/core/ext/xds/xds_client_grpc.cc \
    src/core/ext/xds/xds_client_stats.cc \
    src/core/ext/xds/xds_cluster.cc \
    src/core/ext/xds/xds_cluster_specifier_plugin.cc \
    src/core/ext/xds/xds_common_types.cc \
    src/core/ext/xds/xds_endpoint.cc \
    src/core/ext/xds/xds_health_status.cc \
    src/core/ext/xds/xds_http_fault_filter.cc \
    src/core/ext/xds/xds_http_filters.cc \
    src/core/ext/xds/xds_http_rbac_filter.cc \
    src/core/ext/xds/xds_http_stateful_session_filter.cc \
    src/core/ext/xds/xds_lb_policy_registry.cc \
    src/core/ext/xds/xds_listener.cc \
    src/core/ext/xds/xds_route_config.cc \
    src/core/ext/xds/xds_routing.cc \
    src/core/ext/xds/xds_server_config_fetcher.cc \
    src/core/ext/xds/xds_transport_grpc.cc \
    src/core/lib/address_utils/parse_address.cc \
    src/core/lib/address_utils/sockaddr_utils.cc \
    src/core/lib/backoff/backoff.cc \
    src/core/lib/backoff/random_early_detection.cc \
    src/core/lib/channel/call_tracer.cc \
    src/core/lib/channel/channel_args.cc \
    src/core/lib/channel/channel_args_preconditioning.cc \
    src/core/lib/channel/channel_stack.cc \
    src/core/lib/channel/channel_stack_builder.cc \
    src/core/lib/channel/channel_stack_builder_impl.cc \
    src/core/lib/channel/channel_stack_trace.cc \
    src/core/lib/channel/channel_trace.cc \
    src/core/lib/channel/channelz.cc \
    src/core/lib/channel/channelz_registry.cc \
    src/core/lib/channel/connected_channel.cc \
    src/core/lib/channel/promise_based_filter.cc \
    src/core/lib/channel/server_call_tracer_filter.cc \
    src/core/lib/channel/status_util.cc \
    src/core/lib/compression/compression.cc \
    src/core/lib/compression/compression_internal.cc \
@ -457,8 +487,10 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/config/core_configuration.cc \
    src/core/lib/config/load_config.cc \
    src/core/lib/debug/event_log.cc \
    src/core/lib/debug/histogram_view.cc \
    src/core/lib/debug/stats.cc \
    src/core/lib/debug/stats_data.cc \
    src/core/lib/debug/trace.cc \
    src/core/lib/debug/trace_flags.cc \
    src/core/lib/event_engine/ares_resolver.cc \
    src/core/lib/event_engine/cf_engine/cf_engine.cc \
    src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc \
@ -497,6 +529,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc \
    src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc \
    src/core/lib/event_engine/time_util.cc \
    src/core/lib/event_engine/trace.cc \
    src/core/lib/event_engine/utils.cc \
    src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc \
    src/core/lib/event_engine/windows/iocp.cc \
@ -508,11 +541,36 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/event_engine/work_queue/basic_work_queue.cc \
    src/core/lib/experiments/config.cc \
    src/core/lib/experiments/experiments.cc \
    src/core/lib/gpr/alloc.cc \
    src/core/lib/gpr/android/log.cc \
    src/core/lib/gpr/atm.cc \
    src/core/lib/gpr/iphone/cpu.cc \
    src/core/lib/gpr/linux/cpu.cc \
    src/core/lib/gpr/linux/log.cc \
    src/core/lib/gpr/log.cc \
    src/core/lib/gpr/msys/tmpfile.cc \
    src/core/lib/gpr/posix/cpu.cc \
    src/core/lib/gpr/posix/log.cc \
    src/core/lib/gpr/posix/string.cc \
    src/core/lib/gpr/posix/sync.cc \
    src/core/lib/gpr/posix/time.cc \
    src/core/lib/gpr/posix/tmpfile.cc \
    src/core/lib/gpr/string.cc \
    src/core/lib/gpr/sync.cc \
    src/core/lib/gpr/sync_abseil.cc \
    src/core/lib/gpr/time.cc \
    src/core/lib/gpr/time_precise.cc \
    src/core/lib/gpr/windows/cpu.cc \
    src/core/lib/gpr/windows/log.cc \
    src/core/lib/gpr/windows/string.cc \
    src/core/lib/gpr/windows/string_util.cc \
    src/core/lib/gpr/windows/sync.cc \
    src/core/lib/gpr/windows/time.cc \
    src/core/lib/gpr/windows/tmpfile.cc \
    src/core/lib/gpr/wrap_memcpy.cc \
    src/core/lib/gprpp/crash.cc \
    src/core/lib/gprpp/dump_args.cc \
    src/core/lib/gprpp/examine_stack.cc \
    src/core/lib/gprpp/fork.cc \
    src/core/lib/gprpp/glob.cc \
    src/core/lib/gprpp/host_port.cc \
    src/core/lib/gprpp/linux/env.cc \
    src/core/lib/gprpp/load_file.cc \
@ -529,13 +587,17 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/gprpp/time.cc \
    src/core/lib/gprpp/time_averaged_stats.cc \
    src/core/lib/gprpp/time_util.cc \
    src/core/lib/gprpp/uuid_v4.cc \
    src/core/lib/gprpp/validation_errors.cc \
    src/core/lib/gprpp/windows/directory_reader.cc \
    src/core/lib/gprpp/windows/env.cc \
    src/core/lib/gprpp/windows/stat.cc \
    src/core/lib/gprpp/windows/thd.cc \
    src/core/lib/gprpp/work_serializer.cc \
    src/core/lib/handshaker/proxy_mapper_registry.cc \
    src/core/lib/http/format_request.cc \
    src/core/lib/http/httpcli.cc \
    src/core/lib/http/httpcli_security_connector.cc \
    src/core/lib/http/parser.cc \
    src/core/lib/iomgr/buffer_list.cc \
    src/core/lib/iomgr/call_combiner.cc \
    src/core/lib/iomgr/cfstream_handle.cc \
@ -552,6 +614,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/iomgr/ev_epoll1_linux.cc \
    src/core/lib/iomgr/ev_poll_posix.cc \
    src/core/lib/iomgr/ev_posix.cc \
    src/core/lib/iomgr/ev_windows.cc \
    src/core/lib/iomgr/event_engine_shims/closure.cc \
    src/core/lib/iomgr/event_engine_shims/endpoint.cc \
    src/core/lib/iomgr/event_engine_shims/tcp_client.cc \
@ -612,17 +675,22 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/iomgr/wakeup_fd_nospecial.cc \
    src/core/lib/iomgr/wakeup_fd_pipe.cc \
    src/core/lib/iomgr/wakeup_fd_posix.cc \
    src/core/lib/json/json_object_loader.cc \
    src/core/lib/json/json_reader.cc \
    src/core/lib/json/json_util.cc \
    src/core/lib/json/json_writer.cc \
    src/core/lib/matchers/matchers.cc \
    src/core/lib/promise/activity.cc \
    src/core/lib/promise/party.cc \
    src/core/lib/promise/sleep.cc \
    src/core/lib/promise/trace.cc \
    src/core/lib/resource_quota/api.cc \
    src/core/lib/resource_quota/arena.cc \
    src/core/lib/resource_quota/connection_quota.cc \
    src/core/lib/resource_quota/memory_quota.cc \
    src/core/lib/resource_quota/periodic_update.cc \
    src/core/lib/resource_quota/resource_quota.cc \
    src/core/lib/resource_quota/thread_quota.cc \
    src/core/lib/resource_quota/trace.cc \
    src/core/lib/security/authorization/audit_logging.cc \
    src/core/lib/security/authorization/authorization_policy_provider_vtable.cc \
    src/core/lib/security/authorization/evaluate_args.cc \
@ -676,62 +744,70 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/security/security_connector/insecure/insecure_security_connector.cc \
    src/core/lib/security/security_connector/load_system_roots_fallback.cc \
    src/core/lib/security/security_connector/load_system_roots_supported.cc \
    src/core/lib/security/security_connector/load_system_roots_windows.cc \
    src/core/lib/security/security_connector/local/local_security_connector.cc \
    src/core/lib/security/security_connector/security_connector.cc \
    src/core/lib/security/security_connector/ssl/ssl_security_connector.cc \
    src/core/lib/security/security_connector/ssl_utils.cc \
    src/core/lib/security/security_connector/tls/tls_security_connector.cc \
    src/core/lib/security/transport/client_auth_filter.cc \
    src/core/lib/security/transport/legacy_server_auth_filter.cc \
    src/core/lib/security/transport/secure_endpoint.cc \
    src/core/lib/security/transport/security_handshaker.cc \
    src/core/lib/security/transport/server_auth_filter.cc \
    src/core/lib/security/transport/tsi_error.cc \
    src/core/lib/security/util/json_util.cc \
    src/core/lib/slice/b64.cc \
    src/core/lib/slice/percent_encoding.cc \
    src/core/lib/slice/slice.cc \
    src/core/lib/slice/slice_buffer.cc \
    src/core/lib/slice/slice_refcount.cc \
    src/core/lib/slice/slice_string_helpers.cc \
    src/core/lib/surface/api_trace.cc \
    src/core/lib/surface/builtins.cc \
    src/core/lib/surface/byte_buffer.cc \
    src/core/lib/surface/byte_buffer_reader.cc \
    src/core/lib/surface/call.cc \
    src/core/lib/surface/call_details.cc \
    src/core/lib/surface/call_log_batch.cc \
-    src/core/lib/surface/call_utils.cc \
+    src/core/lib/surface/call_trace.cc \
    src/core/lib/surface/channel.cc \
    src/core/lib/surface/channel_create.cc \
    src/core/lib/surface/channel_init.cc \
    src/core/lib/surface/channel_ping.cc \
    src/core/lib/surface/channel_stack_type.cc \
    src/core/lib/surface/client_call.cc \
    src/core/lib/surface/completion_queue.cc \
    src/core/lib/surface/completion_queue_factory.cc \
    src/core/lib/surface/event_string.cc \
    src/core/lib/surface/filter_stack_call.cc \
    src/core/lib/surface/init.cc \
    src/core/lib/surface/init_internally.cc \
    src/core/lib/surface/lame_client.cc \
    src/core/lib/surface/legacy_channel.cc \
    src/core/lib/surface/metadata_array.cc \
-    src/core/lib/surface/server_call.cc \
+    src/core/lib/surface/server.cc \
    src/core/lib/surface/validate_metadata.cc \
    src/core/lib/surface/version.cc \
    src/core/lib/surface/wait_for_cq_end_op.cc \
    src/core/lib/transport/batch_builder.cc \
    src/core/lib/transport/bdp_estimator.cc \
-    src/core/lib/transport/call_arena_allocator.cc \
+    src/core/lib/transport/call_factory.cc \
    src/core/lib/transport/call_filters.cc \
    src/core/lib/transport/call_final_info.cc \
    src/core/lib/transport/call_size_estimator.cc \
    src/core/lib/transport/call_spine.cc \
    src/core/lib/transport/connectivity_state.cc \
    src/core/lib/transport/error_utils.cc \
-    src/core/lib/transport/interception_chain.cc \
+    src/core/lib/transport/handshaker.cc \
    src/core/lib/transport/handshaker_registry.cc \
    src/core/lib/transport/http_connect_handshaker.cc \
    src/core/lib/transport/message.cc \
    src/core/lib/transport/metadata.cc \
    src/core/lib/transport/metadata_batch.cc \
    src/core/lib/transport/metadata_info.cc \
    src/core/lib/transport/parsed_metadata.cc \
    src/core/lib/transport/status_conversion.cc \
    src/core/lib/transport/tcp_connect_handshaker.cc \
    src/core/lib/transport/timeout_encoding.cc \
    src/core/lib/transport/transport.cc \
    src/core/lib/transport/transport_op_string.cc \
    src/core/lib/uri/uri_parser.cc \
    src/core/load_balancing/address_filtering.cc \
    src/core/load_balancing/backend_metric_parser.cc \
    src/core/load_balancing/child_policy_handler.cc \
    src/core/load_balancing/endpoint_list.cc \
    src/core/load_balancing/grpclb/client_load_reporting_filter.cc \
@ -779,19 +855,9 @@ if test "$PHP_GRPC" != "no"; then
    src/core/resolver/sockaddr/sockaddr_resolver.cc \
    src/core/resolver/xds/xds_dependency_manager.cc \
    src/core/resolver/xds/xds_resolver.cc \
-    src/core/server/server.cc \
+    src/core/resolver/xds/xds_resolver_trace.cc \
    src/core/server/server_call_tracer_filter.cc \
    src/core/server/server_config_selector_filter.cc \
    src/core/server/xds_channel_stack_modifier.cc \
    src/core/server/xds_server_config_fetcher.cc \
    src/core/service_config/service_config_channel_arg_filter.cc \
    src/core/service_config/service_config_impl.cc \
    src/core/service_config/service_config_parser.cc \
    src/core/telemetry/call_tracer.cc \
    src/core/telemetry/histogram_view.cc \
    src/core/telemetry/metrics.cc \
    src/core/telemetry/stats.cc \
    src/core/telemetry/stats_data.cc \
    src/core/tsi/alts/crypt/aes_gcm.cc \
    src/core/tsi/alts/crypt/gsec.cc \
    src/core/tsi/alts/frame_protector/alts_counter.cc \
@ -821,65 +887,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/tsi/ssl_transport_security_utils.cc \
    src/core/tsi/transport_security.cc \
    src/core/tsi/transport_security_grpc.cc \
    src/core/util/alloc.cc \
    src/core/util/android/log.cc \
    src/core/util/atm.cc \
    src/core/util/gcp_metadata_query.cc \
    src/core/util/http_client/format_request.cc \
    src/core/util/http_client/httpcli.cc \
    src/core/util/http_client/httpcli_security_connector.cc \
    src/core/util/http_client/parser.cc \
    src/core/util/iphone/cpu.cc \
    src/core/util/json/json_object_loader.cc \
    src/core/util/json/json_reader.cc \
    src/core/util/json/json_util.cc \
    src/core/util/json/json_writer.cc \
    src/core/util/linux/cpu.cc \
    src/core/util/linux/log.cc \
    src/core/util/log.cc \
    src/core/util/msys/tmpfile.cc \
    src/core/util/posix/cpu.cc \
    src/core/util/posix/log.cc \
    src/core/util/posix/string.cc \
    src/core/util/posix/sync.cc \
    src/core/util/posix/time.cc \
    src/core/util/posix/tmpfile.cc \
    src/core/util/string.cc \
    src/core/util/sync.cc \
    src/core/util/sync_abseil.cc \
    src/core/util/time.cc \
    src/core/util/time_precise.cc \
    src/core/util/windows/cpu.cc \
    src/core/util/windows/log.cc \
    src/core/util/windows/string.cc \
    src/core/util/windows/string_util.cc \
    src/core/util/windows/sync.cc \
    src/core/util/windows/time.cc \
    src/core/util/windows/tmpfile.cc \
    src/core/xds/grpc/certificate_provider_store.cc \
    src/core/xds/grpc/file_watcher_certificate_provider_factory.cc \
    src/core/xds/grpc/xds_audit_logger_registry.cc \
    src/core/xds/grpc/xds_bootstrap_grpc.cc \
    src/core/xds/grpc/xds_certificate_provider.cc \
    src/core/xds/grpc/xds_client_grpc.cc \
    src/core/xds/grpc/xds_cluster.cc \
    src/core/xds/grpc/xds_cluster_specifier_plugin.cc \
    src/core/xds/grpc/xds_common_types.cc \
    src/core/xds/grpc/xds_endpoint.cc \
    src/core/xds/grpc/xds_health_status.cc \
    src/core/xds/grpc/xds_http_fault_filter.cc \
    src/core/xds/grpc/xds_http_filters.cc \
    src/core/xds/grpc/xds_http_rbac_filter.cc \
    src/core/xds/grpc/xds_http_stateful_session_filter.cc \
    src/core/xds/grpc/xds_lb_policy_registry.cc \
    src/core/xds/grpc/xds_listener.cc \
    src/core/xds/grpc/xds_route_config.cc \
    src/core/xds/grpc/xds_routing.cc \
    src/core/xds/grpc/xds_transport_grpc.cc \
    src/core/xds/xds_client/xds_api.cc \
    src/core/xds/xds_client/xds_bootstrap.cc \
    src/core/xds/xds_client/xds_client.cc \
    src/core/xds/xds_client/xds_client_stats.cc \
    src/php/ext/grpc/byte_buffer.c \
    src/php/ext/grpc/call.c \
    src/php/ext/grpc/call_credentials.c \
@ -915,7 +922,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc \
    third_party/abseil-cpp/absl/debugging/internal/demangle.cc \
    third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc \
    third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc \
    third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc \
    third_party/abseil-cpp/absl/debugging/stacktrace.cc \
    third_party/abseil-cpp/absl/debugging/symbolize.cc \
@ -930,19 +936,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/abseil-cpp/absl/hash/internal/city.cc \
    third_party/abseil-cpp/absl/hash/internal/hash.cc \
    third_party/abseil-cpp/absl/hash/internal/low_level_hash.cc \
    third_party/abseil-cpp/absl/log/globals.cc \
    third_party/abseil-cpp/absl/log/internal/check_op.cc \
    third_party/abseil-cpp/absl/log/internal/conditions.cc \
    third_party/abseil-cpp/absl/log/internal/fnmatch.cc \
    third_party/abseil-cpp/absl/log/internal/globals.cc \
    third_party/abseil-cpp/absl/log/internal/log_format.cc \
    third_party/abseil-cpp/absl/log/internal/log_message.cc \
    third_party/abseil-cpp/absl/log/internal/log_sink_set.cc \
    third_party/abseil-cpp/absl/log/internal/nullguard.cc \
    third_party/abseil-cpp/absl/log/internal/proto.cc \
    third_party/abseil-cpp/absl/log/internal/vlog_config.cc \
    third_party/abseil-cpp/absl/log/log_entry.cc \
    third_party/abseil-cpp/absl/log/log_sink.cc \
    third_party/abseil-cpp/absl/numeric/int128.cc \
    third_party/abseil-cpp/absl/profiling/internal/exponential_biased.cc \
    third_party/abseil-cpp/absl/random/discrete_distribution.cc \
@ -1030,6 +1023,7 @@ if test "$PHP_GRPC" != "no"; then
    third_party/address_sorting/address_sorting.c \
    third_party/address_sorting/address_sorting_posix.c \
    third_party/address_sorting/address_sorting_windows.c \
    third_party/boringssl-with-bazel/err_data.c \
    third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c \
    third_party/boringssl-with-bazel/src/crypto/asn1/a_bool.c \
    third_party/boringssl-with-bazel/src/crypto/asn1/a_d2i_fp.c \
@ -1108,7 +1102,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl-with-bazel/src/crypto/dh_extra/dh_asn1.c \
    third_party/boringssl-with-bazel/src/crypto/dh_extra/params.c \
    third_party/boringssl-with-bazel/src/crypto/digest_extra/digest_extra.c \
    third_party/boringssl-with-bazel/src/crypto/dilithium/dilithium.c \
    third_party/boringssl-with-bazel/src/crypto/dsa/dsa.c \
    third_party/boringssl-with-bazel/src/crypto/dsa/dsa_asn1.c \
    third_party/boringssl-with-bazel/src/crypto/ec_extra/ec_asn1.c \
@ -1121,8 +1114,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl-with-bazel/src/crypto/evp/evp.c \
    third_party/boringssl-with-bazel/src/crypto/evp/evp_asn1.c \
    third_party/boringssl-with-bazel/src/crypto/evp/evp_ctx.c \
    third_party/boringssl-with-bazel/src/crypto/evp/p_dh.c \
    third_party/boringssl-with-bazel/src/crypto/evp/p_dh_asn1.c \
    third_party/boringssl-with-bazel/src/crypto/evp/p_dsa_asn1.c \
    third_party/boringssl-with-bazel/src/crypto/evp/p_ec.c \
    third_party/boringssl-with-bazel/src/crypto/evp/p_ec_asn1.c \
@ -1264,7 +1255,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl-with-bazel/src/crypto/x509/x_val.c \
    third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c \
    third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c \
    third_party/boringssl-with-bazel/src/gen/crypto/err_data.c \
    third_party/boringssl-with-bazel/src/ssl/bio_ssl.cc \
    third_party/boringssl-with-bazel/src/ssl/d1_both.cc \
    third_party/boringssl-with-bazel/src/ssl/d1_lib.cc \
@ -1286,7 +1276,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/boringssl-with-bazel/src/ssl/ssl_buffer.cc \
    third_party/boringssl-with-bazel/src/ssl/ssl_cert.cc \
    third_party/boringssl-with-bazel/src/ssl/ssl_cipher.cc \
    third_party/boringssl-with-bazel/src/ssl/ssl_credential.cc \
    third_party/boringssl-with-bazel/src/ssl/ssl_file.cc \
    third_party/boringssl-with-bazel/src/ssl/ssl_key_share.cc \
    third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc \
@ -1337,10 +1326,6 @@ if test "$PHP_GRPC" != "no"; then
    third_party/upb/upb/mem/arena.c \
    third_party/upb/upb/message/accessors.c \
    third_party/upb/upb/message/array.c \
    third_party/upb/upb/message/compat.c \
    third_party/upb/upb/message/copy.c \
    third_party/upb/upb/message/internal/extension.c \
    third_party/upb/upb/message/internal/message.c \
    third_party/upb/upb/message/map.c \
    third_party/upb/upb/message/map_sorter.c \
    third_party/upb/upb/message/message.c \
@ -1371,23 +1356,25 @@ if test "$PHP_GRPC" != "no"; then
    third_party/upb/upb/reflection/service_def.c \
    third_party/upb/upb/text/encode.c \
    third_party/upb/upb/wire/decode.c \
    third_party/upb/upb/wire/decode_fast.c \
    third_party/upb/upb/wire/encode.c \
    third_party/upb/upb/wire/eps_copy_input_stream.c \
    third_party/upb/upb/wire/internal/decode_fast.c \
    third_party/upb/upb/wire/reader.c \
-    third_party/utf8_range/utf8_range.c \
+    third_party/utf8_range/naive.c \
    third_party/utf8_range/range2-neon.c \
    third_party/utf8_range/range2-sse.c \
    , $ext_shared, , -fvisibility=hidden \
    -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN \
    -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \
    -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 \
    -DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \
-    -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.65.0dev\""')
+    -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.62.0dev\""')
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/channelz)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/client_channel)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/backend_metrics)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/census)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/channel_idle)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/deadline)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/fault_injection)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/http)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/http/client)
@ -1395,7 +1382,9 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/http/server)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/message_size)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/rbac)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/server_config_selector)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/stateful_session)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/gcp)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/alpn)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/client)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/server)
@ -1503,11 +1492,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/core/v3)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/type/matcher/v3)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/type/v3)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/xds)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/endpoint_info)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/http_connect)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/security)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/tcp_connect)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/address_utils)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/backoff)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel)
@ -1522,12 +1507,22 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/event_engine/windows)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/event_engine/work_queue)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/experiments)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr/android)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr/iphone)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr/linux)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr/msys)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr/posix)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gpr/windows)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/linux)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/posix)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/windows)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/handshaker)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/http)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr/event_engine_shims)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/json)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/matchers)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/promise)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/resource_quota)
@ -1584,9 +1579,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/google_c2p)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/sockaddr)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/xds)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/server)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/service_config)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/telemetry)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/crypt)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/frame_protector)
@ -1594,17 +1587,6 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/zero_copy_frame_protector)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/ssl/key_logging)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/ssl/session_cache)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/android)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/http_client)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/iphone)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/json)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/linux)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/msys)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/posix)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util/windows)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/xds/grpc)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/xds/xds_client)
  PHP_ADD_BUILD_DIR($ext_builddir/src/php/ext/grpc)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/base)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/base/internal)
@ -1616,8 +1598,6 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/flags)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/flags/internal)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/hash/internal)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/log)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/log/internal)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/numeric)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/profiling/internal)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/random)
@ -1633,6 +1613,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/time/internal/cctz/src)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/types)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/address_sorting)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/asn1)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/base64)
@ -1648,7 +1629,6 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/des)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/dh_extra)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/digest_extra)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/dilithium)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/dsa)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/ec_extra)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/ecdh_extra)
@ -1676,7 +1656,6 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/stack)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/trust_token)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/x509)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/gen/crypto)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/ssl)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/re2/re2)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/re2/util)
@ -1686,7 +1665,6 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/lex)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/mem)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/message)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/message/internal)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/mini_descriptor)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/mini_descriptor/internal)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/mini_table)
@ -1695,6 +1673,5 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/reflection/internal)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/text)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/wire)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/upb/upb/wire/internal)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/utf8_range)
 fi
--- a/config.w32
+++ b/config.w32
@ -6,11 +6,10 @@ ARG_WITH("grpc", "grpc support", "no");
 if (PHP_GRPC != "no") {
  EXTENSION("grpc",
-    "src\\core\\channelz\\channel_trace.cc " +
+    "src\\core\\client_channel\\backend_metric.cc " +
    "src\\core\\channelz\\channelz.cc " +
    "src\\core\\channelz\\channelz_registry.cc " +
    "src\\core\\client_channel\\backup_poller.cc " +
-    "src\\core\\client_channel\\client_channel.cc " +
+    "src\\core\\client_channel\\channel_connectivity.cc " +
    "src\\core\\client_channel\\client_channel_channelz.cc " +
    "src\\core\\client_channel\\client_channel_factory.cc " +
    "src\\core\\client_channel\\client_channel_filter.cc " +
    "src\\core\\client_channel\\client_channel_plugin.cc " +
@ -18,31 +17,37 @@ if (PHP_GRPC != "no") {
    "src\\core\\client_channel\\config_selector.cc " +
    "src\\core\\client_channel\\dynamic_filters.cc " +
    "src\\core\\client_channel\\global_subchannel_pool.cc " +
-    "src\\core\\client_channel\\load_balanced_call_destination.cc " +
+    "src\\core\\client_channel\\http_proxy_mapper.cc " +
    "src\\core\\client_channel\\local_subchannel_pool.cc " +
    "src\\core\\client_channel\\retry_filter.cc " +
    "src\\core\\client_channel\\retry_filter_legacy_call_data.cc " +
    "src\\core\\client_channel\\retry_service_config.cc " +
    "src\\core\\client_channel\\retry_throttle.cc " +
    "src\\core\\client_channel\\service_config_channel_arg_filter.cc " +
    "src\\core\\client_channel\\subchannel.cc " +
    "src\\core\\client_channel\\subchannel_pool_interface.cc " +
    "src\\core\\client_channel\\subchannel_stream_client.cc " +
    "src\\core\\ext\\filters\\backend_metrics\\backend_metric_filter.cc " +
    "src\\core\\ext\\filters\\census\\grpc_context.cc " +
    "src\\core\\ext\\filters\\channel_idle\\channel_idle_filter.cc " +
    "src\\core\\ext\\filters\\channel_idle\\idle_filter_state.cc " +
    "src\\core\\ext\\filters\\channel_idle\\legacy_channel_idle_filter.cc " +
    "src\\core\\ext\\filters\\deadline\\deadline_filter.cc " +
    "src\\core\\ext\\filters\\fault_injection\\fault_injection_filter.cc " +
    "src\\core\\ext\\filters\\fault_injection\\fault_injection_service_config_parser.cc " +
    "src\\core\\ext\\filters\\http\\client\\http_client_filter.cc " +
    "src\\core\\ext\\filters\\http\\client_authority_filter.cc " +
    "src\\core\\ext\\filters\\http\\http_filters_plugin.cc " +
    "src\\core\\ext\\filters\\http\\message_compress\\compression_filter.cc " +
    "src\\core\\ext\\filters\\http\\message_compress\\legacy_compression_filter.cc " +
    "src\\core\\ext\\filters\\http\\server\\http_server_filter.cc " +
    "src\\core\\ext\\filters\\message_size\\message_size_filter.cc " +
    "src\\core\\ext\\filters\\rbac\\rbac_filter.cc " +
    "src\\core\\ext\\filters\\rbac\\rbac_service_config_parser.cc " +
    "src\\core\\ext\\filters\\server_config_selector\\server_config_selector_filter.cc " +
    "src\\core\\ext\\filters\\stateful_session\\stateful_session_filter.cc " +
    "src\\core\\ext\\filters\\stateful_session\\stateful_session_service_config_parser.cc " +
    "src\\core\\ext\\gcp\\metadata_query.cc " +
    "src\\core\\ext\\transport\\chttp2\\alpn\\alpn.cc " +
    "src\\core\\ext\\transport\\chttp2\\client\\chttp2_connector.cc " +
    "src\\core\\ext\\transport\\chttp2\\server\\chttp2_server.cc " +
@ -64,6 +69,7 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\transport\\chttp2\\transport\\hpack_parser.cc " +
    "src\\core\\ext\\transport\\chttp2\\transport\\hpack_parser_table.cc " +
    "src\\core\\ext\\transport\\chttp2\\transport\\http2_settings.cc " +
    "src\\core\\ext\\transport\\chttp2\\transport\\http_trace.cc " +
    "src\\core\\ext\\transport\\chttp2\\transport\\huffsyms.cc " +
    "src\\core\\ext\\transport\\chttp2\\transport\\max_concurrent_streams_policy.cc " +
    "src\\core\\ext\\transport\\chttp2\\transport\\parsing.cc " +
@ -74,6 +80,7 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\transport\\chttp2\\transport\\varint.cc " +
    "src\\core\\ext\\transport\\chttp2\\transport\\write_size_policy.cc " +
    "src\\core\\ext\\transport\\chttp2\\transport\\writing.cc " +
    "src\\core\\ext\\transport\\inproc\\inproc_plugin.cc " +
    "src\\core\\ext\\transport\\inproc\\inproc_transport.cc " +
    "src\\core\\ext\\transport\\inproc\\legacy_inproc_transport.cc " +
    "src\\core\\ext\\upb-gen\\envoy\\admin\\v3\\certs.upb_minitable.c " +
@ -393,26 +400,49 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\cel.upbdefs.c " +
    "src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\range.upbdefs.c " +
    "src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\typed_struct.upbdefs.c " +
-    "src\\core\\handshaker\\endpoint_info\\endpoint_info_handshaker.cc " +
+    "src\\core\\ext\\xds\\certificate_provider_store.cc " +
-    "src\\core\\handshaker\\handshaker.cc " +
+    "src\\core\\ext\\xds\\file_watcher_certificate_provider_factory.cc " +
-    "src\\core\\handshaker\\handshaker_registry.cc " +
+    "src\\core\\ext\\xds\\xds_api.cc " +
-    "src\\core\\handshaker\\http_connect\\http_connect_handshaker.cc " +
+    "src\\core\\ext\\xds\\xds_audit_logger_registry.cc " +
-    "src\\core\\handshaker\\http_connect\\http_proxy_mapper.cc " +
+    "src\\core\\ext\\xds\\xds_bootstrap.cc " +
-    "src\\core\\handshaker\\proxy_mapper_registry.cc " +
+    "src\\core\\ext\\xds\\xds_bootstrap_grpc.cc " +
-    "src\\core\\handshaker\\security\\secure_endpoint.cc " +
+    "src\\core\\ext\\xds\\xds_certificate_provider.cc " +
-    "src\\core\\handshaker\\security\\security_handshaker.cc " +
+    "src\\core\\ext\\xds\\xds_channel_stack_modifier.cc " +
-    "src\\core\\handshaker\\tcp_connect\\tcp_connect_handshaker.cc " +
+    "src\\core\\ext\\xds\\xds_client.cc " +
    "src\\core\\ext\\xds\\xds_client_grpc.cc " +
    "src\\core\\ext\\xds\\xds_client_stats.cc " +
    "src\\core\\ext\\xds\\xds_cluster.cc " +
    "src\\core\\ext\\xds\\xds_cluster_specifier_plugin.cc " +
    "src\\core\\ext\\xds\\xds_common_types.cc " +
    "src\\core\\ext\\xds\\xds_endpoint.cc " +
    "src\\core\\ext\\xds\\xds_health_status.cc " +
    "src\\core\\ext\\xds\\xds_http_fault_filter.cc " +
    "src\\core\\ext\\xds\\xds_http_filters.cc " +
    "src\\core\\ext\\xds\\xds_http_rbac_filter.cc " +
    "src\\core\\ext\\xds\\xds_http_stateful_session_filter.cc " +
    "src\\core\\ext\\xds\\xds_lb_policy_registry.cc " +
    "src\\core\\ext\\xds\\xds_listener.cc " +
    "src\\core\\ext\\xds\\xds_route_config.cc " +
    "src\\core\\ext\\xds\\xds_routing.cc " +
    "src\\core\\ext\\xds\\xds_server_config_fetcher.cc " +
    "src\\core\\ext\\xds\\xds_transport_grpc.cc " +
    "src\\core\\lib\\address_utils\\parse_address.cc " +
    "src\\core\\lib\\address_utils\\sockaddr_utils.cc " +
    "src\\core\\lib\\backoff\\backoff.cc " +
    "src\\core\\lib\\backoff\\random_early_detection.cc " +
    "src\\core\\lib\\channel\\call_tracer.cc " +
    "src\\core\\lib\\channel\\channel_args.cc " +
    "src\\core\\lib\\channel\\channel_args_preconditioning.cc " +
    "src\\core\\lib\\channel\\channel_stack.cc " +
    "src\\core\\lib\\channel\\channel_stack_builder.cc " +
    "src\\core\\lib\\channel\\channel_stack_builder_impl.cc " +
    "src\\core\\lib\\channel\\channel_stack_trace.cc " +
    "src\\core\\lib\\channel\\channel_trace.cc " +
    "src\\core\\lib\\channel\\channelz.cc " +
    "src\\core\\lib\\channel\\channelz_registry.cc " +
    "src\\core\\lib\\channel\\connected_channel.cc " +
    "src\\core\\lib\\channel\\promise_based_filter.cc " +
    "src\\core\\lib\\channel\\server_call_tracer_filter.cc " +
    "src\\core\\lib\\channel\\status_util.cc " +
    "src\\core\\lib\\compression\\compression.cc " +
    "src\\core\\lib\\compression\\compression_internal.cc " +
@ -422,8 +452,10 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\config\\core_configuration.cc " +
    "src\\core\\lib\\config\\load_config.cc " +
    "src\\core\\lib\\debug\\event_log.cc " +
    "src\\core\\lib\\debug\\histogram_view.cc " +
    "src\\core\\lib\\debug\\stats.cc " +
    "src\\core\\lib\\debug\\stats_data.cc " +
    "src\\core\\lib\\debug\\trace.cc " +
    "src\\core\\lib\\debug\\trace_flags.cc " +
    "src\\core\\lib\\event_engine\\ares_resolver.cc " +
    "src\\core\\lib\\event_engine\\cf_engine\\cf_engine.cc " +
    "src\\core\\lib\\event_engine\\cf_engine\\cfstream_endpoint.cc " +
@ -462,6 +494,7 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\event_engine\\thread_pool\\work_stealing_thread_pool.cc " +
    "src\\core\\lib\\event_engine\\thready_event_engine\\thready_event_engine.cc " +
    "src\\core\\lib\\event_engine\\time_util.cc " +
    "src\\core\\lib\\event_engine\\trace.cc " +
    "src\\core\\lib\\event_engine\\utils.cc " +
    "src\\core\\lib\\event_engine\\windows\\grpc_polled_fd_windows.cc " +
    "src\\core\\lib\\event_engine\\windows\\iocp.cc " +
@ -473,11 +506,36 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\event_engine\\work_queue\\basic_work_queue.cc " +
    "src\\core\\lib\\experiments\\config.cc " +
    "src\\core\\lib\\experiments\\experiments.cc " +
    "src\\core\\lib\\gpr\\alloc.cc " +
    "src\\core\\lib\\gpr\\android\\log.cc " +
    "src\\core\\lib\\gpr\\atm.cc " +
    "src\\core\\lib\\gpr\\iphone\\cpu.cc " +
    "src\\core\\lib\\gpr\\linux\\cpu.cc " +
    "src\\core\\lib\\gpr\\linux\\log.cc " +
    "src\\core\\lib\\gpr\\log.cc " +
    "src\\core\\lib\\gpr\\msys\\tmpfile.cc " +
    "src\\core\\lib\\gpr\\posix\\cpu.cc " +
    "src\\core\\lib\\gpr\\posix\\log.cc " +
    "src\\core\\lib\\gpr\\posix\\string.cc " +
    "src\\core\\lib\\gpr\\posix\\sync.cc " +
    "src\\core\\lib\\gpr\\posix\\time.cc " +
    "src\\core\\lib\\gpr\\posix\\tmpfile.cc " +
    "src\\core\\lib\\gpr\\string.cc " +
    "src\\core\\lib\\gpr\\sync.cc " +
    "src\\core\\lib\\gpr\\sync_abseil.cc " +
    "src\\core\\lib\\gpr\\time.cc " +
    "src\\core\\lib\\gpr\\time_precise.cc " +
    "src\\core\\lib\\gpr\\windows\\cpu.cc " +
    "src\\core\\lib\\gpr\\windows\\log.cc " +
    "src\\core\\lib\\gpr\\windows\\string.cc " +
    "src\\core\\lib\\gpr\\windows\\string_util.cc " +
    "src\\core\\lib\\gpr\\windows\\sync.cc " +
    "src\\core\\lib\\gpr\\windows\\time.cc " +
    "src\\core\\lib\\gpr\\windows\\tmpfile.cc " +
    "src\\core\\lib\\gpr\\wrap_memcpy.cc " +
    "src\\core\\lib\\gprpp\\crash.cc " +
    "src\\core\\lib\\gprpp\\dump_args.cc " +
    "src\\core\\lib\\gprpp\\examine_stack.cc " +
    "src\\core\\lib\\gprpp\\fork.cc " +
    "src\\core\\lib\\gprpp\\glob.cc " +
    "src\\core\\lib\\gprpp\\host_port.cc " +
    "src\\core\\lib\\gprpp\\linux\\env.cc " +
    "src\\core\\lib\\gprpp\\load_file.cc " +
@ -494,13 +552,17 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\gprpp\\time.cc " +
    "src\\core\\lib\\gprpp\\time_averaged_stats.cc " +
    "src\\core\\lib\\gprpp\\time_util.cc " +
    "src\\core\\lib\\gprpp\\uuid_v4.cc " +
    "src\\core\\lib\\gprpp\\validation_errors.cc " +
    "src\\core\\lib\\gprpp\\windows\\directory_reader.cc " +
    "src\\core\\lib\\gprpp\\windows\\env.cc " +
    "src\\core\\lib\\gprpp\\windows\\stat.cc " +
    "src\\core\\lib\\gprpp\\windows\\thd.cc " +
    "src\\core\\lib\\gprpp\\work_serializer.cc " +
    "src\\core\\lib\\handshaker\\proxy_mapper_registry.cc " +
    "src\\core\\lib\\http\\format_request.cc " +
    "src\\core\\lib\\http\\httpcli.cc " +
    "src\\core\\lib\\http\\httpcli_security_connector.cc " +
    "src\\core\\lib\\http\\parser.cc " +
    "src\\core\\lib\\iomgr\\buffer_list.cc " +
    "src\\core\\lib\\iomgr\\call_combiner.cc " +
    "src\\core\\lib\\iomgr\\cfstream_handle.cc " +
@ -517,6 +579,7 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\iomgr\\ev_epoll1_linux.cc " +
    "src\\core\\lib\\iomgr\\ev_poll_posix.cc " +
    "src\\core\\lib\\iomgr\\ev_posix.cc " +
    "src\\core\\lib\\iomgr\\ev_windows.cc " +
    "src\\core\\lib\\iomgr\\event_engine_shims\\closure.cc " +
    "src\\core\\lib\\iomgr\\event_engine_shims\\endpoint.cc " +
    "src\\core\\lib\\iomgr\\event_engine_shims\\tcp_client.cc " +
@ -577,17 +640,22 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\iomgr\\wakeup_fd_nospecial.cc " +
    "src\\core\\lib\\iomgr\\wakeup_fd_pipe.cc " +
    "src\\core\\lib\\iomgr\\wakeup_fd_posix.cc " +
    "src\\core\\lib\\json\\json_object_loader.cc " +
    "src\\core\\lib\\json\\json_reader.cc " +
    "src\\core\\lib\\json\\json_util.cc " +
    "src\\core\\lib\\json\\json_writer.cc " +
    "src\\core\\lib\\matchers\\matchers.cc " +
    "src\\core\\lib\\promise\\activity.cc " +
    "src\\core\\lib\\promise\\party.cc " +
    "src\\core\\lib\\promise\\sleep.cc " +
    "src\\core\\lib\\promise\\trace.cc " +
    "src\\core\\lib\\resource_quota\\api.cc " +
    "src\\core\\lib\\resource_quota\\arena.cc " +
    "src\\core\\lib\\resource_quota\\connection_quota.cc " +
    "src\\core\\lib\\resource_quota\\memory_quota.cc " +
    "src\\core\\lib\\resource_quota\\periodic_update.cc " +
    "src\\core\\lib\\resource_quota\\resource_quota.cc " +
    "src\\core\\lib\\resource_quota\\thread_quota.cc " +
    "src\\core\\lib\\resource_quota\\trace.cc " +
    "src\\core\\lib\\security\\authorization\\audit_logging.cc " +
    "src\\core\\lib\\security\\authorization\\authorization_policy_provider_vtable.cc " +
    "src\\core\\lib\\security\\authorization\\evaluate_args.cc " +
@ -641,62 +709,70 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\security\\security_connector\\insecure\\insecure_security_connector.cc " +
    "src\\core\\lib\\security\\security_connector\\load_system_roots_fallback.cc " +
    "src\\core\\lib\\security\\security_connector\\load_system_roots_supported.cc " +
    "src\\core\\lib\\security\\security_connector\\load_system_roots_windows.cc " +
    "src\\core\\lib\\security\\security_connector\\local\\local_security_connector.cc " +
    "src\\core\\lib\\security\\security_connector\\security_connector.cc " +
    "src\\core\\lib\\security\\security_connector\\ssl\\ssl_security_connector.cc " +
    "src\\core\\lib\\security\\security_connector\\ssl_utils.cc " +
    "src\\core\\lib\\security\\security_connector\\tls\\tls_security_connector.cc " +
    "src\\core\\lib\\security\\transport\\client_auth_filter.cc " +
    "src\\core\\lib\\security\\transport\\legacy_server_auth_filter.cc " +
    "src\\core\\lib\\security\\transport\\secure_endpoint.cc " +
    "src\\core\\lib\\security\\transport\\security_handshaker.cc " +
    "src\\core\\lib\\security\\transport\\server_auth_filter.cc " +
    "src\\core\\lib\\security\\transport\\tsi_error.cc " +
    "src\\core\\lib\\security\\util\\json_util.cc " +
    "src\\core\\lib\\slice\\b64.cc " +
    "src\\core\\lib\\slice\\percent_encoding.cc " +
    "src\\core\\lib\\slice\\slice.cc " +
    "src\\core\\lib\\slice\\slice_buffer.cc " +
    "src\\core\\lib\\slice\\slice_refcount.cc " +
    "src\\core\\lib\\slice\\slice_string_helpers.cc " +
    "src\\core\\lib\\surface\\api_trace.cc " +
    "src\\core\\lib\\surface\\builtins.cc " +
    "src\\core\\lib\\surface\\byte_buffer.cc " +
    "src\\core\\lib\\surface\\byte_buffer_reader.cc " +
    "src\\core\\lib\\surface\\call.cc " +
    "src\\core\\lib\\surface\\call_details.cc " +
    "src\\core\\lib\\surface\\call_log_batch.cc " +
-    "src\\core\\lib\\surface\\call_utils.cc " +
+    "src\\core\\lib\\surface\\call_trace.cc " +
    "src\\core\\lib\\surface\\channel.cc " +
    "src\\core\\lib\\surface\\channel_create.cc " +
    "src\\core\\lib\\surface\\channel_init.cc " +
    "src\\core\\lib\\surface\\channel_ping.cc " +
    "src\\core\\lib\\surface\\channel_stack_type.cc " +
    "src\\core\\lib\\surface\\client_call.cc " +
    "src\\core\\lib\\surface\\completion_queue.cc " +
    "src\\core\\lib\\surface\\completion_queue_factory.cc " +
    "src\\core\\lib\\surface\\event_string.cc " +
    "src\\core\\lib\\surface\\filter_stack_call.cc " +
    "src\\core\\lib\\surface\\init.cc " +
    "src\\core\\lib\\surface\\init_internally.cc " +
    "src\\core\\lib\\surface\\lame_client.cc " +
    "src\\core\\lib\\surface\\legacy_channel.cc " +
    "src\\core\\lib\\surface\\metadata_array.cc " +
-    "src\\core\\lib\\surface\\server_call.cc " +
+    "src\\core\\lib\\surface\\server.cc " +
    "src\\core\\lib\\surface\\validate_metadata.cc " +
    "src\\core\\lib\\surface\\version.cc " +
    "src\\core\\lib\\surface\\wait_for_cq_end_op.cc " +
    "src\\core\\lib\\transport\\batch_builder.cc " +
    "src\\core\\lib\\transport\\bdp_estimator.cc " +
-    "src\\core\\lib\\transport\\call_arena_allocator.cc " +
+    "src\\core\\lib\\transport\\call_factory.cc " +
    "src\\core\\lib\\transport\\call_filters.cc " +
    "src\\core\\lib\\transport\\call_final_info.cc " +
    "src\\core\\lib\\transport\\call_size_estimator.cc " +
    "src\\core\\lib\\transport\\call_spine.cc " +
    "src\\core\\lib\\transport\\connectivity_state.cc " +
    "src\\core\\lib\\transport\\error_utils.cc " +
-    "src\\core\\lib\\transport\\interception_chain.cc " +
+    "src\\core\\lib\\transport\\handshaker.cc " +
    "src\\core\\lib\\transport\\handshaker_registry.cc " +
    "src\\core\\lib\\transport\\http_connect_handshaker.cc " +
    "src\\core\\lib\\transport\\message.cc " +
    "src\\core\\lib\\transport\\metadata.cc " +
    "src\\core\\lib\\transport\\metadata_batch.cc " +
    "src\\core\\lib\\transport\\metadata_info.cc " +
    "src\\core\\lib\\transport\\parsed_metadata.cc " +
    "src\\core\\lib\\transport\\status_conversion.cc " +
    "src\\core\\lib\\transport\\tcp_connect_handshaker.cc " +
    "src\\core\\lib\\transport\\timeout_encoding.cc " +
    "src\\core\\lib\\transport\\transport.cc " +
    "src\\core\\lib\\transport\\transport_op_string.cc " +
    "src\\core\\lib\\uri\\uri_parser.cc " +
    "src\\core\\load_balancing\\address_filtering.cc " +
    "src\\core\\load_balancing\\backend_metric_parser.cc " +
    "src\\core\\load_balancing\\child_policy_handler.cc " +
    "src\\core\\load_balancing\\endpoint_list.cc " +
    "src\\core\\load_balancing\\grpclb\\client_load_reporting_filter.cc " +
@ -744,19 +820,9 @@ if (PHP_GRPC != "no") {
    "src\\core\\resolver\\sockaddr\\sockaddr_resolver.cc " +
    "src\\core\\resolver\\xds\\xds_dependency_manager.cc " +
    "src\\core\\resolver\\xds\\xds_resolver.cc " +
-    "src\\core\\server\\server.cc " +
+    "src\\core\\resolver\\xds\\xds_resolver_trace.cc " +
    "src\\core\\server\\server_call_tracer_filter.cc " +
    "src\\core\\server\\server_config_selector_filter.cc " +
    "src\\core\\server\\xds_channel_stack_modifier.cc " +
    "src\\core\\server\\xds_server_config_fetcher.cc " +
    "src\\core\\service_config\\service_config_channel_arg_filter.cc " +
    "src\\core\\service_config\\service_config_impl.cc " +
    "src\\core\\service_config\\service_config_parser.cc " +
    "src\\core\\telemetry\\call_tracer.cc " +
    "src\\core\\telemetry\\histogram_view.cc " +
    "src\\core\\telemetry\\metrics.cc " +
    "src\\core\\telemetry\\stats.cc " +
    "src\\core\\telemetry\\stats_data.cc " +
    "src\\core\\tsi\\alts\\crypt\\aes_gcm.cc " +
    "src\\core\\tsi\\alts\\crypt\\gsec.cc " +
    "src\\core\\tsi\\alts\\frame_protector\\alts_counter.cc " +
@ -786,65 +852,6 @@ if (PHP_GRPC != "no") {
    "src\\core\\tsi\\ssl_transport_security_utils.cc " +
    "src\\core\\tsi\\transport_security.cc " +
    "src\\core\\tsi\\transport_security_grpc.cc " +
    "src\\core\\util\\alloc.cc " +
    "src\\core\\util\\android\\log.cc " +
    "src\\core\\util\\atm.cc " +
    "src\\core\\util\\gcp_metadata_query.cc " +
    "src\\core\\util\\http_client\\format_request.cc " +
    "src\\core\\util\\http_client\\httpcli.cc " +
    "src\\core\\util\\http_client\\httpcli_security_connector.cc " +
    "src\\core\\util\\http_client\\parser.cc " +
    "src\\core\\util\\iphone\\cpu.cc " +
    "src\\core\\util\\json\\json_object_loader.cc " +
    "src\\core\\util\\json\\json_reader.cc " +
    "src\\core\\util\\json\\json_util.cc " +
    "src\\core\\util\\json\\json_writer.cc " +
    "src\\core\\util\\linux\\cpu.cc " +
    "src\\core\\util\\linux\\log.cc " +
    "src\\core\\util\\log.cc " +
    "src\\core\\util\\msys\\tmpfile.cc " +
    "src\\core\\util\\posix\\cpu.cc " +
    "src\\core\\util\\posix\\log.cc " +
    "src\\core\\util\\posix\\string.cc " +
    "src\\core\\util\\posix\\sync.cc " +
    "src\\core\\util\\posix\\time.cc " +
    "src\\core\\util\\posix\\tmpfile.cc " +
    "src\\core\\util\\string.cc " +
    "src\\core\\util\\sync.cc " +
    "src\\core\\util\\sync_abseil.cc " +
    "src\\core\\util\\time.cc " +
    "src\\core\\util\\time_precise.cc " +
    "src\\core\\util\\windows\\cpu.cc " +
    "src\\core\\util\\windows\\log.cc " +
    "src\\core\\util\\windows\\string.cc " +
    "src\\core\\util\\windows\\string_util.cc " +
    "src\\core\\util\\windows\\sync.cc " +
    "src\\core\\util\\windows\\time.cc " +
    "src\\core\\util\\windows\\tmpfile.cc " +
    "src\\core\\xds\\grpc\\certificate_provider_store.cc " +
    "src\\core\\xds\\grpc\\file_watcher_certificate_provider_factory.cc " +
    "src\\core\\xds\\grpc\\xds_audit_logger_registry.cc " +
    "src\\core\\xds\\grpc\\xds_bootstrap_grpc.cc " +
    "src\\core\\xds\\grpc\\xds_certificate_provider.cc " +
    "src\\core\\xds\\grpc\\xds_client_grpc.cc " +
    "src\\core\\xds\\grpc\\xds_cluster.cc " +
    "src\\core\\xds\\grpc\\xds_cluster_specifier_plugin.cc " +
    "src\\core\\xds\\grpc\\xds_common_types.cc " +
    "src\\core\\xds\\grpc\\xds_endpoint.cc " +
    "src\\core\\xds\\grpc\\xds_health_status.cc " +
    "src\\core\\xds\\grpc\\xds_http_fault_filter.cc " +
    "src\\core\\xds\\grpc\\xds_http_filters.cc " +
    "src\\core\\xds\\grpc\\xds_http_rbac_filter.cc " +
    "src\\core\\xds\\grpc\\xds_http_stateful_session_filter.cc " +
    "src\\core\\xds\\grpc\\xds_lb_policy_registry.cc " +
    "src\\core\\xds\\grpc\\xds_listener.cc " +
    "src\\core\\xds\\grpc\\xds_route_config.cc " +
    "src\\core\\xds\\grpc\\xds_routing.cc " +
    "src\\core\\xds\\grpc\\xds_transport_grpc.cc " +
    "src\\core\\xds\\xds_client\\xds_api.cc " +
    "src\\core\\xds\\xds_client\\xds_bootstrap.cc " +
    "src\\core\\xds\\xds_client\\xds_client.cc " +
    "src\\core\\xds\\xds_client\\xds_client_stats.cc " +
    "src\\php\\ext\\grpc\\byte_buffer.c " +
    "src\\php\\ext\\grpc\\call.c " +
    "src\\php\\ext\\grpc\\call_credentials.c " +
@ -880,7 +887,6 @@ if (PHP_GRPC != "no") {
    "third_party\\abseil-cpp\\absl\\debugging\\internal\\address_is_readable.cc " +
    "third_party\\abseil-cpp\\absl\\debugging\\internal\\demangle.cc " +
    "third_party\\abseil-cpp\\absl\\debugging\\internal\\elf_mem_image.cc " +
    "third_party\\abseil-cpp\\absl\\debugging\\internal\\examine_stack.cc " +
    "third_party\\abseil-cpp\\absl\\debugging\\internal\\vdso_support.cc " +
    "third_party\\abseil-cpp\\absl\\debugging\\stacktrace.cc " +
    "third_party\\abseil-cpp\\absl\\debugging\\symbolize.cc " +
@ -895,19 +901,6 @@ if (PHP_GRPC != "no") {
    "third_party\\abseil-cpp\\absl\\hash\\internal\\city.cc " +
    "third_party\\abseil-cpp\\absl\\hash\\internal\\hash.cc " +
    "third_party\\abseil-cpp\\absl\\hash\\internal\\low_level_hash.cc " +
    "third_party\\abseil-cpp\\absl\\log\\globals.cc " +
    "third_party\\abseil-cpp\\absl\\log\\internal\\check_op.cc " +
    "third_party\\abseil-cpp\\absl\\log\\internal\\conditions.cc " +
    "third_party\\abseil-cpp\\absl\\log\\internal\\fnmatch.cc " +
    "third_party\\abseil-cpp\\absl\\log\\internal\\globals.cc " +
    "third_party\\abseil-cpp\\absl\\log\\internal\\log_format.cc " +
    "third_party\\abseil-cpp\\absl\\log\\internal\\log_message.cc " +
    "third_party\\abseil-cpp\\absl\\log\\internal\\log_sink_set.cc " +
    "third_party\\abseil-cpp\\absl\\log\\internal\\nullguard.cc " +
    "third_party\\abseil-cpp\\absl\\log\\internal\\proto.cc " +
    "third_party\\abseil-cpp\\absl\\log\\internal\\vlog_config.cc " +
    "third_party\\abseil-cpp\\absl\\log\\log_entry.cc " +
    "third_party\\abseil-cpp\\absl\\log\\log_sink.cc " +
    "third_party\\abseil-cpp\\absl\\numeric\\int128.cc " +
    "third_party\\abseil-cpp\\absl\\profiling\\internal\\exponential_biased.cc " +
    "third_party\\abseil-cpp\\absl\\random\\discrete_distribution.cc " +
@ -995,6 +988,7 @@ if (PHP_GRPC != "no") {
    "third_party\\address_sorting\\address_sorting.c " +
    "third_party\\address_sorting\\address_sorting_posix.c " +
    "third_party\\address_sorting\\address_sorting_windows.c " +
    "third_party\\boringssl-with-bazel\\err_data.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\asn1\\a_bitstr.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\asn1\\a_bool.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\asn1\\a_d2i_fp.c " +
@ -1073,7 +1067,6 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl-with-bazel\\src\\crypto\\dh_extra\\dh_asn1.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\dh_extra\\params.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\digest_extra\\digest_extra.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\dilithium\\dilithium.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\dsa\\dsa.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\dsa\\dsa_asn1.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\ec_extra\\ec_asn1.c " +
@ -1086,8 +1079,6 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\evp.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\evp_asn1.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\evp_ctx.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_dh.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_dh_asn1.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_dsa_asn1.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_ec.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_ec_asn1.c " +
@ -1229,7 +1220,6 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_val.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_x509.c " +
    "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_x509a.c " +
    "third_party\\boringssl-with-bazel\\src\\gen\\crypto\\err_data.c " +
    "third_party\\boringssl-with-bazel\\src\\ssl\\bio_ssl.cc " +
    "third_party\\boringssl-with-bazel\\src\\ssl\\d1_both.cc " +
    "third_party\\boringssl-with-bazel\\src\\ssl\\d1_lib.cc " +
@ -1251,7 +1241,6 @@ if (PHP_GRPC != "no") {
    "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_buffer.cc " +
    "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_cert.cc " +
    "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_cipher.cc " +
    "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_credential.cc " +
    "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_file.cc " +
    "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_key_share.cc " +
    "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_lib.cc " +
@ -1302,10 +1291,6 @@ if (PHP_GRPC != "no") {
    "third_party\\upb\\upb\\mem\\arena.c " +
    "third_party\\upb\\upb\\message\\accessors.c " +
    "third_party\\upb\\upb\\message\\array.c " +
    "third_party\\upb\\upb\\message\\compat.c " +
    "third_party\\upb\\upb\\message\\copy.c " +
    "third_party\\upb\\upb\\message\\internal\\extension.c " +
    "third_party\\upb\\upb\\message\\internal\\message.c " +
    "third_party\\upb\\upb\\message\\map.c " +
    "third_party\\upb\\upb\\message\\map_sorter.c " +
    "third_party\\upb\\upb\\message\\message.c " +
@ -1336,11 +1321,13 @@ if (PHP_GRPC != "no") {
    "third_party\\upb\\upb\\reflection\\service_def.c " +
    "third_party\\upb\\upb\\text\\encode.c " +
    "third_party\\upb\\upb\\wire\\decode.c " +
    "third_party\\upb\\upb\\wire\\decode_fast.c " +
    "third_party\\upb\\upb\\wire\\encode.c " +
    "third_party\\upb\\upb\\wire\\eps_copy_input_stream.c " +
    "third_party\\upb\\upb\\wire\\internal\\decode_fast.c " +
    "third_party\\upb\\upb\\wire\\reader.c " +
-    "third_party\\utf8_range\\utf8_range.c " +
+    "third_party\\utf8_range\\naive.c " +
    "third_party\\utf8_range\\range2-neon.c " +
    "third_party\\utf8_range\\range2-sse.c " +
    "third_party\\zlib\\adler32.c " +
    "third_party\\zlib\\compress.c " +
    "third_party\\zlib\\crc32.c " +
@ -1375,13 +1362,13 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\channelz");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\client_channel");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\backend_metrics");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\census");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\channel_idle");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\deadline");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\fault_injection");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\http");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\http\\client");
@ -1389,7 +1376,9 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\http\\server");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\message_size");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\rbac");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\server_config_selector");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\stateful_session");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\gcp");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\transport");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\transport\\chttp2");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\transport\\chttp2\\alpn");
@ -1639,11 +1628,7 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher\\v3");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\v3");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\xds");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\endpoint_info");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\http_connect");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\security");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\tcp_connect");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\address_utils");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\backoff");
@ -1659,12 +1644,22 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\event_engine\\windows");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\event_engine\\work_queue");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\experiments");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr\\android");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr\\iphone");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr\\linux");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr\\msys");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr\\posix");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gpr\\windows");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\linux");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\posix");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\gprpp\\windows");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\handshaker");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\http");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\iomgr\\event_engine_shims");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\json");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\matchers");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\promise");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\resource_quota");
@ -1722,9 +1717,7 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\google_c2p");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\sockaddr");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\xds");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\server");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\service_config");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\telemetry");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts\\crypt");
@ -1734,18 +1727,6 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\ssl");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\ssl\\key_logging");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\ssl\\session_cache");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\android");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\http_client");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\iphone");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\json");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\linux");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\msys");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\posix");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\util\\windows");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\xds");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\xds\\grpc");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\xds\\xds_client");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\php");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\php\\ext");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\php\\ext\\grpc");
@ -1764,8 +1745,6 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\flags\\internal");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\hash");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\hash\\internal");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\log");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\log\\internal");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\numeric");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\profiling");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\abseil-cpp\\absl\\profiling\\internal");
@ -1801,7 +1780,6 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\des");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\dh_extra");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\digest_extra");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\dilithium");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\dsa");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\ec_extra");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\ecdh_extra");
@ -1829,8 +1807,6 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\stack");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\trust_token");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\x509");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\gen");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\gen\\crypto");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\ssl");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\re2");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\re2\\re2");
@ -1843,7 +1819,6 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\lex");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\mem");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\message");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\message\\internal");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\mini_descriptor");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\mini_descriptor\\internal");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\mini_table");
@ -1852,7 +1827,6 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\reflection\\internal");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\text");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\wire");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\upb\\upb\\wire\\internal");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\utf8_range");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\zlib");
  _build_dirs = new Array();
--- a/doc/bazel_support.md
+++ b/doc/bazel_support.md
@ -43,7 +43,7 @@ However individual releases may have a broader
 compatibility range. The currently supported versions are captured by the
 following list:
- [`7.1.0`](https://github.com/bazelbuild/bazel/releases/tag/7.1.0)
+- [`6.4.0`](https://github.com/bazelbuild/bazel/releases/tag/6.4.0)
- [`6.5.0`](https://github.com/bazelbuild/bazel/releases/tag/6.5.0)
+- [`7.0.0`](https://github.com/bazelbuild/bazel/releases/tag/7.0.0)
 NOTE: gRPC doesn't support bzlmod yet.
--- a/doc/compression.md
+++ b/doc/compression.md
@ -90,15 +90,6 @@ The inheritance of the compression configuration by child RPCs is left up to the
 implementation. Note that in the absence of changes to the parent channel, its
 configuration will be used.
 ### Deflate Compression
 Like HTTP implementations, gRPC implementations MUST use the "deflate"
 compression to mean the zlib structure (defined in 
 [RFC 1950](https://datatracker.ietf.org/doc/html/rfc1950))
 with the deflate compression algorithm (defined in 
 [RFC 1951](https://datatracker.ietf.org/doc/html/rfc1951)).
 Servers and clients MUST NOT send raw deflate data.
 ### Test cases
 1. When a compression level is not specified for either the channel or the
--- a/doc/environment_variables.md
+++ b/doc/environment_variables.md
@ -41,29 +41,110 @@ some configuration as environment variables that can be set.
  - legacy - the (deprecated) original polling engine for gRPC
 * GRPC_TRACE
-  A comma-separated list of tracer names or glob patterns that provide
+  A comma separated list of tracers that provide additional insight into how
-  additional insight into how gRPC C core is processing requests via debug logs.
+  gRPC C core is processing requests via debug logs. Available tracers include:
-  Available tracers and their usage can be found in
+  - api - traces api calls to the C core
-  [gRPC Trace Flags](trace_flags.md)
+  - bdp_estimator - traces behavior of bdp estimation logic
  - call_error - traces the possible errors contributing to final call status
  - cares_resolver - traces operations of the c-ares based DNS resolver
  - cares_address_sorting - traces operations of the c-ares based DNS
    resolver's resolved address sorter
  - cds_lb - traces cds LB policy
  - channel - traces operations on the C core channel stack
  - channel_stack - traces the set of filters in a channel stack upon
    construction
  - client_channel - traces client channel control plane activity, including
    resolver and load balancing policy interaction
  - client_channel_call - traces client channel call activity related to name
    resolution
  - client_channel_lb_call - traces client channel call activity related
    to load balancing picking
  - compression - traces compression operations
  - connectivity_state - traces connectivity state changes to channels
  - cronet - traces state in the cronet transport engine
  - dns_resolver - traces state in the native DNS resolver
  - executor - traces grpc's internal thread pool ('the executor')
  - glb - traces the grpclb load balancer
  - handshaker - traces handshaking state
  - health_check_client - traces health checking client code
  - http - traces state in the http2 transport engine
  - http2_stream_state - traces all http2 stream state mutations.
  - http2_ping - traces pings/ping acks/antagonist writes in http2 stack.
  - http1 - traces HTTP/1.x operations performed by gRPC
  - inproc - traces the in-process transport
  - http_keepalive - traces gRPC keepalive pings
  - flowctl - traces http2 flow control
  - op_failure - traces error information when failure is pushed onto a
    completion queue
  - pick_first - traces the pick first load balancing policy
  - plugin_credentials - traces plugin credentials
  - pollable_refcount - traces reference counting of 'pollable' objects (only
    in DEBUG)
  - priority_lb - traces priority LB policy
  - resource_quota - trace resource quota objects internals
  - ring_hash_lb - traces the ring hash load balancing policy
  - rls_lb - traces the RLS load balancing policy
  - round_robin - traces the round_robin load balancing policy
  - weighted_round_robin_lb - traces the weighted_round_robin load balancing
    policy
  - queue_pluck
  - grpc_authz_api - traces gRPC authorization
  - server_channel - lightweight trace of significant server channel events
  - secure_endpoint - traces bytes flowing through encrypted channels
  - subchannel - traces the connectivity state of subchannel
  - subchannel_pool - traces subchannel pool
  - timer - timers (alarms) in the grpc internals
  - timer_check - more detailed trace of timer logic in grpc internals
  - transport_security - traces metadata about secure channel establishment
  - tcp - traces bytes in and out of a channel
  - tsi - traces tsi transport security
  - weighted_target_lb - traces weighted_target LB policy
  - xds_client - traces xds client
  - xds_cluster_manager_lb - traces cluster manager LB policy
  - xds_cluster_impl_lb - traces cluster impl LB policy
  - xds_resolver - traces xds resolver
  The following tracers will only run in binaries built in DEBUG mode. This is
  accomplished by invoking `CONFIG=dbg make <target>`
  - metadata - tracks creation and mutation of metadata
  - combiner - traces combiner lock state
  - call_combiner - traces call combiner state
  - closure - tracks closure creation, scheduling, and completion
  - fd_trace - traces fd create(), shutdown() and close() calls for channel fds.
  - pending_tags - traces still-in-progress tags on completion queues
  - polling - traces the selected polling engine
  - polling_api - traces the api calls to polling engine
  - subchannel_refcount
  - queue_refcount
  - error_refcount
  - stream_refcount
  - slice_refcount
  - workqueue_refcount
  - fd_refcount
  - cq_refcount
  - auth_context_refcount
  - security_connector_refcount
  - resolver_refcount
  - lb_policy_refcount
  - chttp2_refcount
  'all' can additionally be used to turn all traces on.
  Individual traces can be disabled by prefixing them with '-'.
  'refcount' will turn on all of the tracers for refcount debugging.
  if 'list_tracers' is present, then all of the available tracers will be
  printed when the program starts up.
  Example:
  export GRPC_TRACE=all,-pending_tags
 * GRPC_VERBOSITY
-<!-- BEGIN_GOOGLE_INTERNAL_DOCUMENTATION"
+  Default gRPC logging verbosity - one of:
-GRPC_VERBOSITY has been disabled for internal usage and will not work anymore.
+  - DEBUG - log all gRPC messages
-If anyone wants to debug, we need to set verbose logs using absl.
+  - INFO - log INFO and ERROR message
-END_GOOGLE_INTERNAL_DOCUMENTATION -->
+  - ERROR - log only errors (default)
-
+  - NONE - won't log any
 <!-- BEGIN_OPEN_SOURCE_DOCUMENTATION -->
 `GRPC_VERBOSITY` is used to set the minimum level of log messages printed by gRPC (supported values are `DEBUG`, `INFO` and `ERROR`). If this environment variable is unset, only `ERROR` logs will be printed.
  gRPC logging verbosity - one of:
  - DEBUG - log INFO, WARNING, ERROR and FATAL messages. Also sets absl VLOG(2) logs enabled. This is not recommended for production systems. This will be expensive for staging environments too, so it can be used when you want to debug a specific issue. 
  - INFO - log INFO, WARNING, ERROR and FATAL messages. This is not recommended for production systems. This may be slightly expensive for staging environments too. We recommend that you use your discretion for staging environments.
  - ERROR - log ERROR and FATAL messages. This is recommended for production systems.
  - NONE - won't log any.
  GRPC_VERBOSITY will set verbosity of absl logging. 
  - If the external application sets some other verbosity, then whatever is set later will be honoured. 
  - If nothing is set as GRPC_VERBOSITY, then the setting of the exernal application will be honoured.
  - If nothing is set by the external application also, the default set by absl will be honoured.
 <!-- END_OPEN_SOURCE_DOCUMENTATION -->
 * GRPC_STACKTRACE_MINLOGLEVEL
  Minimum loglevel to print the stack-trace - one of DEBUG, INFO, ERROR, and NONE.
--- a/doc/g_stands_for.md
+++ b/doc/g_stands_for.md
@ -61,7 +61,4 @@
 - 1.59 'g' stands for ['generative'](https://github.com/grpc/grpc/tree/v1.59.x)
 - 1.60 'g' stands for ['gjallarhorn'](https://github.com/grpc/grpc/tree/v1.60.x)
 - 1.61 'g' stands for ['grand'](https://github.com/grpc/grpc/tree/v1.61.x)
- 1.62 'g' stands for ['guardian'](https://github.com/grpc/grpc/tree/v1.62.x)
+- 1.62 'g' stands for ['guardian'](https://github.com/grpc/grpc/tree/master)
 - 1.63 'g' stands for ['giggle'](https://github.com/grpc/grpc/tree/v1.63.x)
 - 1.64 'g' stands for ['grateful'](https://github.com/grpc/grpc/tree/v1.64.x)
 - 1.65 'g' stands for ['gnarly'](https://github.com/grpc/grpc/tree/master)
--- a/doc/grpc_xds_features.md
+++ b/doc/grpc_xds_features.md
@ -64,19 +64,14 @@ Support for [xDS v2 APIs](https://www.envoyproxy.io/docs/envoy/latest/api/api_su
 [Fault Injection](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/filters/http/fault/v3/fault.proto):<br> Only the following fields are supported:<ul><li>delay</li><li>abort</li><li>max_active_faults</li><li>headers</li></ul> | [A33](https://github.com/grpc/proposal/blob/master/A33-Fault-Injection.md) | v1.37.1  | v1.37.1 | v1.37.0 | v1.4.0 |
 [Client Status Discovery Service](https://github.com/envoyproxy/envoy/blob/main/api/envoy/service/status/v3/csds.proto) | [A40](https://github.com/grpc/proposal/blob/master/A40-csds-support.md) | v1.37.1 (C++)<br>v1.38.0 (Python)  | v1.37.1 | v1.37.0 | v1.5.0 |
 [Aggregate Clusters](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/upstream/aggregate_cluster.html) and [Logical DNS Clusters](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/upstream/service_discovery.html#logical-dns) | [A37](https://github.com/grpc/proposal/blob/master/A37-xds-aggregate-and-logical-dns-clusters.md) | v1.47.0 | v1.39.0 | v1.52.2 | v1.9.0 |
-Aggregate Cluster Behavior Fixes | [A75](https://github.com/grpc/proposal/blob/master/A75-xds-aggregate-cluster-behavior-fixes.md) | v1.61.0 | | | |
+[Ring hash](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/upstream/load_balancing/load_balancers#ring-hash) load balancing policy:<br> Only the following [policy specifiers](https://github.com/envoyproxy/envoy/blob/2443032526cf6e50d63d35770df9473dd0460fc0/api/envoy/config/route/v3/route_components.proto#L706) are supported:<ul><li>header</li><li>filter_state with key `io.grpc.channel_id`</li></ul>Only [`XX_HASH`](https://github.com/envoyproxy/envoy/blob/2443032526cf6e50d63d35770df9473dd0460fc0/api/envoy/config/cluster/v3/cluster.proto#L383) function is supported. | [A42](https://github.com/grpc/proposal/blob/master/A42-xds-ring-hash-lb-policy.md) | v1.40.0<br>(C++ and Python) | v1.40.1 | 1.41.0 | |
 [Ring hash](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/upstream/load_balancing/load_balancers#ring-hash) load balancing policy:<br> Only the following [policy specifiers](https://github.com/envoyproxy/envoy/blob/2443032526cf6e50d63d35770df9473dd0460fc0/api/envoy/config/route/v3/route_components.proto#L706) are supported:<ul><li>header</li><li>filter_state with key `io.grpc.channel_id`</li></ul>Only [`XX_HASH`](https://github.com/envoyproxy/envoy/blob/2443032526cf6e50d63d35770df9473dd0460fc0/api/envoy/config/cluster/v3/cluster.proto#L383) function is supported. | [A42](https://github.com/grpc/proposal/blob/master/A42-xds-ring-hash-lb-policy.md) | v1.40.0<br>(C++ and Python) | v1.40.1 | 1.41.0 | v1.10.0 |
 [Retry](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/route/v3/route_components.proto#envoy-v3-api-msg-config-route-v3-retrypolicy):<br>Only the following fields are supported:<ul><li>retry_on for the following conditions: cancelled, deadline-exceeded, internal, resource-exhausted, and unavailable.</li><li>num_retries</li><li>retry_back_off</li></ul> | [A44](https://github.com/grpc/proposal/blob/master/A44-xds-retry.md) | v1.40.0<br>(C++ and Python) | v1.40.1 | 1.41.0 | v1.8.0 |
 [Security](https://www.envoyproxy.io/docs/envoy/latest/configuration/security/security):<br>Uses [certificate providers](https://github.com/grpc/proposal/blob/master/A29-xds-tls-security.md#certificate-provider-plugin-framework) instead of SDS | [A29](https://github.com/grpc/proposal/blob/master/A29-xds-tls-security.md) | v1.41.0<br>(C++ and Python) | v1.41.0 | 1.41.0 | |
 [Authorization (RBAC)](https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/filters/http/rbac/v3/rbac.proto):<br><ul><li>`LOG` action has no effect<li>CEL unsupported and rejected</ul> | [A41](https://github.com/grpc/proposal/blob/master/A41-xds-rbac.md) | v1.51.0<br>(C++ and Python) | v1.42.0 | 1.42.0 | |
 [Least Request LB Policy](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/upstream/load_balancing/load_balancers.html#weighted-least-request) | [A48](https://github.com/grpc/proposal/blob/master/A48-xds-least-request-lb-policy.md) |  | v1.48.0 |  |  |
 [Outlier Detection](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/upstream/outlier):<br>Only the following detection types are supported:<ul><li>Success Rate</li><li>Failure Percentage</li></ul> | [A50](https://github.com/grpc/proposal/blob/master/A50-xds-outlier-detection.md) | v1.51.0 | v1.49.0 | v1.50.0 | v1.7.0 |
-Ignore Resource Deletion | [A53](https://github.com/grpc/proposal/blob/master/A53-xds-ignore-resource-deletion.md) | v1.48.0 | v1.48.0 | v1.55.0 | v1.7.0 |
+[Custom Load Balancer Configuration](https://github.com/envoyproxy/envoy/blob/57be3189ffa3372b34e9480d1f02b2d165e49077/api/envoy/config/cluster/v3/cluster.proto#L1208) | [A52](https://github.com/grpc/proposal/blob/master/A52-xds-custom-lb-policies.md) | v1.55.0 | v1.47.0 | v1.56.0 | |
 [Custom Load Balancer Configuration](https://github.com/envoyproxy/envoy/blob/57be3189ffa3372b34e9480d1f02b2d165e49077/api/envoy/config/cluster/v3/cluster.proto#L1208) | [A52](https://github.com/grpc/proposal/blob/master/A52-xds-custom-lb-policies.md) | v1.55.0 | v1.47.0 | v1.56.0 | v1.10.0 |
 [xDS Federation](https://github.com/cncf/xds/blob/main/proposals/TP1-xds-transport-next.md) | [A47](https://github.com/grpc/proposal/blob/master/A47-xds-federation.md) | v1.55.0 | v1.55.0 | v1.55.0 | |
 [Client-Side Weighted Round Robin LB Policy](https://github.com/envoyproxy/envoy/blob/a6d46b6ac4750720eec9a49abe701f0df9bf8e0a/api/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.proto#L36) | [A58](https://github.com/grpc/proposal/blob/master/A58-client-side-weighted-round-robin-lb-policy.md) | v1.55.0 | v1.54.0 | v1.56.0 | |
 Pick First | [A62](https://github.com/grpc/proposal/blob/master/A62-pick-first.md) | v1.58.0 | v1.58.1 | v1.56.0 | |
 [StringMatcher for Header Matching](https://github.com/envoyproxy/envoy/blob/3fe4b8d335fa339ef6f17325c8d31f87ade7bb1a/api/envoy/config/route/v3/route_components.proto#L2280) | [A63](https://github.com/grpc/proposal/blob/master/A63-xds-string-matcher-in-header-matching.md) | v1.56.0 | v1.53.0 | v1.56.0 | v1.9.0 |
-LRS Custom Metrics Support | [A64](https://github.com/grpc/proposal/blob/master/A64-lrs-custom-metrics.md) | v1.54.0 | | | |
+mTLS Credentials in xDS Bootstrap File | [A65](https://github.com/grpc/proposal/blob/master/A65-xds-mtls-creds-in-bootstrap.md) | v1.57.0 | | | |
 mTLS Credentials in xDS Bootstrap File | [A65](https://github.com/grpc/proposal/blob/master/A65-xds-mtls-creds-in-bootstrap.md) | v1.65.0 | | v1.61.0 | |
 Stateful Session Affinity | [A55](https://github.com/grpc/proposal/blob/master/A55-xds-stateful-session-affinity.md), [A60](https://github.com/grpc/proposal/blob/master/A60-xds-stateful-session-affinity-weighted-clusters.md), [A75](https://github.com/grpc/proposal/blob/master/A75-xds-aggregate-cluster-behavior-fixes.md) | v1.61.0 | | | |
--- a/doc/python/sphinx/grpc_observability.rst
+++ b/doc/python/sphinx/grpc_observability.rst
@ -1,5 +1,5 @@
 gRPC Python Observability
-=========================
+====================
 Module Contents
 ---------------
--- a/doc/python/sphinx/index.rst
+++ b/doc/python/sphinx/index.rst
@ -18,7 +18,6 @@ API Reference
   grpc_reflection
   grpc_status
   grpc_testing
   grpc_observability
   glossary
--- a/doc/trace_flags.md
+++ b/doc/trace_flags.md
@ -1,120 +0,0 @@
 <!---
 Automatically generated by tools/codegen/core/gen_trace_flags.py
 --->
 gRPC Trace Flags
 ----------------
 The `GRPC_TRACE` environment variable supports a comma-separated list of tracer
 names or glob patterns that provide additional insight into how gRPC C core is
 processing requests via debug logs. Available tracers include:
  - api - API calls to the C core.
  - backend_metric - C++ backend metric recorder APIs.
  - backend_metric_filter - Filter that populates backend metric data in server trailing metadata.
  - bdp_estimator - Behavior of bdp estimation logic.
  - call - Traces operations on a call through the gRPC stack.
  - call_error - Possible errors contributing to final call statuses.
  - cares_address_sorting - Operations of the c-ares based DNS resolver's address sorter.
  - cares_resolver - Operations of the c-ares based DNS resolver.
  - cds_lb - CDS LB policy.
  - channel - Operations on the C core channel stack.
  - channel_stack - Construction of the set of filters in a channel stack.
  - chaotic_good - Chaotic good transport.
  - chttp2_hpack_parser - HTTP/2 HPACK parser.
  - chttp2_new_stream - HTTP/2 incoming stream creation.
  - client_channel - Client channel control plane activity, including resolver and load balancing policy interaction.
  - client_channel_call - Client channel call activity related to name resolution.
  - client_channel_lb_call - Client channel call activity related to load balancing picking.
  - client_idle_filter - Client idleness filter.
  - compression - Compression operations.
  - connectivity_state - Connectivity state changes to channels.
  - cronet - Cronet transport engine.
  - dns_resolver - The active DNS resolver.
  - environment_autodetect - GCP environment auto-detection.
  - event_engine - High-level EventEngine operations.
  - event_engine_client_channel_resolver - EventEngine-based client channel resolver state and events.
  - event_engine_dns - EventEngine DNS resolver.
  - event_engine_endpoint - EventEngine Endpoint operations.
  - event_engine_endpoint_data - Detailed dump of EventEngine endpoint TCP data.
  - event_engine_poller - EventEngine Poller events.
  - executor - gRPC's legacy thread pool ('the executor').
  - fault_injection_filter - Fault injection.
  - flowctl - Http2 flow control.
  - fork - Fork support.
  - glb - gRPClb load balancer.
  - grpc_authz_api - gRPC authorization.
  - handshaker - Handshaking state.
  - health_check_client - Health checking client code.
  - http - Http2 transport engine.
  - http1 - HTTP/1.x operations performed by gRPC.
  - http2_ping - Pings/ping acks/antagonist writes in http2 stack.
  - http2_stream_state - Http2 stream state mutations.
  - http_keepalive - gRPC keepalive pings.
  - inproc - In-process transport.
  - metadata_query - GCP metadata queries.
  - op_failure - Error information when failure is pushed onto a completion queue. The `api` tracer must be enabled for this flag to have any effect.
  - orca_client - Out-of-band backend metric reporting client.
  - outlier_detection_lb - Outlier detection.
  - pick_first - Pick first load balancing policy.
  - plugin_credentials - Plugin credentials.
  - priority_lb - Priority LB policy.
  - queue_pluck - Completion queue plucking. The `api` tracer must be enabled for this flag to have any effect.
  - resource_quota - Resource quota objects internals.
  - retry - Call retries.
  - ring_hash_lb - Ring hash load balancing policy.
  - rls_lb - RLS load balancing policy.
  - round_robin - Round robin load balancing policy.
  - secure_endpoint - Bytes flowing through encrypted channels.
  - server_channel - Lightweight trace of significant server channel events.
  - stateful_session_filter - Stateful session affinity.
  - subchannel - Connectivity state of subchannels.
  - subchannel_pool - Subchannel pool.
  - tcp - Bytes in and out of a channel.
  - timer - Timers (alarms) in the grpc internals.
  - timer_check - more detailed trace of timer logic in grpc internals.
  - tsi - TSI transport security.
  - weighted_round_robin_lb - Weighted round robin load balancing policy.
  - weighted_target_lb - Weighted target LB policy.
  - xds_client - XDS client.
  - xds_client_refcount - Refcount of XDS client.
  - xds_cluster_impl_lb - XDS Cluster impl LB policy.
  - xds_cluster_manager_lb - XDS Cluster manager LB policy.
  - xds_override_host_lb - XDS Override host LB.
  - xds_resolver - XDS Resolver.
  - xds_server_config_fetcher - XDS Server config fetcher.
  - xds_wrr_locality_lb - XDS WRR locality LB policy.
 The following tracers will only run in binaries built in DEBUG mode. This is
 accomplished by invoking `bazel build --config=dbg <target>`
  - auth_context_refcount - Auth context refcounting.
  - call_combiner - Call combiner state.
  - call_refcount - Refcount on call.
  - closure - Legacy closure creation, scheduling, and completion.
  - combiner - Combiner lock state.
  - cq_refcount - Completion queue refcounting.
  - error_refcount - Error refcounting.
  - fd_refcount - File descriptor refcounting.
  - fd_trace - Legacy file descriptor create(), shutdown() and close() calls for channel fds.
  - lb_policy_refcount - LB policy refcounting.
  - party_state - Coordination of activities related to a call.
  - pending_tags - Still-in-progress tags on completion queues. The `api` tracer must be enabled for this flag to have any effect.
  - polling - The active polling engine.
  - polling_api - API calls to polling engine.
  - promise_primitives - Low-level primitives in the promise library.
  - resolver_refcount - Resolver refcouting.
  - security_connector_refcount - Refcounting for security connectors (part of channel credentials).
  - slice_refcount - Slice refcounting.
  - stream_refcount - Stream refcounting.
  - subchannel_refcount - Subchannel refcounting.
  - work_serializer - A synchronization mechanism used to ensure that only one thread is executing at a given time.
 Glob patterns and special cases:
  - `*` can be used to turn all traces on.
  - Individual traces can be disabled by prefixing them with `-`.
  - `*refcount*` will turn on all of the tracers for refcount debugging.
  - if `list_tracers` is present, then all of the available tracers will be
    printed when the program starts up.
 Example:
 export GRPC_TRACE=*,-pending_tags
--- a/examples/android/binder/java/io/grpc/binder/cpp/README.md
+++ b/examples/android/binder/java/io/grpc/binder/cpp/README.md
@ -1,23 +1,20 @@
 # gRPC-core BinderTransport example apps
 WIP.
 ## Build Instruction
-1. Install Android SDK and NDK. Only NDK version >= 25 is supported. We tested against SDK Platform `33` and NDK `26.2.11394342`.
+1. Install Android SDK and NDK. Currently we only support SDK version 30.0.3 and
-2. Make sure Bazel is at least `7.0`. Use `export OVERRIDE_BAZEL_VERSION=7.1.0` to selected a supported version listed in `bazel/supported_versions.txt` if necessary.
+   NDK version 21.4.7075529 . Make sure you get these exact versions otherwise
-3. Point environment variables to install locations of SDK and NDK
+   Bazel might complain.
 2. Point environment variables to install locations of SDK and NDK
    ```
-    export ANDROID_HOME=$HOME/android-sdk
+    export ANDROID_HOME=$HOME/Android/Sdk/
-    export ANDROID_NDK_HOME=$HOME/android-sdk/ndk/26.2.11394342
+    export ANDROID_NDK_HOME=$HOME/Android/Sdk/ndk/21.4.7075529
    ```
 4. To build a fat APK that supports `x86_64`, `armv7`, and `arm64`:
    ```
    bazel build \
      --extra_toolchains=@androidndk//:all \
      --android_platforms=//bazel/platforms/android:x86_64,//bazel/platforms/android:armeabi-v7a,//bazel/platforms/android:arm64-v8a \
      --copt=-Wno-unknown-warning-option \
      //examples/android/binder/java/io/grpc/binder/cpp/exampleserver:app \
      //examples/android/binder/java/io/grpc/binder/cpp/exampleclient:app
    ```
 3. `bazel build //examples/android/binder/java/io/grpc/binder/cpp/exampleclient:app`
 4. `bazel build //examples/android/binder/java/io/grpc/binder/cpp/exampleserver:app`
 5. `adb install
   bazel-bin/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/app.apk`
 6. `adb install
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/BUILD
+++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/BUILD
@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 load("@build_bazel_rules_android//android:rules.bzl", "android_binary", "android_library")
 cc_library(
    name = "jni_lib",
    srcs = ["native.cc"],
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/BUILD
+++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/BUILD
@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 load("@build_bazel_rules_android//android:rules.bzl", "android_binary", "android_library")
 cc_library(
    name = "jni_lib",
    srcs = ["native.cc"],
--- a/examples/cpp/auth/BUILD
+++ b/examples/cpp/auth/BUILD
@ -1,54 +0,0 @@
 # Copyright 2024 the gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 licenses(["notice"])
 cc_library(
    name = "helper",
    srcs = ["helper.cc"],
    hdrs = ["helper.h"],
 )
 cc_binary(
    name = "ssl_client",
    srcs = ["ssl_client.cc"],
    data = [
        "credentials/root.crt",
    ],
    defines = ["BAZEL_BUILD"],
    deps = [
        ":helper",
        "//:grpc++",
        "//examples/protos:helloworld_cc_grpc",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
    ],
 )
 cc_binary(
    name = "ssl_server",
    srcs = ["ssl_server.cc"],
    data = [
        "credentials/localhost.crt",
        "credentials/localhost.key",
    ],
    defines = ["BAZEL_BUILD"],
    deps = [
        ":helper",
        "//:grpc++",
        "//examples/protos:helloworld_cc_grpc",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
    ],
 )
--- a/examples/cpp/auth/CMakeLists.txt
+++ b/examples/cpp/auth/CMakeLists.txt
@ -1,77 +0,0 @@
 # Copyright 2024 the gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 # cmake build file for C++ keyvaluestore example.
 # Assumes protobuf and gRPC have been installed using cmake.
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building keyvaluestore.
 cmake_minimum_required(VERSION 3.8)
 project(Cancellation C CXX)
 include(../cmake/common.cmake)
 # Proto files
 get_filename_component(hw_proto "../../protos/helloworld.proto" ABSOLUTE)
 get_filename_component(hw_proto_path "${hw_proto}" PATH)
 # Generated sources
 set(hw_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.pb.cc")
 set(hw_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.pb.h")
 set(hw_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.cc")
 set(hw_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.h")
 add_custom_command(
      OUTPUT "${hw_proto_srcs}" "${hw_proto_hdrs}" "${hw_grpc_srcs}" "${hw_grpc_hdrs}"
      COMMAND ${_PROTOBUF_PROTOC}
      ARGS --grpc_out "${CMAKE_CURRENT_BINARY_DIR}"
        --cpp_out "${CMAKE_CURRENT_BINARY_DIR}"
        -I "${hw_proto_path}"
        --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
        "${hw_proto}"
      DEPENDS "${hw_proto}")
 # Include generated *.pb.h files
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 # hw_grpc_proto
 add_library(hw_grpc_proto
  ${hw_grpc_srcs}
  ${hw_grpc_hdrs}
  ${hw_proto_srcs}
  ${hw_proto_hdrs})
 target_link_libraries(hw_grpc_proto
  ${_REFLECTION}
  ${_GRPC_GRPCPP}
  ${_PROTOBUF_LIBPROTOBUF})
 # example helper
 add_library(helper
  "helper.h"
  "helper.cc")
 # Targets greeter_(client|server)
 foreach(_target
  ssl_client ssl_server)
  add_executable(${_target} "${_target}.cc")
  target_link_libraries(${_target}
    helper
    hw_grpc_proto
    absl::flags
    absl::flags_parse
    absl::strings
    ${_REFLECTION}
    ${_GRPC_GRPCPP}
    ${_PROTOBUF_LIBPROTOBUF})
 endforeach()
--- a/examples/cpp/auth/README.md
+++ b/examples/cpp/auth/README.md
@ -1,39 +0,0 @@
 # Authentication Example
 ## Overview
 SSL is a commonly used cryptographic protocol to provide end-to-end
 communication security. In the example, we show how to set up a server
 authenticated SSL connection to transmit RPC.
 We provide `grpc::SslServerCredentials` and `grpc::SslCredentials` types
 to use SSL conections.
 In our example, we use the public/private keys created ahead: 
 * "localhost.crt" contains the server certificate (public key). 
 * "localhost.key" contains the server private key. 
 * "root.crt" contains the certificate (certificate authority)
 that can verify the server's certificate.
 ### Try it!
 Once you have working gRPC, you can build this example using either bazel or cmake.
 Make sure to run those at this directory so that they can read credential files properly.
 Run the server, which will listen on port 50051:
 ```sh
 $ ./ssl_server
 ```
 Run the client (in a different terminal):
 ```sh
 $ ./ssl_client
 ```
 If things go smoothly, you will see the client output:
 ```
 Greeter received: Hello world
 ```
--- a/examples/cpp/auth/credentials/localhost.crt
+++ b/examples/cpp/auth/credentials/localhost.crt
@ -1,19 +0,0 @@
 -----BEGIN CERTIFICATE-----
 MIIDFjCCAf4CCQCzrLIhrWa55zANBgkqhkiG9w0BAQsFADBCMQswCQYDVQQGEwJV
 UzETMBEGA1UECAwKQ2FsaWZvcm5pYTEPMA0GA1UECgwGR29vZ2xlMQ0wCwYDVQQL
 DARnUlBDMCAXDTE5MDYyNDIyMjIzM1oYDzIxMTkwNTMxMjIyMjMzWjBWMQswCQYD
 VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEPMA0GA1UECgwGR29vZ2xlMQ0w
 CwYDVQQLDARnUlBDMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEB
 AQUAA4IBDwAwggEKAoIBAQCtCW0TjugnIUu8BEVIYvdMP+/2GENQDjZhZ8eKR5C6
 toDGbgjsDtt/GxISAg4cg70fIvy0XolnGPZodvfHDM4lJ7yHBOdZD8TXQoE6okR7
 HZuLUJ20M0pXgWqtRewKRUjuYsSDXBnzLiZw1dcv9nGpo+Bqa8NonpiGRRpEkshF
 D6T9KU9Ts/x+wMQBIra2Gj0UMh79jPhUuxcYAQA0JQGivnOtdwuPiumpnUT8j8h6
 tWg5l01EsCZWJecCF85KnGpJEVYPyPqBqGsy0nGS9plGotOWF87+jyUQt+KD63xA
 aBmTro86mKDDKEK4JvzjVeMGz2UbVcLPiiZnErTFaiXJAgMBAAEwDQYJKoZIhvcN
 AQELBQADggEBAKsDgOPCWp5WCy17vJbRlgfgk05sVNIHZtzrmdswjBmvSg8MUpep
 XqcPNUpsljAXsf9UM5IFEMRdilUsFGWvHjBEtNAW8WUK9UV18WRuU//0w1Mp5HAN
 xUEKb4BoyZr65vlCnTR+AR5c9FfPvLibhr5qHs2RA8Y3GyLOcGqBWed87jhdQLCc
 P1bxB+96le5JeXq0tw215lxonI2/3ZYVK4/ok9gwXrQoWm8YieJqitk/ZQ4S17/4
 pynHtDfdxLn23EXeGx+UTxJGfpRmhEZdJ+MN7QGYoomzx5qS5XoYKxRNrDlirJpr
 OqXIn8E1it+6d5gOZfuHawcNGhRLplE/pfA=
 -----END CERTIFICATE-----
--- a/examples/cpp/auth/credentials/localhost.key
+++ b/examples/cpp/auth/credentials/localhost.key
@ -1,27 +0,0 @@
 -----BEGIN RSA PRIVATE KEY-----
 MIIEogIBAAKCAQEArQltE47oJyFLvARFSGL3TD/v9hhDUA42YWfHikeQuraAxm4I
 7A7bfxsSEgIOHIO9HyL8tF6JZxj2aHb3xwzOJSe8hwTnWQ/E10KBOqJEex2bi1Cd
 tDNKV4FqrUXsCkVI7mLEg1wZ8y4mcNXXL/ZxqaPgamvDaJ6YhkUaRJLIRQ+k/SlP
 U7P8fsDEASK2tho9FDIe/Yz4VLsXGAEANCUBor5zrXcLj4rpqZ1E/I/IerVoOZdN
 RLAmViXnAhfOSpxqSRFWD8j6gahrMtJxkvaZRqLTlhfO/o8lELfig+t8QGgZk66P
 OpigwyhCuCb841XjBs9lG1XCz4omZxK0xWolyQIDAQABAoIBADeq/Kh6JT3RfGf0
 h8WN8TlaqHxnueAbcmtL0+oss+cdp7gu1jf7X6o4r0uT1a5ew40s2Fe+wj2kzkE1
 ZOlouTlC22gkr7j7Vbxa7PBMG/Pvxoa/XL0IczZLsGImSJXVTG1E4SvRiZeulTdf
 1GbdxhtpWV1jZe5Wd4Na3+SHxF5S7m3PrHiZlYdz1ND+8XZs1NlL9+ej72qSFul9
 t/QjMWJ9pky/Wad5abnRLRyOsg+BsgnXbkUy2rD89ZxFMLda9pzXo3TPyAlBHonr
 mkEsE4eRMWMpjBM79JbeyDdHn/cs/LjAZrzeDf7ugXr2CHQpKaM5O0PsNHezJII9
 L5kCfzECgYEA4M/rz1UP1/BJoSqigUlSs0tPAg8a5UlkVsh6Osuq72IPNo8qg/Fw
 oV/IiIS+q+obRcFj1Od3PGdTpCJwW5dzd2fXBQGmGdj0HucnCrs13RtBh91JiF5i
 y/YYI9KfgOG2ZT9gG68T0gTs6jRrS3Qd83npqjrkJqMOd7s00MK9tUcCgYEAxQq7
 T541oCYHSBRIIb0IrR25krZy9caxzCqPDwOcuuhaCqCiaq+ATvOWlSfgecm4eH0K
 PCH0xlWxG0auPEwm4pA8+/WR/XJwscPZMuoht1EoKy1his4eKx/s7hHNeO6KOF0V
 Y/zqIiuZnEwUoKbn7EqqNFSTT65PJKyGsICJFG8CgYAfaw9yl1myfQNdQb8aQGwN
 YJ33FLNWje427qeeZe5KrDKiFloDvI9YDjHRWnPnRL1w/zj7fSm9yFb5HlMDieP6
 MQnsyjEzdY2QcA+VwVoiv3dmDHgFVeOKy6bOAtaFxYWfGr9MvygO9t9BT/gawGyb
 JVORlc9i0vDnrMMR1dV7awKBgBpTWLtGc/u1mPt0Wj7HtsUKV6TWY32a0l5owTxM
 S0BdksogtBJ06DukJ9Y9wawD23WdnyRxlPZ6tHLkeprrwbY7dypioOKvy4a0l+xJ
 g7+uRCOgqIuXBkjUtx8HmeAyXp0xMo5tWArAsIFFWOwt4IadYygitJvMuh44PraO
 NcJZAoGADEiV0dheXUCVr8DrtSom8DQMj92/G/FIYjXL8OUhh0+F+YlYP0+F8PEU
 yYIWEqL/S5tVKYshimUXQa537JcRKsTVJBG/ZKD2kuqgOc72zQy3oplimXeJDCXY
 h2eAQ0u8GN6tN9C4t8Kp4a3y6FGsxgu+UTxdnL3YQ+yHAVhtCzo=
 -----END RSA PRIVATE KEY-----
--- a/examples/cpp/auth/credentials/root.crt
+++ b/examples/cpp/auth/credentials/root.crt
@ -1,20 +0,0 @@
 -----BEGIN CERTIFICATE-----
 MIIDWTCCAkGgAwIBAgIJAPOConZMwykwMA0GCSqGSIb3DQEBCwUAMEIxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMQ8wDQYDVQQKDAZHb29nbGUxDTAL
 BgNVBAsMBGdSUEMwIBcNMTkwNjI0MjIyMDA3WhgPMjExOTA1MzEyMjIwMDdaMEIx
 CzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMQ8wDQYDVQQKDAZHb29n
 bGUxDTALBgNVBAsMBGdSUEMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
 AQCwqei3TfyLidnQNDJ2lierMYo229K92DuORni7nSjJQ59Jc3dNMsmqGQJjCD8o
 6mTlKM/oCbs27Wpx+OxcOLvT95j2kiDGca1fCvaMdguIod09SWiyMpv/hp0trLv7
 NJIKHznath6rHYX2Ii3fZ1yCPzyQbEPSAA+GNpoNm1v1ZWmWKke9v7vLlS3inNlW
 Mt9jepK7DrtbNZnVDjeItnppBSbVYRMxIyNHkepFbqXx5TpkCvl4M4XQZw9bfSxQ
 i3WZ3q+T1Tw//OUdPNc+OfMhu0MA0QoMwikskP0NaIC3dbJZ5Ogx0RcnaB4E+9C6
 O/znUEh3WuKVl5HXBF+UwWoFAgMBAAGjUDBOMB0GA1UdDgQWBBRm3JIgzgK4G97J
 fbMGatWMZc7V3jAfBgNVHSMEGDAWgBRm3JIgzgK4G97JfbMGatWMZc7V3jAMBgNV
 HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCNiV8x41if094ry2srS0YucpiN
 3rTPk08FOLsENTMYai524TGXJti1P6ofGr5KXCL0uxTByHE3fEiMMud2TIY5iHQo
 Y4mzDTTcb+Q7yKHwYZMlcp6nO8W+NeY5t+S0JPHhb8deKWepcN2UpXBUYQLw7AiE
 l96T9Gi+vC9h/XE5IVwHFQXTxf5UYzXtW1nfapvrOONg/ms41dgmrRKIi+knWfiJ
 FdHpHX2sfDAoJtnpEISX+nxRGNVTLY64utXWm4yxaZJshvy2s8zWJgRg7rtwAhTT
 Np9E9MnihXLEmDI4Co9XlLPJyZFmqImsbmVuKFeQOCiLAoPJaMI2lbi7fiTo
 -----END CERTIFICATE-----
--- a/examples/cpp/auth/helper.cc
+++ b/examples/cpp/auth/helper.cc
@ -1,34 +0,0 @@
 /*
 *
 * Copyright 2024 gRPC authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */
 #include "helper.h"
 #include <fstream>
 #include <iostream>
 #include <sstream>
 std::string LoadStringFromFile(std::string path) {
  std::ifstream file(path);
  if (!file.is_open()) {
    std::cout << "Failed to open " << path << std::endl;
    abort();
  }
  std::stringstream sstr;
  sstr << file.rdbuf();
  return sstr.str();
 }
--- a/examples/cpp/auth/helper.h
+++ b/examples/cpp/auth/helper.h
@ -1,26 +0,0 @@
 /*
 *
 * Copyright 2024 gRPC authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */
 #ifndef GRPC_EXAMPLES_CPP_AUTH_HELPER_H_
 #define GRPC_EXAMPLES_CPP_AUTH_HELPER_H_
 #include <string>
 std::string LoadStringFromFile(std::string path);
 #endif  // GRPC_EXAMPLES_CPP_AUTH_HELPER_H_
--- a/examples/cpp/auth/ssl_client.cc
+++ b/examples/cpp/auth/ssl_client.cc
@ -1,121 +0,0 @@
 /*
 *
 * Copyright 2024 gRPC authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */
 #include <condition_variable>
 #include <iostream>
 #include <memory>
 #include <mutex>
 #include <string>
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "helper.h"
 #include <grpcpp/grpcpp.h>
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
 #include "helloworld.grpc.pb.h"
 #endif
 ABSL_FLAG(uint16_t, port, 50051, "Server port for the service");
 using grpc::Channel;
 using grpc::ClientContext;
 using grpc::Status;
 using helloworld::Greeter;
 using helloworld::HelloReply;
 using helloworld::HelloRequest;
 class GreeterClient {
 public:
  GreeterClient(std::shared_ptr<Channel> channel)
      : stub_(Greeter::NewStub(channel)) {}
  // Assembles the client's payload, sends it and presents the response back
  // from the server.
  std::string SayHello(const std::string& user) {
    // Data we are sending to the server.
    HelloRequest request;
    request.set_name(user);
    // Container for the data we expect from the server.
    HelloReply reply;
    // Context for the client. It could be used to convey extra information to
    // the server and/or tweak certain RPC behaviors.
    ClientContext context;
    // The actual RPC.
    std::mutex mu;
    std::condition_variable cv;
    bool done = false;
    Status status;
    stub_->async()->SayHello(&context, &request, &reply,
                             [&mu, &cv, &done, &status](Status s) {
                               status = std::move(s);
                               std::lock_guard<std::mutex> lock(mu);
                               done = true;
                               cv.notify_one();
                             });
    std::unique_lock<std::mutex> lock(mu);
    while (!done) {
      cv.wait(lock);
    }
    // Act upon its status.
    if (status.ok()) {
      return reply.message();
    } else {
      std::cout << status.error_code() << ": " << status.error_message()
                << std::endl;
      return "RPC failed";
    }
  }
 private:
  std::unique_ptr<Greeter::Stub> stub_;
 };
 #ifdef BAZEL_BUILD
 constexpr char kRootCertificate[] = "examples/cpp/auth/credentials/root.crt";
 #else
 constexpr char kRootCertificate[] = "credentials/root.crt";
 #endif
 int main(int argc, char** argv) {
  absl::ParseCommandLine(argc, argv);
  // Instantiate the client. It requires a channel, out of which the actual RPCs
  // are created. This channel models a connection to an endpoint specified by
  // the argument "--target=" which is the only expected argument.
  std::string target_str =
      absl::StrFormat("localhost:%d", absl::GetFlag(FLAGS_port));
  // Build a SSL options for the channel
  grpc::SslCredentialsOptions ssl_options;
  ssl_options.pem_root_certs = LoadStringFromFile(kRootCertificate);
  // Create a channel with SSL credentials
  GreeterClient greeter(
      grpc::CreateChannel(target_str, grpc::SslCredentials(ssl_options)));
  std::string user("world");
  std::string reply = greeter.SayHello(user);
  std::cout << "Greeter received: " << reply << std::endl;
  return 0;
 }
--- a/examples/cpp/auth/ssl_server.cc
+++ b/examples/cpp/auth/ssl_server.cc
@ -1,94 +0,0 @@
 // Copyright 2024 gRPC authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include <iostream>
 #include <memory>
 #include <string>
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 #include "helper.h"
 #include <grpcpp/grpcpp.h>
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
 #include "helloworld.grpc.pb.h"
 #endif
 ABSL_FLAG(uint16_t, port, 50051, "Server port for the service");
 using grpc::CallbackServerContext;
 using grpc::Server;
 using grpc::ServerBuilder;
 using grpc::ServerUnaryReactor;
 using grpc::Status;
 using helloworld::Greeter;
 using helloworld::HelloReply;
 using helloworld::HelloRequest;
 // Logic and data behind the server's behavior.
 class GreeterServiceImpl final : public Greeter::CallbackService {
  ServerUnaryReactor* SayHello(CallbackServerContext* context,
                               const HelloRequest* request,
                               HelloReply* reply) override {
    std::string prefix("Hello ");
    reply->set_message(prefix + request->name());
    ServerUnaryReactor* reactor = context->DefaultReactor();
    reactor->Finish(Status::OK);
    return reactor;
  }
 };
 #ifdef BAZEL_BUILD
 constexpr char kServerCertPath[] =
    "examples/cpp/auth/credentials/localhost.crt";
 constexpr char kServerKeyPath[] = "examples/cpp/auth/credentials/localhost.key";
 #else
 constexpr char kServerCertPath[] = "credentials/localhost.crt";
 constexpr char kServerKeyPath[] = "credentials/localhost.key";
 #endif
 void RunServer(uint16_t port) {
  std::string server_address = absl::StrFormat("0.0.0.0:%d", port);
  GreeterServiceImpl service;
  ServerBuilder builder;
  // Load SSL credentials and build a SSL credential options
  grpc::SslServerCredentialsOptions::PemKeyCertPair key_cert_pair = {
      LoadStringFromFile(kServerKeyPath), LoadStringFromFile(kServerCertPath)};
  grpc::SslServerCredentialsOptions ssl_options;
  ssl_options.pem_key_cert_pairs.emplace_back(key_cert_pair);
  // Listen on the given address with SSL credentials
  builder.AddListeningPort(server_address,
                           grpc::SslServerCredentials(ssl_options));
  // Register "service" as the instance through which we'll communicate with
  // clients. In this case it corresponds to an *synchronous* service.
  builder.RegisterService(&service);
  // Finally assemble the server.
  std::unique_ptr<Server> server(builder.BuildAndStart());
  std::cout << "Server listening on " << server_address << std::endl;
  // Wait for the server to shutdown. Note that some other thread must be
  // responsible for shutting down the server for this call to ever return.
  server->Wait();
 }
 int main(int argc, char** argv) {
  absl::ParseCommandLine(argc, argv);
  RunServer(absl::GetFlag(FLAGS_port));
  return 0;
 }
--- a/examples/cpp/csm/BUILD
+++ b/examples/cpp/csm/BUILD
@ -41,7 +41,6 @@ cc_binary(
        "//examples/protos:helloworld_cc_grpc",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
        "@com_google_absl//absl/log",
        "@io_opentelemetry_cpp//exporters/prometheus:prometheus_exporter",
        "@io_opentelemetry_cpp//sdk/src/metrics",
    ],
--- a/examples/cpp/csm/csm_greeter_server.cc
+++ b/examples/cpp/csm/csm_greeter_server.cc
@ -22,7 +22,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "opentelemetry/exporters/prometheus/exporter_factory.h"
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
@ -92,7 +91,7 @@ void RunServer(const char* hostname) {
  xds_builder.AddListeningPort(absl::StrCat("0.0.0.0:", port),
                               grpc::InsecureServerCredentials());
  xds_enabled_server = xds_builder.BuildAndStart();
-  LOG(INFO) << "Server starting on 0.0.0.0:" << port;
+  gpr_log(GPR_INFO, "Server starting on 0.0.0.0:%d", port);
  // Wait for the server to shutdown. Note that some other thread must be
  // responsible for shutting down the server for this call to ever return.
--- a/examples/cpp/csm/observability/BUILD
+++ b/examples/cpp/csm/observability/BUILD
@ -1,50 +0,0 @@
 # Copyright 2023 the gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 licenses(["notice"])
 cc_binary(
    name = "csm_greeter_client",
    srcs = ["csm_greeter_client.cc"],
    defines = ["BAZEL_BUILD"],
    deps = [
        "//:grpc++",
        "//:grpcpp_csm_observability",
        "//examples/cpp/otel:util",
        "//examples/protos:helloworld_cc_grpc",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
        "@io_opentelemetry_cpp//exporters/prometheus:prometheus_exporter",
        "@io_opentelemetry_cpp//sdk/src/metrics",
    ],
 )
 cc_binary(
    name = "csm_greeter_server",
    srcs = ["csm_greeter_server.cc"],
    defines = ["BAZEL_BUILD"],
    deps = [
        "//:grpc++",
        "//:grpc++_reflection",
        "//:grpcpp_admin",
        "//:grpcpp_csm_observability",
        "//examples/cpp/otel:util",
        "//examples/protos:helloworld_cc_grpc",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
        "@com_google_absl//absl/log",
        "@io_opentelemetry_cpp//exporters/prometheus:prometheus_exporter",
        "@io_opentelemetry_cpp//sdk/src/metrics",
    ],
 )
--- a/examples/cpp/csm/observability/Dockerfile.client
+++ b/examples/cpp/csm/observability/Dockerfile.client
@ -1,37 +0,0 @@
 # Copyright 2023 The gRPC Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 FROM python:3.9-slim-bookworm
 RUN apt-get update -y && apt-get upgrade -y && apt-get install -y build-essential clang curl
 WORKDIR /workdir
 RUN ln -s /usr/bin/python3 /usr/bin/python
 RUN mkdir /artifacts
 COPY . .
 RUN tools/bazel build //examples/cpp/csm/observability:csm_greeter_client
 RUN cp -rL /workdir/bazel-bin/examples/cpp/csm/observability/csm_greeter_client /artifacts/
 FROM python:3.9-slim-bookworm
 RUN apt-get update \
    && apt-get -y upgrade \
    && apt-get -y autoremove \
    && apt-get install -y curl
 COPY --from=0 /artifacts ./
 ENTRYPOINT ["/csm_greeter_client"]
--- a/examples/cpp/csm/observability/Dockerfile.server
+++ b/examples/cpp/csm/observability/Dockerfile.server
@ -1,37 +0,0 @@
 # Copyright 2023 The gRPC Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 FROM python:3.9-slim-bookworm
 RUN apt-get update -y && apt-get upgrade -y && apt-get install -y build-essential clang curl
 WORKDIR /workdir
 RUN ln -s /usr/bin/python3 /usr/bin/python
 RUN mkdir /artifacts
 COPY . .
 RUN tools/bazel build //examples/cpp/csm/observability:csm_greeter_server
 RUN cp -rL /workdir/bazel-bin/examples/cpp/csm/observability/csm_greeter_server /artifacts/
 FROM python:3.9-slim-bookworm
 RUN apt-get update \
    && apt-get -y upgrade \
    && apt-get -y autoremove \
    && apt-get install -y curl
 COPY --from=0 /artifacts ./
 ENTRYPOINT ["/csm_greeter_server"]
--- a/examples/cpp/csm/observability/README.md
+++ b/examples/cpp/csm/observability/README.md
@ -1,35 +0,0 @@
 # gRPC C++ CSM Hello World Example
 This CSM example builds on the [Hello World Example](https://github.com/grpc/grpc/tree/master/examples/cpp/helloworld) and changes the gRPC client and server to test CSM observability.
 ## Configuration
 The client takes the following command-line arguments -
 * target - By default, the client tries to connect to the xDS "xds:///helloworld:50051" and gRPC would use xDS to resolve this target and connect to the server backend. This can be overridden to change the target.
 * prometheus_endpoint - Endpoint used for prometheus. Default value is localhost:9464
 The server takes the following command-line arguments -
 * port - Port on which the Hello World service is run. Defaults to 50051.
 * prometheus_endpoint - Endpoint used for prometheus. Default value is localhost:9464
 ## Building
 From the gRPC workspace folder:
 Client:
 ```
 docker build -f examples/cpp/csm/observability/Dockerfile.client
 ```
 Server:
 ```
 docker build -f examples/cpp/csm/observability/Dockerfile.server
 ```
 To push to a registry, add a tag to the image either by adding a `-t` flag to `docker build` command above or run:
 ```
 docker image tag ${sha from build command above} ${tag}
 ```
 And then push the tagged image using `docker push`
--- a/examples/cpp/csm/observability/csm_greeter_client.cc
+++ b/examples/cpp/csm/observability/csm_greeter_client.cc
@ -1,79 +0,0 @@
 /*
 *
 * Copyright 2023 gRPC authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */
 #include <sys/types.h>
 #include <chrono>
 #include <condition_variable>
 #include <iostream>
 #include <memory>
 #include <string>
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/types/optional.h"
 #include "examples/cpp/otel/util.h"
 #include "opentelemetry/exporters/prometheus/exporter_factory.h"
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include <grpcpp/ext/csm_observability.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/string_ref.h>
 ABSL_FLAG(std::string, target, "xds:///helloworld:50051", "Target string");
 ABSL_FLAG(std::string, prometheus_endpoint, "localhost:9464",
          "Prometheus exporter endpoint");
 namespace {
 absl::StatusOr<grpc::CsmObservability> InitializeObservability() {
  opentelemetry::exporter::metrics::PrometheusExporterOptions opts;
  // default was "localhost:9464" which causes connection issue across GKE pods
  opts.url = "0.0.0.0:9464";
  auto prometheus_exporter =
      opentelemetry::exporter::metrics::PrometheusExporterFactory::Create(opts);
  auto meter_provider =
      std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
  // The default histogram boundaries are not granular enough for RPCs. Override
  // the "grpc.client.attempt.duration" view as recommended by
  // https://github.com/grpc/proposal/blob/master/A66-otel-stats.md.
  AddLatencyView(meter_provider.get(), "grpc.client.attempt.duration", "s");
  meter_provider->AddMetricReader(std::move(prometheus_exporter));
  return grpc::CsmObservabilityBuilder()
      .SetMeterProvider(std::move(meter_provider))
      .BuildAndRegister();
 }
 }  // namespace
 int main(int argc, char** argv) {
  absl::ParseCommandLine(argc, argv);
  // Setup CSM observability
  auto observability = InitializeObservability();
  if (!observability.ok()) {
    std::cerr << "CsmObservability::Init() failed: "
              << observability.status().ToString() << std::endl;
    return static_cast<int>(observability.status().code());
  }
  // Continuously send RPCs every second.
  RunClient(absl::GetFlag(FLAGS_target));
  return 0;
 }
--- a/examples/cpp/csm/observability/csm_greeter_server.cc
+++ b/examples/cpp/csm/observability/csm_greeter_server.cc
@ -1,67 +0,0 @@
 /*
 *
 * Copyright 2023 gRPC authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */
 #include <iostream>
 #include <memory>
 #include <string>
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "examples/cpp/otel/util.h"
 #include "opentelemetry/exporters/prometheus/exporter_factory.h"
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include <grpcpp/ext/admin_services.h>
 #include <grpcpp/ext/csm_observability.h>
 #include <grpcpp/ext/proto_server_reflection_plugin.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/health_check_service_interface.h>
 #include <grpcpp/xds_server_builder.h>
 ABSL_FLAG(int32_t, port, 50051, "Server port for service.");
 ABSL_FLAG(std::string, prometheus_endpoint, "localhost:9464",
          "Prometheus exporter endpoint");
 int main(int argc, char** argv) {
  absl::ParseCommandLine(argc, argv);
  opentelemetry::exporter::metrics::PrometheusExporterOptions opts;
  // default was "localhost:9464" which causes connection issue across GKE pods
  opts.url = "0.0.0.0:9464";
  auto prometheus_exporter =
      opentelemetry::exporter::metrics::PrometheusExporterFactory::Create(opts);
  auto meter_provider =
      std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
  // The default histogram boundaries are not granular enough for RPCs. Override
  // the "grpc.server.call.duration" view as recommended by
  // https://github.com/grpc/proposal/blob/master/A66-otel-stats.md.
  AddLatencyView(meter_provider.get(), "grpc.server.call.duration", "s");
  meter_provider->AddMetricReader(std::move(prometheus_exporter));
  auto observability = grpc::CsmObservabilityBuilder()
                           .SetMeterProvider(std::move(meter_provider))
                           .BuildAndRegister();
  if (!observability.ok()) {
    std::cerr << "CsmObservability::Init() failed: "
              << observability.status().ToString() << std::endl;
    return static_cast<int>(observability.status().code());
  }
  RunServer(absl::GetFlag(FLAGS_port));
  return 0;
 }
--- a/examples/cpp/health/BUILD
+++ b/examples/cpp/health/BUILD
@ -1,42 +0,0 @@
 # Copyright 2024 the gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 licenses(["notice"])
 cc_binary(
    name = "health_client",
    srcs = ["health_client.cc"],
    defines = ["BAZEL_BUILD"],
    deps = [
        "//:grpc++",
        "//examples/protos:helloworld_cc_grpc",
        "//src/proto/grpc/health/v1:health_proto",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
    ],
 )
 cc_binary(
    name = "health_server",
    srcs = ["health_server.cc"],
    defines = ["BAZEL_BUILD"],
    deps = [
        "//:grpc++",
        "//:grpc++_reflection",
        "//examples/protos:helloworld_cc_grpc",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
        "@com_google_absl//absl/strings:str_format",
    ],
 )
--- a/examples/cpp/health/CMakeLists.txt
+++ b/examples/cpp/health/CMakeLists.txt
@ -1,98 +0,0 @@
 # Copyright 2024 gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 # cmake build file for C++ helloworld example.
 # Assumes protobuf and gRPC have been installed using cmake.
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 cmake_minimum_required(VERSION 3.8)
 project(HelloWorld C CXX)
 include(../cmake/common.cmake)
 # Proto file
 get_filename_component(hw_proto "../../protos/helloworld.proto" ABSOLUTE)
 get_filename_component(hw_proto_path "${hw_proto}" PATH)
 get_filename_component(health_proto "../../../src/proto/grpc/health/v1/health.proto" ABSOLUTE)
 get_filename_component(health_proto_path "${health_proto}" PATH)
 # Generated sources
 set(hw_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.pb.cc")
 set(hw_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.pb.h")
 set(hw_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.cc")
 set(hw_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.h")
 add_custom_command(
      OUTPUT "${hw_proto_srcs}" "${hw_proto_hdrs}" "${hw_grpc_srcs}" "${hw_grpc_hdrs}"
      COMMAND ${_PROTOBUF_PROTOC}
      ARGS --grpc_out "${CMAKE_CURRENT_BINARY_DIR}"
        --cpp_out "${CMAKE_CURRENT_BINARY_DIR}"
        -I "${hw_proto_path}"
        --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
        "${hw_proto}"
      DEPENDS "${hw_proto}")
 # Health protos
 set(health_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/health.pb.cc")
 set(health_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/health.pb.h")
 set(health_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/health.grpc.pb.cc")
 set(health_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/health.grpc.pb.h")
 add_custom_command(
      OUTPUT "${health_proto_srcs}" "${health_proto_hdrs}" "${health_grpc_srcs}" "${health_grpc_hdrs}"
      COMMAND ${_PROTOBUF_PROTOC}
      ARGS --grpc_out "${CMAKE_CURRENT_BINARY_DIR}"
        --cpp_out "${CMAKE_CURRENT_BINARY_DIR}"
        -I "${health_proto_path}"
        --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
        "${health_proto}"
      DEPENDS "${health_proto}")
 # Include generated *.pb.h files
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 # hw_grpc_proto
 add_library(hw_grpc_proto
  ${hw_grpc_srcs}
  ${hw_grpc_hdrs}
  ${hw_proto_srcs}
  ${hw_proto_hdrs})
 target_link_libraries(hw_grpc_proto
  ${_REFLECTION}
  ${_GRPC_GRPCPP}
  ${_PROTOBUF_LIBPROTOBUF})
 #health_grpc_proto
 add_library(health_grpc_proto
  ${health_grpc_srcs}
  ${health_grpc_hdrs}
  ${health_proto_srcs}
  ${health_proto_hdrs})
 target_link_libraries(health_grpc_proto
  ${_PROTOBUF_LIBPROTOBUF})
 # Targets greeter_[async_](client|server)
 foreach(_target
  health_client health_server)
  add_executable(${_target} "${_target}.cc")
  target_link_libraries(${_target}
    hw_grpc_proto
    health_grpc_proto
    absl::flags
    absl::flags_parse
    ${_REFLECTION}
    ${_GRPC_GRPCPP}
    ${_PROTOBUF_LIBPROTOBUF})
 endforeach()
--- a/examples/cpp/health/README.md
+++ b/examples/cpp/health/README.md
@ -1,6 +0,0 @@
 # gRPC C++ Health Check Example
 You can find a complete set of instructions for building gRPC and running the
 example in the [C++ Quick Start][].
 [C++ Quick Start]: https://grpc.io/docs/languages/cpp/quickstart
--- a/examples/cpp/health/health_client.cc
+++ b/examples/cpp/health/health_client.cc
@ -1,140 +0,0 @@
 /*
 *
 * Copyright 2024 gRPC authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */
 #include <condition_variable>
 #include <iostream>
 #include <memory>
 #include <mutex>
 #include <string>
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include <grpcpp/grpcpp.h>
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #include "src/proto/grpc/health/v1/health.grpc.pb.h"
 #else
 #include "health.grpc.pb.h"
 #include "helloworld.grpc.pb.h"
 #endif
 ABSL_FLAG(std::string, target, "localhost:50051", "Server address");
 using grpc::Channel;
 using grpc::ClientContext;
 using grpc::Status;
 using grpc::health::v1::Health;
 using grpc::health::v1::HealthCheckRequest;
 using grpc::health::v1::HealthCheckResponse;
 using helloworld::Greeter;
 using helloworld::HelloReply;
 using helloworld::HelloRequest;
 class GreeterClient {
 public:
  GreeterClient(std::shared_ptr<Channel> channel)
      : stub_(Greeter::NewStub(channel)),
        health_stub_(Health::NewStub(channel)) {}
  // Assembles the client's payload, sends it and presents the response back
  // from the server.
  std::string SayHello(const std::string& user) {
    // Data we are sending to the server.
    HelloRequest request;
    request.set_name(user);
    // Container for the data we expect from the server.
    HelloReply reply;
    // Context for the client. It could be used to convey extra information to
    // the server and/or tweak certain RPC behaviors.
    ClientContext context;
    // The actual RPC.
    std::mutex mu;
    std::condition_variable cv;
    bool done = false;
    Status status;
    stub_->async()->SayHello(&context, &request, &reply,
                             [&mu, &cv, &done, &status](Status s) {
                               status = std::move(s);
                               std::lock_guard<std::mutex> lock(mu);
                               done = true;
                               cv.notify_one();
                             });
    std::unique_lock<std::mutex> lock(mu);
    while (!done) {
      cv.wait(lock);
    }
    // Act upon its status.
    if (status.ok()) {
      return reply.message();
    } else {
      std::cout << status.error_code() << ": " << status.error_message()
                << std::endl;
      return "RPC failed";
    }
  }
  void CheckHealth(const std::string& message) {
    ClientContext context;
    HealthCheckResponse response;
    Status status = health_stub_->Check(
        &context, HealthCheckRequest::default_instance(), &response);
    if (!status.ok()) {
      std::cerr << "Failed to check service health: " << status.error_code()
                << ": " << status.error_message() << "\n";
      return;
    }
    std::cout << message << ": " << response.DebugString();
  }
 private:
  std::unique_ptr<Greeter::Stub> stub_;
  std::unique_ptr<Health::Stub> health_stub_;
 };
 int main(int argc, char** argv) {
  absl::ParseCommandLine(argc, argv);
  // Instantiate the client. It requires a channel, out of which the actual RPCs
  // are created. This channel models a connection to an endpoint specified by
  // the argument "--target=" which is the only expected argument.
  std::string target_str = absl::GetFlag(FLAGS_target);
  // We indicate that the channel isn't authenticated (use of
  // InsecureChannelCredentials()).
  grpc::ChannelArguments args;
  args.SetServiceConfigJSON(
      "{\"healthCheckConfig\": "
      "{\"serviceName\": \"\"}}");
  GreeterClient greeter(grpc::CreateCustomChannel(
      target_str, grpc::InsecureChannelCredentials(), args));
  std::string user = "world";
  greeter.CheckHealth("Before call");
  std::string reply = greeter.SayHello(user);
  std::cout << "Greeter received: " << reply << std::endl;
  greeter.CheckHealth("After call");
  reply = greeter.SayHello(user);
  std::cout << "Greeter received: " << reply << std::endl;
  greeter.CheckHealth("After second call");
  return 0;
 }
--- a/examples/cpp/health/health_server.cc
+++ b/examples/cpp/health/health_server.cc
@ -1,100 +0,0 @@
 /*
 *
 * Copyright 2024 gRPC authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */
 #include <iostream>
 #include <memory>
 #include <string>
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 #include <grpcpp/ext/proto_server_reflection_plugin.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/health_check_service_interface.h>
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
 #include "helloworld.grpc.pb.h"
 #endif
 ABSL_FLAG(uint16_t, port, 50051, "Server port for the service");
 using grpc::CallbackServerContext;
 using grpc::Server;
 using grpc::ServerBuilder;
 using grpc::ServerUnaryReactor;
 using grpc::Status;
 using helloworld::Greeter;
 using helloworld::HelloReply;
 using helloworld::HelloRequest;
 // Logic and data behind the server's behavior.
 class GreeterServiceImpl final : public Greeter::CallbackService {
 public:
  void set_health_check_service(
      grpc::HealthCheckServiceInterface* health_check_service) {
    health_check_service_ = health_check_service;
  }
 private:
  ServerUnaryReactor* SayHello(CallbackServerContext* context,
                               const HelloRequest* request,
                               HelloReply* reply) override {
    std::string prefix("Hello ");
    reply->set_message(prefix + request->name());
    ServerUnaryReactor* reactor = context->DefaultReactor();
    reactor->Finish(Status::OK);
    // Goes down, then up
    is_serving_ = !is_serving_;
    health_check_service_->SetServingStatus(is_serving_);
    return reactor;
  }
  grpc::HealthCheckServiceInterface* health_check_service_ = nullptr;
  bool is_serving_ = true;
 };
 void RunServer(uint16_t port) {
  std::string server_address = absl::StrFormat("0.0.0.0:%d", port);
  GreeterServiceImpl service;
  grpc::EnableDefaultHealthCheckService(true);
  grpc::reflection::InitProtoReflectionServerBuilderPlugin();
  ServerBuilder builder;
  // Listen on the given address without any authentication mechanism.
  builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
  // Register "service" as the instance through which we'll communicate with
  // clients. In this case it corresponds to an *synchronous* service.
  builder.RegisterService(&service);
  // Finally assemble the server.
  std::unique_ptr<Server> server(builder.BuildAndStart());
  service.set_health_check_service(server->GetHealthCheckService());
  std::cout << "Server listening on " << server_address << std::endl;
  // Wait for the server to shutdown. Note that some other thread must be
  // responsible for shutting down the server for this call to ever return.
  server->Wait();
 }
 int main(int argc, char** argv) {
  absl::ParseCommandLine(argc, argv);
  RunServer(absl::GetFlag(FLAGS_port));
  return 0;
 }
--- a/examples/cpp/helloworld/BUILD
+++ b/examples/cpp/helloworld/BUILD
@ -35,7 +35,6 @@ cc_binary(
        "//examples/protos:helloworld_cc_grpc",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
        "@com_google_absl//absl/log:check",
    ],
 )
@ -48,7 +47,6 @@ cc_binary(
        "//examples/protos:helloworld_cc_grpc",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
        "@com_google_absl//absl/log:check",
    ],
 )
@ -99,7 +97,6 @@ cc_binary(
        "//examples/protos:helloworld_cc_grpc",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
        "@com_google_absl//absl/log:check",
        "@com_google_absl//absl/strings:str_format",
    ],
 )
@ -129,6 +126,5 @@ cc_binary(
        "//examples/protos:helloworld_cc_grpc",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
        "@com_google_absl//absl/log",
    ],
 )
--- a/examples/cpp/helloworld/CMakeLists.txt
+++ b/examples/cpp/helloworld/CMakeLists.txt
@ -52,7 +52,6 @@ add_library(hw_grpc_proto
  ${hw_proto_srcs}
  ${hw_proto_hdrs})
 target_link_libraries(hw_grpc_proto
  absl::check
  ${_REFLECTION}
  ${_GRPC_GRPCPP}
  ${_PROTOBUF_LIBPROTOBUF})
@ -65,10 +64,8 @@ foreach(_target
  add_executable(${_target} "${_target}.cc")
  target_link_libraries(${_target}
    hw_grpc_proto
    absl::check
    absl::flags
    absl::flags_parse
    absl::log
    ${_REFLECTION}
    ${_GRPC_GRPCPP}
    ${_PROTOBUF_LIBPROTOBUF})
--- a/examples/cpp/helloworld/greeter_async_client.cc
+++ b/examples/cpp/helloworld/greeter_async_client.cc
@ -22,7 +22,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/log/check.h"
 #include <grpc/support/log.h>
 #include <grpcpp/grpcpp.h>
@ -82,14 +81,14 @@ class GreeterClient {
    // Block until the next result is available in the completion queue "cq".
    // The return value of Next should always be checked. This return value
    // tells us whether there is any kind of event or the cq_ is shutting down.
-    CHECK(cq.Next(&got_tag, &ok));
+    GPR_ASSERT(cq.Next(&got_tag, &ok));
    // Verify that the result from "cq" corresponds, by its tag, our previous
    // request.
-    CHECK_EQ(got_tag, (void*)1);
+    GPR_ASSERT(got_tag == (void*)1);
    // ... and that the request was completed successfully. Note that "ok"
    // corresponds solely to the request for updates introduced by Finish().
-    CHECK(ok);
+    GPR_ASSERT(ok);
    // Act upon the status of the actual RPC.
    if (status.ok()) {
--- a/examples/cpp/helloworld/greeter_async_client2.cc
+++ b/examples/cpp/helloworld/greeter_async_client2.cc
@ -23,7 +23,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/log/check.h"
 #include <grpc/support/log.h>
 #include <grpcpp/grpcpp.h>
@ -89,7 +88,7 @@ class GreeterClient {
      // Verify that the request was completed successfully. Note that "ok"
      // corresponds solely to the request for updates introduced by Finish().
-      CHECK(ok);
+      GPR_ASSERT(ok);
      if (call->status.ok())
        std::cout << "Greeter received: " << call->reply.message() << std::endl;
--- a/examples/cpp/helloworld/greeter_async_server.cc
+++ b/examples/cpp/helloworld/greeter_async_server.cc
@ -23,7 +23,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
 #include <grpc/support/log.h>
@ -117,7 +116,7 @@ class ServerImpl final {
        status_ = FINISH;
        responder_.Finish(reply_, Status::OK, this);
      } else {
-        CHECK_EQ(status_, FINISH);
+        GPR_ASSERT(status_ == FINISH);
        // Once in the FINISH state, deallocate ourselves (CallData).
        delete this;
      }
@ -159,8 +158,8 @@ class ServerImpl final {
      // memory address of a CallData instance.
      // The return value of Next should always be checked. This return value
      // tells us whether there is any kind of event or cq_ is shutting down.
-      CHECK(cq_->Next(&tag, &ok));
+      GPR_ASSERT(cq_->Next(&tag, &ok));
-      CHECK(ok);
+      GPR_ASSERT(ok);
      static_cast<CallData*>(tag)->Proceed();
    }
  }
--- a/examples/cpp/helloworld/xds_greeter_server.cc
+++ b/examples/cpp/helloworld/xds_greeter_server.cc
@ -22,7 +22,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include <grpcpp/ext/admin_services.h>
@ -80,20 +79,21 @@ void RunServer() {
        absl::StrCat("0.0.0.0:", port),
        grpc::XdsServerCredentials(grpc::InsecureServerCredentials()));
    xds_enabled_server = xds_builder.BuildAndStart();
-    LOG(INFO) << "Server starting on 0.0.0.0:" << port;
+    gpr_log(GPR_INFO, "Server starting on 0.0.0.0:%d", port);
    grpc::AddAdminServices(&builder);
    // For the maintenance server, do not use any authentication mechanism.
    builder.AddListeningPort(absl::StrCat("0.0.0.0:", maintenance_port),
                             grpc::InsecureServerCredentials());
    server = builder.BuildAndStart();
-    LOG(INFO) << "Maintenance server listening on 0.0.0.0:" << maintenance_port;
+    gpr_log(GPR_INFO, "Maintenance server listening on 0.0.0.0:%d",
            maintenance_port);
  } else {
    grpc::AddAdminServices(&xds_builder);
    // Listen on the given address without any authentication mechanism.
    builder.AddListeningPort(absl::StrCat("0.0.0.0:", port),
                             grpc::InsecureServerCredentials());
    server = xds_builder.BuildAndStart();
-    LOG(INFO) << "Server listening on 0.0.0.0:" << port;
+    gpr_log(GPR_INFO, "Server listening on 0.0.0.0:%d", port);
  }
  // Wait for the server to shutdown. Note that some other thread must be
--- a/examples/cpp/interceptors/BUILD
+++ b/examples/cpp/interceptors/BUILD
@ -24,7 +24,6 @@ cc_binary(
    deps = [
        "//:grpc++",
        "//examples/protos:keyvaluestore",
        "@com_google_absl//absl/log:check",
    ],
 )
--- a/examples/cpp/interceptors/CMakeLists.txt
+++ b/examples/cpp/interceptors/CMakeLists.txt
@ -52,7 +52,6 @@ add_library(kvs_grpc_proto
  ${kvs_proto_srcs}
  ${kvs_proto_hdrs})
 target_link_libraries(kvs_grpc_proto
  absl::check
  ${_REFLECTION}
  ${_GRPC_GRPCPP}
  ${_PROTOBUF_LIBPROTOBUF})
@ -60,7 +59,6 @@ target_link_libraries(kvs_grpc_proto
 # client
 add_executable(client "client.cc" "caching_interceptor.h")
 target_link_libraries(client
  absl::check
  kvs_grpc_proto
  ${_REFLECTION}
  ${_GRPC_GRPCPP}
@ -69,7 +67,6 @@ target_link_libraries(client
 # server
 add_executable(server "server.cc")
 target_link_libraries(server
  absl::check
  kvs_grpc_proto
  ${_REFLECTION}
  ${_GRPC_GRPCPP}
--- a/examples/cpp/interceptors/caching_interceptor.h
+++ b/examples/cpp/interceptors/caching_interceptor.h
@ -18,8 +18,6 @@
 #include <map>
 #include "absl/log/check.h"
 #include <grpcpp/support/client_interceptor.h>
 #ifdef BAZEL_BUILD
@ -64,9 +62,10 @@ class CachingInterceptor : public grpc::experimental::Interceptor {
        keyvaluestore::Request req_msg;
        auto* buffer = methods->GetSerializedSendMessage();
        auto copied_buffer = *buffer;
-        CHECK(grpc::SerializationTraits<keyvaluestore::Request>::Deserialize(
+        GPR_ASSERT(
-                  &copied_buffer, &req_msg)
+            grpc::SerializationTraits<keyvaluestore::Request>::Deserialize(
-                  .ok());
+                &copied_buffer, &req_msg)
                .ok());
        requested_key = req_msg.key();
      }
--- a/examples/cpp/keepalive/CMakeLists.txt
+++ b/examples/cpp/keepalive/CMakeLists.txt
@ -58,7 +58,7 @@ target_link_libraries(hw_grpc_proto
 # Targets greeter_[async_](client|server)
 foreach(_target
-  greeter_callback_client greeter_callback_server)
+  greeter_callback_client greeter_callback_server
  add_executable(${_target} "${_target}.cc")
  target_link_libraries(${_target}
    hw_grpc_proto
--- a/examples/cpp/otel/BUILD
+++ b/examples/cpp/otel/BUILD
@ -14,31 +14,14 @@
 licenses(["notice"])
 package(
    default_visibility = ["//examples/cpp:__subpackages__"],
 )
 cc_library(
    name = "util",
    srcs = ["util.cc"],
    hdrs = ["util.h"],
    defines = ["BAZEL_BUILD"],
    deps = [
        "//:grpc++",
        "//:grpc++_reflection",
        "//examples/protos:helloworld_cc_grpc",
        "@io_opentelemetry_cpp//sdk/src/metrics",
    ],
 )
 cc_binary(
    name = "greeter_callback_client",
    srcs = ["greeter_callback_client.cc"],
    defines = ["BAZEL_BUILD"],
    deps = [
        "util",
        "//:grpc++",
        "//:grpcpp_otel_plugin",
        "//examples/protos:helloworld_cc_grpc",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
        "@io_opentelemetry_cpp//exporters/prometheus:prometheus_exporter",
@ -51,9 +34,10 @@ cc_binary(
    srcs = ["greeter_callback_server.cc"],
    defines = ["BAZEL_BUILD"],
    deps = [
        "util",
        "//:grpc++",
        "//:grpc++_reflection",
        "//:grpcpp_otel_plugin",
        "//examples/protos:helloworld_cc_grpc",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
        "@com_google_absl//absl/strings:str_format",
--- a/examples/cpp/otel/CMakeLists.txt
+++ b/examples/cpp/otel/CMakeLists.txt
@ -1,87 +0,0 @@
 # Copyright 2018 gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 # cmake build file for C++ gRPC OpenTelemetry example.
 # Assumes absl, protobuf, prometheus-cpp, opentelemetry-cpp and gRPC (with -DgRPC_BUILD_OPENTELEMETRY_PLUGIN=ON) have been installed using cmake.
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 cmake_minimum_required(VERSION 3.13)
 project(grpc_opentelemetry_example C CXX)
 include(../cmake/common.cmake)
 # Find prometheus-cpp package
 find_package(prometheus-cpp CONFIG REQUIRED)
 # Find opentelemetry-cpp package
 find_package(opentelemetry-cpp CONFIG REQUIRED)
 # Proto file
 get_filename_component(hw_proto "../../protos/helloworld.proto" ABSOLUTE)
 get_filename_component(hw_proto_path "${hw_proto}" PATH)
 # Generated sources
 set(hw_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.pb.cc")
 set(hw_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.pb.h")
 set(hw_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.cc")
 set(hw_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.h")
 add_custom_command(
      OUTPUT "${hw_proto_srcs}" "${hw_proto_hdrs}" "${hw_grpc_srcs}" "${hw_grpc_hdrs}"
      COMMAND ${_PROTOBUF_PROTOC}
      ARGS --grpc_out "${CMAKE_CURRENT_BINARY_DIR}"
        --cpp_out "${CMAKE_CURRENT_BINARY_DIR}"
        -I "${hw_proto_path}"
        --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
        "${hw_proto}"
      DEPENDS "${hw_proto}")
 # Include generated *.pb.h files
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 include_directories("${CMAKE_SOURCE_DIR}")
 # hw_grpc_proto
 add_library(hw_grpc_proto
  ${hw_grpc_srcs}
  ${hw_grpc_hdrs}
  ${hw_proto_srcs}
  ${hw_proto_hdrs})
 target_link_libraries(hw_grpc_proto
  ${_REFLECTION}
  ${_GRPC_GRPCPP}
  ${_PROTOBUF_LIBPROTOBUF})
 # util
 add_library(util
  "util.cc")
 target_link_libraries(util
  hw_grpc_proto
  opentelemetry-cpp::metrics
  ${_GRPC_GRPCPP}
  ${_REFLECTION}
  ${_PROTOBUF_LIBPROTOBUF})
 # Targets greeter_callback_(client|server)
 foreach(_target
  greeter_callback_client greeter_callback_server)
  add_executable(${_target} "${_target}.cc")
  target_link_libraries(${_target}
    absl::flags
    absl::flags_parse
    opentelemetry-cpp::metrics
    opentelemetry-cpp::prometheus_exporter
    gRPC::grpcpp_otel_plugin
    util)
 endforeach()
--- a/examples/cpp/otel/Makefile
+++ b/examples/cpp/otel/Makefile
@ -1,124 +0,0 @@
 #
 # Copyright 2015 gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 # TODO(jtattermusch): Remove the hack to workaround protobuf bug. See https://github.com/protocolbuffers/protobuf/issues/12439
 # Hack: protobuf currently doesn't declare it's absl dependencies when protobuf.pc pkgconfig file is used.
 PROTOBUF_ABSL_DEPS = absl_absl_check absl_absl_log absl_algorithm absl_base absl_bind_front absl_bits absl_btree absl_cleanup absl_cord absl_core_headers absl_debugging absl_die_if_null absl_dynamic_annotations absl_flags absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_layout absl_log_initialize absl_log_severity absl_memory absl_node_hash_map absl_node_hash_set absl_optional absl_span absl_status absl_statusor absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant
 # TODO(jtattermusch): Remove the hack to workaround protobuf/utf8_range bug. See https://github.com/protocolbuffers/utf8_range/issues/20
 # Hack: utf8_range (which is protobuf's dependency) currently doesn't have a pkgconfig file, so we need to explicitly
 # tweak the list of libraries to link against to fix the build.
 PROTOBUF_UTF8_RANGE_LINK_LIBS = -lutf8_validity
 OPENTELEMETRY_LINK_LIBS = -lopentelemetry_metrics -lopentelemetry_exporter_prometheus -lopentelemetry_common -lopentelemetry_resources -lprometheus-cpp-pull -lprometheus-cpp-core
 HOST_SYSTEM = $(shell uname | cut -f 1 -d_)
 SYSTEM ?= $(HOST_SYSTEM)
 CXX = g++
 CPPFLAGS += `pkg-config --cflags protobuf grpc absl_flags absl_flags_parse`
 ifeq ($(SYSTEM),Darwin)
 LDFLAGS += -L/usr/local/lib `pkg-config --libs --static protobuf grpc++ grpcpp_otel_plugin absl_flags absl_flags_parse $(PROTOBUF_ABSL_DEPS)` \
           $(PROTOBUF_UTF8_RANGE_LINK_LIBS) \
 	       $(OPENTELEMETRY_LINK_LIBS) \
           -pthread \
           -lgrpc++_reflection \
           -ldl
 else
 LDFLAGS += -L/usr/local/lib `pkg-config --libs --static protobuf grpc++ grpcpp_otel_plugin absl_flags absl_flags_parse $(PROTOBUF_ABSL_DEPS)` \
           $(PROTOBUF_UTF8_RANGE_LINK_LIBS) \
 	       $(OPENTELEMETRY_LINK_LIBS) \
           -pthread \
           -Wl,--no-as-needed -lgrpc++_reflection -Wl,--as-needed \
           -ldl
 endif
 PROTOC = protoc
 GRPC_CPP_PLUGIN = grpc_cpp_plugin
 GRPC_CPP_PLUGIN_PATH ?= `which $(GRPC_CPP_PLUGIN)`
 PROTOS_PATH = ../../protos
 vpath %.proto $(PROTOS_PATH)
 all: system-check greeter_callback_client greeter_callback_server
 greeter_callback_client: util.o helloworld.pb.o helloworld.grpc.pb.o greeter_callback_client.o
 	$(CXX) $^ $(LDFLAGS) -o $@
 greeter_callback_server: util.o helloworld.pb.o helloworld.grpc.pb.o greeter_callback_server.o
 	$(CXX) $^ $(LDFLAGS) -o $@
 .PRECIOUS: %.grpc.pb.cc
 %.grpc.pb.cc: %.proto
 	$(PROTOC) -I $(PROTOS_PATH) --grpc_out=. --plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN_PATH) $<
 .PRECIOUS: %.pb.cc
 %.pb.cc: %.proto
 	$(PROTOC) -I $(PROTOS_PATH) --cpp_out=. $<
 clean:
 	rm -f *.o *.pb.cc *.pb.h greeter_callback_client greeter_callback_server
 # The following is to test your system and ensure a smoother experience.
 # They are by no means necessary to actually compile a grpc-enabled software.
 PROTOC_CMD = which $(PROTOC)
 PROTOC_CHECK_CMD = $(PROTOC) --version | grep -q 'libprotoc.3\|libprotoc [0-9][0-9]\.'
 PLUGIN_CHECK_CMD = which $(GRPC_CPP_PLUGIN)
 HAS_PROTOC = $(shell $(PROTOC_CMD) > /dev/null && echo true || echo false)
 ifeq ($(HAS_PROTOC),true)
 HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
 endif
 HAS_PLUGIN = $(shell $(PLUGIN_CHECK_CMD) > /dev/null && echo true || echo false)
 SYSTEM_OK = false
 ifeq ($(HAS_VALID_PROTOC),true)
 ifeq ($(HAS_PLUGIN),true)
 SYSTEM_OK = true
 endif
 endif
 system-check:
 ifneq ($(HAS_VALID_PROTOC),true)
 	@echo " DEPENDENCY ERROR"
 	@echo
 	@echo "You don't have protoc 3.0.0 or newer installed in your path."
 	@echo "Please install an up-to-date version of Google protocol buffers."
 	@echo "You can find it here:"
 	@echo
 	@echo "   https://github.com/protocolbuffers/protobuf/releases"
 	@echo
 	@echo "Here is what I get when trying to evaluate your version of protoc:"
 	@echo
 	-$(PROTOC) --version
 	@echo
 	@echo
 endif
 ifneq ($(HAS_PLUGIN),true)
 	@echo " DEPENDENCY ERROR"
 	@echo
 	@echo "You don't have the grpc c++ protobuf plugin installed in your path."
 	@echo "Please install grpc. You can find it here:"
 	@echo
 	@echo "   https://github.com/grpc/grpc"
 	@echo
 	@echo "Here is what I get when trying to detect if you have the plugin:"
 	@echo
 	-which $(GRPC_CPP_PLUGIN)
 	@echo
 	@echo
 endif
 ifneq ($(SYSTEM_OK),true)
 	@false
 endif
--- a/examples/cpp/otel/README.md
+++ b/examples/cpp/otel/README.md
@ -39,15 +39,6 @@ $ curl localhost:9465/metrics
 > ***NOTE:*** If the prometheus endpoint configured is overridden, please update
 > the target in the above curl command.
 ## CMake Instructions
 The following libraries need to be installed before building the example with CMake -
 * absl
 * protobuf
 * prometheus-cpp
 * opentelemetry-cpp (with the options `-DWITH_ABSEIL=ON` `-DWITH_PROMETHEUS=ON`)
 * grpc (with the option `-DgRPC_BUILD_GRPCPP_OTEL_PLUGIN=ON`)
 You can find a complete set of instructions for building gRPC and running the
 Hello World app in the [C++ Quick Start][].
--- a/examples/cpp/otel/greeter_callback_client.cc
+++ b/examples/cpp/otel/greeter_callback_client.cc
@ -16,14 +16,12 @@
 *
 */
-// Explicitly define HAVE_ABSEIL to avoid conflict with OTel's Abseil
+#include <condition_variable>
-// version. Refer
+#include <iostream>
-// https://github.com/open-telemetry/opentelemetry-cpp/issues/1042.
+#include <memory>
-#ifndef HAVE_ABSEIL
+#include <mutex>
 #define HAVE_ABSEIL
 #endif
 #include <string>
 #include <thread>
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
@ -32,17 +30,76 @@
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include <grpcpp/ext/otel_plugin.h>
 #include <grpcpp/grpcpp.h>
 #ifdef BAZEL_BUILD
-#include "examples/cpp/otel/util.h"
+#include "examples/protos/helloworld.grpc.pb.h"
 #else
-#include "util.h"
+#include "helloworld.grpc.pb.h"
 #endif
 ABSL_FLAG(std::string, target, "localhost:50051", "Server address");
 ABSL_FLAG(std::string, prometheus_endpoint, "localhost:9465",
          "Prometheus exporter endpoint");
 using grpc::Channel;
 using grpc::ClientContext;
 using grpc::Status;
 using helloworld::Greeter;
 using helloworld::HelloReply;
 using helloworld::HelloRequest;
 class GreeterClient {
 public:
  GreeterClient(std::shared_ptr<Channel> channel)
      : stub_(Greeter::NewStub(channel)) {}
  // Assembles the client's payload, sends it and presents the response back
  // from the server.
  std::string SayHello(const std::string& user) {
    // Data we are sending to the server.
    HelloRequest request;
    request.set_name(user);
    // Container for the data we expect from the server.
    HelloReply reply;
    // Context for the client. It could be used to convey extra information to
    // the server and/or tweak certain RPC behaviors.
    ClientContext context;
    // The actual RPC.
    std::mutex mu;
    std::condition_variable cv;
    bool done = false;
    Status status;
    stub_->async()->SayHello(&context, &request, &reply,
                             [&mu, &cv, &done, &status](Status s) {
                               status = std::move(s);
                               std::lock_guard<std::mutex> lock(mu);
                               done = true;
                               cv.notify_one();
                             });
    std::unique_lock<std::mutex> lock(mu);
    while (!done) {
      cv.wait(lock);
    }
    // Act upon its status.
    if (status.ok()) {
      return reply.message();
    } else {
      std::cout << status.error_code() << ": " << status.error_message()
                << std::endl;
      return "RPC failed";
    }
  }
 private:
  std::unique_ptr<Greeter::Stub> stub_;
 };
 int main(int argc, char** argv) {
  absl::ParseCommandLine(argc, argv);
  // Register a global gRPC OpenTelemetry plugin configured with a prometheus
@ -53,10 +110,6 @@ int main(int argc, char** argv) {
      opentelemetry::exporter::metrics::PrometheusExporterFactory::Create(opts);
  auto meter_provider =
      std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
  // The default histogram boundaries are not granular enough for RPCs. Override
  // the "grpc.client.attempt.duration" view as recommended by
  // https://github.com/grpc/proposal/blob/master/A66-otel-stats.md.
  AddLatencyView(meter_provider.get(), "grpc.client.attempt.duration", "s");
  meter_provider->AddMetricReader(std::move(prometheus_exporter));
  auto status = grpc::OpenTelemetryPluginBuilder()
                    .SetMeterProvider(std::move(meter_provider))
@ -66,9 +119,20 @@ int main(int argc, char** argv) {
              << status.ToString() << std::endl;
    return static_cast<int>(status.code());
  }
-
+  // Instantiate the client. It requires a channel, out of which the actual RPCs
  // are created. This channel models a connection to an endpoint specified by
  // the argument "--target=" which is the only expected argument.
  std::string target_str = absl::GetFlag(FLAGS_target);
  grpc::ChannelArguments args;
  // Continuously send RPCs every second.
-  RunClient(absl::GetFlag(FLAGS_target));
+  while (true) {
    GreeterClient greeter(grpc::CreateCustomChannel(
        target_str, grpc::InsecureChannelCredentials(), args));
    std::string user("world");
    std::string reply = greeter.SayHello(user);
    std::cout << "Greeter received: " << reply << std::endl;
    std::this_thread::sleep_for(std::chrono::seconds(1));
  }
  return 0;
 }
--- a/examples/cpp/otel/greeter_callback_server.cc
+++ b/examples/cpp/otel/greeter_callback_server.cc
@ -16,13 +16,6 @@
 *
 */
 // Explicitly define HAVE_ABSEIL to avoid conflict with OTel's Abseil
 // version. Refer
 // https://github.com/open-telemetry/opentelemetry-cpp/issues/1042.
 #ifndef HAVE_ABSEIL
 #define HAVE_ABSEIL
 #endif
 #include <iostream>
 #include <memory>
 #include <string>
@ -35,17 +28,64 @@
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include <grpcpp/ext/otel_plugin.h>
 #include <grpcpp/ext/proto_server_reflection_plugin.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/health_check_service_interface.h>
 #ifdef BAZEL_BUILD
-#include "examples/cpp/otel/util.h"
+#include "examples/protos/helloworld.grpc.pb.h"
 #else
-#include "util.h"
+#include "helloworld.grpc.pb.h"
 #endif
 ABSL_FLAG(uint16_t, port, 50051, "Server port for the service");
 ABSL_FLAG(std::string, prometheus_endpoint, "localhost:9464",
          "Prometheus exporter endpoint");
 using grpc::CallbackServerContext;
 using grpc::Server;
 using grpc::ServerBuilder;
 using grpc::ServerUnaryReactor;
 using grpc::Status;
 using helloworld::Greeter;
 using helloworld::HelloReply;
 using helloworld::HelloRequest;
 // Logic and data behind the server's behavior.
 class GreeterServiceImpl final : public Greeter::CallbackService {
  ServerUnaryReactor* SayHello(CallbackServerContext* context,
                               const HelloRequest* request,
                               HelloReply* reply) override {
    std::string prefix("Hello ");
    reply->set_message(prefix + request->name());
    ServerUnaryReactor* reactor = context->DefaultReactor();
    reactor->Finish(Status::OK);
    return reactor;
  }
 };
 void RunServer(uint16_t port) {
  std::string server_address = absl::StrFormat("0.0.0.0:%d", port);
  GreeterServiceImpl service;
  grpc::EnableDefaultHealthCheckService(true);
  grpc::reflection::InitProtoReflectionServerBuilderPlugin();
  ServerBuilder builder;
  // Listen on the given address without any authentication mechanism.
  builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
  // Register "service" as the instance through which we'll communicate with
  // clients. In this case it corresponds to an *synchronous* service.
  builder.RegisterService(&service);
  // Finally assemble the server.
  std::unique_ptr<Server> server(builder.BuildAndStart());
  std::cout << "Server listening on " << server_address << std::endl;
  // Wait for the server to shutdown. Note that some other thread must be
  // responsible for shutting down the server for this call to ever return.
  server->Wait();
 }
 int main(int argc, char** argv) {
  absl::ParseCommandLine(argc, argv);
  // Register a global gRPC OpenTelemetry plugin configured with a prometheus
@ -56,10 +96,6 @@ int main(int argc, char** argv) {
      opentelemetry::exporter::metrics::PrometheusExporterFactory::Create(opts);
  auto meter_provider =
      std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
  // The default histogram boundaries are not granular enough for RPCs. Override
  // the "grpc.server.call.duration" view as recommended by
  // https://github.com/grpc/proposal/blob/master/A66-otel-stats.md.
  AddLatencyView(meter_provider.get(), "grpc.server.call.duration", "s");
  meter_provider->AddMetricReader(std::move(prometheus_exporter));
  auto status = grpc::OpenTelemetryPluginBuilder()
                    .SetMeterProvider(std::move(meter_provider))
--- a/examples/cpp/otel/ostream/BUILD
+++ b/examples/cpp/otel/ostream/BUILD
@ -1,44 +0,0 @@
 # Copyright 2023 the gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 licenses(["notice"])
 cc_binary(
    name = "greeter_callback_client",
    srcs = ["greeter_callback_client.cc"],
    defines = ["BAZEL_BUILD"],
    deps = [
        "//:grpcpp_otel_plugin",
        "//examples/cpp/otel:util",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
        "@io_opentelemetry_cpp//exporters/ostream:ostream_metric_exporter",
        "@io_opentelemetry_cpp//sdk/src/metrics",
    ],
 )
 cc_binary(
    name = "greeter_callback_server",
    srcs = ["greeter_callback_server.cc"],
    defines = ["BAZEL_BUILD"],
    deps = [
        "//:grpcpp_otel_plugin",
        "//examples/cpp/otel:util",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
        "@com_google_absl//absl/strings:str_format",
        "@io_opentelemetry_cpp//exporters/ostream:ostream_metric_exporter",
        "@io_opentelemetry_cpp//sdk/src/metrics",
    ],
 )
--- a/examples/cpp/otel/ostream/CMakeLists.txt
+++ b/examples/cpp/otel/ostream/CMakeLists.txt
@ -1,85 +0,0 @@
 # Copyright 2018 gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 # cmake build file for C++ gRPC OpenTelemetry example.
 # Assumes absl, protobuf, prometheus-cpp, opentelemetry-cpp and gRPC (with -DgRPC_BUILD_OPENTELEMETRY_PLUGIN=ON) have been installed using cmake.
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 cmake_minimum_required(VERSION 3.13)
 project(grpc_opentelemetry_example C CXX)
 include(../../cmake/common.cmake)
 # Find opentelemetry-cpp package
 find_package(opentelemetry-cpp CONFIG REQUIRED)
 # Proto file
 get_filename_component(hw_proto "../../../protos/helloworld.proto" ABSOLUTE)
 get_filename_component(hw_proto_path "${hw_proto}" PATH)
 # Generated sources
 set(hw_proto_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.pb.cc")
 set(hw_proto_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.pb.h")
 set(hw_grpc_srcs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.cc")
 set(hw_grpc_hdrs "${CMAKE_CURRENT_BINARY_DIR}/helloworld.grpc.pb.h")
 add_custom_command(
      OUTPUT "${hw_proto_srcs}" "${hw_proto_hdrs}" "${hw_grpc_srcs}" "${hw_grpc_hdrs}"
      COMMAND ${_PROTOBUF_PROTOC}
      ARGS --grpc_out "${CMAKE_CURRENT_BINARY_DIR}"
        --cpp_out "${CMAKE_CURRENT_BINARY_DIR}"
        -I "${hw_proto_path}"
        --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
        "${hw_proto}"
      DEPENDS "${hw_proto}")
 # Include generated *.pb.h files
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 include_directories("${CMAKE_SOURCE_DIR}")
 # hw_grpc_proto
 add_library(hw_grpc_proto
  ${hw_grpc_srcs}
  ${hw_grpc_hdrs}
  ${hw_proto_srcs}
  ${hw_proto_hdrs})
 target_link_libraries(hw_grpc_proto
  ${_REFLECTION}
  ${_GRPC_GRPCPP}
  ${_PROTOBUF_LIBPROTOBUF})
 # util
 add_library(util
  "../util.cc")
 target_link_libraries(util
  hw_grpc_proto
  opentelemetry-cpp::metrics
  ${_GRPC_GRPCPP}
  ${_REFLECTION}
  ${_PROTOBUF_LIBPROTOBUF})
 # Targets greeter_callback_(client|server)
 foreach(_target
  greeter_callback_client greeter_callback_server)
  add_executable(${_target} "${_target}.cc")
  target_link_libraries(${_target}
    absl::flags
    absl::flags_parse
    opentelemetry-cpp::metrics
    opentelemetry-cpp::ostream_metrics_exporter
    gRPC::grpcpp_otel_plugin
    util
    ${_PROTOBUF_LIBPROTOBUF})
 endforeach()
--- a/examples/cpp/otel/ostream/Makefile
+++ b/examples/cpp/otel/ostream/Makefile
@ -1,127 +0,0 @@
 #
 # Copyright 2015 gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 # TODO(jtattermusch): Remove the hack to workaround protobuf bug. See https://github.com/protocolbuffers/protobuf/issues/12439
 # Hack: protobuf currently doesn't declare it's absl dependencies when protobuf.pc pkgconfig file is used.
 PROTOBUF_ABSL_DEPS = absl_absl_check absl_absl_log absl_algorithm absl_base absl_bind_front absl_bits absl_btree absl_cleanup absl_cord absl_core_headers absl_debugging absl_die_if_null absl_dynamic_annotations absl_flags absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_layout absl_log_initialize absl_log_severity absl_memory absl_node_hash_map absl_node_hash_set absl_optional absl_span absl_status absl_statusor absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant
 # TODO(jtattermusch): Remove the hack to workaround protobuf/utf8_range bug. See https://github.com/protocolbuffers/utf8_range/issues/20
 # Hack: utf8_range (which is protobuf's dependency) currently doesn't have a pkgconfig file, so we need to explicitly
 # tweak the list of libraries to link against to fix the build.
 PROTOBUF_UTF8_RANGE_LINK_LIBS = -lutf8_validity
 OPENTELEMETRY_LINK_LIBS = -lopentelemetry_metrics -lopentelemetry_exporter_ostream_metrics -lopentelemetry_resources -lopentelemetry_common
 HOST_SYSTEM = $(shell uname | cut -f 1 -d_)
 SYSTEM ?= $(HOST_SYSTEM)
 CXX = g++
 CPPFLAGS += `pkg-config --cflags protobuf grpc absl_flags absl_flags_parse`
 ifeq ($(SYSTEM),Darwin)
 LDFLAGS += -L/usr/local/lib `pkg-config --libs --static protobuf grpc++ grpcpp_otel_plugin absl_flags absl_flags_parse $(PROTOBUF_ABSL_DEPS)` \
           $(PROTOBUF_UTF8_RANGE_LINK_LIBS) \
 	       $(OPENTELEMETRY_LINK_LIBS) \
           -pthread \
           -lgrpc++_reflection \
           -ldl
 else
 LDFLAGS += -L/usr/local/lib `pkg-config --libs --static protobuf grpc++ grpcpp_otel_plugin absl_flags absl_flags_parse $(PROTOBUF_ABSL_DEPS)` \
           $(PROTOBUF_UTF8_RANGE_LINK_LIBS) \
 	       $(OPENTELEMETRY_LINK_LIBS) \
           -pthread \
           -Wl,--no-as-needed -lgrpc++_reflection -Wl,--as-needed \
           -ldl
 endif
 PROTOC = protoc
 GRPC_CPP_PLUGIN = grpc_cpp_plugin
 GRPC_CPP_PLUGIN_PATH ?= `which $(GRPC_CPP_PLUGIN)`
 PROTOS_PATH = ../../../protos
 vpath %.proto $(PROTOS_PATH)
 all: system-check greeter_callback_client greeter_callback_server
 greeter_callback_client: util.o helloworld.pb.o helloworld.grpc.pb.o greeter_callback_client.o
 	$(CXX) $^ $(LDFLAGS) -o $@
 greeter_callback_server: util.o helloworld.pb.o helloworld.grpc.pb.o greeter_callback_server.o
 	$(CXX) $^ $(LDFLAGS) -o $@
 .PRECIOUS: %.grpc.pb.cc
 %.grpc.pb.cc: %.proto
 	$(PROTOC) -I $(PROTOS_PATH) --grpc_out=. --plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN_PATH) $<
 .PRECIOUS: %.pb.cc
 %.pb.cc: %.proto
 	$(PROTOC) -I $(PROTOS_PATH) --cpp_out=. $<
 util.o: ../util.cc
 	$(CXX) $^ -I . -I $(CPPFLAGS) -c -o $@
 clean:
 	rm -f *.o *.pb.cc *.pb.h greeter_callback_client greeter_callback_server
 # The following is to test your system and ensure a smoother experience.
 # They are by no means necessary to actually compile a grpc-enabled software.
 PROTOC_CMD = which $(PROTOC)
 PROTOC_CHECK_CMD = $(PROTOC) --version | grep -q 'libprotoc.3\|libprotoc [0-9][0-9]\.'
 PLUGIN_CHECK_CMD = which $(GRPC_CPP_PLUGIN)
 HAS_PROTOC = $(shell $(PROTOC_CMD) > /dev/null && echo true || echo false)
 ifeq ($(HAS_PROTOC),true)
 HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
 endif
 HAS_PLUGIN = $(shell $(PLUGIN_CHECK_CMD) > /dev/null && echo true || echo false)
 SYSTEM_OK = false
 ifeq ($(HAS_VALID_PROTOC),true)
 ifeq ($(HAS_PLUGIN),true)
 SYSTEM_OK = true
 endif
 endif
 system-check:
 ifneq ($(HAS_VALID_PROTOC),true)
 	@echo " DEPENDENCY ERROR"
 	@echo
 	@echo "You don't have protoc 3.0.0 or newer installed in your path."
 	@echo "Please install an up-to-date version of Google protocol buffers."
 	@echo "You can find it here:"
 	@echo
 	@echo "   https://github.com/protocolbuffers/protobuf/releases"
 	@echo
 	@echo "Here is what I get when trying to evaluate your version of protoc:"
 	@echo
 	-$(PROTOC) --version
 	@echo
 	@echo
 endif
 ifneq ($(HAS_PLUGIN),true)
 	@echo " DEPENDENCY ERROR"
 	@echo
 	@echo "You don't have the grpc c++ protobuf plugin installed in your path."
 	@echo "Please install grpc. You can find it here:"
 	@echo
 	@echo "   https://github.com/grpc/grpc"
 	@echo
 	@echo "Here is what I get when trying to detect if you have the plugin:"
 	@echo
 	-which $(GRPC_CPP_PLUGIN)
 	@echo
 	@echo
 endif
 ifneq ($(SYSTEM_OK),true)
 	@false
 endif
--- a/examples/cpp/otel/ostream/greeter_callback_client.cc
+++ b/examples/cpp/otel/ostream/greeter_callback_client.cc
@ -1,79 +0,0 @@
 /*
 *
 * Copyright 2021 gRPC authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */
 // Explicitly define HAVE_ABSEIL to avoid conflict with OTel's Abseil
 // version. Refer
 // https://github.com/open-telemetry/opentelemetry-cpp/issues/1042.
 #ifndef HAVE_ABSEIL
 #define HAVE_ABSEIL
 #endif
 #include <string>
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "opentelemetry/exporters/ostream/metric_exporter.h"
 #include "opentelemetry/exporters/ostream/metric_exporter_factory.h"
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include <grpcpp/ext/otel_plugin.h>
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/util.h"
 #else
 #include "../util.h"
 #endif
 ABSL_FLAG(std::string, target, "localhost:50051", "Server address");
 int main(int argc, char** argv) {
  absl::ParseCommandLine(argc, argv);
  // Register a global gRPC OpenTelemetry plugin configured with an ostream
  // exporter.
  auto ostream_exporter =
      opentelemetry::exporter::metrics::OStreamMetricExporterFactory::Create();
  opentelemetry::sdk::metrics::PeriodicExportingMetricReaderOptions
      reader_options;
  reader_options.export_interval_millis = std::chrono::milliseconds(1000);
  reader_options.export_timeout_millis = std::chrono::milliseconds(500);
  auto reader =
      opentelemetry::sdk::metrics::PeriodicExportingMetricReaderFactory::Create(
          std::move(ostream_exporter), reader_options);
  auto meter_provider =
      std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
  // The default histogram boundaries are not granular enough for RPCs. Override
  // the "grpc.client.attempt.duration" view as recommended by
  // https://github.com/grpc/proposal/blob/master/A66-otel-stats.md.
  AddLatencyView(meter_provider.get(), "grpc.client.attempt.duration", "s");
  meter_provider->AddMetricReader(std::move(reader));
  auto status = grpc::OpenTelemetryPluginBuilder()
                    .SetMeterProvider(std::move(meter_provider))
                    .BuildAndRegisterGlobal();
  if (!status.ok()) {
    std::cerr << "Failed to register gRPC OpenTelemetry Plugin: "
              << status.ToString() << std::endl;
    return static_cast<int>(status.code());
  }
  // Continuously send RPCs every second.
  RunClient(absl::GetFlag(FLAGS_target));
  return 0;
 }
--- a/examples/cpp/otel/ostream/greeter_callback_server.cc
+++ b/examples/cpp/otel/ostream/greeter_callback_server.cc
@ -1,78 +0,0 @@
 /*
 *
 * Copyright 2021 gRPC authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */
 // Explicitly define HAVE_ABSEIL to avoid conflict with OTel's Abseil
 // version. Refer
 // https://github.com/open-telemetry/opentelemetry-cpp/issues/1042.
 #ifndef HAVE_ABSEIL
 #define HAVE_ABSEIL
 #endif
 #include <iostream>
 #include <memory>
 #include <string>
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "opentelemetry/exporters/ostream/metric_exporter.h"
 #include "opentelemetry/exporters/ostream/metric_exporter_factory.h"
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader.h"
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include <grpcpp/ext/otel_plugin.h>
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/util.h"
 #else
 #include "../util.h"
 #endif
 ABSL_FLAG(uint16_t, port, 50051, "Server port for the service");
 int main(int argc, char** argv) {
  absl::ParseCommandLine(argc, argv);
  // Register a global gRPC OpenTelemetry plugin configured with an ostream
  // exporter.
  auto ostream_exporter =
      opentelemetry::exporter::metrics::OStreamMetricExporterFactory::Create();
  opentelemetry::sdk::metrics::PeriodicExportingMetricReaderOptions
      reader_options;
  reader_options.export_interval_millis = std::chrono::milliseconds(1000);
  reader_options.export_timeout_millis = std::chrono::milliseconds(500);
  auto reader =
      opentelemetry::sdk::metrics::PeriodicExportingMetricReaderFactory::Create(
          std::move(ostream_exporter), reader_options);
  auto meter_provider =
      std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
  // The default histogram boundaries are not granular enough for RPCs. Override
  // the "grpc.server.call.duration" view as recommended by
  // https://github.com/grpc/proposal/blob/master/A66-otel-stats.md.
  AddLatencyView(meter_provider.get(), "grpc.server.call.duration", "s");
  meter_provider->AddMetricReader(std::move(reader));
  auto status = grpc::OpenTelemetryPluginBuilder()
                    .SetMeterProvider(std::move(meter_provider))
                    .BuildAndRegisterGlobal();
  if (!status.ok()) {
    std::cerr << "Failed to register gRPC OpenTelemetry Plugin: "
              << status.ToString() << std::endl;
    return static_cast<int>(status.code());
  }
  RunServer(absl::GetFlag(FLAGS_port));
  return 0;
 }
--- a/examples/cpp/otel/util.cc
+++ b/examples/cpp/otel/util.cc
@ -1,181 +0,0 @@
 //
 //
 // Copyright 2024 gRPC authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
 //
 // Explicitly define HAVE_ABSEIL to avoid conflict with OTel's Abseil
 // version. Refer
 // https://github.com/open-telemetry/opentelemetry-cpp/issues/1042.
 #ifndef HAVE_ABSEIL
 #define HAVE_ABSEIL
 #endif
 #include <condition_variable>
 #include <mutex>
 #include "opentelemetry/sdk/metrics/view/instrument_selector_factory.h"
 #include "opentelemetry/sdk/metrics/view/meter_selector_factory.h"
 #include "opentelemetry/sdk/metrics/view/view_factory.h"
 #include <grpcpp/ext/proto_server_reflection_plugin.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/health_check_service_interface.h>
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/util.h"
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
 #include "helloworld.grpc.pb.h"
 #include "util.h"
 #endif
 using grpc::CallbackServerContext;
 using grpc::Channel;
 using grpc::ClientContext;
 using grpc::Server;
 using grpc::ServerBuilder;
 using grpc::ServerUnaryReactor;
 using grpc::Status;
 using helloworld::Greeter;
 using helloworld::HelloReply;
 using helloworld::HelloRequest;
 void AddLatencyView(opentelemetry::sdk::metrics::MeterProvider* provider,
                    const std::string& name, const std::string& unit) {
  auto histogram_config = std::make_shared<
      opentelemetry::sdk::metrics::HistogramAggregationConfig>();
  histogram_config->boundaries_ = {
      0,     0.00001, 0.00005, 0.0001, 0.0003, 0.0006, 0.0008, 0.001, 0.002,
      0.003, 0.004,   0.005,   0.006,  0.008,  0.01,   0.013,  0.016, 0.02,
      0.025, 0.03,    0.04,    0.05,   0.065,  0.08,   0.1,    0.13,  0.16,
      0.2,   0.25,    0.3,     0.4,    0.5,    0.65,   0.8,    1,     2,
      5,     10,      20,      50,     100};
  provider->AddView(
      opentelemetry::sdk::metrics::InstrumentSelectorFactory::Create(
          opentelemetry::sdk::metrics::InstrumentType::kHistogram, name, unit),
      opentelemetry::sdk::metrics::MeterSelectorFactory::Create(
          "grpc-c++", grpc::Version(), ""),
      opentelemetry::sdk::metrics::ViewFactory::Create(
          name, "", unit,
          opentelemetry::sdk::metrics::AggregationType::kHistogram,
          std::move(histogram_config)));
 }
 namespace {
 class GreeterClient {
 public:
  GreeterClient(std::shared_ptr<Channel> channel)
      : stub_(Greeter::NewStub(channel)) {}
  // Assembles the client's payload, sends it and presents the response back
  // from the server.
  std::string SayHello(const std::string& user) {
    // Data we are sending to the server.
    HelloRequest request;
    request.set_name(user);
    // Container for the data we expect from the server.
    HelloReply reply;
    // Context for the client. It could be used to convey extra information to
    // the server and/or tweak certain RPC behaviors.
    ClientContext context;
    // The actual RPC.
    std::mutex mu;
    std::condition_variable cv;
    bool done = false;
    Status status;
    stub_->async()->SayHello(&context, &request, &reply,
                             [&mu, &cv, &done, &status](Status s) {
                               status = std::move(s);
                               std::lock_guard<std::mutex> lock(mu);
                               done = true;
                               cv.notify_one();
                             });
    std::unique_lock<std::mutex> lock(mu);
    while (!done) {
      cv.wait(lock);
    }
    // Act upon its status.
    if (status.ok()) {
      return reply.message();
    } else {
      std::cout << status.error_code() << ": " << status.error_message()
                << std::endl;
      return "RPC failed";
    }
  }
 private:
  std::unique_ptr<Greeter::Stub> stub_;
 };
 // Logic and data behind the server's behavior.
 class GreeterServiceImpl final : public Greeter::CallbackService {
  ServerUnaryReactor* SayHello(CallbackServerContext* context,
                               const HelloRequest* request,
                               HelloReply* reply) override {
    std::string prefix("Hello ");
    reply->set_message(prefix + request->name());
    ServerUnaryReactor* reactor = context->DefaultReactor();
    reactor->Finish(Status::OK);
    return reactor;
  }
 };
 }  // namespace
 void RunServer(uint16_t port) {
  std::string server_address = absl::StrFormat("0.0.0.0:%d", port);
  GreeterServiceImpl service;
  grpc::EnableDefaultHealthCheckService(true);
  grpc::reflection::InitProtoReflectionServerBuilderPlugin();
  ServerBuilder builder;
  // Listen on the given address without any authentication mechanism.
  builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
  // Register "service" as the instance through which we'll communicate with
  // clients. In this case it corresponds to an *synchronous* service.
  builder.RegisterService(&service);
  // Finally assemble the server.
  std::unique_ptr<Server> server(builder.BuildAndStart());
  std::cout << "Server listening on " << server_address << std::endl;
  // Wait for the server to shutdown. Note that some other thread must be
  // responsible for shutting down the server for this call to ever return.
  server->Wait();
 }
 void RunClient(const std::string& target_str) {
  // Instantiate the client. It requires a channel, out of which the actual RPCs
  // are created. This channel models a connection to an endpoint specified by
  // the argument "--target=" which is the only expected argument.
  grpc::ChannelArguments args;
  // Continuously send RPCs every second.
  while (true) {
    GreeterClient greeter(grpc::CreateCustomChannel(
        target_str, grpc::InsecureChannelCredentials(), args));
    std::string user("world");
    std::string reply = greeter.SayHello(user);
    std::cout << "Greeter received: " << reply << std::endl;
    std::this_thread::sleep_for(std::chrono::seconds(1));
  }
 }
--- a/examples/cpp/otel/util.h
+++ b/examples/cpp/otel/util.h
@ -1,33 +0,0 @@
 //
 //
 // Copyright 2024 gRPC authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
 //
 #ifndef GRPCPP_EXAMPLES_CPP_OTEL_UTIL_H
 #define GRPCPP_EXAMPLES_CPP_OTEL_UTIL_H
 #include <string>
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 // Helper function that adds view for gRPC latency instrument \a name with unit
 // \a unit with bucket boundaries that are more useful for RPCs.
 void AddLatencyView(opentelemetry::sdk::metrics::MeterProvider* provider,
                    const std::string& name, const std::string& unit);
 void RunServer(uint16_t port);
 void RunClient(const std::string& target_str);
 #endif  // GRPCPP_EXAMPLES_CPP_OTEL_UTIL_H
--- a/examples/cpp/systemd_socket_activation/test.sh
+++ b/examples/cpp/systemd_socket_activation/test.sh
@ -37,8 +37,8 @@ pass() {
 }
 bazel build --define=use_systemd=true //examples/cpp/systemd_socket_activation:all || fail "Failed to build sd_sock_act"
-cp ../../../bazel-bin/examples/cpp/systemd_socket_activation/server /tmp/greeter_server
+cp ../../../../bazel-bin/examples/cpp/systemd_socket_activation/server /tmp/greeter_server
-cp ../../../bazel-bin/examples/cpp/systemd_socket_activation/client /tmp/greeter_client
+cp ../../../../bazel-bin/examples/cpp/systemd_socket_activation/client /tmp/greeter_client
 cat << EOF > /etc/systemd/system/sdsockact.service
 [Service]
--- a/examples/cpp/xds/BUILD
+++ b/examples/cpp/xds/BUILD
@ -37,6 +37,5 @@ cc_binary(
        "//examples/protos:helloworld_cc_grpc",
        "@com_google_absl//absl/flags:flag",
        "@com_google_absl//absl/flags:parse",
        "@com_google_absl//absl/log",
    ],
 )
--- a/examples/cpp/xds/xds_greeter_server.cc
+++ b/examples/cpp/xds/xds_greeter_server.cc
@ -22,7 +22,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include <grpcpp/ext/admin_services.h>
@ -85,20 +84,21 @@ void RunServer() {
        absl::StrCat("0.0.0.0:", port),
        grpc::XdsServerCredentials(grpc::InsecureServerCredentials()));
    xds_enabled_server = xds_builder.BuildAndStart();
-    LOG(INFO) << "Server starting on 0.0.0.0:" << port;
+    gpr_log(GPR_INFO, "Server starting on 0.0.0.0:%d", port);
    grpc::AddAdminServices(&builder);
    // For the maintenance server, do not use any authentication mechanism.
    builder.AddListeningPort(absl::StrCat("0.0.0.0:", maintenance_port),
                             grpc::InsecureServerCredentials());
    server = builder.BuildAndStart();
-    LOG(INFO) << "Maintenance server listening on 0.0.0.0:" << maintenance_port;
+    gpr_log(GPR_INFO, "Maintenance server listening on 0.0.0.0:%d",
            maintenance_port);
  } else {
    grpc::AddAdminServices(&xds_builder);
    // Listen on the given address without any authentication mechanism.
    builder.AddListeningPort(absl::StrCat("0.0.0.0:", port),
                             grpc::InsecureServerCredentials());
    server = xds_builder.BuildAndStart();
-    LOG(INFO) << "Server listening on 0.0.0.0:" << port;
+    gpr_log(GPR_INFO, "Server listening on 0.0.0.0:%d", port);
  }
  // Wait for the server to shutdown. Note that some other thread must be
--- a/examples/objective-c/BUILD
+++ b/examples/objective-c/BUILD
@ -27,10 +27,10 @@ objc_grpc_library(
    deps = ["//examples/protos:helloworld_proto"],
 )
-# This one works with import "third_party/com_github_grpc_grpc/examples/protos/Keyvaluestore.pbrpc.h"
+# This one works with import "external/com_github_grpc_grpc/examples/protos/Keyvaluestore.pbrpc.h"
 objc_grpc_library(
    name = "Keyvaluestore_grpc_proto_external",
-    srcs = ["//third_party/com_github_grpc_grpc/examples/protos:keyvaluestore.proto"],
+    srcs = ["//external/com_github_grpc_grpc/examples/protos:keyvaluestore.proto"],
    tags = ["manual"],
    deps = ["@com_github_grpc_grpc//examples/protos:keyvaluestore_proto"],
 )
--- a/examples/php/echo/apache.Dockerfile
+++ b/examples/php/echo/apache.Dockerfile
@ -18,7 +18,7 @@ FROM composer:1.8.6 as composer
 FROM grpc-php/base as grpc-base
-FROM php:8.1-apache-buster
+FROM php:7.4-apache-buster
 RUN apt-get -qq update && apt-get -qq install -y git
--- a/examples/php/echo/base.Dockerfile
+++ b/examples/php/echo/base.Dockerfile
@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM php:8.1-buster
+FROM php:7.4-buster
 RUN apt-get -qq update && apt-get -qq install -y \
  autoconf automake cmake curl git libtool \
--- a/examples/php/echo/cli.Dockerfile
+++ b/examples/php/echo/cli.Dockerfile
@ -18,7 +18,7 @@ FROM composer:1.8.6 as composer
 FROM grpc-php/base as grpc-base
-FROM php:8.1-buster
+FROM php:7.4-buster
 RUN apt-get -qq update && apt-get -qq install -y git
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
eugeneo	436463b1a9	Automated change: Fix sanity tests	2024-02-13 17:06:52 +00:00
Eugene Ostroukhov	de59548834	[experiments] Set call_status_override_on_cancellation default to `false` from `debug`	2024-02-13 08:58:30 -08:00
`@ -14,4 +14,4 @@`

	# AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!!	# AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!!

	`__version__ = """1.65.0.dev0"""`	`__version__ = """1.62.0.dev0"""`