Merge github.com:grpc/grpc into cmake

.clang-tidy

@@ -70,6 +70,7 @@ Checks: '-*,
   -bugprone-assignment-in-if-condition,
   -bugprone-branch-clone,
   -bugprone-casting-through-void,
+  -bugprone-crtp-constructor-accessibility,
   -bugprone-easily-swappable-parameters,
   -bugprone-empty-catch,
   -bugprone-exception-escape,
@@ -80,8 +81,10 @@ Checks: '-*,
   -bugprone-narrowing-conversions,
   -bugprone-not-null-terminated-result,
   -bugprone-reserved-identifier,
+  -bugprone-return-const-ref-from-parameter,
   -bugprone-signed-char-misuse,
   -bugprone-sizeof-expression,
+  -bugprone-suspicious-stringview-data-usage,
   -bugprone-switch-missing-default-case,
   -bugprone-too-small-loop-variable,
   -bugprone-unchecked-optional-access,
@@ -92,6 +95,7 @@ Checks: '-*,
   performance-*,
   -performance-avoid-endl,
   -performance-enum-size,
+  -performance-inefficient-vector-operation,
   -performance-no-automatic-move,
   -performance-no-int-to-ptr,
   -performance-noexcept-swap,
@@ -140,7 +144,7 @@ Checks: '-*,
   readability-duplicate-include,
   readability-function-size,
   readability-inconsistent-declaration-parameter-name,
-  readability-math-missing-parentheses,
+  -readability-math-missing-parentheses,
   readability-misleading-indentation,
   readability-misplaced-array-index,
   readability-redundant-access-specifiers,

.gitattributes

@@ -20,6 +20,7 @@ src/ruby/ext/grpc/rb_grpc_imports.generated.h linguist-generated=true
 src/ruby/ext/grpc/rb_grpc_imports.generated.c linguist-generated=true
 include/grpc/module.modulemap linguist-generated=true
 test/core/security/grpc_tls_credentials_options_comparator_test.cc linguist-generated=true
