move backoff

BUILD

@@ -3449,10 +3449,10 @@ grpc_cc_library(
 grpc_cc_library(
     name = "backoff",
     srcs = [
-        "//src/core:lib/backoff/backoff.cc",
+        "//src/core:util/backoff.cc",
     ],
     hdrs = [
-        "//src/core:lib/backoff/backoff.h",
+        "//src/core:util/backoff.h",
     ],
     external_deps = ["absl/random"],
     language = "c++",

CMakeLists.txt

@@ -2237,8 +2237,8 @@ add_library(grpc
   src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
   src/core/lib/address_utils/parse_address.cc
   src/core/lib/address_utils/sockaddr_utils.cc
-  src/core/lib/backoff/backoff.cc
-  src/core/lib/backoff/random_early_detection.cc
+  src/core/util/backoff.cc
+  src/core/util/random_early_detection.cc
   src/core/lib/channel/channel_args.cc
   src/core/lib/channel/channel_args_preconditioning.cc
   src/core/lib/channel/channel_stack.cc
@@ -3033,8 +3033,8 @@ add_library(grpc_unsecure
   src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
   src/core/lib/address_utils/parse_address.cc
   src/core/lib/address_utils/sockaddr_utils.cc
-  src/core/lib/backoff/backoff.cc
-  src/core/lib/backoff/random_early_detection.cc
+  src/core/util/backoff.cc
+  src/core/util/random_early_detection.cc
   src/core/lib/channel/channel_args.cc
   src/core/lib/channel/channel_args_preconditioning.cc
   src/core/lib/channel/channel_stack.cc
@@ -5153,7 +5153,7 @@ add_library(grpc_authorization_provider
   src/core/handshaker/security/tsi_error.cc
   src/core/lib/address_utils/parse_address.cc
   src/core/lib/address_utils/sockaddr_utils.cc
-  src/core/lib/backoff/backoff.cc
+  src/core/util/backoff.cc
   src/core/lib/channel/channel_args.cc
   src/core/lib/channel/channel_args_preconditioning.cc
   src/core/lib/channel/channel_stack.cc
@@ -17849,7 +17849,7 @@ add_executable(interception_chain_test
   src/core/handshaker/proxy_mapper_registry.cc
   src/core/lib/address_utils/parse_address.cc
   src/core/lib/address_utils/sockaddr_utils.cc
-  src/core/lib/backoff/backoff.cc
+  src/core/util/backoff.cc
   src/core/lib/channel/channel_args.cc
   src/core/lib/channel/channel_args_preconditioning.cc
   src/core/lib/channel/channel_stack.cc
@@ -23330,7 +23330,7 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(random_early_detection_test
-  src/core/lib/backoff/random_early_detection.cc
+  src/core/util/random_early_detection.cc
   test/core/backoff/random_early_detection_test.cc
 )
 target_compile_features(random_early_detection_test PUBLIC cxx_std_14)

Makefile

@@ -1068,8 +1068,8 @@ LIBGRPC_SRC = \
     src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \
     src/core/lib/address_utils/parse_address.cc \
     src/core/lib/address_utils/sockaddr_utils.cc \
-    src/core/lib/backoff/backoff.cc \
-    src/core/lib/backoff/random_early_detection.cc \
+    src/core/util/backoff.cc \
+    src/core/util/random_early_detection.cc \
     src/core/lib/channel/channel_args.cc \
     src/core/lib/channel/channel_args_preconditioning.cc \
     src/core/lib/channel/channel_stack.cc \

Package.swift

@@ -1090,10 +1090,10 @@ let package = Package(
         "src/core/lib/address_utils/parse_address.h",
         "src/core/lib/address_utils/sockaddr_utils.cc",
         "src/core/lib/address_utils/sockaddr_utils.h",
-        "src/core/lib/backoff/backoff.cc",
-        "src/core/lib/backoff/backoff.h",
-        "src/core/lib/backoff/random_early_detection.cc",
-        "src/core/lib/backoff/random_early_detection.h",
+        "src/core/util/backoff.cc",
+        "src/core/util/backoff.h",
+        "src/core/util/random_early_detection.cc",
+        "src/core/util/random_early_detection.h",
         "src/core/lib/channel/call_finalization.h",
         "src/core/lib/channel/channel_args.cc",
         "src/core/lib/channel/channel_args.h",

build_autogenerated.yaml

@@ -793,8 +793,8 @@ libs:
   - src/core/handshaker/tcp_connect/tcp_connect_handshaker.h
   - src/core/lib/address_utils/parse_address.h
   - src/core/lib/address_utils/sockaddr_utils.h
-  - src/core/lib/backoff/backoff.h
-  - src/core/lib/backoff/random_early_detection.h
+  - src/core/util/backoff.h
+  - src/core/util/random_early_detection.h
   - src/core/lib/channel/call_finalization.h
   - src/core/lib/channel/channel_args.h
   - src/core/lib/channel/channel_args_preconditioning.h
@@ -1653,8 +1653,8 @@ libs:
   - src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
   - src/core/lib/address_utils/parse_address.cc
   - src/core/lib/address_utils/sockaddr_utils.cc
-  - src/core/lib/backoff/backoff.cc
-  - src/core/lib/backoff/random_early_detection.cc
+  - src/core/util/backoff.cc
+  - src/core/util/random_early_detection.cc
   - src/core/lib/channel/channel_args.cc
   - src/core/lib/channel/channel_args_preconditioning.cc
   - src/core/lib/channel/channel_stack.cc
@@ -2338,8 +2338,8 @@ libs:
   - src/core/handshaker/tcp_connect/tcp_connect_handshaker.h
   - src/core/lib/address_utils/parse_address.h
   - src/core/lib/address_utils/sockaddr_utils.h
-  - src/core/lib/backoff/backoff.h
-  - src/core/lib/backoff/random_early_detection.h
+  - src/core/util/backoff.h
+  - src/core/util/random_early_detection.h
   - src/core/lib/channel/call_finalization.h
   - src/core/lib/channel/channel_args.h
   - src/core/lib/channel/channel_args_preconditioning.h
@@ -2813,8 +2813,8 @@ libs:
   - src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
   - src/core/lib/address_utils/parse_address.cc
   - src/core/lib/address_utils/sockaddr_utils.cc
-  - src/core/lib/backoff/backoff.cc
-  - src/core/lib/backoff/random_early_detection.cc
+  - src/core/util/backoff.cc
+  - src/core/util/random_early_detection.cc
   - src/core/lib/channel/channel_args.cc
   - src/core/lib/channel/channel_args_preconditioning.cc
   - src/core/lib/channel/channel_stack.cc
@@ -4434,7 +4434,7 @@ libs:
   - src/core/handshaker/security/tsi_error.h
   - src/core/lib/address_utils/parse_address.h
   - src/core/lib/address_utils/sockaddr_utils.h
-  - src/core/lib/backoff/backoff.h
+  - src/core/util/backoff.h
   - src/core/lib/channel/call_finalization.h
   - src/core/lib/channel/channel_args.h
   - src/core/lib/channel/channel_args_preconditioning.h
@@ -4784,7 +4784,7 @@ libs:
   - src/core/handshaker/security/tsi_error.cc
   - src/core/lib/address_utils/parse_address.cc
   - src/core/lib/address_utils/sockaddr_utils.cc
-  - src/core/lib/backoff/backoff.cc
+  - src/core/util/backoff.cc
   - src/core/lib/channel/channel_args.cc
   - src/core/lib/channel/channel_args_preconditioning.cc
   - src/core/lib/channel/channel_stack.cc
@@ -11636,7 +11636,7 @@ targets:
   - src/core/handshaker/proxy_mapper_registry.h
   - src/core/lib/address_utils/parse_address.h
   - src/core/lib/address_utils/sockaddr_utils.h
-  - src/core/lib/backoff/backoff.h
+  - src/core/util/backoff.h
   - src/core/lib/channel/call_finalization.h
   - src/core/lib/channel/channel_args.h
   - src/core/lib/channel/channel_args_preconditioning.h
@@ -11955,7 +11955,7 @@ targets:
   - src/core/handshaker/proxy_mapper_registry.cc
   - src/core/lib/address_utils/parse_address.cc
   - src/core/lib/address_utils/sockaddr_utils.cc
-  - src/core/lib/backoff/backoff.cc
+  - src/core/util/backoff.cc
   - src/core/lib/channel/channel_args.cc
   - src/core/lib/channel/channel_args_preconditioning.cc
   - src/core/lib/channel/channel_stack.cc
@@ -15007,9 +15007,9 @@ targets:
   build: test
   language: c++
   headers:
-  - src/core/lib/backoff/random_early_detection.h
+  - src/core/util/random_early_detection.h
   src:
-  - src/core/lib/backoff/random_early_detection.cc
+  - src/core/util/random_early_detection.cc
   - test/core/backoff/random_early_detection_test.cc
   deps:
   - gtest

config.m4

@@ -443,8 +443,8 @@ if test "$PHP_GRPC" != "no"; then
     src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc \
     src/core/lib/address_utils/parse_address.cc \
     src/core/lib/address_utils/sockaddr_utils.cc \
-    src/core/lib/backoff/backoff.cc \
-    src/core/lib/backoff/random_early_detection.cc \
+    src/core/util/backoff.cc \
+    src/core/util/random_early_detection.cc \
     src/core/lib/channel/channel_args.cc \
     src/core/lib/channel/channel_args_preconditioning.cc \
     src/core/lib/channel/channel_stack.cc \
@@ -1517,7 +1517,7 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/security)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/tcp_connect)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/address_utils)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/backoff)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/util)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/compression)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/config)

