grpc 1.52.0.pre2 → 1.53.0.pre2

data/src/core/lib/debug/stats_data.cc

@@ -1,22 +1,18 @@
-/*
- * Copyright 2017 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2017 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-/*
- * Automatically generated by tools/codegen/core/gen_stats_data.py
- */
+// Automatically generated by tools/codegen/core/gen_stats_data.py
 
 #include <grpc/support/port_platform.h>
 
@@ -31,15 +27,15 @@ union DblUint {
   uint64_t uint;
 };
 }  // namespace
-void HistogramCollector_32768_24::Collect(Histogram_32768_24* result) const {
-  for (int i = 0; i < 24; i++) {
+void HistogramCollector_65536_26::Collect(Histogram_65536_26* result) const {
+  for (int i = 0; i < 26; i++) {
     result->buckets_[i] += buckets_[i].load(std::memory_order_relaxed);
   }
 }
-Histogram_32768_24 operator-(const Histogram_32768_24& left,
-                             const Histogram_32768_24& right) {
-  Histogram_32768_24 result;
-  for (int i = 0; i < 24; i++) {
+Histogram_65536_26 operator-(const Histogram_65536_26& left,
+                             const Histogram_65536_26& right) {
+  Histogram_65536_26 result;
+  for (int i = 0; i < 26; i++) {
     result.buckets_[i] = left.buckets_[i] - right.buckets_[i];
   }
   return result;
@@ -73,23 +69,15 @@ Histogram_80_10 operator-(const Histogram_80_10& left,
 }
 const absl::string_view
     GlobalStats::counter_name[static_cast<int>(Counter::COUNT)] = {
-        "client_calls_created",
-        "server_calls_created",
-        "client_channels_created",
-        "client_subchannels_created",
-        "server_channels_created",
-        "syscall_write",
-        "syscall_read",
-        "tcp_read_alloc_8k",
-        "tcp_read_alloc_64k",
-        "http2_settings_writes",
-        "http2_pings_sent",
-        "http2_writes_begun",
-        "http2_transport_stalls",
-        "http2_stream_stalls",
-        "cq_pluck_creates",
-        "cq_next_creates",
-        "cq_callback_creates",
+        "client_calls_created",    "server_calls_created",
+        "client_channels_created", "client_subchannels_created",
+        "server_channels_created", "insecure_connections_created",
+        "syscall_write",           "syscall_read",
+        "tcp_read_alloc_8k",       "tcp_read_alloc_64k",
+        "http2_settings_writes",   "http2_pings_sent",
+        "http2_writes_begun",      "http2_transport_stalls",
+        "http2_stream_stalls",     "cq_pluck_creates",
+        "cq_next_creates",         "cq_callback_creates",
 };
 const absl::string_view GlobalStats::counter_doc[static_cast<int>(
     Counter::COUNT)] = {
@@ -98,6 +86,7 @@ const absl::string_view GlobalStats::counter_doc[static_cast<int>(
     "Number of client channels created",
     "Number of client subchannels created",
     "Number of server channels created",
+    "Number of insecure connections created",
     "Number of write syscalls (or equivalent - eg sendmsg) made by this "
     "process",
     "Number of read syscalls (or equivalent - eg recvmsg) made by this process",
@@ -117,29 +106,31 @@ const absl::string_view GlobalStats::counter_doc[static_cast<int>(
     "Number of completion queues created for cq_callback (indicates callback "
     "api usage)",
 };
-const absl::string_view
-    GlobalStats::histogram_name[static_cast<int>(Histogram::COUNT)] = {
-        "call_initial_size",       "tcp_write_size", "tcp_write_iov_size",
-        "tcp_read_size",           "tcp_read_offer", "tcp_read_offer_iov_size",
-        "http2_send_message_size",
+const absl::string_view GlobalStats::histogram_name[static_cast<int>(
+    Histogram::COUNT)] = {
+    "call_initial_size",       "tcp_write_size",      "tcp_write_iov_size",
+    "tcp_read_size",           "tcp_read_offer",      "tcp_read_offer_iov_size",
+    "http2_send_message_size", "http2_metadata_size",
 };
-const absl::string_view
-    GlobalStats::histogram_doc[static_cast<int>(Histogram::COUNT)] = {
-        "Initial size of the grpc_call arena created at call start",
-        "Number of bytes offered to each syscall_write",
-        "Number of byte segments offered to each syscall_write",
-        "Number of bytes received by each syscall_read",
-        "Number of bytes offered to each syscall_read",
-        "Number of byte segments offered to each syscall_read",
-        "Size of messages received by HTTP2 transport",
+const absl::string_view GlobalStats::histogram_doc[static_cast<int>(
+    Histogram::COUNT)] = {
+    "Initial size of the grpc_call arena created at call start",
+    "Number of bytes offered to each syscall_write",
+    "Number of byte segments offered to each syscall_write",
+    "Number of bytes received by each syscall_read",
+    "Number of bytes offered to each syscall_read",
+    "Number of byte segments offered to each syscall_read",
+    "Size of messages received by HTTP2 transport",
+    "Number of bytes consumed by metadata, according to HPACK accounting rules",
 };
 namespace {
-const int kStatsTable0[25] = {
-    0,   1,   2,   4,    7,    11,   17,   26,   40,   61,    93,    142,  216,
-    329, 500, 760, 1155, 1755, 2667, 4052, 6155, 9350, 14203, 21574, 32768};
-const uint8_t kStatsTable1[27] = {3,  3,  4,  5,  6,  6,  7,  8,  9,
-                                  10, 11, 11, 12, 13, 14, 15, 16, 16,
-                                  17, 18, 19, 20, 20, 21, 22, 23, 24};
+const int kStatsTable0[27] = {0,    1,     2,     4,     7,     11,   17,
+                              26,   40,    61,    92,    139,   210,  317,
+                              478,  721,   1087,  1638,  2468,  3719, 5604,
+                              8443, 12721, 19166, 28875, 43502, 65536};
+const uint8_t kStatsTable1[29] = {3,  3,  4,  5,  6,  6,  7,  8,  9,  10,
+                                  11, 11, 12, 13, 14, 15, 16, 16, 17, 18,
+                                  19, 20, 21, 21, 22, 23, 24, 25, 26};
 const int kStatsTable2[21] = {
     0,     1,      3,      8,       19,      45,      106,
     250,   588,    1383,   3252,    7646,    17976,   42262,
@@ -150,7 +141,7 @@ const uint8_t kStatsTable3[23] = {2,  3,  3,  4,  5,  6,  7,  8,
 const int kStatsTable4[11] = {0, 1, 2, 4, 7, 11, 17, 26, 38, 56, 80};
 const uint8_t kStatsTable5[9] = {3, 3, 4, 5, 6, 6, 7, 8, 9};
 }  // namespace
-int Histogram_32768_24::BucketFor(int value) {
+int Histogram_65536_26::BucketFor(int value) {
   if (value < 3) {
     if (value < 0) {
       return 0;
@@ -158,14 +149,14 @@ int Histogram_32768_24::BucketFor(int value) {
       return value;
     }
   } else {
-    if (value < 24577) {
+    if (value < 49153) {
       DblUint val;
       val.dbl = value;
       const int bucket =
           kStatsTable1[((val.uint - 4613937818241073152ull) >> 51)];
       return bucket - (value < kStatsTable0[bucket]);
     } else {
-      return 23;
+      return 25;
     }
   }
 }
@@ -217,6 +208,7 @@ GlobalStats::GlobalStats()
       client_channels_created{0},
       client_subchannels_created{0},
       server_channels_created{0},
+      insecure_connections_created{0},
       syscall_write{0},
       syscall_read{0},
       tcp_read_alloc_8k{0},
@@ -234,7 +226,7 @@ HistogramView GlobalStats::histogram(Histogram which) const {
     default:
       GPR_UNREACHABLE_CODE(return HistogramView());
     case Histogram::kCallInitialSize:
-      return HistogramView{&Histogram_32768_24::BucketFor, kStatsTable0, 24,
+      return HistogramView{&Histogram_65536_26::BucketFor, kStatsTable0, 26,
                            call_initial_size.buckets()};
     case Histogram::kTcpWriteSize:
       return HistogramView{&Histogram_16777216_20::BucketFor, kStatsTable2, 20,
@@ -254,6 +246,9 @@ HistogramView GlobalStats::histogram(Histogram which) const {
     case Histogram::kHttp2SendMessageSize:
       return HistogramView{&Histogram_16777216_20::BucketFor, kStatsTable2, 20,
                            http2_send_message_size.buckets()};
+    case Histogram::kHttp2MetadataSize:
+      return HistogramView{&Histogram_65536_26::BucketFor, kStatsTable0, 26,
+                           http2_metadata_size.buckets()};
   }
 }
 std::unique_ptr<GlobalStats> GlobalStatsCollector::Collect() const {
@@ -269,6 +264,8 @@ std::unique_ptr<GlobalStats> GlobalStatsCollector::Collect() const {
         data.client_subchannels_created.load(std::memory_order_relaxed);
     result->server_channels_created +=
         data.server_channels_created.load(std::memory_order_relaxed);
+    result->insecure_connections_created +=
+        data.insecure_connections_created.load(std::memory_order_relaxed);
     result->syscall_write += data.syscall_write.load(std::memory_order_relaxed);
     result->syscall_read += data.syscall_read.load(std::memory_order_relaxed);
     result->tcp_read_alloc_8k +=
@@ -298,6 +295,7 @@ std::unique_ptr<GlobalStats> GlobalStatsCollector::Collect() const {
     data.tcp_read_offer.Collect(&result->tcp_read_offer);
     data.tcp_read_offer_iov_size.Collect(&result->tcp_read_offer_iov_size);
     data.http2_send_message_size.Collect(&result->http2_send_message_size);
+    data.http2_metadata_size.Collect(&result->http2_metadata_size);
   }
   return result;
 }
@@ -313,6 +311,8 @@ std::unique_ptr<GlobalStats> GlobalStats::Diff(const GlobalStats& other) const {
       client_subchannels_created - other.client_subchannels_created;
   result->server_channels_created =
       server_channels_created - other.server_channels_created;
+  result->insecure_connections_created =
+      insecure_connections_created - other.insecure_connections_created;
   result->syscall_write = syscall_write - other.syscall_write;
   result->syscall_read = syscall_read - other.syscall_read;
   result->tcp_read_alloc_8k = tcp_read_alloc_8k - other.tcp_read_alloc_8k;
@@ -336,6 +336,7 @@ std::unique_ptr<GlobalStats> GlobalStats::Diff(const GlobalStats& other) const {
       tcp_read_offer_iov_size - other.tcp_read_offer_iov_size;
   result->http2_send_message_size =
       http2_send_message_size - other.http2_send_message_size;
+  result->http2_metadata_size = http2_metadata_size - other.http2_metadata_size;
   return result;
 }
 }  // namespace grpc_core

data/src/core/lib/debug/stats_data.h

@@ -1,25 +1,21 @@
-/*
- * Copyright 2017 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2017 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-/*
- * Automatically generated by tools/codegen/core/gen_stats_data.py
- */
+// Automatically generated by tools/codegen/core/gen_stats_data.py
 
-#ifndef GRPC_CORE_LIB_DEBUG_STATS_DATA_H
-#define GRPC_CORE_LIB_DEBUG_STATS_DATA_H
+#ifndef GRPC_SRC_CORE_LIB_DEBUG_STATS_DATA_H
+#define GRPC_SRC_CORE_LIB_DEBUG_STATS_DATA_H
 
 #include <grpc/support/port_platform.h>
 
@@ -34,28 +30,28 @@
 #include "src/core/lib/gprpp/per_cpu.h"
 
 namespace grpc_core {
-class HistogramCollector_32768_24;
-class Histogram_32768_24 {
+class HistogramCollector_65536_26;
+class Histogram_65536_26 {
  public:
   static int BucketFor(int value);
   const uint64_t* buckets() const { return buckets_; }
-  friend Histogram_32768_24 operator-(const Histogram_32768_24& left,
-                                      const Histogram_32768_24& right);
+  friend Histogram_65536_26 operator-(const Histogram_65536_26& left,
+                                      const Histogram_65536_26& right);
 
  private:
-  friend class HistogramCollector_32768_24;
-  uint64_t buckets_[24]{};
+  friend class HistogramCollector_65536_26;
+  uint64_t buckets_[26]{};
 };
-class HistogramCollector_32768_24 {
+class HistogramCollector_65536_26 {
  public:
   void Increment(int value) {
-    buckets_[Histogram_32768_24::BucketFor(value)].fetch_add(
+    buckets_[Histogram_65536_26::BucketFor(value)].fetch_add(
         1, std::memory_order_relaxed);
   }
-  void Collect(Histogram_32768_24* result) const;
+  void Collect(Histogram_65536_26* result) const;
 
  private:
-  std::atomic<uint64_t> buckets_[24]{};
+  std::atomic<uint64_t> buckets_[26]{};
 };
 class HistogramCollector_16777216_20;
 class Histogram_16777216_20 {
@@ -110,6 +106,7 @@ struct GlobalStats {
     kClientChannelsCreated,
     kClientSubchannelsCreated,
     kServerChannelsCreated,
+    kInsecureConnectionsCreated,
     kSyscallWrite,
     kSyscallRead,
     kTcpReadAlloc8k,
@@ -132,6 +129,7 @@ struct GlobalStats {
     kTcpReadOffer,
     kTcpReadOfferIovSize,
     kHttp2SendMessageSize,
+    kHttp2MetadataSize,
     COUNT
   };
   GlobalStats();
@@ -148,6 +146,7 @@ struct GlobalStats {
       uint64_t client_channels_created;
       uint64_t client_subchannels_created;
       uint64_t server_channels_created;
+      uint64_t insecure_connections_created;
       uint64_t syscall_write;
       uint64_t syscall_read;
       uint64_t tcp_read_alloc_8k;
@@ -163,13 +162,14 @@ struct GlobalStats {
     };
     uint64_t counters[static_cast<int>(Counter::COUNT)];
   };
-  Histogram_32768_24 call_initial_size;
+  Histogram_65536_26 call_initial_size;
   Histogram_16777216_20 tcp_write_size;
   Histogram_80_10 tcp_write_iov_size;
   Histogram_16777216_20 tcp_read_size;
   Histogram_16777216_20 tcp_read_offer;
   Histogram_80_10 tcp_read_offer_iov_size;
   Histogram_16777216_20 http2_send_message_size;
+  Histogram_65536_26 http2_metadata_size;
   HistogramView histogram(Histogram which) const;
   std::unique_ptr<GlobalStats> Diff(const GlobalStats& other) const;
 };
@@ -196,6 +196,10 @@ class GlobalStatsCollector {
     data_.this_cpu().server_channels_created.fetch_add(
         1, std::memory_order_relaxed);
   }
+  void IncrementInsecureConnectionsCreated() {
+    data_.this_cpu().insecure_connections_created.fetch_add(
+        1, std::memory_order_relaxed);
+  }
   void IncrementSyscallWrite() {
     data_.this_cpu().syscall_write.fetch_add(1, std::memory_order_relaxed);
   }
@@ -257,6 +261,9 @@ class GlobalStatsCollector {
   void IncrementHttp2SendMessageSize(int value) {
     data_.this_cpu().http2_send_message_size.Increment(value);
   }
+  void IncrementHttp2MetadataSize(int value) {
+    data_.this_cpu().http2_metadata_size.Increment(value);
+  }
 
  private:
   struct Data {
@@ -265,6 +272,7 @@ class GlobalStatsCollector {
     std::atomic<uint64_t> client_channels_created{0};
     std::atomic<uint64_t> client_subchannels_created{0};
     std::atomic<uint64_t> server_channels_created{0};
+    std::atomic<uint64_t> insecure_connections_created{0};
     std::atomic<uint64_t> syscall_write{0};
     std::atomic<uint64_t> syscall_read{0};
     std::atomic<uint64_t> tcp_read_alloc_8k{0};
@@ -277,16 +285,17 @@ class GlobalStatsCollector {
     std::atomic<uint64_t> cq_pluck_creates{0};
     std::atomic<uint64_t> cq_next_creates{0};
     std::atomic<uint64_t> cq_callback_creates{0};
-    HistogramCollector_32768_24 call_initial_size;
+    HistogramCollector_65536_26 call_initial_size;
     HistogramCollector_16777216_20 tcp_write_size;
     HistogramCollector_80_10 tcp_write_iov_size;
     HistogramCollector_16777216_20 tcp_read_size;
     HistogramCollector_16777216_20 tcp_read_offer;
     HistogramCollector_80_10 tcp_read_offer_iov_size;
     HistogramCollector_16777216_20 http2_send_message_size;
+    HistogramCollector_65536_26 http2_metadata_size;
   };
   PerCpu<Data> data_;
 };
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_LIB_DEBUG_STATS_DATA_H */
+#endif  // GRPC_SRC_CORE_LIB_DEBUG_STATS_DATA_H

data/src/core/lib/debug/trace.h

@@ -16,20 +16,12 @@
 //
 //
 
-#ifndef GRPC_CORE_LIB_DEBUG_TRACE_H
-#define GRPC_CORE_LIB_DEBUG_TRACE_H
-
-#if defined(__has_feature)
-#if __has_feature(thread_sanitizer)
-#define GRPC_THREADSAFE_TRACER
-#endif
-#endif
+#ifndef GRPC_SRC_CORE_LIB_DEBUG_TRACE_H
+#define GRPC_SRC_CORE_LIB_DEBUG_TRACE_H
 
 #include <grpc/support/port_platform.h>
 
-#ifdef GRPC_THREADSAFE_TRACER
 #include <atomic>
-#endif
 
 #include "src/core/lib/gprpp/global_config.h"
 #include "src/core/lib/gprpp/memory.h"
@@ -79,13 +71,7 @@ class TraceFlag {
 // Prefer GRPC_TRACE_FLAG_ENABLED() macro instead of using enabled() directly.
 #define GRPC_USE_TRACERS  // tracers on by default in OSS
 #if defined(GRPC_USE_TRACERS) || !defined(NDEBUG)
-  bool enabled() {
-#ifdef GRPC_THREADSAFE_TRACER
-    return value_.load(std::memory_order_relaxed);
-#else
-    return value_;
-#endif  // GRPC_THREADSAFE_TRACER
-  }
+  bool enabled() { return value_.load(std::memory_order_relaxed); }
 #else
   bool enabled() { return false; }
 #endif  // defined(GRPC_USE_TRACERS) || !defined(NDEBUG)
@@ -95,20 +81,12 @@ class TraceFlag {
   friend class TraceFlagList;
 
   void set_enabled(bool enabled) {
-#ifdef GRPC_THREADSAFE_TRACER
     value_.store(enabled, std::memory_order_relaxed);
-#else
-    value_ = enabled;
-#endif
   }
 
   TraceFlag* next_tracer_;
   const char* const name_;
-#ifdef GRPC_THREADSAFE_TRACER
   std::atomic<bool> value_;
-#else
-  bool value_;
-#endif
 };
 
 #define GRPC_TRACE_FLAG_ENABLED(f) GPR_UNLIKELY((f).enabled())
@@ -130,4 +108,4 @@ class DebugOnlyTraceFlag {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_LIB_DEBUG_TRACE_H
+#endif  // GRPC_SRC_CORE_LIB_DEBUG_TRACE_H

data/src/core/lib/event_engine/channel_args_endpoint_config.cc

@@ -17,6 +17,8 @@
 
 #include "absl/types/optional.h"
 
+#include <grpc/event_engine/event_engine.h>
+
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc_event_engine {
@@ -33,6 +35,9 @@ absl::optional<absl::string_view> ChannelArgsEndpointConfig::GetString(
 }
 
 void* ChannelArgsEndpointConfig::GetVoidPointer(absl::string_view key) const {
+  if (key == GRPC_INTERNAL_ARG_EVENT_ENGINE) {
+    return args_.GetObject<EventEngine>();
+  }
   return args_.GetVoidPointer(key);
 }
 

data/src/core/lib/event_engine/channel_args_endpoint_config.h

@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef GRPC_CORE_LIB_EVENT_ENGINE_CHANNEL_ARGS_ENDPOINT_CONFIG_H
-#define GRPC_CORE_LIB_EVENT_ENGINE_CHANNEL_ARGS_ENDPOINT_CONFIG_H
+#ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_CHANNEL_ARGS_ENDPOINT_CONFIG_H
+#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_CHANNEL_ARGS_ENDPOINT_CONFIG_H
 
 #include <grpc/support/port_platform.h>
 
@@ -46,4 +46,4 @@ class ChannelArgsEndpointConfig : public EndpointConfig {
 }  // namespace experimental
 }  // namespace grpc_event_engine
 
-#endif  // GRPC_CORE_LIB_EVENT_ENGINE_CHANNEL_ARGS_ENDPOINT_CONFIG_H
+#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_CHANNEL_ARGS_ENDPOINT_CONFIG_H

data/src/core/lib/event_engine/common_closures.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H
-#define GRPC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H
+#ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H
+#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H
 
 #include <grpc/support/port_platform.h>
 
@@ -68,4 +68,4 @@ class SelfDeletingClosure : public EventEngine::Closure {
 }  // namespace experimental
 }  // namespace grpc_event_engine
 
-#endif  // GRPC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H
+#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H

data/src/core/lib/event_engine/default_event_engine.cc

@@ -28,6 +28,7 @@
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/default_event_engine_factory.h"
 #include "src/core/lib/event_engine/trace.h"
+#include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/no_destruct.h"
 #include "src/core/lib/gprpp/sync.h"
 
@@ -63,15 +64,19 @@ std::unique_ptr<EventEngine> CreateEventEngine() {
   return DefaultEventEngineFactory();
 }
 
-std::shared_ptr<EventEngine> GetDefaultEventEngine() {
+std::shared_ptr<EventEngine> GetDefaultEventEngine(
+    grpc_core::SourceLocation location) {
   grpc_core::MutexLock lock(&*g_mu);
   if (std::shared_ptr<EventEngine> engine = g_event_engine->lock()) {
-    GRPC_EVENT_ENGINE_TRACE("DefaultEventEngine::%p use_count:%ld",
-                            engine.get(), engine.use_count());
+    GRPC_EVENT_ENGINE_TRACE(
+        "Returning existing EventEngine::%p. use_count:%ld. Called from "
+        "[%s:%d]",
+        engine.get(), engine.use_count(), location.file(), location.line());
     return engine;
   }
   std::shared_ptr<EventEngine> engine{CreateEventEngine()};
-  GRPC_EVENT_ENGINE_TRACE("Created DefaultEventEngine::%p", engine.get());
+  GRPC_EVENT_ENGINE_TRACE("Created DefaultEventEngine::%p. Called from [%s:%d]",
+                          engine.get(), location.file(), location.line());
   *g_event_engine = engine;
   return engine;
 }

data/src/core/lib/event_engine/default_event_engine.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H
-#define GRPC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H
+#ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H
+#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -22,6 +22,7 @@
 #include <grpc/event_engine/event_engine.h>
 
 #include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/promise/context.h"
 
 namespace grpc_core {
@@ -34,9 +35,32 @@ namespace experimental {
 
 /// Access the shared global EventEngine instance.
 ///
-/// The concept of a global EventEngine may go away in a post-iomgr world.
-/// Strongly consider whether you could use \a CreateEventEngine instead.
-std::shared_ptr<EventEngine> GetDefaultEventEngine();
+/// GetDefaultEventEngine is a lazy thing: either a shared global EventEngine
+/// instance exists and will be returned, or that shared global instance will be
+/// created and returned. The returned shared_ptr<EventEngine>'s life is
+/// determined by the shared_ptr, and therefore EventEngines may be created and
+/// destroyed multiple times through the life of your gRPC process, there is no
+/// guarantee of one persistent global instance like in iomgr.
+///
+/// Why would we do this? To begin with, users may provide their own EventEngine
+/// instances on channel or server creation; if they do that, there is some
+/// chance that a default EventEngine instance will not have to be created, and
+/// applications will not have to pay the (probably small) price of
+/// instantiating an engine they do not own. The other major consideration is
+/// that gRPC shutdown is likely going away. Without a well-defined point at
+/// which a persistent global EventEngine instance can safely be shut down, we
+/// risk undefined behavior and various documented breakages if the engine is
+/// not shut down cleanly before the process exits. Therefore, allowing the
+/// EventEngine lifetimes to be determined by the scopes in which they are
+/// needed is a fine solution.
+///
+/// If you're writing code that needs an EventEngine, prefer 1) getting the
+/// EventEngine from somewhere it is already cached - preconditioned
+/// ChannelArgs, or the channel stack for example - or 2) if not otherwise
+/// available, call \a GetDefaultEventEngine and save that shared_ptr to ensure
+/// the Engine's lifetime is at least as long as you need it to be.
+std::shared_ptr<EventEngine> GetDefaultEventEngine(
+    grpc_core::SourceLocation location = grpc_core::SourceLocation());
 
 /// On ingress, ensure that an EventEngine exists in channel args via
 /// preconditioning.
@@ -46,4 +70,4 @@ void RegisterEventEngineChannelArgPreconditioning(
 }  // namespace experimental
 }  // namespace grpc_event_engine
 
-#endif  // GRPC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H
+#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H

data/src/core/lib/event_engine/default_event_engine_factory.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H
-#define GRPC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H
+#ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H
+#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H
 
 #include <grpc/support/port_platform.h>
 
@@ -30,4 +30,4 @@ std::unique_ptr<EventEngine> DefaultEventEngineFactory();
 }  // namespace experimental
 }  // namespace grpc_event_engine
 
-#endif  // GRPC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H
+#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H

data/src/core/lib/event_engine/event_engine.cc

@@ -0,0 +1,25 @@
+// Copyright 2023 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#include <grpc/support/port_platform.h>
+
+#include <grpc/event_engine/event_engine.h>
+
+namespace grpc_event_engine {
+namespace experimental {
+
+constexpr EventEngine::TaskHandle EventEngine::kInvalidTaskHandle;
+constexpr EventEngine::ConnectionHandle EventEngine::kInvalidConnectionHandle;
+
+}  // namespace experimental
+}  // namespace grpc_event_engine