+tools/distrib/python/xds_protos/** linguist-generated=true
 tools/doxygen/Doxyfile.c++ linguist-generated=true
 tools/doxygen/Doxyfile.c++.internal linguist-generated=true
 tools/doxygen/Doxyfile.core linguist-generated=true

.pylintrc

@@ -73,7 +73,7 @@ disable=
 	protected-access,
 	# NOTE(nathaniel): Pylint and I will probably never agree on this.
 	too-few-public-methods,
-	# NOTE(nathaniel): Pylint and I wil probably never agree on this for
+	# NOTE(nathaniel): Pylint and I will probably never agree on this for
 	# private classes. For public classes maybe?
 	too-many-instance-attributes,
 	# NOTE(nathaniel): Some of our modules have a lot of lines... of

.pylintrc-examples

@@ -76,7 +76,7 @@ disable=
 	protected-access,
 	# NOTE(nathaniel): Pylint and I will probably never agree on this.
 	too-few-public-methods,
-	# NOTE(nathaniel): Pylint and I wil probably never agree on this for
+	# NOTE(nathaniel): Pylint and I will probably never agree on this for
 	# private classes. For public classes maybe?
 	too-many-instance-attributes,
 	# NOTE(nathaniel): Some of our modules have a lot of lines... of

.pylintrc-tests

@@ -102,7 +102,7 @@ disable=
 	protected-access,
 	# NOTE(nathaniel): Pylint and I will probably never agree on this.
 	too-few-public-methods,
-	# NOTE(nathaniel): Pylint and I wil probably never agree on this for
+	# NOTE(nathaniel): Pylint and I will probably never agree on this for
 	# private classes. For public classes maybe?
 	too-many-instance-attributes,
 	# NOTE(nathaniel): Some of our modules have a lot of lines... of

BUILD

@@ -106,6 +106,11 @@ config_setting(
     values = {"apple_platform_type": "watchos"},
 )
 
+config_setting(
+    name = "windows_os",
+    constraint_values = ["@platforms//os:windows"],
+)
+
 config_setting(
     name = "systemd",
     values = {"define": "use_systemd=true"},
@@ -899,6 +904,19 @@ grpc_cc_library(
     hdrs = ["include/grpc/impl/channel_arg_names.h"],
 )
 
+grpc_cc_library(
+    name = "grpc_slice",
+    hdrs = [
+        "include/grpc/slice.h",
+        "include/grpc/slice_buffer.h",
+    ],
+    visibility = ["@grpc:public"],
+    deps = [
+        "//src/core:slice",
+        "//src/core:slice_buffer",
+    ],
+)
+
 grpc_cc_library(
     name = "grpc++",
     hdrs = [
@@ -2174,6 +2192,7 @@ grpc_cc_library(
         "//src/core:channel_args",
         "//src/core:channel_fwd",
         "//src/core:closure",
+        "//src/core:connection_context",
         "//src/core:context",
         "//src/core:error",
         "//src/core:event_engine_memory_allocator",
@@ -2324,6 +2343,7 @@ grpc_cc_library(
     tags = ["nofixdeps"],
     visibility = ["@grpc:alt_grpc++_base_legacy"],
     deps = [
+        "backoff",
         "channel_arg_names",
         "channel_stack_builder",
         "config",
@@ -2416,6 +2436,7 @@ grpc_cc_library(
     ],
     visibility = ["@grpc:alt_grpc++_base_unsecure_legacy"],
     deps = [
+        "backoff",
         "channel_arg_names",
         "channel_stack_builder",
         "config",
@@ -2466,6 +2487,7 @@ grpc_cc_library(
 
 grpc_cc_library(
     name = "grpc++_codegen_proto",
+    hdrs = ["include/grpcpp/impl/generic_serialize.h"],
     external_deps = [
         "absl/strings:cord",
         "protobuf_headers",
@@ -2491,6 +2513,7 @@ grpc_cc_library(
 grpc_cc_library(
     name = "grpc++_config_proto",
     external_deps = [
+        "absl/status",
         "protobuf_headers",
         "protobuf",
     ],
@@ -2526,8 +2549,8 @@ grpc_cc_library(
         "config_vars",
         "grpc++",
         "grpc++_config_proto",
-        "//src/proto/grpc/reflection/v1:reflection_cc_grpc",
-        "//src/proto/grpc/reflection/v1alpha:reflection_cc_grpc",
+        "//src/proto/grpc/reflection/v1:reflection_proto",
+        "//src/proto/grpc/reflection/v1alpha:reflection_proto",
     ],
     alwayslink = 1,
 )
@@ -2579,9 +2602,13 @@ grpc_cc_library(
     srcs = [
         "src/cpp/server/orca/orca_service.cc",
     ],
+    hdrs = [
+        "src/cpp/server/orca/orca_service.h",
+    ],
     external_deps = [
         "absl/base:core_headers",
         "absl/log:check",
+        "absl/log:log",
         "absl/strings",
         "absl/time",
         "absl/types:optional",
@@ -2635,7 +2662,7 @@ grpc_cc_library(
         "grpc",
         "grpc++",
         "grpc++_config_proto",
-        "//src/proto/grpc/channelz:channelz_cc_grpc",
+        "//src/proto/grpc/channelz:channelz_proto",
     ],
     alwayslink = 1,
 )
@@ -2708,7 +2735,7 @@ grpc_cc_library(
         "include/grpcpp/test/mock_stream.h",
         "include/grpcpp/test/server_context_test_spouse.h",
     ],
-    visibility = ["@grpc:grpc++_test"],
+    visibility = ["@grpc:public"],
     deps = [
         "channel",
         "grpc++",
@@ -2946,10 +2973,10 @@ grpc_filegroup(
 grpc_cc_library(
     name = "load_config",
     srcs = [
-        "//src/core:lib/config/load_config.cc",
+        "//src/core:config/load_config.cc",
     ],
     hdrs = [
-        "//src/core:lib/config/load_config.h",
+        "//src/core:config/load_config.h",
     ],
     external_deps = [
         "absl/flags:flag",
@@ -2967,11 +2994,11 @@ grpc_cc_library(
 grpc_cc_library(
     name = "config_vars",
     srcs = [
-        "//src/core:lib/config/config_vars.cc",
-        "//src/core:lib/config/config_vars_non_generated.cc",
+        "//src/core:config/config_vars.cc",
+        "//src/core:config/config_vars_non_generated.cc",
     ],
     hdrs = [
-        "//src/core:lib/config/config_vars.h",
+        "//src/core:config/config_vars.h",
     ],
     external_deps = [
         "absl/flags:flag",
@@ -2987,15 +3014,15 @@ grpc_cc_library(
 grpc_cc_library(
     name = "config",
     srcs = [
-        "//src/core:lib/config/core_configuration.cc",
+        "//src/core:config/core_configuration.cc",
     ],
     external_deps = [
         "absl/functional:any_invocable",
         "absl/log:check",
     ],
     language = "c++",
     public_hdrs = [
-        "//src/core:lib/config/core_configuration.h",
+        "//src/core:config/core_configuration.h",
     ],
     visibility = ["@grpc:client_channel"],
     deps = [

bazel/cc_grpc_library.bzl

@@ -70,11 +70,11 @@ def cc_grpc_library(
     proto_targets = []
 
     if not grpc_only:
-        proto_target = "_" + name + "_only"
-        cc_proto_target = name if proto_only else "_" + name + "_cc_proto"
+        proto_target = name + "_only"
+        cc_proto_target = name if proto_only else name + "_cc_proto"
 
-        proto_deps = ["_" + dep + "_only" for dep in deps if dep.find(":") == -1]
-        proto_deps += [dep.split(":")[0] + ":" + "_" + dep.split(":")[1] + "_only" for dep in deps if dep.find(":") != -1 and dep.find("com_google_googleapis") == -1]
+        proto_deps = [dep + "_only" for dep in deps if dep.find(":") == -1]
+        proto_deps += [dep.split(":")[0] + ":" + dep.split(":")[1] + "_only" for dep in deps if dep.find(":") != -1 and dep.find("com_google_googleapis") == -1]
         proto_deps += [dep for dep in deps if dep.find("com_google_googleapis") != -1]
         if well_known_protos:
             proto_deps += well_known_proto_libs()

bazel/grpc_build_system.bzl

@@ -117,7 +117,6 @@ def _update_visibility(visibility):
         "grpcpp_gcp_observability": PUBLIC,
         "grpc_resolver_fake": PRIVATE,
         "grpc++_public_hdrs": PUBLIC,
-        "grpc++_test": PRIVATE,
         "http": PRIVATE,
         "httpcli": PRIVATE,
         "iomgr_internal_errqueue": PRIVATE,

bazel/grpc_deps.bzl

@@ -58,12 +58,12 @@ def grpc_deps():
     if "com_google_protobuf" not in native.existing_rules():
         http_archive(
             name = "com_google_protobuf",
-            sha256 = "8766fce06ef41d79cb6037d04be37df3d5c493d9da92517a7243640d6389f03c",
-            strip_prefix = "protobuf-10ef3f77683f77fb3c059bf47725c27b3ff41e63",
+            sha256 = "cf2db029202bb8eb1471b9bae387cc475d15d9e99c547e6906155033f81249a5",
+            strip_prefix = "protobuf-2d4414f384dc499af113b5991ce3eaa9df6dd931",
             urls = [
-                # https://github.com/protocolbuffers/protobuf/commits/v28.1
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/10ef3f77683f77fb3c059bf47725c27b3ff41e63.tar.gz",
-                "https://github.com/protocolbuffers/protobuf/archive/10ef3f77683f77fb3c059bf47725c27b3ff41e63.tar.gz",
+                # https://github.com/protocolbuffers/protobuf/commits/v29.0
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/2d4414f384dc499af113b5991ce3eaa9df6dd931.tar.gz",
+                "https://github.com/protocolbuffers/protobuf/archive/2d4414f384dc499af113b5991ce3eaa9df6dd931.tar.gz",
             ],
             patches = [
                 "@com_github_grpc_grpc//third_party:protobuf.patch",
@@ -109,11 +109,12 @@ def grpc_deps():
     if "com_github_google_benchmark" not in native.existing_rules():
         http_archive(
             name = "com_github_google_benchmark",
-            sha256 = "8e7b955f04bc6984e4f14074d0d191474f76a6c8e849e04a9dced49bc975f2d4",
-            strip_prefix = "benchmark-344117638c8ff7e239044fd0fa7085839fc03021",
+            sha256 = "11f344710a80fd73db0fc686b4fe40867dc34d914d9cdfd7a4b416a65d1e692f",
+            strip_prefix = "benchmark-12235e24652fc7f809373e7c11a5f73c5763fc4c",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/344117638c8ff7e239044fd0fa7085839fc03021.tar.gz",
-                "https://github.com/google/benchmark/archive/344117638c8ff7e239044fd0fa7085839fc03021.tar.gz",
+                # v1.9.0
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/12235e24652fc7f809373e7c11a5f73c5763fc4c.tar.gz",
+                "https://github.com/google/benchmark/archive/12235e24652fc7f809373e7c11a5f73c5763fc4c.tar.gz",
             ],
         )
 
@@ -340,11 +341,11 @@ def grpc_deps():
     if "io_opentelemetry_cpp" not in native.existing_rules():
         http_archive(
             name = "io_opentelemetry_cpp",
-            sha256 = "ed681d20a684b7d485a49288e7cfb2d182bf882e5c112c5f2fa3f9e9da2278fc",
-            strip_prefix = "opentelemetry-cpp-4bd64c9a336fd438d6c4c9dad2e6b61b0585311f",
+            sha256 = "4b822a2f137b8c2ea403c5ec9a661addcc048aa8ba3afebffd58cbcf218457bc",
+            strip_prefix = "opentelemetry-cpp-a388e87d72b8321c189c8d41edb746ffa687ce3c",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/open-telemetry/opentelemetry-cpp/archive/4bd64c9a336fd438d6c4c9dad2e6b61b0585311f.tar.gz",
-                "https://github.com/open-telemetry/opentelemetry-cpp/archive/4bd64c9a336fd438d6c4c9dad2e6b61b0585311f.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/open-telemetry/opentelemetry-cpp/archive/a388e87d72b8321c189c8d41edb746ffa687ce3c.tar.gz",
+                "https://github.com/open-telemetry/opentelemetry-cpp/archive/a388e87d72b8321c189c8d41edb746ffa687ce3c.tar.gz",
             ],
         )
 

build_handwritten.yaml

@@ -15,7 +15,7 @@ settings:
   core_version: 44.1.0
   csharp_major_version: 2
   g_stands_for: gridiron
-  protobuf_version: 3.28.1
+  protobuf_version: 3.29.0
   supported_python_versions:
   - '3.8'
   - '3.9'