Merge branch 'master' into ssl-shard-count

matthewstevenson88 · May 13, 2024 · 6059308 · 6059308
2 parents 8631894 + 27b82ca
commit 6059308
Show file tree

Hide file tree

Showing 56 changed files with 1,009 additions and 1,596 deletions.
diff --git a/BUILD b/BUILD
@@ -1942,9 +1942,7 @@ grpc_cc_library(
         "promise",
         "ref_counted_ptr",
         "stats",
-        "//src/core:1999",
         "//src/core:activity",
-        "//src/core:arena",
         "//src/core:arena_promise",
         "//src/core:cancel_callback",
         "//src/core:channel_args",
@@ -1958,6 +1956,7 @@ grpc_cc_library(
         "//src/core:error",
         "//src/core:error_utils",
         "//src/core:experiments",
+        "//src/core:interception_chain",
         "//src/core:iomgr_fwd",
         "//src/core:map",
         "//src/core:metadata_batch",
@@ -2078,6 +2077,7 @@ grpc_cc_library(
         "//src/core:arena_promise",
         "//src/core:atomic_utils",
         "//src/core:bitset",
+        "//src/core:call_destination",
         "//src/core:call_filters",
         "//src/core:call_final_info",
         "//src/core:call_finalization",

diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Makefile b/Makefile
diff --git a/Package.swift b/Package.swift
diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
diff --git a/config.m4 b/config.m4
diff --git a/config.w32 b/config.w32
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
diff --git a/grpc.gemspec b/grpc.gemspec
diff --git a/include/grpcpp/ext/otel_plugin.h b/include/grpcpp/ext/otel_plugin.h
@@ -88,11 +88,25 @@ class OpenTelemetryPluginBuilder {
   /// If `SetMeterProvider()` is not called, no metrics are collected.
   OpenTelemetryPluginBuilder& SetMeterProvider(
       std::shared_ptr<opentelemetry::metrics::MeterProvider> meter_provider);
-  /// If set, \a target_attribute_filter is called per channel to decide whether
-  /// to record the target attribute on client or to replace it with "other".
-  /// This helps reduce the cardinality on metrics in cases where many channels
-  /// are created with different targets in the same binary (which might happen
-  /// for example, if the channel target string uses IP addresses directly).
+  /// DEPRECATED: If set, \a target_attribute_filter is called per channel to
+  /// decide whether to record the target attribute on client or to replace it
+  /// with "other". This helps reduce the cardinality on metrics in cases where
+  /// many channels are created with different targets in the same binary (which
+  /// might happen for example, if the channel target string uses IP addresses
+  /// directly).
+  /// This filtration only works for the per-call metrics -
+  /// grpc.client.attempt.started
+  /// grpc.client.attempt.duration
+  /// grpc.client.attempt.sent_total_compressed_message_size
+  /// grpc.client.attempt.rcvd_total_compressed_message_size
+  /// For example, the grpc.target attribute on pick first lb policy metrics
+  /// defined in
+  /// https://github.com/grpc/proposal/blob/master/A78-grpc-metrics-wrr-pf-xds.md
+  /// will not be filtered. Please contact the grpc team if this filtration is
+  /// of interest to you.
+  GRPC_DEPRECATED(
+      "Does not work as expected. Please raise an issue on "
+      "https://github.com/grpc/grpc if this would be of use to you.")
   OpenTelemetryPluginBuilder& SetTargetAttributeFilter(
       absl::AnyInvocable<bool(absl::string_view /*target*/) const>
           target_attribute_filter);

diff --git a/package.xml b/package.xml
diff --git a/src/core/BUILD b/src/core/BUILD
@@ -664,7 +664,10 @@ grpc_cc_library(
 
 grpc_cc_library(
     name = "promise_like",
-    external_deps = ["absl/meta:type_traits"],
+    external_deps = [
+        "absl/functional:any_invocable",
+        "absl/meta:type_traits",
+    ],
     language = "c++",
     public_hdrs = [
         "lib/promise/detail/promise_like.h",
@@ -3130,6 +3133,7 @@ grpc_cc_library(
         "channel_fwd",
         "channel_stack_trace",
         "channel_stack_type",
+        "interception_chain",
         "//:channel_stack_builder",
         "//:debug_location",
         "//:gpr",
@@ -3147,6 +3151,7 @@ grpc_cc_library(
     deps = [
         "channel_args",
         "//:channelz",
+        "//:event_engine_base_hdrs",
         "//:gpr_platform",
     ],
 )
@@ -7087,6 +7092,7 @@ grpc_cc_library(
         "experiments",
         "iomgr_fwd",
         "metadata_batch",
+        "resource_quota",
         "slice",
         "slice_buffer",
         "status_helper",