Merge remote-tracking branch 'upstream/master' into support-use-frame…

…works

.github/labeler.yml

@@ -52,9 +52,3 @@ lang/ruby:
 "lang/C#":
 - src/compiler/csharp*
 - src/csharp/**
-
-"disposition/Needs Internal Changes":
-- src/core/lib/event_engine/windows/**
-- src/core/lib/gpr/windows/**
-- src/core/lib/gprpp/windows/**
-- test/core/event_engine/windows/**

.github/workflows/pr-auto-tag-and-check-title.yaml → .github/workflows/pr-auto-tag.yaml

@@ -1,4 +1,4 @@
-name: PR Title Check & Tag
+name: PR Auto Tag
 on:
   pull_request_target:
     types: [opened, reopened, synchronize, edited]
@@ -17,16 +17,3 @@ jobs:
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         sync-labels: ""
-
-  title-check:
-    permissions:
-      contents: read
-      pull-requests: write
-
-    runs-on: ubuntu-latest
-    steps:
-    - uses: thehanimo/[email protected]
-      with:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        pass_on_octokit_error: false
-        configuration_path: ".github/pr_title_checker_config.json"

BUILD

@@ -30,8 +30,8 @@ licenses(["reciprocal"])
 package(
     default_visibility = ["//visibility:public"],
     features = [
-        "layering_check",
         "-parse_headers",
+        "layering_check",
     ],
 )
 
@@ -211,11 +211,11 @@ config_setting(
 python_config_settings()
 
 # This should be updated along with build_handwritten.yaml
-g_stands_for = "gjallarhorn"  # @unused
+g_stands_for = "grand"  # @unused
 
 core_version = "37.0.0"  # @unused
 
-version = "1.60.0-dev"  # @unused
+version = "1.61.0-dev"  # @unused
 
 GPR_PUBLIC_HDRS = [
     "include/grpc/support/alloc.h",
@@ -2941,6 +2941,7 @@ grpc_cc_library(
         "//src/core:lib/resolver/endpoint_addresses.h",
     ],
     external_deps = [
+        "absl/functional:function_ref",
         "absl/status",
         "absl/status:statusor",
         "absl/strings",

_metadata.py

@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!!
 
-__version__ = """1.60.0.dev0"""
+__version__ = """1.61.0.dev0"""

bazel/googleapis.BUILD

@@ -15,7 +15,7 @@
 licenses(["notice"])
 
 package(
-    default_visibility = ["//visibility:public"]
+    default_visibility = ["//visibility:public"],
 )
 
 # This is needed for the dependency on google_cloud_cpp to work.

bazel/grpc_build_system.bzl

@@ -29,8 +29,8 @@ Contains macros used throughout the repo.
 
 load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
 load("//bazel:copts.bzl", "GRPC_DEFAULT_COPTS")
-load("//bazel:experiments.bzl", "EXPERIMENTS")
-load("//bazel:test_experiments.bzl", "TEST_EXPERIMENTS")
+load("//bazel:experiments.bzl", "EXPERIMENTS", "EXPERIMENT_ENABLES")
+load("//bazel:test_experiments.bzl", "TEST_EXPERIMENTS", "TEST_EXPERIMENT_ENABLES")
 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")
@@ -418,6 +418,7 @@ def expand_tests(name, srcs, deps, tags, args, exclude_pollers, uses_polling, us
         return tags
 
     experiment_config = list(poller_config)
+    experiment_enables = {k: v for k, v in EXPERIMENT_ENABLES.items() + TEST_EXPERIMENT_ENABLES.items()}
     for mode, config in mode_config.items():
         enabled_tags, disabled_tags = config
         if enabled_tags != None:
@@ -426,7 +427,7 @@ def expand_tests(name, srcs, deps, tags, args, exclude_pollers, uses_polling, us
                     config = dict(config)
                     config["name"] = config["name"] + "@experiment=" + experiment
                     env = dict(config["env"])
-                    env["GRPC_EXPERIMENTS"] = experiment
+                    env["GRPC_EXPERIMENTS"] = experiment_enables[experiment]
                     env["GRPC_CI_EXPERIMENTS"] = "1"
                     config["env"] = env
                     tags = config["tags"] + ["experiment_variation"]

bazel/test_experiments.bzl

@@ -16,6 +16,13 @@
 
 """Dictionary of tags to experiments so we know when to test different experiments."""
 
+TEST_EXPERIMENT_ENABLES = {
+    "test_experiment_1": "test_experiment_1",
+    "test_experiment_2": "test_experiment_2",
+    "test_experiment_3": "test_experiment_3",
+    "test_experiment_4": "test_experiment_4",
+}
+
 TEST_EXPERIMENTS = {
     "windows": {
         "dbg": {

build_handwritten.yaml

@@ -14,9 +14,9 @@ settings:
   '#10': See the expand_version.py for all the quirks here
   core_version: 37.0.0
   csharp_major_version: 2
-  g_stands_for: gjallarhorn
+  g_stands_for: grand
   protobuf_version: 3.25.0
-  version: 1.60.0-dev
+  version: 1.61.0-dev
 configs:
   asan:
     CC: clang

doc/g_stands_for.md

@@ -59,4 +59,5 @@
 - 1.57 'g' stands for ['grounded'](https://github.com/grpc/grpc/tree/v1.57.x)
 - 1.58 'g' stands for ['goku'](https://github.com/grpc/grpc/tree/v1.58.x)
 - 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/master)
+- 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/master)