Merge github.com:grpc/grpc into rubble

Rakefile

@@ -184,7 +184,7 @@ task 'gem:native', [:plat] do |t, args|
     run_rake_compiler(plat, <<~EOT)
       #{prepare_ccache_cmd} && \
       gem update --system --no-document && \
-      bundle && \
+      bundle update && \
       bundle exec rake clean && \
       bundle exec rake native:#{plat} pkg/#{spec.full_name}-#{plat}.gem pkg/#{spec.full_name}.gem \
         RUBY_CC_VERSION=#{ruby_cc_versions} \
@@ -216,7 +216,7 @@ task 'gem:native', [:plat] do |t, args|
     run_rake_compiler(plat, <<~EOT)
       #{prepare_ccache_cmd} && \
       gem update --system --no-document && \
-      bundle && \
+      bundle update && \
       bundle exec rake clean && \
       export GRPC_RUBY_DEBUG_SYMBOLS_OUTPUT_DIR=#{debug_symbols_dir} && \
       bundle exec rake native:#{plat} pkg/#{spec.full_name}-#{plat}.gem pkg/#{spec.full_name}.gem \

bazel/grpc_deps.bzl

@@ -320,43 +320,26 @@ def grpc_deps():
             ],
         )
 
-    # TODO(stanleycheung): remove this when prometheus-cpp AND
-    #   opentelemetry-cpp cut a new release
-    # This override is needed because this fix
-    #   https://github.com/jupp0r/prometheus-cpp/pull/626
-    #   has not been included in the latest prometheus-cpp release yet.
-    # We also need opentelemetry-cpp to update their dependency on
-    #   prometheus-cpp after that fix is released.
-    # Without the fix, we cannot build the prometheus exporter with bazel 6
-    if "com_github_jupp0r_prometheus_cpp" not in native.existing_rules():
-        http_archive(
-            name = "com_github_jupp0r_prometheus_cpp",
-            sha256 = "cdf03ee63fcb1d9e113f7bd525e043c254729dddf19d80396489f5b92c83c18d",
-            strip_prefix = "prometheus-cpp-b1234816facfdda29845c46696a02998a4af115a",
-            urls = [
-                "https://github.com/jupp0r/prometheus-cpp/archive/b123481.zip",
-            ],
-        )
-
     if "io_opentelemetry_cpp" not in native.existing_rules():
         http_archive(
             name = "io_opentelemetry_cpp",
-            sha256 = "4b822a2f137b8c2ea403c5ec9a661addcc048aa8ba3afebffd58cbcf218457bc",
-            strip_prefix = "opentelemetry-cpp-a388e87d72b8321c189c8d41edb746ffa687ce3c",
+            sha256 = "fb7c38e82ce5a5dcad70be7eafe0d3d4f439e3ef822b414a99db7514580ddac4",
+            strip_prefix = "opentelemetry-cpp-955a807c0461544560429c2414b8967f6023e590",
             urls = [
-                "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",
+                # v1.18.0
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/open-telemetry/opentelemetry-cpp/archive/955a807c0461544560429c2414b8967f6023e590.tar.gz",
+                "https://github.com/open-telemetry/opentelemetry-cpp/archive/955a807c0461544560429c2414b8967f6023e590.tar.gz",
             ],
         )
 
     if "google_cloud_cpp" not in native.existing_rules():
         http_archive(
             name = "google_cloud_cpp",
-            sha256 = "7ca7f583b60d2aa1274411fed3b9fb3887119b2e84244bb3fc69ea1db819e4e5",
-            strip_prefix = "google-cloud-cpp-2.16.0",
+            sha256 = "e53ba3799c052d97acac9a6a6b27af24ce822dbde7bfde973bac9e5da714e6b2",
+            strip_prefix = "google-cloud-cpp-2.33.0",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/googleapis/google-cloud-cpp/archive/refs/tags/v2.16.0.tar.gz",
-                "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v2.16.0.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/googleapis/google-cloud-cpp/archive/refs/tags/v2.33.0.tar.gz",
+                "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v2.33.0.tar.gz",
             ],
         )
 

