Merge remote-tracking branch 'upstream/master' into dualstack_wrr

markdroth · Sep 15, 2023 · fb1deca · fb1deca
2 parents feb0b11 + 17662c6
commit fb1deca
Show file tree

Hide file tree

Showing 82 changed files with 1,300 additions and 1,051 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -31,9 +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/debug/stats_data.h linguist-generated=true
-src/core/debug/stats_data.cc linguist-generated=true
-src/core/experiments/experiments.h linguist-generated=true
-src/core/experiments/experiments.cc linguist-generated=true
+src/core/lib/debug/stats_data.h 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
diff --git a/BUILD b/BUILD
@@ -2398,14 +2398,20 @@ grpc_cc_library(
     hdrs = [
         "//src/core:lib/gprpp/work_serializer.h",
     ],
-    external_deps = ["absl/base:core_headers"],
+    external_deps = [
+        "absl/base:core_headers",
+        "absl/container:inlined_vector",
+    ],
     language = "c++",
     visibility = ["@grpc:client_channel"],
     deps = [
         "debug_location",
+        "event_engine_base_hdrs",
+        "exec_ctx",
         "gpr",
         "grpc_trace",
         "orphanable",
+        "//src/core:experiments",
     ],
 )
 
@@ -3065,7 +3071,9 @@ grpc_cc_library(
         "//src/core:dual_ref_counted",
         "//src/core:env",
         "//src/core:error",
+        "//src/core:experiments",
         "//src/core:gpr_atm",
+        "//src/core:gpr_manual_constructor",
         "//src/core:grpc_backend_metric_data",
         "//src/core:grpc_deadline_filter",
         "//src/core:grpc_service_config",
@@ -3723,6 +3731,7 @@ grpc_cc_library(
         "work_serializer",
         "//src/core:channel_args",
         "//src/core:grpc_service_config",
+        "//src/core:notification",
         "//src/core:ref_counted",
         "//src/core:useful",
     ],

diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Makefile b/Makefile
diff --git a/Package.swift b/Package.swift