gRPC-C++.podspec

@@ -872,8 +872,8 @@ Pod::Spec.new do |s|
                       'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h',
                       'src/core/lib/address_utils/parse_address.h',
                       'src/core/lib/address_utils/sockaddr_utils.h',
-                      'src/core/lib/backoff/backoff.h',
-                      'src/core/lib/backoff/random_early_detection.h',
+                      'src/core/util/backoff.h',
+                      'src/core/util/random_early_detection.h',
                       'src/core/lib/channel/call_finalization.h',
                       'src/core/lib/channel/channel_args.h',
                       'src/core/lib/channel/channel_args_preconditioning.h',
@@ -2147,8 +2147,8 @@ Pod::Spec.new do |s|
                               'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h',
                               'src/core/lib/address_utils/parse_address.h',
                               'src/core/lib/address_utils/sockaddr_utils.h',
-                              'src/core/lib/backoff/backoff.h',
-                              'src/core/lib/backoff/random_early_detection.h',
+                              'src/core/util/backoff.h',
+                              'src/core/util/random_early_detection.h',
                               'src/core/lib/channel/call_finalization.h',
                               'src/core/lib/channel/channel_args.h',
                               'src/core/lib/channel/channel_args_preconditioning.h',

gRPC-Core.podspec

@@ -1209,10 +1209,10 @@ Pod::Spec.new do |s|
                       'src/core/lib/address_utils/parse_address.h',
                       'src/core/lib/address_utils/sockaddr_utils.cc',
                       'src/core/lib/address_utils/sockaddr_utils.h',
-                      'src/core/lib/backoff/backoff.cc',
-                      'src/core/lib/backoff/backoff.h',
-                      'src/core/lib/backoff/random_early_detection.cc',
-                      'src/core/lib/backoff/random_early_detection.h',
+                      'src/core/util/backoff.cc',
+                      'src/core/util/backoff.h',
+                      'src/core/util/random_early_detection.cc',
+                      'src/core/util/random_early_detection.h',
                       'src/core/lib/channel/call_finalization.h',
                       'src/core/lib/channel/channel_args.cc',
                       'src/core/lib/channel/channel_args.h',
@@ -2930,8 +2930,8 @@ Pod::Spec.new do |s|
                               'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h',
                               'src/core/lib/address_utils/parse_address.h',
                               'src/core/lib/address_utils/sockaddr_utils.h',
-                              'src/core/lib/backoff/backoff.h',
-                              'src/core/lib/backoff/random_early_detection.h',
+                              'src/core/util/backoff.h',
+                              'src/core/util/random_early_detection.h',
                               'src/core/lib/channel/call_finalization.h',
                               'src/core/lib/channel/channel_args.h',
                               'src/core/lib/channel/channel_args_preconditioning.h',

grpc.gemspec

@@ -1096,10 +1096,10 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/address_utils/parse_address.h )
   s.files += %w( src/core/lib/address_utils/sockaddr_utils.cc )
   s.files += %w( src/core/lib/address_utils/sockaddr_utils.h )
-  s.files += %w( src/core/lib/backoff/backoff.cc )
-  s.files += %w( src/core/lib/backoff/backoff.h )
-  s.files += %w( src/core/lib/backoff/random_early_detection.cc )
-  s.files += %w( src/core/lib/backoff/random_early_detection.h )
+  s.files += %w( src/core/util/backoff.cc )
+  s.files += %w( src/core/util/backoff.h )
+  s.files += %w( src/core/util/random_early_detection.cc )
+  s.files += %w( src/core/util/random_early_detection.h )
   s.files += %w( src/core/lib/channel/call_finalization.h )
   s.files += %w( src/core/lib/channel/channel_args.cc )
   s.files += %w( src/core/lib/channel/channel_args.h )

grpc.gyp

@@ -693,8 +693,8 @@
         'src/core/ext/xds/xds_transport_grpc.cc',
         'src/core/lib/address_utils/parse_address.cc',
         'src/core/lib/address_utils/sockaddr_utils.cc',
-        'src/core/lib/backoff/backoff.cc',
-        'src/core/lib/backoff/random_early_detection.cc',
+        'src/core/util/backoff.cc',
+        'src/core/util/random_early_detection.cc',
         'src/core/lib/channel/call_tracer.cc',
         'src/core/lib/channel/channel_args.cc',
         'src/core/lib/channel/channel_args_preconditioning.cc',
@@ -1236,8 +1236,8 @@
         'src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c',
         'src/core/lib/address_utils/parse_address.cc',
         'src/core/lib/address_utils/sockaddr_utils.cc',
-        'src/core/lib/backoff/backoff.cc',
-        'src/core/lib/backoff/random_early_detection.cc',
+        'src/core/util/backoff.cc',
+        'src/core/util/random_early_detection.cc',
         'src/core/lib/channel/call_tracer.cc',
         'src/core/lib/channel/channel_args.cc',
         'src/core/lib/channel/channel_args_preconditioning.cc',
@@ -2046,8 +2046,8 @@
         'src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c',
         'src/core/lib/address_utils/parse_address.cc',
         'src/core/lib/address_utils/sockaddr_utils.cc',
-        'src/core/lib/backoff/backoff.cc',
-        'src/core/lib/backoff/random_early_detection.cc',
+        'src/core/util/backoff.cc',
+        'src/core/util/random_early_detection.cc',
         'src/core/lib/channel/call_tracer.cc',
         'src/core/lib/channel/channel_args.cc',
         'src/core/lib/channel/channel_args_preconditioning.cc',

package.xml

@@ -1078,10 +1078,10 @@
     <file baseinstalldir="/" name="src/core/lib/address_utils/parse_address.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/address_utils/sockaddr_utils.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/address_utils/sockaddr_utils.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/backoff/backoff.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/backoff/backoff.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/backoff/random_early_detection.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/backoff/random_early_detection.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/backoff.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/backoff.h" role="src" />
+    <file baseinstalldir="/" name="src/core/util/random_early_detection.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/util/random_early_detection.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/call_finalization.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/channel_args.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/channel_args.h" role="src" />

src/core/BUILD

