rename xds_client_stats.h -> xds_locality.h

BUILD

@@ -4405,7 +4405,7 @@ grpc_cc_library(
         "//src/core:xds/xds_client/xds_bootstrap.h",
         "//src/core:xds/xds_client/xds_channel_args.h",
         "//src/core:xds/xds_client/xds_client.h",
-        "//src/core:xds/xds_client/xds_client_stats.h",
+        "//src/core:xds/xds_client/xds_locality.h",
         "//src/core:xds/xds_client/xds_metrics.h",
         "//src/core:xds/xds_client/xds_resource_type.h",
         "//src/core:xds/xds_client/xds_resource_type_impl.h",

CMakeLists.txt

@@ -2656,10 +2656,10 @@ add_library(grpc
   src/core/xds/grpc/xds_routing.cc
   src/core/xds/grpc/xds_server_grpc.cc
   src/core/xds/grpc/xds_transport_grpc.cc
+  src/core/xds/xds_client/lrs_client.cc
   src/core/xds/xds_client/xds_api.cc
   src/core/xds/xds_client/xds_bootstrap.cc
   src/core/xds/xds_client/xds_client.cc
-  src/core/xds/xds_client/xds_client_stats.cc
 )
 
 target_compile_features(grpc PUBLIC cxx_std_14)

Makefile

@@ -1515,10 +1515,10 @@ LIBGRPC_SRC = \
     src/core/xds/grpc/xds_routing.cc \
     src/core/xds/grpc/xds_server_grpc.cc \
     src/core/xds/grpc/xds_transport_grpc.cc \
+    src/core/xds/xds_client/lrs_client.cc \
     src/core/xds/xds_client/xds_api.cc \
     src/core/xds/xds_client/xds_bootstrap.cc \
     src/core/xds/xds_client/xds_client.cc \
-    src/core/xds/xds_client/xds_client_stats.cc \
     third_party/abseil-cpp/absl/base/internal/cycleclock.cc \
     third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc \
     third_party/abseil-cpp/absl/base/internal/raw_logging.cc \

Package.swift

@@ -2026,6 +2026,8 @@ let package = Package(
         "src/core/xds/grpc/xds_server_grpc.h",
         "src/core/xds/grpc/xds_transport_grpc.cc",
         "src/core/xds/grpc/xds_transport_grpc.h",
+        "src/core/xds/xds_client/lrs_client.cc",
+        "src/core/xds/xds_client/lrs_client.h",
         "src/core/xds/xds_client/xds_api.cc",
         "src/core/xds/xds_client/xds_api.h",
         "src/core/xds/xds_client/xds_bootstrap.cc",
@@ -2033,8 +2035,7 @@ let package = Package(
         "src/core/xds/xds_client/xds_channel_args.h",
         "src/core/xds/xds_client/xds_client.cc",
         "src/core/xds/xds_client/xds_client.h",
-        "src/core/xds/xds_client/xds_client_stats.cc",
-        "src/core/xds/xds_client/xds_client_stats.h",
+        "src/core/xds/xds_client/xds_locality.h",
         "src/core/xds/xds_client/xds_metrics.h",
         "src/core/xds/xds_client/xds_resource_type.h",
         "src/core/xds/xds_client/xds_resource_type_impl.h",

build_autogenerated.yaml

@@ -1255,11 +1255,12 @@ libs:
   - src/core/xds/grpc/xds_routing.h
   - src/core/xds/grpc/xds_server_grpc.h
   - src/core/xds/grpc/xds_transport_grpc.h
+  - src/core/xds/xds_client/lrs_client.h
   - src/core/xds/xds_client/xds_api.h
   - src/core/xds/xds_client/xds_bootstrap.h
   - src/core/xds/xds_client/xds_channel_args.h
   - src/core/xds/xds_client/xds_client.h
-  - src/core/xds/xds_client/xds_client_stats.h
+  - src/core/xds/xds_client/xds_locality.h
   - src/core/xds/xds_client/xds_metrics.h
   - src/core/xds/xds_client/xds_resource_type.h
   - src/core/xds/xds_client/xds_resource_type_impl.h
@@ -2071,10 +2072,10 @@ libs:
   - src/core/xds/grpc/xds_routing.cc
   - src/core/xds/grpc/xds_server_grpc.cc
   - src/core/xds/grpc/xds_transport_grpc.cc
+  - src/core/xds/xds_client/lrs_client.cc
   - src/core/xds/xds_client/xds_api.cc
   - src/core/xds/xds_client/xds_bootstrap.cc
   - src/core/xds/xds_client/xds_client.cc
-  - src/core/xds/xds_client/xds_client_stats.cc
   deps:
   - upb_json_lib
   - upb_textformat_lib

config.m4

@@ -890,10 +890,10 @@ if test "$PHP_GRPC" != "no"; then
     src/core/xds/grpc/xds_routing.cc \
     src/core/xds/grpc/xds_server_grpc.cc \
     src/core/xds/grpc/xds_transport_grpc.cc \
+    src/core/xds/xds_client/lrs_client.cc \
     src/core/xds/xds_client/xds_api.cc \
     src/core/xds/xds_client/xds_bootstrap.cc \
     src/core/xds/xds_client/xds_client.cc \
-    src/core/xds/xds_client/xds_client_stats.cc \
     src/php/ext/grpc/byte_buffer.c \
     src/php/ext/grpc/call.c \
     src/php/ext/grpc/call_credentials.c \

config.w32

@@ -855,10 +855,10 @@ if (PHP_GRPC != "no") {
     "src\\core\\xds\\grpc\\xds_routing.cc " +
     "src\\core\\xds\\grpc\\xds_server_grpc.cc " +
     "src\\core\\xds\\grpc\\xds_transport_grpc.cc " +
+    "src\\core\\xds\\xds_client\\lrs_client.cc " +
     "src\\core\\xds\\xds_client\\xds_api.cc " +
     "src\\core\\xds\\xds_client\\xds_bootstrap.cc " +
     "src\\core\\xds\\xds_client\\xds_client.cc " +
-    "src\\core\\xds\\xds_client\\xds_client_stats.cc " +
     "src\\php\\ext\\grpc\\byte_buffer.c " +
     "src\\php\\ext\\grpc\\call.c " +
     "src\\php\\ext\\grpc\\call_credentials.c " +

gRPC-C++.podspec

@@ -1365,11 +1365,12 @@ Pod::Spec.new do |s|
                       'src/core/xds/grpc/xds_routing.h',
                       'src/core/xds/grpc/xds_server_grpc.h',
                       'src/core/xds/grpc/xds_transport_grpc.h',
+                      'src/core/xds/xds_client/lrs_client.h',
                       'src/core/xds/xds_client/xds_api.h',
                       'src/core/xds/xds_client/xds_bootstrap.h',
                       'src/core/xds/xds_client/xds_channel_args.h',
                       'src/core/xds/xds_client/xds_client.h',
-                      'src/core/xds/xds_client/xds_client_stats.h',
+                      'src/core/xds/xds_client/xds_locality.h',
                       'src/core/xds/xds_client/xds_metrics.h',
                       'src/core/xds/xds_client/xds_resource_type.h',
                       'src/core/xds/xds_client/xds_resource_type_impl.h',
@@ -2657,11 +2658,12 @@ Pod::Spec.new do |s|
                               'src/core/xds/grpc/xds_routing.h',
                               'src/core/xds/grpc/xds_server_grpc.h',
                               'src/core/xds/grpc/xds_transport_grpc.h',
+                              'src/core/xds/xds_client/lrs_client.h',
                               'src/core/xds/xds_client/xds_api.h',
                               'src/core/xds/xds_client/xds_bootstrap.h',
                               'src/core/xds/xds_client/xds_channel_args.h',
                               'src/core/xds/xds_client/xds_client.h',
-                              'src/core/xds/xds_client/xds_client_stats.h',
+                              'src/core/xds/xds_client/xds_locality.h',
                               'src/core/xds/xds_client/xds_metrics.h',
                               'src/core/xds/xds_client/xds_resource_type.h',
                               'src/core/xds/xds_client/xds_resource_type_impl.h',

gRPC-Core.podspec

@@ -2142,6 +2142,8 @@ Pod::Spec.new do |s|
                       'src/core/xds/grpc/xds_server_grpc.h',
                       'src/core/xds/grpc/xds_transport_grpc.cc',
                       'src/core/xds/grpc/xds_transport_grpc.h',
+                      'src/core/xds/xds_client/lrs_client.cc',
+                      'src/core/xds/xds_client/lrs_client.h',
                       'src/core/xds/xds_client/xds_api.cc',
                       'src/core/xds/xds_client/xds_api.h',
                       'src/core/xds/xds_client/xds_bootstrap.cc',
@@ -2149,8 +2151,7 @@ Pod::Spec.new do |s|
                       'src/core/xds/xds_client/xds_channel_args.h',
                       'src/core/xds/xds_client/xds_client.cc',
                       'src/core/xds/xds_client/xds_client.h',
-                      'src/core/xds/xds_client/xds_client_stats.cc',
-                      'src/core/xds/xds_client/xds_client_stats.h',
+                      'src/core/xds/xds_client/xds_locality.h',
                       'src/core/xds/xds_client/xds_metrics.h',
                       'src/core/xds/xds_client/xds_resource_type.h',
                       'src/core/xds/xds_client/xds_resource_type_impl.h',
@@ -3440,11 +3441,12 @@ Pod::Spec.new do |s|
                               'src/core/xds/grpc/xds_routing.h',
                               'src/core/xds/grpc/xds_server_grpc.h',
                               'src/core/xds/grpc/xds_transport_grpc.h',
+                              'src/core/xds/xds_client/lrs_client.h',
                               'src/core/xds/xds_client/xds_api.h',
                               'src/core/xds/xds_client/xds_bootstrap.h',
                               'src/core/xds/xds_client/xds_channel_args.h',
                               'src/core/xds/xds_client/xds_client.h',
-                              'src/core/xds/xds_client/xds_client_stats.h',
+                              'src/core/xds/xds_client/xds_locality.h',
                               'src/core/xds/xds_client/xds_metrics.h',
                               'src/core/xds/xds_client/xds_resource_type.h',
                               'src/core/xds/xds_client/xds_resource_type_impl.h',

grpc.gemspec

@@ -2028,6 +2028,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/xds/grpc/xds_server_grpc.h )
   s.files += %w( src/core/xds/grpc/xds_transport_grpc.cc )
   s.files += %w( src/core/xds/grpc/xds_transport_grpc.h )
+  s.files += %w( src/core/xds/xds_client/lrs_client.cc )
+  s.files += %w( src/core/xds/xds_client/lrs_client.h )
   s.files += %w( src/core/xds/xds_client/xds_api.cc )
   s.files += %w( src/core/xds/xds_client/xds_api.h )
   s.files += %w( src/core/xds/xds_client/xds_bootstrap.cc )
@@ -2035,8 +2037,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/xds/xds_client/xds_channel_args.h )
   s.files += %w( src/core/xds/xds_client/xds_client.cc )
   s.files += %w( src/core/xds/xds_client/xds_client.h )
-  s.files += %w( src/core/xds/xds_client/xds_client_stats.cc )
-  s.files += %w( src/core/xds/xds_client/xds_client_stats.h )
+  s.files += %w( src/core/xds/xds_client/xds_locality.h )
   s.files += %w( src/core/xds/xds_client/xds_metrics.h )
   s.files += %w( src/core/xds/xds_client/xds_resource_type.h )
   s.files += %w( src/core/xds/xds_client/xds_resource_type_impl.h )

package.xml

@@ -2010,6 +2010,8 @@
     <file baseinstalldir="/" name="src/core/xds/grpc/xds_server_grpc.h" role="src" />
     <file baseinstalldir="/" name="src/core/xds/grpc/xds_transport_grpc.cc" role="src" />
     <file baseinstalldir="/" name="src/core/xds/grpc/xds_transport_grpc.h" role="src" />
+    <file baseinstalldir="/" name="src/core/xds/xds_client/lrs_client.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/xds/xds_client/lrs_client.h" role="src" />
     <file baseinstalldir="/" name="src/core/xds/xds_client/xds_api.cc" role="src" />
     <file baseinstalldir="/" name="src/core/xds/xds_client/xds_api.h" role="src" />
     <file baseinstalldir="/" name="src/core/xds/xds_client/xds_bootstrap.cc" role="src" />
@@ -2017,8 +2019,7 @@
     <file baseinstalldir="/" name="src/core/xds/xds_client/xds_channel_args.h" role="src" />
     <file baseinstalldir="/" name="src/core/xds/xds_client/xds_client.cc" role="src" />
     <file baseinstalldir="/" name="src/core/xds/xds_client/xds_client.h" role="src" />
-    <file baseinstalldir="/" name="src/core/xds/xds_client/xds_client_stats.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/xds/xds_client/xds_client_stats.h" role="src" />
+    <file baseinstalldir="/" name="src/core/xds/xds_client/xds_locality.h" role="src" />
     <file baseinstalldir="/" name="src/core/xds/xds_client/xds_metrics.h" role="src" />
     <file baseinstalldir="/" name="src/core/xds/xds_client/xds_resource_type.h" role="src" />
     <file baseinstalldir="/" name="src/core/xds/xds_client/xds_resource_type_impl.h" role="src" />

src/core/load_balancing/xds/xds_cluster_impl.cc

@@ -73,7 +73,7 @@
 #include "src/core/xds/grpc/xds_endpoint.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 #include "src/core/xds/xds_client/xds_client.h"
-#include "src/core/xds/xds_client/xds_client_stats.h"
+#include "src/core/xds/xds_client/xds_locality.h"
 
 namespace grpc_core {
 

src/core/load_balancing/xds/xds_wrr_locality.cc

@@ -50,7 +50,7 @@
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
 #include "src/core/util/json/json_writer.h"
-#include "src/core/xds/xds_client/xds_client_stats.h"
+#include "src/core/xds/xds_client/xds_locality.h"
 
 namespace grpc_core {
 

src/core/xds/grpc/xds_endpoint.h

@@ -29,7 +29,7 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/resolver/endpoint_addresses.h"
-#include "src/core/xds/xds_client/xds_client_stats.h"
+#include "src/core/xds/xds_client/xds_locality.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
 

src/core/xds/xds_client/lrs_client.cc

@@ -49,7 +49,7 @@
 #include "src/core/util/upb_utils.h"
 #include "src/core/xds/xds_client/xds_api.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
-#include "src/core/xds/xds_client/xds_client_stats.h"
+#include "src/core/xds/xds_client/xds_locality.h"
 
 #define GRPC_XDS_INITIAL_CONNECT_BACKOFF_SECONDS 1
 #define GRPC_XDS_RECONNECT_BACKOFF_MULTIPLIER 1.6

src/core/xds/xds_client/lrs_client.h

@@ -43,7 +43,7 @@
 #include "src/core/lib/uri/uri_parser.h"
 #include "src/core/xds/xds_client/xds_api.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
-#include "src/core/xds/xds_client/xds_client_stats.h"
+#include "src/core/xds/xds_client/xds_locality.h"
 #include "src/core/xds/xds_client/xds_metrics.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_transport.h"

src/core/xds/xds_client/xds_api.h

@@ -38,7 +38,7 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
-#include "src/core/xds/xds_client/xds_client_stats.h"
+#include "src/core/xds/xds_client/xds_locality.h"
 
 namespace grpc_core {
 

src/core/xds/xds_client/xds_client.cc

@@ -56,7 +56,7 @@
 #include "src/core/util/upb_utils.h"
 #include "src/core/xds/xds_client/xds_api.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
-#include "src/core/xds/xds_client/xds_client_stats.h"
+#include "src/core/xds/xds_client/xds_locality.h"
 
 #define GRPC_XDS_INITIAL_CONNECT_BACKOFF_SECONDS 1
 #define GRPC_XDS_RECONNECT_BACKOFF_MULTIPLIER 1.6

src/core/xds/xds_client/xds_client.h

@@ -44,7 +44,7 @@
 #include "src/core/lib/uri/uri_parser.h"
 #include "src/core/xds/xds_client/xds_api.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
-#include "src/core/xds/xds_client/xds_client_stats.h"
+#include "src/core/xds/xds_client/xds_locality.h"
 #include "src/core/xds/xds_client/xds_metrics.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_transport.h"

src/core/xds/xds_client/xds_locality.h

@@ -1,6 +1,3 @@
-// FIXME: rename to xds_locality.h
-
-
 //
 //
 // Copyright 2018 gRPC authors.
@@ -19,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_STATS_H
-#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_STATS_H
+#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_LOCALITY_H
+#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_LOCALITY_H
 
 #include <string>
 #include <utility>
@@ -103,4 +100,4 @@ class XdsLocalityName final : public RefCounted<XdsLocalityName> {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_STATS_H
+#endif  // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_LOCALITY_H

src/python/grpcio/grpc_core_dependencies.py

@@ -864,10 +864,10 @@ CORE_SOURCE_FILES = [
     'src/core/xds/grpc/xds_routing.cc',
     'src/core/xds/grpc/xds_server_grpc.cc',
     'src/core/xds/grpc/xds_transport_grpc.cc',
+    'src/core/xds/xds_client/lrs_client.cc',
     'src/core/xds/xds_client/xds_api.cc',
     'src/core/xds/xds_client/xds_bootstrap.cc',
     'src/core/xds/xds_client/xds_client.cc',
-    'src/core/xds/xds_client/xds_client_stats.cc',
     'third_party/abseil-cpp/absl/base/internal/cycleclock.cc',
     'third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc',
     'third_party/abseil-cpp/absl/base/internal/raw_logging.cc',

test/core/xds/xds_endpoint_resource_type_test.cc

@@ -49,7 +49,7 @@
 #include "src/core/xds/grpc/xds_health_status.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 #include "src/core/xds/xds_client/xds_client.h"
-#include "src/core/xds/xds_client/xds_client_stats.h"
+#include "src/core/xds/xds_client/xds_locality.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/proto/grpc/testing/xds/v3/address.pb.h"
 #include "src/proto/grpc/testing/xds/v3/base.pb.h"

tools/doxygen/Doxyfile.c++.internal

@@ -3034,6 +3034,8 @@ src/core/xds/grpc/xds_server_grpc.cc \
 src/core/xds/grpc/xds_server_grpc.h \
 src/core/xds/grpc/xds_transport_grpc.cc \
 src/core/xds/grpc/xds_transport_grpc.h \
+src/core/xds/xds_client/lrs_client.cc \
+src/core/xds/xds_client/lrs_client.h \
 src/core/xds/xds_client/xds_api.cc \
 src/core/xds/xds_client/xds_api.h \
 src/core/xds/xds_client/xds_bootstrap.cc \
@@ -3041,8 +3043,7 @@ src/core/xds/xds_client/xds_bootstrap.h \
 src/core/xds/xds_client/xds_channel_args.h \
 src/core/xds/xds_client/xds_client.cc \
 src/core/xds/xds_client/xds_client.h \
-src/core/xds/xds_client/xds_client_stats.cc \
-src/core/xds/xds_client/xds_client_stats.h \
+src/core/xds/xds_client/xds_locality.h \
 src/core/xds/xds_client/xds_metrics.h \
 src/core/xds/xds_client/xds_resource_type.h \
 src/core/xds/xds_client/xds_resource_type_impl.h \

tools/doxygen/Doxyfile.core.internal

@@ -2812,6 +2812,8 @@ src/core/xds/grpc/xds_server_grpc.cc \
 src/core/xds/grpc/xds_server_grpc.h \
 src/core/xds/grpc/xds_transport_grpc.cc \
 src/core/xds/grpc/xds_transport_grpc.h \
+src/core/xds/xds_client/lrs_client.cc \
+src/core/xds/xds_client/lrs_client.h \
 src/core/xds/xds_client/xds_api.cc \
 src/core/xds/xds_client/xds_api.h \
 src/core/xds/xds_client/xds_bootstrap.cc \
@@ -2819,8 +2821,7 @@ src/core/xds/xds_client/xds_bootstrap.h \
 src/core/xds/xds_client/xds_channel_args.h \
 src/core/xds/xds_client/xds_client.cc \
 src/core/xds/xds_client/xds_client.h \
-src/core/xds/xds_client/xds_client_stats.cc \
-src/core/xds/xds_client/xds_client_stats.h \
+src/core/xds/xds_client/xds_locality.h \
 src/core/xds/xds_client/xds_metrics.h \
 src/core/xds/xds_client/xds_resource_type.h \
 src/core/xds/xds_client/xds_resource_type_impl.h \