src/core/lib/experiments/experiments.yaml

@@ -105,15 +105,15 @@
   test_tags: [resource_quota_test]
 - name: local_connector_secure
   description: Local security connector uses TSI_SECURITY_NONE for LOCAL_TCP connections.
-  expiry: 2024/12/30
+  expiry: 2025/01/30
   owner: [email protected]
   test_tags: ["core_end2end_test"]
 - name: max_pings_wo_data_throttle
   description:
     Experiment to throttle pings to a period of 1 min when
     GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA limit has reached (instead of
     completely blocking).
-  expiry: 2024/01/30
+  expiry: 2025/01/30
   owner: [email protected]
   test_tags: []
 - name: monitoring_experiment
@@ -214,6 +214,6 @@
     Have the work serializer dispatch work to event engine for every callback,
     instead of running things inline in the first thread that successfully
     enqueues work.
-  expiry: 2024/12/31
+  expiry: 2025/01/30
   owner: [email protected]
   test_tags: ["core_end2end_test", "cpp_end2end_test", "xds_end2end_test", "lb_unit_test"]

test/core/experiments/fixtures/test_experiments.yaml

@@ -14,18 +14,18 @@
 
 - name: test_experiment_1
   description: Test Experiment 1
-  expiry: 2023/08/01
+  expiry: 2023/08/30
   owner: [email protected]
   test_tags: [experiments_tag_test]
 - name: test_experiment_2
   description: Test Experiment 2
-  expiry: 2023/01/01
+  expiry: 2023/01/30
   owner: [email protected]
 - name: test_experiment_3
   description: Test Experiment 3
-  expiry: 2024/01/01
+  expiry: 2024/01/30
   owner: [email protected]
 - name: test_experiment_4
   description: Test Experiment 4
-  expiry: 2022/01/01
+  expiry: 2022/01/30
   owner: [email protected]

test/distrib/bazel/test_single_bazel_version.sh

@@ -63,7 +63,7 @@ EXCLUDED_TARGETS=(
 
   # Analyzing windows toolchains when running on linux results in an error.
   # Since bazel distribtests are run on linux, we exclude the windows RBE toolchains.
-  "-//third_party/toolchains/rbe_windows_bazel_7.3.1_vs2022/..."
+  "-//third_party/toolchains/rbe_windows_vs2022_bazel7/..."
   "-//third_party/toolchains:rbe_windows_default_toolchain_suite"
 
   # Exclude bazelified tests as they contain some bazel hackery

third_party/toolchains/BUILD

@@ -21,13 +21,13 @@ package(default_visibility = ["//visibility:public"])
 # The default toolchain suite for RBE linux, pass it to --crosstool_top
 alias(
     name = "rbe_linux_default_toolchain_suite",
-    actual = "//third_party/toolchains/rbe_ubuntu2004/cc:toolchain",
+    actual = "//third_party/toolchains/rbe_ubuntu2004_bazel7/cc:toolchain",
 )
 
 # The default CC toolchain suite for RBE linux
 alias(
     name = "rbe_linux_default_cc_toolchain",
-    actual = "//third_party/toolchains/rbe_ubuntu2004/config:cc-toolchain",
+    actual = "//third_party/toolchains/rbe_ubuntu2004_bazel7/config:cc-toolchain",
 )
 
 # The default platform for RBE Linux
@@ -46,19 +46,19 @@ platform(
         os_family = "Linux",
     ),
     # Inherit from the platform target generated by 'rbe_configs_gen'.
-    parents = ["//third_party/toolchains/rbe_ubuntu2004/config:platform"],
+    parents = ["//third_party/toolchains/rbe_ubuntu2004_bazel7/config:platform"],
 )
 
 # The default toolchain suite for RBE windows, pass it to --crosstool_top
 alias(
     name = "rbe_windows_default_toolchain_suite",
-    actual = "//third_party/toolchains/rbe_windows_bazel_7.3.1_vs2022/cc:toolchain",
+    actual = "//third_party/toolchains/rbe_windows_vs2022_bazel7/cc:toolchain",
 )
 
 # The default CC toolchain suite for RBE windows
 alias(
     name = "rbe_windows_default_cc_toolchain",
-    actual = "//third_party/toolchains/rbe_windows_bazel_7.3.1_vs2022/config:cc-toolchain",
+    actual = "//third_party/toolchains/rbe_windows_vs2022_bazel7/config:cc-toolchain",
 )
 
 # The default platform for RBE windows
