Merge branch 'master' into mcs

Author: kannanjgithub

.bazelignore

@@ -27,6 +27,7 @@ test/distrib/bazel/python
 test/distrib/bazel/python_second_test_repo
 
 # Directories build containing own BUILD files.
+test/bzlmod
 src/python/grpcio_tests/src/
 tools/distrib/python/grpcio_tools/build/
 tools/distrib/python/grpcio_tools/protobuf/

.github/ISSUE_TEMPLATE/bug_report_ruby.md

@@ -2,7 +2,7 @@
 name: Report a gRPC Ruby bug
 about: Create a report to help us improve
 labels: kind/bug, priority/P2, lang/ruby
-assignees: apolcyn
+assignees: asheshvidyut
 
 ---
 

BUILD

@@ -631,7 +631,6 @@ grpc_cc_library(
         "avoid_dep",
         "nofixdeps",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         "channel_arg_names",
         "channel_stack_builder",
@@ -1234,7 +1233,7 @@ grpc_cc_library(
         "avoid_dep",
         "nofixdeps",
     ],
-    visibility = ["//visibility:public"],
+    visibility = ["//bazel:grpc++_unsecure"],
     deps = [
         "channel_arg_names",
         "global_callback_hook",
@@ -5378,6 +5377,21 @@ grpc_upb_proto_reflection_library(
     deps = ["@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg"],
 )
 
+grpc_upb_proto_library(
+    name = "envoy_extensions_grpc_service_call_credentials_access_token_upb",
+    deps = ["@envoy_api//envoy/extensions/grpc_service/call_credentials/access_token/v3:pkg"],
+)
+
+grpc_upb_proto_library(
+    name = "envoy_extensions_grpc_service_channel_credentials_tls_upb",
+    deps = ["@envoy_api//envoy/extensions/grpc_service/channel_credentials/tls/v3:pkg"],
+)
+
+grpc_upb_proto_library(
+    name = "envoy_extensions_grpc_service_channel_credentials_xds_upb",
+    deps = ["@envoy_api//envoy/extensions/grpc_service/channel_credentials/xds/v3:pkg"],
+)
+
 grpc_upb_proto_library(
     name = "envoy_extensions_transport_sockets_tls_upb",
     deps = ["@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg"],

CMakeLists.txt

@@ -32,7 +32,7 @@ single_version_override(
 
 bazel_dep(name = "apple_support", version = "1.17.1", repo_name = "build_bazel_apple_support")
 bazel_dep(name = "bazel_skylib", version = "1.8.1")
-bazel_dep(name = "boringssl", version = "0.20241024.0")  # mistmatched 20241211
+bazel_dep(name = "boringssl", version = "0.20241024.0")  # mismatched 20241211
 bazel_dep(name = "c-ares", version = "1.19.1", repo_name = "com_github_cares_cares")
 bazel_dep(name = "envoy_api", version = "0.0.0-20251216-6ef568c")
 bazel_dep(name = "googleapis-cc", version = "1.0.0")
@@ -53,17 +53,28 @@ single_version_override(
 )
 
 bazel_dep(name = "protoc-gen-validate", version = "1.2.1.bcr.1", repo_name = "com_envoyproxy_protoc_gen_validate")  # Not needed directly
-bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_googlesource_code_re2")  # mistmached 2022-04-01
+bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_googlesource_code_re2")  # mismatched 2022-04-01
 bazel_dep(name = "rules_apple", version = "3.16.0", repo_name = "build_bazel_rules_apple")
 bazel_dep(name = "rules_cc", version = "0.1.1")
 bazel_dep(name = "rules_proto", version = "7.0.2")
+bazel_dep(name = "rules_shell", version = "0.4.0")
 bazel_dep(name = "xds", version = "0.0.0-20251210-ee656c7", repo_name = "com_github_cncf_xds")
+
+# --- Zlib
+# Patch is needed to for running Windows RBE tests.
 bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
+single_version_override(
+    module_name = "zlib",
+    patch_strip = 1,
+    patches = [
+        "//bazel:zlib.patch",
+    ],
+    version = "1.3.1.bcr.5",
+)
 
 # Development dependencies
 # ========================
 bazel_dep(name = "google_benchmark", version = "1.9.0", dev_dependency = True, repo_name = "com_github_google_benchmark")
-bazel_dep(name = "rules_shell", version = "0.4.0", dev_dependency = True)
 
 # Python dependencies
 # ===================
@@ -114,11 +125,38 @@ http_archive(
     url = "https://github.com/python/typing_extensions/archive/4.12.2.tar.gz",
 )
 
-# Provide repo @com_google_fuzztest.
-include("//bazel:com_google_fuzztest.MODULE.bazel")
+# --- Provide repo @com_google_fuzztest.
+bazel_dep(name = "fuzztest", version = "20250805.0", dev_dependency = True, repo_name = "com_google_fuzztest")  # mismatched 2023-05-16
 
-# Provides repo @grpc_custom_exec_properties.
-include("//bazel:grpc_custom_exec_properties.MODULE.bazel")
+# This package is not directly used by grpc, but requested by fuzztest.
+#
+# The reason for version bump is because bazel resolve this package to riegeli@0.0.0-20240606-973b6f0,
+# which is incompatible with the version of abseil-cpp we use.
+#
+# See also https://bazel.build/external/module#version-selection.
+bazel_dep(name = "riegeli", version = "0.0.0-20250706-c4d1f27", dev_dependency = True)
+
+# --- Provide repo @grpc_custom_exec_properties.
+http_archive(
+    name = "bazel_toolchains",
+    integrity = "sha256-F57AL4Cehqv1Y1bYiYyL10Bp8b18VgRAUMLNPXnQ4CQ=",
+    strip_prefix = "bazel-toolchains-4.1.0",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
+    ],
+)
+
+exec_properties = use_extension("//bazel:extensions.bzl", "exec_properties")
+exec_properties.custom_exec_properties(
+    name = "grpc_custom_exec_properties",
+    constant = "LARGE_MACHINE",
+    rbe_exec_properties_dict = {
+        "os": "ubuntu",
+        "machine_size": "large",
+    },
+)
+use_repo(exec_properties, "grpc_custom_exec_properties")
 
 # -- google_cloud_cpp 2.35.0 related repos, which requires a modified version of googleapis, hence the version pinning.
 bazel_dep(name = "googleapis", version = "0.0.0-20251003-2193a2bf", repo_name = "com_google_googleapis")
@@ -142,6 +180,27 @@ archive_override(
     ],
 )
 
+# --- libpfm 4.11.0
+#
+# Not directly used, depended on by google_benchmark.
+# Override URL with our mirror site because the original link is broken.
+#
+# See also https://github.com/bazelbuild/bazel-central-registry/blob/c83ac4d4bac24aeebf1b99f8b8d21166e0886397/modules/libpfm/4.11.0.bcr.1/source.json
+bazel_dep(name = "libpfm", version = "4.11.0.bcr.1", dev_dependency = True)
+archive_override(
+    module_name = "libpfm",
+    integrity = "sha256-XaX4hyveFLNjTJaI2YD2i9ootRAmhyPMEpc+7bq5/sw=",
+    patch_strip = 1,
+    patches = [
+        "//bazel:libpfm.patch",
+    ],
+    strip_prefix = "libpfm-4.11.0",
+    urls = [
+        "https://storage.googleapis.com/grpc-bazel-mirror/sourceforge.net/projects/perfmon2/files/libpfm4/libpfm-4.11.0.tar.gz",
+        "https://sourceforge.net/projects/perfmon2/files/libpfm4/libpfm-4.11.0.tar.gz/download",
+    ],
+)
+
 # --- Python headers
 # TODO(weizheyuan): Maybe replace this with python header exposed by rules_python.
 # See also https://github.com/grpc/grpc/issues/24665

MODULE.bazel

@@ -137,6 +137,11 @@ package_group(
     packages = [],
 )
 
+package_group(
+    name = "grpc++_unsecure",
+    packages = [],
+)
+
 package_group(
     name = "grpc_resolver_fake",
     packages = [],

Makefile

@@ -22,18 +22,16 @@
 
 from typeguard import install_import_hook
 
-# Add all relevant grpc.aio submodules here
-# Temporarily disable most hooks due to type annotation issues
-# install_import_hook('grpc.aio')
-# install_import_hook('grpc.aio._channel')
+install_import_hook('grpc.aio')
+install_import_hook('grpc.aio._channel')
 install_import_hook('grpc.aio._server')
 install_import_hook('grpc.aio._utils')
 install_import_hook('grpc.aio._interceptor')
 install_import_hook('grpc.aio._base_channel')
 install_import_hook('grpc.aio._base_server')
 install_import_hook('grpc.aio._typing')
 install_import_hook('grpc.aio._call')
-# install_import_hook('grpc.aio._metadata')
+install_import_hook('grpc.aio._metadata')
 
 
 class SingleLoader: