grpc 1.70.1 → 1.71.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3d9dc2a0f6e2e1be40db23cb763857b333850e692c842dc01b58333b1599070
-  data.tar.gz: dbb1dd9a7ed73243d498fbbb7a7944b62b4421bb8952f042c44233cae6e6cc42
+  metadata.gz: e4fe9919595645ce34228d2cca8ab27222d0b8e08dcde7df4b4f66104825a6d3
+  data.tar.gz: eb3ad90988043fa92b4597851e3bb33b90bdc4075fc926276e8b724a6ae2e173
 SHA512:
-  metadata.gz: 7c467f358ea631bc227bbee3d0df2048004d9077990e07ec530ecd4a15b2a11304f241557f79e8defb180810c45a425b91bee767e4f77f9c924f42cf1ea2670e
-  data.tar.gz: 7029a108e3ad9d317e9da5608d091802a23d7a55730512ec42ca4c41ed330ca976832b4d40ac24719aa9e2a4672ca1c5f6ebd7ce1b2fc71dd07a51ee0ef5c7db
+  metadata.gz: 6d20d23004ed83ab14201a323dab6ef85527a97a9376e9a035587370220e84dc9d185968a4606bf09e7d2bd230ad59560edd407a5c5c336c9bcaf076c35c0fbb
+  data.tar.gz: 8708310fe819bce4a3b00b05822be099384c3d45ea56cfa2784e4bc11cf2a77708840d1feb15117e20da4b48c6c36df0aa09f4c011af6d84b4e584f0c334ee01

data/Makefile

@@ -367,8 +367,8 @@ E = @echo
 Q = @
 endif
 
-CORE_VERSION = 45.0.0
-CPP_VERSION = 1.70.1
+CORE_VERSION = 46.0.0
+CPP_VERSION = 1.71.0
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
@@ -404,7 +404,7 @@ SHARED_EXT_CORE = dll
 SHARED_EXT_CPP = dll
 
 SHARED_PREFIX =
-SHARED_VERSION_CORE = -45
+SHARED_VERSION_CORE = -46
 SHARED_VERSION_CPP = -1
 else ifeq ($(SYSTEM),Darwin)
 EXECUTABLE_SUFFIX =
@@ -838,6 +838,7 @@ LIBGRPC_SRC = \
     src/core/ext/upb-gen/envoy/service/status/v3/csds.upb_minitable.c \
     src/core/ext/upb-gen/envoy/type/http/v3/cookie.upb_minitable.c \
     src/core/ext/upb-gen/envoy/type/http/v3/path_transformation.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/type/matcher/v3/address.upb_minitable.c \
     src/core/ext/upb-gen/envoy/type/matcher/v3/filter_state.upb_minitable.c \
     src/core/ext/upb-gen/envoy/type/matcher/v3/http_inputs.upb_minitable.c \
     src/core/ext/upb-gen/envoy/type/matcher/v3/metadata.upb_minitable.c \
@@ -999,6 +1000,7 @@ LIBGRPC_SRC = \
     src/core/ext/upbdefs-gen/envoy/service/status/v3/csds.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/type/http/v3/cookie.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/type/http/v3/path_transformation.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/type/matcher/v3/address.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/type/matcher/v3/filter_state.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/type/matcher/v3/http_inputs.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/type/matcher/v3/metadata.upbdefs.c \
@@ -1768,30 +1770,15 @@ PUBLIC_HEADERS_C += \
     include/grpc/grpc_posix.h \
     include/grpc/grpc_security.h \
     include/grpc/grpc_security_constants.h \
-    include/grpc/impl/call.h \
     include/grpc/impl/channel_arg_names.h \
-    include/grpc/impl/codegen/atm.h \
-    include/grpc/impl/codegen/atm_gcc_atomic.h \
-    include/grpc/impl/codegen/atm_gcc_sync.h \
-    include/grpc/impl/codegen/atm_windows.h \
     include/grpc/impl/codegen/byte_buffer.h \
     include/grpc/impl/codegen/byte_buffer_reader.h \
     include/grpc/impl/codegen/compression_types.h \
     include/grpc/impl/codegen/connectivity_state.h \
-    include/grpc/impl/codegen/fork.h \
-    include/grpc/impl/codegen/gpr_types.h \
     include/grpc/impl/codegen/grpc_types.h \
-    include/grpc/impl/codegen/log.h \
-    include/grpc/impl/codegen/port_platform.h \
     include/grpc/impl/codegen/propagation_bits.h \
     include/grpc/impl/codegen/slice.h \
     include/grpc/impl/codegen/status.h \