@@ -73,5 +73,5 @@ platform(
         os_family = "Windows",
     ),
     # Inherit from the platform target generated by 'rbe_configs_gen'.
-    parents = ["//third_party/toolchains/rbe_windows_bazel_7.3.1_vs2022/config:platform"],
+    parents = ["//third_party/toolchains/rbe_windows_vs2022_bazel7/config:platform"],
 )

third_party/toolchains/README.md

@@ -1,12 +1,13 @@
 # RBE toolchain configuration (Linux and Windows)
 
 ## Linux
-The `rbe_ubuntu2004` directory contains the autogenerated toolchain configuration for linux RBE.
+
+The `rbe_ubuntu2004_bazel7` directory contains the autogenerated toolchain configuration for linux RBE.
 Run `generate_linux_rbe_configs.sh` to regenerate.
 
 ## Windows
 
-The `rbe_windows_bazel_7.3.1_vs2022` directory contains the autogenerated toolchain configuration for windows RBE.
+The `rbe_windows_vs2022_bazel7` directory contains the autogenerated toolchain configuration for windows RBE.
 The configuration was generated by the `rbe_configs_gen` tool (just as the linux RBE config),
 but since it's a windows configuration, it needs to be run on a windows machine.
 

third_party/toolchains/generate_linux_rbe_configs.sh

@@ -42,12 +42,12 @@ LINUX_RBE_DOCKER_IMAGE=$(cat ${LINUX_RBE_DOCKERFILE_DIR}.current_version)
 # Bazel version used for configuring
 # Needs to be the oldest of the versions from bazel/supported_versions.txt chosen 
 # so that the result is compatible with other supported bazel versions.
-BAZEL_VERSION=7.3.1
+BAZEL_VERSION=7.4.1
 
 # TODO(jtattermusch): experiment with --cpp_env_json to simplify bazel build configuration.
 
 # Where to store the generated configs (relative to repo root)
-CONFIG_OUTPUT_PATH=third_party/toolchains/rbe_ubuntu2004
+CONFIG_OUTPUT_PATH=third_party/toolchains/rbe_ubuntu2004_bazel7
 
 # Delete old generated configs.
 rm -rf "${REPO_ROOT}/${CONFIG_OUTPUT_PATH}"

third_party/toolchains/generate_windows_rbe_configs.sh

@@ -33,10 +33,10 @@ WINDOWS_RBE_DOCKER_IMAGE=us-docker.pkg.dev/grpc-testing/testing-images-public/rb
 # Bazel version used for configuring
 # Needs to be one of the versions from bazel/supported_versions.txt chosen so that the result is compatible
 # with other supported bazel versions.
-BAZEL_VERSION=7.3.1
+BAZEL_VERSION=7.4.1
 
 # Where to store the generated configs (relative to repo root)
-CONFIG_OUTPUT_PATH=third_party/toolchains/rbe_windows_bazel_7.3.1_vs2022
+CONFIG_OUTPUT_PATH=third_party/toolchains/rbe_windows_vs2022_bazel7
 
 # Delete old generated configs.
 rm -rf "${REPO_ROOT}/${CONFIG_OUTPUT_PATH}"