@@ -5001,10 +5001,10 @@ grpc_cc_library(
 grpc_cc_library(
     name = "random_early_detection",
     srcs = [
-        "lib/backoff/random_early_detection.cc",
+        "util/random_early_detection.cc",
     ],
     hdrs = [
-        "lib/backoff/random_early_detection.h",
+        "util/random_early_detection.h",
     ],
     external_deps = [
         "absl/random:bit_gen_ref",

src/core/client_channel/retry_filter_legacy_call_data.cc

@@ -30,7 +30,7 @@
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/retry_service_config.h"
 #include "src/core/client_channel/retry_throttle.h"
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/context.h"
 #include "src/core/lib/channel/status_util.h"

src/core/client_channel/retry_filter_legacy_call_data.h

@@ -34,7 +34,7 @@
 #include "src/core/client_channel/retry_filter.h"
 #include "src/core/client_channel/retry_service_config.h"
 #include "src/core/client_channel/retry_throttle.h"
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/context.h"

src/core/client_channel/subchannel.cc

@@ -45,7 +45,7 @@
 #include "src/core/client_channel/subchannel_pool_interface.h"
 #include "src/core/handshaker/proxy_mapper_registry.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder_impl.h"

src/core/client_channel/subchannel.h

@@ -33,7 +33,7 @@
 
 #include "src/core/client_channel/connector.h"
 #include "src/core/client_channel/subchannel_pool_interface.h"
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/context.h"

src/core/client_channel/subchannel_stream_client.h

@@ -33,7 +33,7 @@
 #include <grpc/status.h>
 
 #include "src/core/client_channel/subchannel.h"
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/channel/context.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"

src/core/ext/transport/chttp2/transport/hpack_parser.h

@@ -39,7 +39,7 @@
 #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
-#include "src/core/lib/backoff/random_early_detection.h"
+#include "src/core/util/random_early_detection.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_refcount.h"

src/core/ext/transport/chttp2/transport/parsing.cc

@@ -59,7 +59,7 @@
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/ext/transport/chttp2/transport/max_concurrent_streams_policy.h"
 #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h"
-#include "src/core/lib/backoff/random_early_detection.h"
+#include "src/core/util/random_early_detection.h"
 #include "src/core/lib/channel/context.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"

src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc

@@ -36,7 +36,7 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/thd_id.h>
 
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/thread_local.h"
 #include "src/core/lib/event_engine/trace.h"

src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h

@@ -32,7 +32,7 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/thd_id.h>
 
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/event_engine/thread_pool/thread_count.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/work_queue/basic_work_queue.h"

src/core/load_balancing/grpclb/grpclb.cc

@@ -96,7 +96,7 @@
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"

src/core/load_balancing/rls/rls.cc

@@ -68,7 +68,7 @@
 
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_filter.h"
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"

src/core/resolver/dns/c_ares/dns_resolver_ares.cc

@@ -62,7 +62,7 @@
 
 #include "absl/strings/str_cat.h"
 
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/resolve_address.h"

src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc

@@ -39,7 +39,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/resolved_address_internal.h"

src/core/resolver/dns/native/dns_resolver.cc

@@ -32,7 +32,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"

src/core/resolver/polling_resolver.cc

@@ -32,7 +32,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"

src/core/resolver/polling_resolver.h

@@ -26,7 +26,7 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/orphanable.h"

src/core/server/server.h

@@ -46,7 +46,7 @@
 #include <grpc/support/time.h>
 
 #include "src/core/channelz/channelz.h"
-#include "src/core/lib/backoff/random_early_detection.h"
+#include "src/core/util/random_early_detection.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"

src/core/util/backoff.cc

@@ -16,7 +16,7 @@
 //
 //
 
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 
 #include <algorithm>
 

src/core/util/backoff.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H
-#define GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H
+#ifndef GRPC_SRC_CORE_UTIL_BACKOFF_H
+#define GRPC_SRC_CORE_UTIL_BACKOFF_H
 
 #include "absl/random/random.h"
 
@@ -86,4 +86,4 @@ class BackOff {
 };
 
 }  // namespace grpc_core
-#endif  // GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H
+#endif  // GRPC_SRC_CORE_UTIL_BACKOFF_H

src/core/util/random_early_detection.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/backoff/random_early_detection.h"
+#include "src/core/util/random_early_detection.h"
 
 #include "absl/random/distributions.h"
 

src/core/util/random_early_detection.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_BACKOFF_RANDOM_EARLY_DETECTION_H
-#define GRPC_SRC_CORE_LIB_BACKOFF_RANDOM_EARLY_DETECTION_H
+#ifndef GRPC_SRC_CORE_UTIL_RANDOM_EARLY_DETECTION_H
+#define GRPC_SRC_CORE_UTIL_RANDOM_EARLY_DETECTION_H
 
 #include <limits.h>
 
@@ -59,4 +59,4 @@ class RandomEarlyDetection {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_BACKOFF_RANDOM_EARLY_DETECTION_H
+#endif  // GRPC_SRC_CORE_UTIL_RANDOM_EARLY_DETECTION_H

src/core/xds/xds_client/xds_client.cc

@@ -46,7 +46,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"

src/python/grpcio/grpc_core_dependencies.py

@@ -417,8 +417,8 @@ CORE_SOURCE_FILES = [
     'src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc',
     'src/core/lib/address_utils/parse_address.cc',
     'src/core/lib/address_utils/sockaddr_utils.cc',
-    'src/core/lib/backoff/backoff.cc',
-    'src/core/lib/backoff/random_early_detection.cc',
+    'src/core/util/backoff.cc',
+    'src/core/util/random_early_detection.cc',
     'src/core/lib/channel/channel_args.cc',
     'src/core/lib/channel/channel_args_preconditioning.cc',
     'src/core/lib/channel/channel_stack.cc',

test/core/backoff/backoff_test.cc

@@ -16,7 +16,7 @@
 //
 //
 
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 
 #include <algorithm>
 #include <memory>

test/core/backoff/random_early_detection_test.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/core/lib/backoff/random_early_detection.h"
+#include "src/core/util/random_early_detection.h"
 
 #include <memory>
 

test/cpp/end2end/cfstream_test.cc

@@ -39,7 +39,7 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/iomgr/port.h"

test/cpp/end2end/client_lb_end2end_test.cc

@@ -55,7 +55,7 @@
 #include "src/core/client_channel/global_subchannel_pool.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/gprpp/crash.h"

test/cpp/end2end/flaky_network_test.cc

@@ -41,7 +41,7 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/env.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"

test/cpp/end2end/service_config_end2end_test.cc

@@ -48,7 +48,7 @@
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/client_channel/global_subchannel_pool.h"
 #include "src/core/lib/address_utils/parse_address.h"
-#include "src/core/lib/backoff/backoff.h"
+#include "src/core/util/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/gprpp/crash.h"

tools/doxygen/Doxyfile.c++.internal

@@ -2095,10 +2095,10 @@ src/core/lib/address_utils/parse_address.cc \
 src/core/lib/address_utils/parse_address.h \
 src/core/lib/address_utils/sockaddr_utils.cc \
 src/core/lib/address_utils/sockaddr_utils.h \
-src/core/lib/backoff/backoff.cc \
-src/core/lib/backoff/backoff.h \
-src/core/lib/backoff/random_early_detection.cc \
-src/core/lib/backoff/random_early_detection.h \
+src/core/util/backoff.cc \
+src/core/util/backoff.h \
+src/core/util/random_early_detection.cc \
+src/core/util/random_early_detection.h \
 src/core/lib/channel/call_finalization.h \
 src/core/lib/channel/channel_args.cc \
 src/core/lib/channel/channel_args.h \

tools/doxygen/Doxyfile.core.internal

@@ -1866,10 +1866,10 @@ src/core/lib/address_utils/parse_address.cc \
 src/core/lib/address_utils/parse_address.h \
 src/core/lib/address_utils/sockaddr_utils.cc \
 src/core/lib/address_utils/sockaddr_utils.h \
-src/core/lib/backoff/backoff.cc \
-src/core/lib/backoff/backoff.h \
-src/core/lib/backoff/random_early_detection.cc \
-src/core/lib/backoff/random_early_detection.h \
+src/core/util/backoff.cc \
+src/core/util/backoff.h \
+src/core/util/random_early_detection.cc \
+src/core/util/random_early_detection.h \
 src/core/lib/channel/README.md \
 src/core/lib/channel/call_finalization.h \
 src/core/lib/channel/channel_args.cc \