-    include/grpc/impl/codegen/sync.h \
-    include/grpc/impl/codegen/sync_abseil.h \
-    include/grpc/impl/codegen/sync_custom.h \
-    include/grpc/impl/codegen/sync_generic.h \
-    include/grpc/impl/codegen/sync_posix.h \
-    include/grpc/impl/codegen/sync_windows.h \
     include/grpc/impl/compression_types.h \
     include/grpc/impl/connectivity_state.h \
     include/grpc/impl/grpc_types.h \
@@ -1802,25 +1789,6 @@ PUBLIC_HEADERS_C += \
     include/grpc/slice.h \
     include/grpc/slice_buffer.h \
     include/grpc/status.h \
-    include/grpc/support/alloc.h \
-    include/grpc/support/atm_gcc_atomic.h \
-    include/grpc/support/atm_gcc_sync.h \
-    include/grpc/support/atm_windows.h \
-    include/grpc/support/cpu.h \
-    include/grpc/support/json.h \
-    include/grpc/support/log.h \
-    include/grpc/support/log_windows.h \
-    include/grpc/support/metrics.h \
-    include/grpc/support/port_platform.h \
-    include/grpc/support/string_util.h \
-    include/grpc/support/sync.h \
-    include/grpc/support/sync_abseil.h \
-    include/grpc/support/sync_custom.h \
-    include/grpc/support/sync_generic.h \
-    include/grpc/support/sync_posix.h \
-    include/grpc/support/sync_windows.h \
-    include/grpc/support/thd_id.h \
-    include/grpc/support/time.h \
     include/grpc/support/workaround_list.h \
 
 LIBGRPC_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC_SRC))))
@@ -1859,8 +1827,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_
 ifeq ($(SYSTEM),Darwin)
 	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
 else
-	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.45 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
-	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.45
+	$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.46 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libcares.a $(OPENSSL_MERGE_LIBS) $(ZLIB_MERGE_LIBS) $(LDLIBS_SECURE) $(LDLIBS)
+	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.46
 	$(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so
 endif
 endif
@@ -1919,8 +1887,8 @@ LIBBORINGSSL_SRC = \
     third_party/boringssl-with-bazel/src/crypto/bio/socket.cc \
     third_party/boringssl-with-bazel/src/crypto/bio/socket_helper.cc \
     third_party/boringssl-with-bazel/src/crypto/blake2/blake2.cc \
-    third_party/boringssl-with-bazel/src/crypto/bn_extra/bn_asn1.cc \
-    third_party/boringssl-with-bazel/src/crypto/bn_extra/convert.cc \
+    third_party/boringssl-with-bazel/src/crypto/bn/bn_asn1.cc \
+    third_party/boringssl-with-bazel/src/crypto/bn/convert.cc \
     third_party/boringssl-with-bazel/src/crypto/buf/buf.cc \
     third_party/boringssl-with-bazel/src/crypto/bytestring/asn1_compat.cc \
     third_party/boringssl-with-bazel/src/crypto/bytestring/ber.cc \
@@ -1928,17 +1896,17 @@ LIBBORINGSSL_SRC = \
     third_party/boringssl-with-bazel/src/crypto/bytestring/cbs.cc \
     third_party/boringssl-with-bazel/src/crypto/bytestring/unicode.cc \
     third_party/boringssl-with-bazel/src/crypto/chacha/chacha.cc \
-    third_party/boringssl-with-bazel/src/crypto/cipher_extra/cipher_extra.cc \
-    third_party/boringssl-with-bazel/src/crypto/cipher_extra/derive_key.cc \
-    third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_aesctrhmac.cc \
-    third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_aesgcmsiv.cc \
-    third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_chacha20poly1305.cc \
-    third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_des.cc \
-    third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_null.cc \
-    third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_rc2.cc \
-    third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_rc4.cc \
-    third_party/boringssl-with-bazel/src/crypto/cipher_extra/e_tls.cc \
-    third_party/boringssl-with-bazel/src/crypto/cipher_extra/tls_cbc.cc \
+    third_party/boringssl-with-bazel/src/crypto/cipher/derive_key.cc \
+    third_party/boringssl-with-bazel/src/crypto/cipher/e_aesctrhmac.cc \
+    third_party/boringssl-with-bazel/src/crypto/cipher/e_aesgcmsiv.cc \
+    third_party/boringssl-with-bazel/src/crypto/cipher/e_chacha20poly1305.cc \
+    third_party/boringssl-with-bazel/src/crypto/cipher/e_des.cc \
+    third_party/boringssl-with-bazel/src/crypto/cipher/e_null.cc \
+    third_party/boringssl-with-bazel/src/crypto/cipher/e_rc2.cc \
+    third_party/boringssl-with-bazel/src/crypto/cipher/e_rc4.cc \
+    third_party/boringssl-with-bazel/src/crypto/cipher/e_tls.cc \
+    third_party/boringssl-with-bazel/src/crypto/cipher/get_cipher.cc \
+    third_party/boringssl-with-bazel/src/crypto/cipher/tls_cbc.cc \
     third_party/boringssl-with-bazel/src/crypto/conf/conf.cc \
     third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_apple.cc \
     third_party/boringssl-with-bazel/src/crypto/cpu_aarch64_fuchsia.cc \
@@ -1954,16 +1922,16 @@ LIBBORINGSSL_SRC = \
     third_party/boringssl-with-bazel/src/crypto/curve25519/curve25519_64_adx.cc \
     third_party/boringssl-with-bazel/src/crypto/curve25519/spake25519.cc \
     third_party/boringssl-with-bazel/src/crypto/des/des.cc \
-    third_party/boringssl-with-bazel/src/crypto/dh_extra/dh_asn1.cc \
-    third_party/boringssl-with-bazel/src/crypto/dh_extra/params.cc \
-    third_party/boringssl-with-bazel/src/crypto/digest_extra/digest_extra.cc \
+    third_party/boringssl-with-bazel/src/crypto/dh/dh_asn1.cc \
+    third_party/boringssl-with-bazel/src/crypto/dh/params.cc \
+    third_party/boringssl-with-bazel/src/crypto/digest/digest_extra.cc \
     third_party/boringssl-with-bazel/src/crypto/dsa/dsa.cc \
     third_party/boringssl-with-bazel/src/crypto/dsa/dsa_asn1.cc \
-    third_party/boringssl-with-bazel/src/crypto/ec_extra/ec_asn1.cc \
-    third_party/boringssl-with-bazel/src/crypto/ec_extra/ec_derive.cc \
-    third_party/boringssl-with-bazel/src/crypto/ec_extra/hash_to_curve.cc \
-    third_party/boringssl-with-bazel/src/crypto/ecdh_extra/ecdh_extra.cc \
-    third_party/boringssl-with-bazel/src/crypto/ecdsa_extra/ecdsa_asn1.cc \
+    third_party/boringssl-with-bazel/src/crypto/ec/ec_asn1.cc \
+    third_party/boringssl-with-bazel/src/crypto/ec/ec_derive.cc \
+    third_party/boringssl-with-bazel/src/crypto/ec/hash_to_curve.cc \
+    third_party/boringssl-with-bazel/src/crypto/ecdh/ecdh.cc \
+    third_party/boringssl-with-bazel/src/crypto/ecdsa/ecdsa_asn1.cc \
     third_party/boringssl-with-bazel/src/crypto/engine/engine.cc \
     third_party/boringssl-with-bazel/src/crypto/err/err.cc \
     third_party/boringssl-with-bazel/src/crypto/evp/evp.cc \
@@ -1990,7 +1958,6 @@ LIBBORINGSSL_SRC = \
     third_party/boringssl-with-bazel/src/crypto/fipsmodule/fips_shared_support.cc \
     third_party/boringssl-with-bazel/src/crypto/hpke/hpke.cc \
     third_party/boringssl-with-bazel/src/crypto/hrss/hrss.cc \
-    third_party/boringssl-with-bazel/src/crypto/keccak/keccak.cc \
     third_party/boringssl-with-bazel/src/crypto/kyber/kyber.cc \
     third_party/boringssl-with-bazel/src/crypto/lhash/lhash.cc \
     third_party/boringssl-with-bazel/src/crypto/md4/md4.cc \
@@ -2017,31 +1984,28 @@ LIBBORINGSSL_SRC = \
     third_party/boringssl-with-bazel/src/crypto/poly1305/poly1305_arm.cc \
     third_party/boringssl-with-bazel/src/crypto/poly1305/poly1305_vec.cc \
     third_party/boringssl-with-bazel/src/crypto/pool/pool.cc \
-    third_party/boringssl-with-bazel/src/crypto/rand_extra/deterministic.cc \
-    third_party/boringssl-with-bazel/src/crypto/rand_extra/fork_detect.cc \
-    third_party/boringssl-with-bazel/src/crypto/rand_extra/forkunsafe.cc \
-    third_party/boringssl-with-bazel/src/crypto/rand_extra/getentropy.cc \
-    third_party/boringssl-with-bazel/src/crypto/rand_extra/ios.cc \
-    third_party/boringssl-with-bazel/src/crypto/rand_extra/passive.cc \
-    third_party/boringssl-with-bazel/src/crypto/rand_extra/rand_extra.cc \
-    third_party/boringssl-with-bazel/src/crypto/rand_extra/trusty.cc \
-    third_party/boringssl-with-bazel/src/crypto/rand_extra/urandom.cc \
-    third_party/boringssl-with-bazel/src/crypto/rand_extra/windows.cc \
+    third_party/boringssl-with-bazel/src/crypto/rand/deterministic.cc \
+    third_party/boringssl-with-bazel/src/crypto/rand/fork_detect.cc \
+    third_party/boringssl-with-bazel/src/crypto/rand/forkunsafe.cc \
+    third_party/boringssl-with-bazel/src/crypto/rand/getentropy.cc \
+    third_party/boringssl-with-bazel/src/crypto/rand/ios.cc \
+    third_party/boringssl-with-bazel/src/crypto/rand/passive.cc \
+    third_party/boringssl-with-bazel/src/crypto/rand/rand.cc \
+    third_party/boringssl-with-bazel/src/crypto/rand/trusty.cc \
+    third_party/boringssl-with-bazel/src/crypto/rand/urandom.cc \
+    third_party/boringssl-with-bazel/src/crypto/rand/windows.cc \
     third_party/boringssl-with-bazel/src/crypto/rc4/rc4.cc \
     third_party/boringssl-with-bazel/src/crypto/refcount.cc \
-    third_party/boringssl-with-bazel/src/crypto/rsa_extra/rsa_asn1.cc \
-    third_party/boringssl-with-bazel/src/crypto/rsa_extra/rsa_crypt.cc \
-    third_party/boringssl-with-bazel/src/crypto/rsa_extra/rsa_extra.cc \
-    third_party/boringssl-with-bazel/src/crypto/rsa_extra/rsa_print.cc \
+    third_party/boringssl-with-bazel/src/crypto/rsa/rsa_asn1.cc \
+    third_party/boringssl-with-bazel/src/crypto/rsa/rsa_crypt.cc \
+    third_party/boringssl-with-bazel/src/crypto/rsa/rsa_extra.cc \
+    third_party/boringssl-with-bazel/src/crypto/rsa/rsa_print.cc \
     third_party/boringssl-with-bazel/src/crypto/sha/sha1.cc \
     third_party/boringssl-with-bazel/src/crypto/sha/sha256.cc \
     third_party/boringssl-with-bazel/src/crypto/sha/sha512.cc \
     third_party/boringssl-with-bazel/src/crypto/siphash/siphash.cc \
-    third_party/boringssl-with-bazel/src/crypto/slhdsa/fors.cc \
-    third_party/boringssl-with-bazel/src/crypto/slhdsa/merkle.cc \
     third_party/boringssl-with-bazel/src/crypto/slhdsa/slhdsa.cc \
-    third_party/boringssl-with-bazel/src/crypto/slhdsa/thash.cc \
-    third_party/boringssl-with-bazel/src/crypto/slhdsa/wots.cc \
+    third_party/boringssl-with-bazel/src/crypto/spake2plus/spake2plus.cc \
     third_party/boringssl-with-bazel/src/crypto/stack/stack.cc \
     third_party/boringssl-with-bazel/src/crypto/thread.cc \
     third_party/boringssl-with-bazel/src/crypto/thread_none.cc \

data/include/grpc/event_engine/endpoint_config.h

@@ -16,10 +16,10 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <optional>
 #include <string>
 
 #include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
 
 namespace grpc_event_engine {
 namespace experimental {
@@ -32,11 +32,11 @@ class EndpointConfig {
  public:
   virtual ~EndpointConfig() = default;
   // If the key points to an integer config, an integer value gets returned.
-  // Otherwise it returns an absl::nullopt_t
-  virtual absl::optional<int> GetInt(absl::string_view key) const = 0;
+  // Otherwise it returns an std::nullopt_t
+  virtual std::optional<int> GetInt(absl::string_view key) const = 0;
   // If the key points to an string config, an string value gets returned.
-  // Otherwise it returns an absl::nullopt_t
-  virtual absl::optional<absl::string_view> GetString(
+  // Otherwise it returns an std::nullopt_t
+  virtual std::optional<absl::string_view> GetString(
       absl::string_view key) const = 0;
   // If the key points to an void* config, a void* pointer value gets returned.
   // Otherwise it returns nullptr

data/include/grpc/event_engine/event_engine.h

@@ -28,6 +28,7 @@
 #include "absl/status/statusor.h"
 
 // TODO(vigneshbabu): Define the Endpoint::Write metrics collection system
+// TODO(hork): remove all references to the factory methods.
 namespace grpc_event_engine {
 namespace experimental {
 
@@ -471,7 +472,7 @@ class EventEngine : public std::enable_shared_from_this<EventEngine>,
   virtual bool Cancel(TaskHandle handle) = 0;
 };
 
-/// Replace gRPC's default EventEngine factory.
+/// [DEPRECATED] Replace gRPC's default EventEngine factory.
 ///
 /// Applications may call \a SetEventEngineFactory at any time to replace the
 /// default factory used within gRPC. EventEngines will be created when
@@ -480,18 +481,56 @@ class EventEngine : public std::enable_shared_from_this<EventEngine>,
 /// To be certain that none of the gRPC-provided built-in EventEngines are
 /// created, applications must set a custom EventEngine factory method *before*
 /// grpc is initialized.
+// TODO(hork): delete once all known users have migrated away
 void SetEventEngineFactory(
-    absl::AnyInvocable<std::unique_ptr<EventEngine>()> factory);
+    absl::AnyInvocable<std::shared_ptr<EventEngine>()> factory);
 
-/// Reset gRPC's EventEngine factory to the built-in default.
+/// [DEPRECATED] Reset gRPC's EventEngine factory to the built-in default.
 ///
 /// Applications that have called \a SetEventEngineFactory can remove their
 /// custom factory using this method. The built-in EventEngine factories will be
 /// used going forward. This has no affect on any EventEngines that were created
 /// using the previous factories.
+//
+// TODO(hork): delete once all known users have migrated away
 void EventEngineFactoryReset();
-/// Create an EventEngine using the default factory.
-std::unique_ptr<EventEngine> CreateEventEngine();
+
+/// Create a new EventEngine instance.
+std::shared_ptr<EventEngine> CreateEventEngine();
+
+/// Set the default EventEngine instance, which will be used throughout gRPC
+///
+/// gRPC will hold a ref to this engine until either
+/// \a ShutdownDefaultEventEngine() is called or \a SetDefaultEventEngine() is
+/// called again with a different value. Passing a value of nullptr will cause
+/// gRPC to drop the ref it was holding without setting it to a new one.
+///
+/// Earlier calls to \a GetDefaultEventEngine will still hold a ref to the
+/// previous default engine instance, if any.
+void SetDefaultEventEngine(std::shared_ptr<EventEngine> engine);
+
+/// Returns the default EventEngine instance.
+///
+/// Note that if SetDefaultEventEngine() has not been called, then the default
+/// EventEngine may be created and destroyed as needed, meaning that multiple
+/// calls to GetDefaultEventEngine() over a process's lifetime may return
+/// different instances. Callers are expected to call GetDefaultEventEngine()
+/// once and hold the returned reference for as long as they need the
+/// EventEngine instance.
+std::shared_ptr<EventEngine> GetDefaultEventEngine();
+
+/// Resets gRPC to use one of the default internal EventEngines for all *new*
+/// \a GetDefaultEventEngine requests and blocks until all refs on the active
+/// default engine have been released (destroying that engine).
+///
+/// If you called \a SetDefaultEventEngine, you must call either
+/// \a ShutdownDefaultEventEngine or \a SetDefaultEventEngine(nullptr) at the
+/// end of your program. If you don't, the engine will never be destroyed.
+///
+/// If you want to reset the default engine to one of gRPC's internal versions
+/// without waiting for all references to be released on the current default
+/// engine, call \a SetDefaultEventEngine(nullptr) instead.
+void ShutdownDefaultEventEngine();
 
 bool operator==(const EventEngine::TaskHandle& lhs,
                 const EventEngine::TaskHandle& rhs);

data/include/grpc/status.h

@@ -146,7 +146,7 @@ typedef enum {
   GRPC_STATUS_DATA_LOSS = 15,
 
   /** Force users to include a default branch: */
-  GRPC_STATUS__DO_NOT_USE = -1
+  GRPC_STATUS__DO_NOT_USE = 0x7fffffffu,
 } grpc_status_code;
 
 #ifdef __cplusplus

data/include/grpc/support/json.h

@@ -23,10 +23,10 @@
 #include <map>
 #include <string>
 #include <utility>
+#include <variant>
 #include <vector>
 
 #include "absl/strings/str_cat.h"
-#include "absl/types/variant.h"
 
 namespace grpc_core {
 namespace experimental {
@@ -147,46 +147,46 @@ class Json {
 
   // Moveable.
   Json(Json&& other) noexcept : value_(std::move(other.value_)) {
-    other.value_ = absl::monostate();
+    other.value_ = std::monostate();
   }
   Json& operator=(Json&& other) noexcept {
     value_ = std::move(other.value_);
-    other.value_ = absl::monostate();
+    other.value_ = std::monostate();
     return *this;
   }
 
   // Returns the JSON type.
   Type type() const {
     struct ValueFunctor {
-      Json::Type operator()(const absl::monostate&) { return Type::kNull; }
+      Json::Type operator()(const std::monostate&) { return Type::kNull; }
       Json::Type operator()(bool) { return Type::kBoolean; }
       Json::Type operator()(const NumberValue&) { return Type::kNumber; }
       Json::Type operator()(const std::string&) { return Type::kString; }
       Json::Type operator()(const Object&) { return Type::kObject; }
       Json::Type operator()(const Array&) { return Type::kArray; }
     };
-    return absl::visit(ValueFunctor(), value_);
+    return std::visit(ValueFunctor(), value_);
   }
 
   // Payload accessor for kBoolean.
   // Must not be called for other types.
-  bool boolean() const { return absl::get<bool>(value_); }
+  bool boolean() const { return std::get<bool>(value_); }
 
   // Payload accessor for kNumber or kString.
   // Must not be called for other types.
   const std::string& string() const {
-    const NumberValue* num = absl::get_if<NumberValue>(&value_);
+    const NumberValue* num = std::get_if<NumberValue>(&value_);
     if (num != nullptr) return num->value;
-    return absl::get<std::string>(value_);
+    return std::get<std::string>(value_);
   }
 
   // Payload accessor for kObject.
   // Must not be called for other types.
-  const Object& object() const { return absl::get<Object>(value_); }
+  const Object& object() const { return std::get<Object>(value_); }
 
   // Payload accessor for kArray.
   // Must not be called for other types.
-  const Array& array() const { return absl::get<Array>(value_); }
+  const Array& array() const { return std::get<Array>(value_); }
 
   bool operator==(const Json& other) const { return value_ == other.value_; }
   bool operator!=(const Json& other) const { return !(*this == other); }
@@ -199,12 +199,12 @@ class Json {
       return value == other.value;
     }
   };
-  using Value = absl::variant<absl::monostate,  // kNull
-                              bool,             // kBoolean
-                              NumberValue,      // kNumber
-                              std::string,      // kString
-                              Object,           // kObject
-                              Array>;           // kArray
+  using Value = std::variant<std::monostate,  // kNull
+                             bool,            // kBoolean
+                             NumberValue,     // kNumber
+                             std::string,     // kString
+                             Object,          // kObject
+                             Array>;          // kArray
 
   explicit Json(Value value) : value_(std::move(value)) {}
 

data/src/core/call/request_buffer.cc

@@ -15,9 +15,9 @@
 #include "src/core/call/request_buffer.h"
 
 #include <cstdint>
+#include <optional>
 
 #include "absl/strings/str_cat.h"
-#include "absl/types/optional.h"
 #include "src/core/util/match.h"
 
 namespace grpc_core {
@@ -29,8 +29,8 @@ RequestBuffer::RequestBuffer() : state_(absl::in_place_type_t<Buffering>()) {}
 ValueOrFailure<size_t> RequestBuffer::PushClientInitialMetadata(
     ClientMetadataHandle md) {
   MutexLock lock(&mu_);
-  if (absl::get_if<Cancelled>(&state_)) return Failure{};
-  auto& buffering = absl::get<Buffering>(state_);
+  if (std::get_if<Cancelled>(&state_)) return Failure{};
+  auto& buffering = std::get<Buffering>(state_);
   CHECK_EQ(buffering.initial_metadata.get(), nullptr);
   buffering.initial_metadata = std::move(md);
   buffering.buffered += buffering.initial_metadata->TransportSize();
@@ -41,15 +41,15 @@ ValueOrFailure<size_t> RequestBuffer::PushClientInitialMetadata(
 Poll<ValueOrFailure<size_t>> RequestBuffer::PollPushMessage(
     MessageHandle& message) {
   MutexLock lock(&mu_);
-  if (absl::get_if<Cancelled>(&state_)) return Failure{};
+  if (std::get_if<Cancelled>(&state_)) return Failure{};
   size_t buffered = 0;
-  if (auto* buffering = absl::get_if<Buffering>(&state_)) {
+  if (auto* buffering = std::get_if<Buffering>(&state_)) {
     if (winner_ != nullptr) return PendingPush();
     buffering->buffered += message->payload()->Length();
     buffered = buffering->buffered;
     buffering->messages.push_back(std::move(message));
   } else {
-    auto& streaming = absl::get<Streaming>(state_);
+    auto& streaming = std::get<Streaming>(state_);
     CHECK_EQ(streaming.end_of_stream, false);
     if (streaming.message != nullptr) {
       return PendingPush();
@@ -62,13 +62,13 @@ Poll<ValueOrFailure<size_t>> RequestBuffer::PollPushMessage(
 
 StatusFlag RequestBuffer::FinishSends() {
   MutexLock lock(&mu_);
-  if (absl::get_if<Cancelled>(&state_)) return Failure{};
-  if (auto* buffering = absl::get_if<Buffering>(&state_)) {
+  if (std::get_if<Cancelled>(&state_)) return Failure{};
+  if (auto* buffering = std::get_if<Buffering>(&state_)) {
     Buffered buffered(std::move(buffering->initial_metadata),
                       std::move(buffering->messages));
     state_.emplace<Buffered>(std::move(buffered));
   } else {
-    auto& streaming = absl::get<Streaming>(state_);
+    auto& streaming = std::get<Streaming>(state_);
     CHECK_EQ(streaming.end_of_stream, false);
     streaming.end_of_stream = true;
   }
@@ -78,7 +78,7 @@ StatusFlag RequestBuffer::FinishSends() {
 
 void RequestBuffer::Cancel(absl::Status error) {
   MutexLock lock(&mu_);
-  if (absl::holds_alternative<Cancelled>(state_)) return;
+  if (std::holds_alternative<Cancelled>(state_)) return;
   state_.emplace<Cancelled>(std::move(error));
   WakeupAsyncAllPullers();
 }
@@ -87,13 +87,13 @@ void RequestBuffer::Commit(Reader* winner) {
   MutexLock lock(&mu_);
   CHECK_EQ(winner_, nullptr);
   winner_ = winner;
-  if (auto* buffering = absl::get_if<Buffering>(&state_)) {
+  if (auto* buffering = std::get_if<Buffering>(&state_)) {
     if (buffering->initial_metadata != nullptr &&
         winner->message_index_ == buffering->messages.size() &&
         winner->pulled_client_initial_metadata_) {
       state_.emplace<Streaming>();
     }
-  } else if (auto* buffered = absl::get_if<Buffered>(&state_)) {
+  } else if (auto* buffered = std::get_if<Buffered>(&state_)) {
     CHECK_NE(buffered->initial_metadata.get(), nullptr);
     if (winner->message_index_ == buffered->messages.size()) {
       state_.emplace<Streaming>().end_of_stream = true;
@@ -116,7 +116,7 @@ RequestBuffer::Reader::PollPullClientInitialMetadata() {
     error_ = absl::CancelledError("Another call was chosen");
     return Failure{};
   }
-  if (auto* buffering = absl::get_if<Buffering>(&buffer_->state_)) {
+  if (auto* buffering = std::get_if<Buffering>(&buffer_->state_)) {
     if (buffering->initial_metadata.get() == nullptr) {
       return buffer_->PendingPull(this);
     }
@@ -125,22 +125,22 @@ RequestBuffer::Reader::PollPullClientInitialMetadata() {
     buffer_->MaybeSwitchToStreaming();
     return std::move(result);
   }
-  if (auto* buffered = absl::get_if<Buffered>(&buffer_->state_)) {
+  if (auto* buffered = std::get_if<Buffered>(&buffer_->state_)) {
     pulled_client_initial_metadata_ = true;
     return ClaimObject(buffered->initial_metadata);
   }
-  error_ = absl::get<Cancelled>(buffer_->state_).error;
+  error_ = std::get<Cancelled>(buffer_->state_).error;
   return Failure{};
 }
 
-Poll<ValueOrFailure<absl::optional<MessageHandle>>>
+Poll<ValueOrFailure<std::optional<MessageHandle>>>
 RequestBuffer::Reader::PollPullMessage() {
   ReleasableMutexLock lock(&buffer_->mu_);
   if (buffer_->winner_ != nullptr && buffer_->winner_ != this) {
     error_ = absl::CancelledError("Another call was chosen");
     return Failure{};
   }
-  if (auto* buffering = absl::get_if<Buffering>(&buffer_->state_)) {
+  if (auto* buffering = std::get_if<Buffering>(&buffer_->state_)) {
     if (message_index_ == buffering->messages.size()) {
       return buffer_->PendingPull(this);
     }
@@ -150,15 +150,15 @@ RequestBuffer::Reader::PollPullMessage() {
     buffer_->MaybeSwitchToStreaming();
     return std::move(result);
   }
-  if (auto* buffered = absl::get_if<Buffered>(&buffer_->state_)) {
-    if (message_index_ == buffered->messages.size()) return absl::nullopt;
+  if (auto* buffered = std::get_if<Buffered>(&buffer_->state_)) {
+    if (message_index_ == buffered->messages.size()) return std::nullopt;
     const auto idx = message_index_;
     ++message_index_;
     return ClaimObject(buffered->messages[idx]);
   }
-  if (auto* streaming = absl::get_if<Streaming>(&buffer_->state_)) {
+  if (auto* streaming = std::get_if<Streaming>(&buffer_->state_)) {
     if (streaming->message == nullptr) {
-      if (streaming->end_of_stream) return absl::nullopt;
+      if (streaming->end_of_stream) return std::nullopt;
       return buffer_->PendingPull(this);
     }
     auto msg = std::move(streaming->message);
@@ -167,7 +167,7 @@ RequestBuffer::Reader::PollPullMessage() {
     waker.Wakeup();
     return std::move(msg);
   }
-  error_ = absl::get<Cancelled>(buffer_->state_).error;
+  error_ = std::get<Cancelled>(buffer_->state_).error;
   return Failure{};
 }
 

data/src/core/call/request_buffer.h

@@ -51,7 +51,7 @@ class RequestBuffer {
       return [this]() { return PollPullClientInitialMetadata(); };
     }
     // Pull a message. Returns a promise that resolves to a
-    // ValueOrFailure<absl::optional<MessageHandle>>.
+    // ValueOrFailure<std::optional<MessageHandle>>.
     GRPC_MUST_USE_RESULT auto PullMessage() {
       return [this]() { return PollPullMessage(); };
     }
@@ -62,7 +62,7 @@ class RequestBuffer {
     friend class RequestBuffer;
 
     Poll<ValueOrFailure<ClientMetadataHandle>> PollPullClientInitialMetadata();
-    Poll<ValueOrFailure<absl::optional<MessageHandle>>> PollPullMessage();
+    Poll<ValueOrFailure<std::optional<MessageHandle>>> PollPullMessage();
 
     template <typename T>
     T ClaimObject(T& object) ABSL_EXCLUSIVE_LOCKS_REQUIRED(buffer_->mu_) {
@@ -143,7 +143,7 @@ class RequestBuffer {
     explicit Cancelled(absl::Status error) : error(std::move(error)) {}
     absl::Status error;
   };
-  using State = absl::variant<Buffering, Buffered, Streaming, Cancelled>;
+  using State = std::variant<Buffering, Buffered, Streaming, Cancelled>;
 
   Poll<ValueOrFailure<size_t>> PollPushMessage(MessageHandle& message);
   Pending PendingPull(Reader* reader) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) {
@@ -155,7 +155,7 @@ class RequestBuffer {
     return Pending{};
   }
   void MaybeSwitchToStreaming() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_) {
-    auto& buffering = absl::get<Buffering>(state_);
+    auto& buffering = std::get<Buffering>(state_);
     if (winner_ == nullptr) return;
     if (winner_->message_index_ < buffering.messages.size()) return;
     state_.emplace<Streaming>();

data/src/core/channelz/channelz.cc

@@ -334,7 +334,7 @@ ServerNode::~ServerNode() {}
 
 void ServerNode::AddChildSocket(RefCountedPtr<SocketNode> node) {
   MutexLock lock(&child_mu_);
-  child_sockets_.insert(std::make_pair(node->uuid(), std::move(node)));
+  child_sockets_.insert(std::pair(node->uuid(), std::move(node)));
 }
 
 void ServerNode::RemoveChildSocket(intptr_t child_uuid) {
@@ -344,7 +344,7 @@ void ServerNode::RemoveChildSocket(intptr_t child_uuid) {
 
 void ServerNode::AddChildListenSocket(RefCountedPtr<ListenSocketNode> node) {
   MutexLock lock(&child_mu_);
-  child_listen_sockets_.insert(std::make_pair(node->uuid(), std::move(node)));
+  child_listen_sockets_.insert(std::pair(node->uuid(), std::move(node)));
 }
 
 void ServerNode::RemoveChildListenSocket(intptr_t child_uuid) {