From 6c08d36c3b44e92cef41a5ac3f74fd959cadd993 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Thu, 23 May 2024 15:51:05 -0700 Subject: [PATCH] [reorg] move telemetry code to src/core/telemetry (#36644) Closes #36644 PiperOrigin-RevId: 636702732 --- .gitattributes | 4 +- BUILD | 10 +- CMakeLists.txt | 46 ++++----- Makefile | 10 +- Package.swift | 22 ++--- build_autogenerated.yaml | 94 +++++++++---------- config.m4 | 11 ++- config.w32 | 11 ++- gRPC-C++.podspec | 24 ++--- gRPC-Core.podspec | 34 +++---- grpc.gemspec | 22 ++--- package.xml | 22 ++--- setup.py | 2 +- src/core/BUILD | 12 +-- .../client_channel/client_channel_filter.h | 2 +- .../client_channel/client_channel_internal.h | 2 +- src/core/client_channel/subchannel.cc | 4 +- .../message_compress/compression_filter.cc | 2 +- .../ext/filters/logging/logging_filter.cc | 2 +- .../chttp2/transport/chttp2_transport.cc | 8 +- .../chttp2/transport/chttp2_transport.h | 2 +- .../chttp2/transport/context_list_entry.h | 2 +- .../chttp2/transport/hpack_parser.cc | 6 +- .../transport/chttp2/transport/hpack_parser.h | 2 +- .../ext/transport/chttp2/transport/internal.h | 4 +- .../ext/transport/chttp2/transport/parsing.cc | 2 +- .../ext/transport/chttp2/transport/writing.cc | 6 +- .../security/security_handshaker.cc | 4 +- src/core/lib/channel/channel_stack.h | 2 +- src/core/lib/gprpp/work_serializer.cc | 4 +- src/core/lib/iomgr/call_combiner.cc | 4 +- src/core/lib/iomgr/ev_epoll1_linux.cc | 4 +- src/core/lib/iomgr/ev_poll_posix.cc | 4 +- src/core/lib/iomgr/iocp_windows.cc | 4 +- src/core/lib/iomgr/tcp_posix.cc | 4 +- src/core/lib/surface/call.cc | 6 +- src/core/lib/surface/channel.cc | 4 +- src/core/lib/surface/channel_create.cc | 4 +- src/core/lib/surface/completion_queue.cc | 4 +- src/core/lib/surface/legacy_channel.cc | 6 +- src/core/lib/surface/legacy_channel.h | 2 +- src/core/lib/transport/metadata_info.h | 2 +- src/core/load_balancing/lb_policy.h | 2 +- .../load_balancing/pick_first/pick_first.cc | 2 +- src/core/load_balancing/rls/rls.cc | 2 +- .../weighted_round_robin.cc | 6 +- .../load_balancing/xds/xds_cluster_impl.cc | 2 +- src/core/server/server.cc | 2 +- src/core/server/server.h | 2 +- src/core/server/server_call_tracer_filter.cc | 2 +- .../{lib/channel => telemetry}/call_tracer.cc | 4 +- .../{lib/channel => telemetry}/call_tracer.h | 8 +- .../debug => telemetry}/histogram_view.cc | 2 +- .../{lib/debug => telemetry}/histogram_view.h | 6 +- .../{lib/channel => telemetry}/metrics.cc | 2 +- src/core/{lib/channel => telemetry}/metrics.h | 8 +- src/core/{lib/debug => telemetry}/stats.cc | 2 +- src/core/{lib/debug => telemetry}/stats.h | 10 +- .../{lib/debug => telemetry}/stats_data.cc | 2 +- .../{lib/debug => telemetry}/stats_data.h | 8 +- .../{lib/debug => telemetry}/stats_data.yaml | 0 .../{lib/channel => telemetry}/tcp_tracer.h | 6 +- src/core/xds/grpc/xds_client_grpc.cc | 2 +- src/core/xds/grpc/xds_client_grpc.h | 2 +- src/core/xds/xds_client/xds_client_stats.h | 2 +- src/cpp/ext/csm/metadata_exchange.cc | 2 +- src/cpp/ext/filters/census/client_filter.cc | 2 +- src/cpp/ext/filters/census/grpc_plugin.cc | 2 +- .../filters/census/open_census_call_tracer.h | 4 +- .../ext/filters/census/server_call_tracer.cc | 4 +- .../ext/filters/census/server_call_tracer.h | 2 +- src/cpp/ext/otel/otel_client_call_tracer.cc | 2 +- src/cpp/ext/otel/otel_client_call_tracer.h | 4 +- src/cpp/ext/otel/otel_plugin.cc | 2 +- src/cpp/ext/otel/otel_plugin.h | 2 +- src/cpp/ext/otel/otel_server_call_tracer.cc | 2 +- src/cpp/ext/otel/otel_server_call_tracer.h | 2 +- .../grpcio/grpc/_cython/_cygrpc/grpc.pxi | 2 +- src/python/grpcio/grpc_core_dependencies.py | 10 +- .../grpc_observability/_cyobservability.pxd | 2 +- .../grpc_observability/client_call_tracer.h | 2 +- .../grpc_observability/server_call_tracer.cc | 2 +- .../grpc_observability/server_call_tracer.h | 2 +- src/python/grpcio_observability/setup.py | 2 +- test/core/channel/BUILD | 31 ------ .../server_call_tracer_factory_test.cc | 2 +- test/core/end2end/tests/http2_stats.cc | 6 +- test/core/end2end/tests/simple_request.cc | 4 +- .../fuzzing_event_engine.cc | 2 +- test/core/gprpp/work_serializer_test.cc | 6 +- test/core/load_balancing/pick_first_test.cc | 2 +- test/core/{debug => telemetry}/BUILD | 35 ++++++- .../call_tracer_test.cc | 2 +- .../{channel => telemetry}/metrics_test.cc | 2 +- test/core/{debug => telemetry}/stats_test.cc | 4 +- test/core/test_util/fake_stats_plugin.h | 6 +- .../end2end/xds/xds_cluster_end2end_test.cc | 2 +- test/cpp/ext/csm/metadata_exchange_test.cc | 2 +- test/cpp/ext/otel/otel_plugin_test.cc | 2 +- test/cpp/ext/otel/otel_test_library.cc | 2 +- test/cpp/ext/otel/otel_test_library.h | 2 +- test/cpp/microbenchmarks/helpers.h | 4 +- test/cpp/naming/cancel_ares_query_test.cc | 4 +- test/cpp/performance/writes_per_rpc_test.cc | 2 +- test/cpp/qps/scenario_runner.cc | 4 +- tools/codegen/core/gen_stats_data.py | 16 ++-- .../clang_tidy_all_the_things.sh | 2 +- tools/doxygen/Doxyfile.c++.internal | 22 ++--- tools/doxygen/Doxyfile.core.internal | 22 ++--- 109 files changed, 376 insertions(+), 374 deletions(-) rename src/core/{lib/channel => telemetry}/call_tracer.cc (99%) rename src/core/{lib/channel => telemetry}/call_tracer.h (97%) rename src/core/{lib/debug => telemetry}/histogram_view.cc (97%) rename src/core/{lib/debug => telemetry}/histogram_view.h (86%) rename src/core/{lib/channel => telemetry}/metrics.cc (99%) rename src/core/{lib/channel => telemetry}/metrics.h (99%) rename src/core/{lib/debug => telemetry}/stats.cc (98%) rename src/core/{lib/debug => telemetry}/stats.h (89%) rename src/core/{lib/debug => telemetry}/stats_data.cc (99%) rename src/core/{lib/debug => telemetry}/stats_data.h (99%) rename src/core/{lib/debug => telemetry}/stats_data.yaml (100%) rename src/core/{lib/channel => telemetry}/tcp_tracer.h (97%) rename test/core/{debug => telemetry}/BUILD (56%) rename test/core/{channel => telemetry}/call_tracer_test.cc (99%) rename test/core/{channel => telemetry}/metrics_test.cc (99%) rename test/core/{debug => telemetry}/stats_test.cc (97%) diff --git a/.gitattributes b/.gitattributes index b03b218eb51..2661229e94f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -29,8 +29,8 @@ tools/run_tests/tests.json linguist-generated=true tools/run_tests/generated/tests.json linguist-generated=true tools/run_tests/generated/sources_and_headers.json linguist-generated=true src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h linguist-generated=true -src/core/lib/debug/stats_data.h linguist-generated=true -src/core/lib/debug/stats_data.cc linguist-generated=true +src/core/telemetry/stats_data.h linguist-generated=true +src/core/telemetry/stats_data.cc linguist-generated=true src/core/lib/experiments/experiments.h linguist-generated=true src/core/lib/experiments/experiments.cc linguist-generated=true bazel/experiments.bzl linguist-generated=true diff --git a/BUILD b/BUILD index 6cfbe881c50..79ee22f7510 100644 --- a/BUILD +++ b/BUILD @@ -1742,10 +1742,10 @@ grpc_cc_library( grpc_cc_library( name = "call_tracer", srcs = [ - "//src/core:lib/channel/call_tracer.cc", + "//src/core:telemetry/call_tracer.cc", ], hdrs = [ - "//src/core:lib/channel/call_tracer.h", + "//src/core:telemetry/call_tracer.h", ], external_deps = [ "absl/log:check", @@ -3463,10 +3463,10 @@ grpc_cc_library( grpc_cc_library( name = "stats", srcs = [ - "//src/core:lib/debug/stats.cc", + "//src/core:telemetry/stats.cc", ], hdrs = [ - "//src/core:lib/debug/stats.h", + "//src/core:telemetry/stats.h", ], external_deps = [ "absl/strings", @@ -4751,7 +4751,7 @@ grpc_cc_library( grpc_cc_library( name = "tcp_tracer", hdrs = [ - "//src/core:lib/channel/tcp_tracer.h", + "//src/core:telemetry/tcp_tracer.h", ], external_deps = [ "absl/time", diff --git a/CMakeLists.txt b/CMakeLists.txt index d0172728836..f4090e8b821 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2228,7 +2228,6 @@ add_library(grpc src/core/lib/address_utils/sockaddr_utils.cc src/core/lib/backoff/backoff.cc src/core/lib/backoff/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 src/core/lib/channel/channel_stack.cc @@ -2236,7 +2235,6 @@ add_library(grpc src/core/lib/channel/channel_stack_builder_impl.cc src/core/lib/channel/channel_stack_trace.cc src/core/lib/channel/connected_channel.cc - src/core/lib/channel/metrics.cc src/core/lib/channel/promise_based_filter.cc src/core/lib/channel/status_util.cc src/core/lib/compression/compression.cc @@ -2244,9 +2242,6 @@ add_library(grpc src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc src/core/lib/debug/event_log.cc - src/core/lib/debug/histogram_view.cc - src/core/lib/debug/stats.cc - src/core/lib/debug/stats_data.cc src/core/lib/debug/trace.cc src/core/lib/event_engine/ares_resolver.cc src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -2571,6 +2566,11 @@ add_library(grpc src/core/service_config/service_config_channel_arg_filter.cc src/core/service_config/service_config_impl.cc src/core/service_config/service_config_parser.cc + src/core/telemetry/call_tracer.cc + src/core/telemetry/histogram_view.cc + src/core/telemetry/metrics.cc + src/core/telemetry/stats.cc + src/core/telemetry/stats_data.cc src/core/tsi/alts/crypt/aes_gcm.cc src/core/tsi/alts/crypt/gsec.cc src/core/tsi/alts/frame_protector/alts_counter.cc @@ -3021,7 +3021,6 @@ add_library(grpc_unsecure src/core/lib/address_utils/sockaddr_utils.cc src/core/lib/backoff/backoff.cc src/core/lib/backoff/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 src/core/lib/channel/channel_stack.cc @@ -3029,7 +3028,6 @@ add_library(grpc_unsecure src/core/lib/channel/channel_stack_builder_impl.cc src/core/lib/channel/channel_stack_trace.cc src/core/lib/channel/connected_channel.cc - src/core/lib/channel/metrics.cc src/core/lib/channel/promise_based_filter.cc src/core/lib/channel/status_util.cc src/core/lib/compression/compression.cc @@ -3037,9 +3035,6 @@ add_library(grpc_unsecure src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc src/core/lib/debug/event_log.cc - src/core/lib/debug/histogram_view.cc - src/core/lib/debug/stats.cc - src/core/lib/debug/stats_data.cc src/core/lib/debug/trace.cc src/core/lib/event_engine/ares_resolver.cc src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -3312,6 +3307,11 @@ add_library(grpc_unsecure src/core/service_config/service_config_channel_arg_filter.cc src/core/service_config/service_config_impl.cc src/core/service_config/service_config_parser.cc + src/core/telemetry/call_tracer.cc + src/core/telemetry/histogram_view.cc + src/core/telemetry/metrics.cc + src/core/telemetry/stats.cc + src/core/telemetry/stats_data.cc src/core/tsi/alts/handshaker/transport_security_common_api.cc src/core/tsi/fake_transport_security.cc src/core/tsi/local_transport_security.cc @@ -5139,7 +5139,6 @@ add_library(grpc_authorization_provider 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/channel/call_tracer.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_args_preconditioning.cc src/core/lib/channel/channel_stack.cc @@ -5147,7 +5146,6 @@ add_library(grpc_authorization_provider src/core/lib/channel/channel_stack_builder_impl.cc src/core/lib/channel/channel_stack_trace.cc src/core/lib/channel/connected_channel.cc - src/core/lib/channel/metrics.cc src/core/lib/channel/promise_based_filter.cc src/core/lib/channel/status_util.cc src/core/lib/compression/compression.cc @@ -5155,9 +5153,6 @@ add_library(grpc_authorization_provider src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc src/core/lib/debug/event_log.cc - src/core/lib/debug/histogram_view.cc - src/core/lib/debug/stats.cc - src/core/lib/debug/stats_data.cc src/core/lib/debug/trace.cc src/core/lib/event_engine/ares_resolver.cc src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -5384,6 +5379,11 @@ add_library(grpc_authorization_provider src/core/resolver/resolver.cc src/core/resolver/resolver_registry.cc src/core/service_config/service_config_parser.cc + src/core/telemetry/call_tracer.cc + src/core/telemetry/histogram_view.cc + src/core/telemetry/metrics.cc + src/core/telemetry/stats.cc + src/core/telemetry/stats_data.cc src/core/tsi/alts/handshaker/transport_security_common_api.cc src/core/tsi/transport_security.cc src/core/tsi/transport_security_grpc.cc @@ -8703,7 +8703,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(call_tracer_test - test/core/channel/call_tracer_test.cc + test/core/telemetry/call_tracer_test.cc test/core/test_util/fake_stats_plugin.cc ) if(WIN32 AND MSVC) @@ -17768,7 +17768,6 @@ add_executable(interception_chain_test 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/channel/call_tracer.cc src/core/lib/channel/channel_args.cc src/core/lib/channel/channel_args_preconditioning.cc src/core/lib/channel/channel_stack.cc @@ -17776,7 +17775,6 @@ add_executable(interception_chain_test src/core/lib/channel/channel_stack_builder_impl.cc src/core/lib/channel/channel_stack_trace.cc src/core/lib/channel/connected_channel.cc - src/core/lib/channel/metrics.cc src/core/lib/channel/promise_based_filter.cc src/core/lib/channel/status_util.cc src/core/lib/compression/compression.cc @@ -17784,9 +17782,6 @@ add_executable(interception_chain_test src/core/lib/compression/message_compress.cc src/core/lib/config/core_configuration.cc src/core/lib/debug/event_log.cc - src/core/lib/debug/histogram_view.cc - src/core/lib/debug/stats.cc - src/core/lib/debug/stats_data.cc src/core/lib/debug/trace.cc src/core/lib/event_engine/ares_resolver.cc src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -17988,6 +17983,11 @@ add_executable(interception_chain_test src/core/resolver/resolver.cc src/core/resolver/resolver_registry.cc src/core/service_config/service_config_parser.cc + src/core/telemetry/call_tracer.cc + src/core/telemetry/histogram_view.cc + src/core/telemetry/metrics.cc + src/core/telemetry/stats.cc + src/core/telemetry/stats_data.cc src/core/tsi/alts/handshaker/transport_security_common_api.cc test/core/transport/interception_chain_test.cc third_party/upb/upb/mini_descriptor/build_enum.c @@ -20000,7 +20000,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(metrics_test - test/core/channel/metrics_test.cc + test/core/telemetry/metrics_test.cc test/core/test_util/fake_stats_plugin.cc ) if(WIN32 AND MSVC) @@ -28801,7 +28801,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(stats_test - test/core/debug/stats_test.cc + test/core/telemetry/stats_test.cc ) if(WIN32 AND MSVC) if(BUILD_SHARED_LIBS) diff --git a/Makefile b/Makefile index 5e22b66b5ee..3de6515f8a0 100644 --- a/Makefile +++ b/Makefile @@ -1068,7 +1068,6 @@ LIBGRPC_SRC = \ src/core/lib/address_utils/sockaddr_utils.cc \ src/core/lib/backoff/backoff.cc \ src/core/lib/backoff/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 \ src/core/lib/channel/channel_stack.cc \ @@ -1076,7 +1075,6 @@ LIBGRPC_SRC = \ src/core/lib/channel/channel_stack_builder_impl.cc \ src/core/lib/channel/channel_stack_trace.cc \ src/core/lib/channel/connected_channel.cc \ - src/core/lib/channel/metrics.cc \ src/core/lib/channel/promise_based_filter.cc \ src/core/lib/channel/status_util.cc \ src/core/lib/compression/compression.cc \ @@ -1087,9 +1085,6 @@ LIBGRPC_SRC = \ src/core/lib/config/core_configuration.cc \ src/core/lib/config/load_config.cc \ src/core/lib/debug/event_log.cc \ - src/core/lib/debug/histogram_view.cc \ - src/core/lib/debug/stats.cc \ - src/core/lib/debug/stats_data.cc \ src/core/lib/debug/trace.cc \ src/core/lib/event_engine/ares_resolver.cc \ src/core/lib/event_engine/cf_engine/cf_engine.cc \ @@ -1430,6 +1425,11 @@ LIBGRPC_SRC = \ src/core/service_config/service_config_channel_arg_filter.cc \ src/core/service_config/service_config_impl.cc \ src/core/service_config/service_config_parser.cc \ + src/core/telemetry/call_tracer.cc \ + src/core/telemetry/histogram_view.cc \ + src/core/telemetry/metrics.cc \ + src/core/telemetry/stats.cc \ + src/core/telemetry/stats_data.cc \ src/core/tsi/alts/crypt/aes_gcm.cc \ src/core/tsi/alts/crypt/gsec.cc \ src/core/tsi/alts/frame_protector/alts_counter.cc \ diff --git a/Package.swift b/Package.swift index 2cfe0e1798e..cd30f90e602 100644 --- a/Package.swift +++ b/Package.swift @@ -1092,8 +1092,6 @@ let package = Package( "src/core/lib/backoff/random_early_detection.cc", "src/core/lib/backoff/random_early_detection.h", "src/core/lib/channel/call_finalization.h", - "src/core/lib/channel/call_tracer.cc", - "src/core/lib/channel/call_tracer.h", "src/core/lib/channel/channel_args.cc", "src/core/lib/channel/channel_args.h", "src/core/lib/channel/channel_args_preconditioning.cc", @@ -1110,13 +1108,10 @@ let package = Package( "src/core/lib/channel/connected_channel.cc", "src/core/lib/channel/connected_channel.h", "src/core/lib/channel/context.h", - "src/core/lib/channel/metrics.cc", - "src/core/lib/channel/metrics.h", "src/core/lib/channel/promise_based_filter.cc", "src/core/lib/channel/promise_based_filter.h", "src/core/lib/channel/status_util.cc", "src/core/lib/channel/status_util.h", - "src/core/lib/channel/tcp_tracer.h", "src/core/lib/compression/compression.cc", "src/core/lib/compression/compression_internal.cc", "src/core/lib/compression/compression_internal.h", @@ -1131,12 +1126,6 @@ let package = Package( "src/core/lib/config/load_config.h", "src/core/lib/debug/event_log.cc", "src/core/lib/debug/event_log.h", - "src/core/lib/debug/histogram_view.cc", - "src/core/lib/debug/histogram_view.h", - "src/core/lib/debug/stats.cc", - "src/core/lib/debug/stats.h", - "src/core/lib/debug/stats_data.cc", - "src/core/lib/debug/stats_data.h", "src/core/lib/debug/trace.cc", "src/core/lib/debug/trace.h", "src/core/lib/event_engine/ares_resolver.cc", @@ -1866,6 +1855,17 @@ let package = Package( "src/core/service_config/service_config_impl.h", "src/core/service_config/service_config_parser.cc", "src/core/service_config/service_config_parser.h", + "src/core/telemetry/call_tracer.cc", + "src/core/telemetry/call_tracer.h", + "src/core/telemetry/histogram_view.cc", + "src/core/telemetry/histogram_view.h", + "src/core/telemetry/metrics.cc", + "src/core/telemetry/metrics.h", + "src/core/telemetry/stats.cc", + "src/core/telemetry/stats.h", + "src/core/telemetry/stats_data.cc", + "src/core/telemetry/stats_data.h", + "src/core/telemetry/tcp_tracer.h", "src/core/tsi/alts/crypt/aes_gcm.cc", "src/core/tsi/alts/crypt/gsec.cc", "src/core/tsi/alts/crypt/gsec.h", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index f72466229e9..aaa5f04cc81 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -795,7 +795,6 @@ libs: - src/core/lib/backoff/backoff.h - src/core/lib/backoff/random_early_detection.h - src/core/lib/channel/call_finalization.h - - src/core/lib/channel/call_tracer.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h - src/core/lib/channel/channel_fwd.h @@ -805,17 +804,12 @@ libs: - src/core/lib/channel/channel_stack_trace.h - src/core/lib/channel/connected_channel.h - src/core/lib/channel/context.h - - src/core/lib/channel/metrics.h - src/core/lib/channel/promise_based_filter.h - src/core/lib/channel/status_util.h - - src/core/lib/channel/tcp_tracer.h - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - src/core/lib/debug/event_log.h - - src/core/lib/debug/histogram_view.h - - src/core/lib/debug/stats.h - - src/core/lib/debug/stats_data.h - src/core/lib/debug/trace.h - src/core/lib/event_engine/ares_resolver.h - src/core/lib/event_engine/cf_engine/cf_engine.h @@ -1184,6 +1178,12 @@ libs: - src/core/service_config/service_config_call_data.h - src/core/service_config/service_config_impl.h - src/core/service_config/service_config_parser.h + - src/core/telemetry/call_tracer.h + - src/core/telemetry/histogram_view.h + - src/core/telemetry/metrics.h + - src/core/telemetry/stats.h + - src/core/telemetry/stats_data.h + - src/core/telemetry/tcp_tracer.h - src/core/tsi/alts/crypt/gsec.h - src/core/tsi/alts/frame_protector/alts_counter.h - src/core/tsi/alts/frame_protector/alts_crypter.h @@ -1649,7 +1649,6 @@ libs: - src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/backoff/backoff.cc - src/core/lib/backoff/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 - src/core/lib/channel/channel_stack.cc @@ -1657,7 +1656,6 @@ libs: - src/core/lib/channel/channel_stack_builder_impl.cc - src/core/lib/channel/channel_stack_trace.cc - src/core/lib/channel/connected_channel.cc - - src/core/lib/channel/metrics.cc - src/core/lib/channel/promise_based_filter.cc - src/core/lib/channel/status_util.cc - src/core/lib/compression/compression.cc @@ -1665,9 +1663,6 @@ libs: - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - src/core/lib/debug/event_log.cc - - src/core/lib/debug/histogram_view.cc - - src/core/lib/debug/stats.cc - - src/core/lib/debug/stats_data.cc - src/core/lib/debug/trace.cc - src/core/lib/event_engine/ares_resolver.cc - src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -1992,6 +1987,11 @@ libs: - src/core/service_config/service_config_channel_arg_filter.cc - src/core/service_config/service_config_impl.cc - src/core/service_config/service_config_parser.cc + - src/core/telemetry/call_tracer.cc + - src/core/telemetry/histogram_view.cc + - src/core/telemetry/metrics.cc + - src/core/telemetry/stats.cc + - src/core/telemetry/stats_data.cc - src/core/tsi/alts/crypt/aes_gcm.cc - src/core/tsi/alts/crypt/gsec.cc - src/core/tsi/alts/frame_protector/alts_counter.cc @@ -2333,7 +2333,6 @@ libs: - src/core/lib/backoff/backoff.h - src/core/lib/backoff/random_early_detection.h - src/core/lib/channel/call_finalization.h - - src/core/lib/channel/call_tracer.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h - src/core/lib/channel/channel_fwd.h @@ -2343,17 +2342,12 @@ libs: - src/core/lib/channel/channel_stack_trace.h - src/core/lib/channel/connected_channel.h - src/core/lib/channel/context.h - - src/core/lib/channel/metrics.h - src/core/lib/channel/promise_based_filter.h - src/core/lib/channel/status_util.h - - src/core/lib/channel/tcp_tracer.h - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - src/core/lib/debug/event_log.h - - src/core/lib/debug/histogram_view.h - - src/core/lib/debug/stats.h - - src/core/lib/debug/stats_data.h - src/core/lib/debug/trace.h - src/core/lib/event_engine/ares_resolver.h - src/core/lib/event_engine/cf_engine/cf_engine.h @@ -2677,6 +2671,12 @@ libs: - src/core/service_config/service_config_call_data.h - src/core/service_config/service_config_impl.h - src/core/service_config/service_config_parser.h + - src/core/telemetry/call_tracer.h + - src/core/telemetry/histogram_view.h + - src/core/telemetry/metrics.h + - src/core/telemetry/stats.h + - src/core/telemetry/stats_data.h + - src/core/telemetry/tcp_tracer.h - src/core/tsi/alts/handshaker/transport_security_common_api.h - src/core/tsi/fake_transport_security.h - src/core/tsi/local_transport_security.h @@ -2802,7 +2802,6 @@ libs: - src/core/lib/address_utils/sockaddr_utils.cc - src/core/lib/backoff/backoff.cc - src/core/lib/backoff/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 - src/core/lib/channel/channel_stack.cc @@ -2810,7 +2809,6 @@ libs: - src/core/lib/channel/channel_stack_builder_impl.cc - src/core/lib/channel/channel_stack_trace.cc - src/core/lib/channel/connected_channel.cc - - src/core/lib/channel/metrics.cc - src/core/lib/channel/promise_based_filter.cc - src/core/lib/channel/status_util.cc - src/core/lib/compression/compression.cc @@ -2818,9 +2816,6 @@ libs: - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - src/core/lib/debug/event_log.cc - - src/core/lib/debug/histogram_view.cc - - src/core/lib/debug/stats.cc - - src/core/lib/debug/stats_data.cc - src/core/lib/debug/trace.cc - src/core/lib/event_engine/ares_resolver.cc - src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -3093,6 +3088,11 @@ libs: - src/core/service_config/service_config_channel_arg_filter.cc - src/core/service_config/service_config_impl.cc - src/core/service_config/service_config_parser.cc + - src/core/telemetry/call_tracer.cc + - src/core/telemetry/histogram_view.cc + - src/core/telemetry/metrics.cc + - src/core/telemetry/stats.cc + - src/core/telemetry/stats_data.cc - src/core/tsi/alts/handshaker/transport_security_common_api.cc - src/core/tsi/fake_transport_security.cc - src/core/tsi/local_transport_security.cc @@ -4423,7 +4423,6 @@ libs: - src/core/lib/avl/avl.h - src/core/lib/backoff/backoff.h - src/core/lib/channel/call_finalization.h - - src/core/lib/channel/call_tracer.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h - src/core/lib/channel/channel_fwd.h @@ -4433,17 +4432,12 @@ libs: - src/core/lib/channel/channel_stack_trace.h - src/core/lib/channel/connected_channel.h - src/core/lib/channel/context.h - - src/core/lib/channel/metrics.h - src/core/lib/channel/promise_based_filter.h - src/core/lib/channel/status_util.h - - src/core/lib/channel/tcp_tracer.h - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - src/core/lib/debug/event_log.h - - src/core/lib/debug/histogram_view.h - - src/core/lib/debug/stats.h - - src/core/lib/debug/stats_data.h - src/core/lib/debug/trace.h - src/core/lib/event_engine/ares_resolver.h - src/core/lib/event_engine/cf_engine/cf_engine.h @@ -4726,6 +4720,12 @@ libs: - src/core/service_config/service_config.h - src/core/service_config/service_config_call_data.h - src/core/service_config/service_config_parser.h + - src/core/telemetry/call_tracer.h + - src/core/telemetry/histogram_view.h + - src/core/telemetry/metrics.h + - src/core/telemetry/stats.h + - src/core/telemetry/stats_data.h + - src/core/telemetry/tcp_tracer.h - src/core/tsi/alts/handshaker/transport_security_common_api.h - src/core/tsi/transport_security.h - src/core/tsi/transport_security_grpc.h @@ -4769,7 +4769,6 @@ libs: - 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/channel/call_tracer.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc @@ -4777,7 +4776,6 @@ libs: - src/core/lib/channel/channel_stack_builder_impl.cc - src/core/lib/channel/channel_stack_trace.cc - src/core/lib/channel/connected_channel.cc - - src/core/lib/channel/metrics.cc - src/core/lib/channel/promise_based_filter.cc - src/core/lib/channel/status_util.cc - src/core/lib/compression/compression.cc @@ -4785,9 +4783,6 @@ libs: - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - src/core/lib/debug/event_log.cc - - src/core/lib/debug/histogram_view.cc - - src/core/lib/debug/stats.cc - - src/core/lib/debug/stats_data.cc - src/core/lib/debug/trace.cc - src/core/lib/event_engine/ares_resolver.cc - src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -5014,6 +5009,11 @@ libs: - src/core/resolver/resolver.cc - src/core/resolver/resolver_registry.cc - src/core/service_config/service_config_parser.cc + - src/core/telemetry/call_tracer.cc + - src/core/telemetry/histogram_view.cc + - src/core/telemetry/metrics.cc + - src/core/telemetry/stats.cc + - src/core/telemetry/stats_data.cc - src/core/tsi/alts/handshaker/transport_security_common_api.cc - src/core/tsi/transport_security.cc - src/core/tsi/transport_security_grpc.cc @@ -6605,7 +6605,7 @@ targets: headers: - test/core/test_util/fake_stats_plugin.h src: - - test/core/channel/call_tracer_test.cc + - test/core/telemetry/call_tracer_test.cc - test/core/test_util/fake_stats_plugin.cc deps: - gtest @@ -11582,7 +11582,6 @@ targets: - src/core/lib/avl/avl.h - src/core/lib/backoff/backoff.h - src/core/lib/channel/call_finalization.h - - src/core/lib/channel/call_tracer.h - src/core/lib/channel/channel_args.h - src/core/lib/channel/channel_args_preconditioning.h - src/core/lib/channel/channel_fwd.h @@ -11592,17 +11591,12 @@ targets: - src/core/lib/channel/channel_stack_trace.h - src/core/lib/channel/connected_channel.h - src/core/lib/channel/context.h - - src/core/lib/channel/metrics.h - src/core/lib/channel/promise_based_filter.h - src/core/lib/channel/status_util.h - - src/core/lib/channel/tcp_tracer.h - src/core/lib/compression/compression_internal.h - src/core/lib/compression/message_compress.h - src/core/lib/config/core_configuration.h - src/core/lib/debug/event_log.h - - src/core/lib/debug/histogram_view.h - - src/core/lib/debug/stats.h - - src/core/lib/debug/stats_data.h - src/core/lib/debug/trace.h - src/core/lib/event_engine/ares_resolver.h - src/core/lib/event_engine/cf_engine/cf_engine.h @@ -11861,6 +11855,12 @@ targets: - src/core/service_config/service_config.h - src/core/service_config/service_config_call_data.h - src/core/service_config/service_config_parser.h + - src/core/telemetry/call_tracer.h + - src/core/telemetry/histogram_view.h + - src/core/telemetry/metrics.h + - src/core/telemetry/stats.h + - src/core/telemetry/stats_data.h + - src/core/telemetry/tcp_tracer.h - src/core/tsi/alts/handshaker/transport_security_common_api.h - src/core/util/spinlock.h - test/core/promise/poll_matcher.h @@ -11897,7 +11897,6 @@ targets: - 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/channel/call_tracer.cc - src/core/lib/channel/channel_args.cc - src/core/lib/channel/channel_args_preconditioning.cc - src/core/lib/channel/channel_stack.cc @@ -11905,7 +11904,6 @@ targets: - src/core/lib/channel/channel_stack_builder_impl.cc - src/core/lib/channel/channel_stack_trace.cc - src/core/lib/channel/connected_channel.cc - - src/core/lib/channel/metrics.cc - src/core/lib/channel/promise_based_filter.cc - src/core/lib/channel/status_util.cc - src/core/lib/compression/compression.cc @@ -11913,9 +11911,6 @@ targets: - src/core/lib/compression/message_compress.cc - src/core/lib/config/core_configuration.cc - src/core/lib/debug/event_log.cc - - src/core/lib/debug/histogram_view.cc - - src/core/lib/debug/stats.cc - - src/core/lib/debug/stats_data.cc - src/core/lib/debug/trace.cc - src/core/lib/event_engine/ares_resolver.cc - src/core/lib/event_engine/cf_engine/cf_engine.cc @@ -12117,6 +12112,11 @@ targets: - src/core/resolver/resolver.cc - src/core/resolver/resolver_registry.cc - src/core/service_config/service_config_parser.cc + - src/core/telemetry/call_tracer.cc + - src/core/telemetry/histogram_view.cc + - src/core/telemetry/metrics.cc + - src/core/telemetry/stats.cc + - src/core/telemetry/stats_data.cc - src/core/tsi/alts/handshaker/transport_security_common_api.cc - test/core/transport/interception_chain_test.cc - third_party/upb/upb/mini_descriptor/build_enum.c @@ -13379,7 +13379,7 @@ targets: headers: - test/core/test_util/fake_stats_plugin.h src: - - test/core/channel/metrics_test.cc + - test/core/telemetry/metrics_test.cc - test/core/test_util/fake_stats_plugin.cc deps: - gtest @@ -18776,7 +18776,7 @@ targets: language: c++ headers: [] src: - - test/core/debug/stats_test.cc + - test/core/telemetry/stats_test.cc deps: - gtest - grpc_test_util diff --git a/config.m4 b/config.m4 index 672e7101589..86b0b7922b3 100644 --- a/config.m4 +++ b/config.m4 @@ -443,7 +443,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/address_utils/sockaddr_utils.cc \ src/core/lib/backoff/backoff.cc \ src/core/lib/backoff/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 \ src/core/lib/channel/channel_stack.cc \ @@ -451,7 +450,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/channel/channel_stack_builder_impl.cc \ src/core/lib/channel/channel_stack_trace.cc \ src/core/lib/channel/connected_channel.cc \ - src/core/lib/channel/metrics.cc \ src/core/lib/channel/promise_based_filter.cc \ src/core/lib/channel/status_util.cc \ src/core/lib/compression/compression.cc \ @@ -462,9 +460,6 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/config/core_configuration.cc \ src/core/lib/config/load_config.cc \ src/core/lib/debug/event_log.cc \ - src/core/lib/debug/histogram_view.cc \ - src/core/lib/debug/stats.cc \ - src/core/lib/debug/stats_data.cc \ src/core/lib/debug/trace.cc \ src/core/lib/event_engine/ares_resolver.cc \ src/core/lib/event_engine/cf_engine/cf_engine.cc \ @@ -805,6 +800,11 @@ if test "$PHP_GRPC" != "no"; then src/core/service_config/service_config_channel_arg_filter.cc \ src/core/service_config/service_config_impl.cc \ src/core/service_config/service_config_parser.cc \ + src/core/telemetry/call_tracer.cc \ + src/core/telemetry/histogram_view.cc \ + src/core/telemetry/metrics.cc \ + src/core/telemetry/stats.cc \ + src/core/telemetry/stats_data.cc \ src/core/tsi/alts/crypt/aes_gcm.cc \ src/core/tsi/alts/crypt/gsec.cc \ src/core/tsi/alts/frame_protector/alts_counter.cc \ @@ -1592,6 +1592,7 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/xds) PHP_ADD_BUILD_DIR($ext_builddir/src/core/server) PHP_ADD_BUILD_DIR($ext_builddir/src/core/service_config) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/telemetry) PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi) PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/crypt) PHP_ADD_BUILD_DIR($ext_builddir/src/core/tsi/alts/frame_protector) diff --git a/config.w32 b/config.w32 index c430f747c0a..86eb1661975 100644 --- a/config.w32 +++ b/config.w32 @@ -408,7 +408,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\address_utils\\sockaddr_utils.cc " + "src\\core\\lib\\backoff\\backoff.cc " + "src\\core\\lib\\backoff\\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 " + "src\\core\\lib\\channel\\channel_stack.cc " + @@ -416,7 +415,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\channel\\channel_stack_builder_impl.cc " + "src\\core\\lib\\channel\\channel_stack_trace.cc " + "src\\core\\lib\\channel\\connected_channel.cc " + - "src\\core\\lib\\channel\\metrics.cc " + "src\\core\\lib\\channel\\promise_based_filter.cc " + "src\\core\\lib\\channel\\status_util.cc " + "src\\core\\lib\\compression\\compression.cc " + @@ -427,9 +425,6 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\config\\core_configuration.cc " + "src\\core\\lib\\config\\load_config.cc " + "src\\core\\lib\\debug\\event_log.cc " + - "src\\core\\lib\\debug\\histogram_view.cc " + - "src\\core\\lib\\debug\\stats.cc " + - "src\\core\\lib\\debug\\stats_data.cc " + "src\\core\\lib\\debug\\trace.cc " + "src\\core\\lib\\event_engine\\ares_resolver.cc " + "src\\core\\lib\\event_engine\\cf_engine\\cf_engine.cc " + @@ -770,6 +765,11 @@ if (PHP_GRPC != "no") { "src\\core\\service_config\\service_config_channel_arg_filter.cc " + "src\\core\\service_config\\service_config_impl.cc " + "src\\core\\service_config\\service_config_parser.cc " + + "src\\core\\telemetry\\call_tracer.cc " + + "src\\core\\telemetry\\histogram_view.cc " + + "src\\core\\telemetry\\metrics.cc " + + "src\\core\\telemetry\\stats.cc " + + "src\\core\\telemetry\\stats_data.cc " + "src\\core\\tsi\\alts\\crypt\\aes_gcm.cc " + "src\\core\\tsi\\alts\\crypt\\gsec.cc " + "src\\core\\tsi\\alts\\frame_protector\\alts_counter.cc " + @@ -1730,6 +1730,7 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\xds"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\server"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\service_config"); + FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\telemetry"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\tsi\\alts\\crypt"); diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 457103324f9..f96e7926a7d 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -874,7 +874,6 @@ Pod::Spec.new do |s| 'src/core/lib/backoff/backoff.h', 'src/core/lib/backoff/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', - 'src/core/lib/channel/call_tracer.h', 'src/core/lib/channel/channel_args.h', 'src/core/lib/channel/channel_args_preconditioning.h', 'src/core/lib/channel/channel_fwd.h', @@ -884,19 +883,14 @@ Pod::Spec.new do |s| 'src/core/lib/channel/channel_stack_trace.h', 'src/core/lib/channel/connected_channel.h', 'src/core/lib/channel/context.h', - 'src/core/lib/channel/metrics.h', 'src/core/lib/channel/promise_based_filter.h', 'src/core/lib/channel/status_util.h', - 'src/core/lib/channel/tcp_tracer.h', 'src/core/lib/compression/compression_internal.h', 'src/core/lib/compression/message_compress.h', 'src/core/lib/config/config_vars.h', 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.h', 'src/core/lib/debug/event_log.h', - 'src/core/lib/debug/histogram_view.h', - 'src/core/lib/debug/stats.h', - 'src/core/lib/debug/stats_data.h', 'src/core/lib/debug/trace.h', 'src/core/lib/event_engine/ares_resolver.h', 'src/core/lib/event_engine/cf_engine/cf_engine.h', @@ -1282,6 +1276,12 @@ Pod::Spec.new do |s| 'src/core/service_config/service_config_call_data.h', 'src/core/service_config/service_config_impl.h', 'src/core/service_config/service_config_parser.h', + 'src/core/telemetry/call_tracer.h', + 'src/core/telemetry/histogram_view.h', + 'src/core/telemetry/metrics.h', + 'src/core/telemetry/stats.h', + 'src/core/telemetry/stats_data.h', + 'src/core/telemetry/tcp_tracer.h', 'src/core/tsi/alts/crypt/gsec.h', 'src/core/tsi/alts/frame_protector/alts_counter.h', 'src/core/tsi/alts/frame_protector/alts_crypter.h', @@ -2145,7 +2145,6 @@ Pod::Spec.new do |s| 'src/core/lib/backoff/backoff.h', 'src/core/lib/backoff/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', - 'src/core/lib/channel/call_tracer.h', 'src/core/lib/channel/channel_args.h', 'src/core/lib/channel/channel_args_preconditioning.h', 'src/core/lib/channel/channel_fwd.h', @@ -2155,19 +2154,14 @@ Pod::Spec.new do |s| 'src/core/lib/channel/channel_stack_trace.h', 'src/core/lib/channel/connected_channel.h', 'src/core/lib/channel/context.h', - 'src/core/lib/channel/metrics.h', 'src/core/lib/channel/promise_based_filter.h', 'src/core/lib/channel/status_util.h', - 'src/core/lib/channel/tcp_tracer.h', 'src/core/lib/compression/compression_internal.h', 'src/core/lib/compression/message_compress.h', 'src/core/lib/config/config_vars.h', 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.h', 'src/core/lib/debug/event_log.h', - 'src/core/lib/debug/histogram_view.h', - 'src/core/lib/debug/stats.h', - 'src/core/lib/debug/stats_data.h', 'src/core/lib/debug/trace.h', 'src/core/lib/event_engine/ares_resolver.h', 'src/core/lib/event_engine/cf_engine/cf_engine.h', @@ -2553,6 +2547,12 @@ Pod::Spec.new do |s| 'src/core/service_config/service_config_call_data.h', 'src/core/service_config/service_config_impl.h', 'src/core/service_config/service_config_parser.h', + 'src/core/telemetry/call_tracer.h', + 'src/core/telemetry/histogram_view.h', + 'src/core/telemetry/metrics.h', + 'src/core/telemetry/stats.h', + 'src/core/telemetry/stats_data.h', + 'src/core/telemetry/tcp_tracer.h', 'src/core/tsi/alts/crypt/gsec.h', 'src/core/tsi/alts/frame_protector/alts_counter.h', 'src/core/tsi/alts/frame_protector/alts_crypter.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 2d2af17efc5..8096fd0e6cd 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1211,8 +1211,6 @@ Pod::Spec.new do |s| 'src/core/lib/backoff/random_early_detection.cc', 'src/core/lib/backoff/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', - 'src/core/lib/channel/call_tracer.cc', - 'src/core/lib/channel/call_tracer.h', 'src/core/lib/channel/channel_args.cc', 'src/core/lib/channel/channel_args.h', 'src/core/lib/channel/channel_args_preconditioning.cc', @@ -1229,13 +1227,10 @@ Pod::Spec.new do |s| 'src/core/lib/channel/connected_channel.cc', 'src/core/lib/channel/connected_channel.h', 'src/core/lib/channel/context.h', - 'src/core/lib/channel/metrics.cc', - 'src/core/lib/channel/metrics.h', 'src/core/lib/channel/promise_based_filter.cc', 'src/core/lib/channel/promise_based_filter.h', 'src/core/lib/channel/status_util.cc', 'src/core/lib/channel/status_util.h', - 'src/core/lib/channel/tcp_tracer.h', 'src/core/lib/compression/compression.cc', 'src/core/lib/compression/compression_internal.cc', 'src/core/lib/compression/compression_internal.h', @@ -1250,12 +1245,6 @@ Pod::Spec.new do |s| 'src/core/lib/config/load_config.h', 'src/core/lib/debug/event_log.cc', 'src/core/lib/debug/event_log.h', - 'src/core/lib/debug/histogram_view.cc', - 'src/core/lib/debug/histogram_view.h', - 'src/core/lib/debug/stats.cc', - 'src/core/lib/debug/stats.h', - 'src/core/lib/debug/stats_data.cc', - 'src/core/lib/debug/stats_data.h', 'src/core/lib/debug/trace.cc', 'src/core/lib/debug/trace.h', 'src/core/lib/event_engine/ares_resolver.cc', @@ -1981,6 +1970,17 @@ Pod::Spec.new do |s| 'src/core/service_config/service_config_impl.h', 'src/core/service_config/service_config_parser.cc', 'src/core/service_config/service_config_parser.h', + 'src/core/telemetry/call_tracer.cc', + 'src/core/telemetry/call_tracer.h', + 'src/core/telemetry/histogram_view.cc', + 'src/core/telemetry/histogram_view.h', + 'src/core/telemetry/metrics.cc', + 'src/core/telemetry/metrics.h', + 'src/core/telemetry/stats.cc', + 'src/core/telemetry/stats.h', + 'src/core/telemetry/stats_data.cc', + 'src/core/telemetry/stats_data.h', + 'src/core/telemetry/tcp_tracer.h', 'src/core/tsi/alts/crypt/aes_gcm.cc', 'src/core/tsi/alts/crypt/gsec.cc', 'src/core/tsi/alts/crypt/gsec.h', @@ -2925,7 +2925,6 @@ Pod::Spec.new do |s| 'src/core/lib/backoff/backoff.h', 'src/core/lib/backoff/random_early_detection.h', 'src/core/lib/channel/call_finalization.h', - 'src/core/lib/channel/call_tracer.h', 'src/core/lib/channel/channel_args.h', 'src/core/lib/channel/channel_args_preconditioning.h', 'src/core/lib/channel/channel_fwd.h', @@ -2935,19 +2934,14 @@ Pod::Spec.new do |s| 'src/core/lib/channel/channel_stack_trace.h', 'src/core/lib/channel/connected_channel.h', 'src/core/lib/channel/context.h', - 'src/core/lib/channel/metrics.h', 'src/core/lib/channel/promise_based_filter.h', 'src/core/lib/channel/status_util.h', - 'src/core/lib/channel/tcp_tracer.h', 'src/core/lib/compression/compression_internal.h', 'src/core/lib/compression/message_compress.h', 'src/core/lib/config/config_vars.h', 'src/core/lib/config/core_configuration.h', 'src/core/lib/config/load_config.h', 'src/core/lib/debug/event_log.h', - 'src/core/lib/debug/histogram_view.h', - 'src/core/lib/debug/stats.h', - 'src/core/lib/debug/stats_data.h', 'src/core/lib/debug/trace.h', 'src/core/lib/event_engine/ares_resolver.h', 'src/core/lib/event_engine/cf_engine/cf_engine.h', @@ -3333,6 +3327,12 @@ Pod::Spec.new do |s| 'src/core/service_config/service_config_call_data.h', 'src/core/service_config/service_config_impl.h', 'src/core/service_config/service_config_parser.h', + 'src/core/telemetry/call_tracer.h', + 'src/core/telemetry/histogram_view.h', + 'src/core/telemetry/metrics.h', + 'src/core/telemetry/stats.h', + 'src/core/telemetry/stats_data.h', + 'src/core/telemetry/tcp_tracer.h', 'src/core/tsi/alts/crypt/gsec.h', 'src/core/tsi/alts/frame_protector/alts_counter.h', 'src/core/tsi/alts/frame_protector/alts_crypter.h', diff --git a/grpc.gemspec b/grpc.gemspec index 7104853d64f..1a0b2d73869 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1098,8 +1098,6 @@ Gem::Specification.new do |s| 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/lib/channel/call_finalization.h ) - s.files += %w( src/core/lib/channel/call_tracer.cc ) - s.files += %w( src/core/lib/channel/call_tracer.h ) s.files += %w( src/core/lib/channel/channel_args.cc ) s.files += %w( src/core/lib/channel/channel_args.h ) s.files += %w( src/core/lib/channel/channel_args_preconditioning.cc ) @@ -1116,13 +1114,10 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/channel/connected_channel.cc ) s.files += %w( src/core/lib/channel/connected_channel.h ) s.files += %w( src/core/lib/channel/context.h ) - s.files += %w( src/core/lib/channel/metrics.cc ) - s.files += %w( src/core/lib/channel/metrics.h ) s.files += %w( src/core/lib/channel/promise_based_filter.cc ) s.files += %w( src/core/lib/channel/promise_based_filter.h ) s.files += %w( src/core/lib/channel/status_util.cc ) s.files += %w( src/core/lib/channel/status_util.h ) - s.files += %w( src/core/lib/channel/tcp_tracer.h ) s.files += %w( src/core/lib/compression/compression.cc ) s.files += %w( src/core/lib/compression/compression_internal.cc ) s.files += %w( src/core/lib/compression/compression_internal.h ) @@ -1137,12 +1132,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/config/load_config.h ) s.files += %w( src/core/lib/debug/event_log.cc ) s.files += %w( src/core/lib/debug/event_log.h ) - s.files += %w( src/core/lib/debug/histogram_view.cc ) - s.files += %w( src/core/lib/debug/histogram_view.h ) - s.files += %w( src/core/lib/debug/stats.cc ) - s.files += %w( src/core/lib/debug/stats.h ) - s.files += %w( src/core/lib/debug/stats_data.cc ) - s.files += %w( src/core/lib/debug/stats_data.h ) s.files += %w( src/core/lib/debug/trace.cc ) s.files += %w( src/core/lib/debug/trace.h ) s.files += %w( src/core/lib/event_engine/ares_resolver.cc ) @@ -1868,6 +1857,17 @@ Gem::Specification.new do |s| s.files += %w( src/core/service_config/service_config_impl.h ) s.files += %w( src/core/service_config/service_config_parser.cc ) s.files += %w( src/core/service_config/service_config_parser.h ) + s.files += %w( src/core/telemetry/call_tracer.cc ) + s.files += %w( src/core/telemetry/call_tracer.h ) + s.files += %w( src/core/telemetry/histogram_view.cc ) + s.files += %w( src/core/telemetry/histogram_view.h ) + s.files += %w( src/core/telemetry/metrics.cc ) + s.files += %w( src/core/telemetry/metrics.h ) + s.files += %w( src/core/telemetry/stats.cc ) + s.files += %w( src/core/telemetry/stats.h ) + s.files += %w( src/core/telemetry/stats_data.cc ) + s.files += %w( src/core/telemetry/stats_data.h ) + s.files += %w( src/core/telemetry/tcp_tracer.h ) s.files += %w( src/core/tsi/alts/crypt/aes_gcm.cc ) s.files += %w( src/core/tsi/alts/crypt/gsec.cc ) s.files += %w( src/core/tsi/alts/crypt/gsec.h ) diff --git a/package.xml b/package.xml index 3cd01a87805..249e19c2fff 100644 --- a/package.xml +++ b/package.xml @@ -1080,8 +1080,6 @@ - - @@ -1098,13 +1096,10 @@ - - - @@ -1119,12 +1114,6 @@ - - - - - - @@ -1850,6 +1839,17 @@ + + + + + + + + + + + diff --git a/setup.py b/setup.py index d25e924d594..b93637215ff 100644 --- a/setup.py +++ b/setup.py @@ -441,7 +441,7 @@ DEFINE_MACROS += (("GRPC_DO_NOT_INSTANTIATE_POSIX_POLLER", 1),) # Fix for Cython build issue in aarch64. # It's required to define this macro before include . -# was included in core/lib/channel/call_tracer.h. +# was included in core/telemetry/call_tracer.h. # This macro should already be defined in grpc/grpc.h through port_platform.h, # but we're still having issue in aarch64, so we manually define the macro here. # TODO(xuanwn): Figure out what's going on in the aarch64 build so we can support diff --git a/src/core/BUILD b/src/core/BUILD index 53457328bfd..0752f8b056f 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -2998,10 +2998,10 @@ grpc_cc_library( grpc_cc_library( name = "histogram_view", srcs = [ - "lib/debug/histogram_view.cc", + "telemetry/histogram_view.cc", ], hdrs = [ - "lib/debug/histogram_view.h", + "telemetry/histogram_view.h", ], deps = ["//:gpr"], ) @@ -3009,10 +3009,10 @@ grpc_cc_library( grpc_cc_library( name = "stats_data", srcs = [ - "lib/debug/stats_data.cc", + "telemetry/stats_data.cc", ], hdrs = [ - "lib/debug/stats_data.h", + "telemetry/stats_data.h", ], external_deps = ["absl/strings"], deps = [ @@ -7887,10 +7887,10 @@ grpc_cc_library( grpc_cc_library( name = "metrics", srcs = [ - "lib/channel/metrics.cc", + "telemetry/metrics.cc", ], hdrs = [ - "lib/channel/metrics.h", + "telemetry/metrics.h", ], external_deps = [ "absl/container:flat_hash_map", diff --git a/src/core/client_channel/client_channel_filter.h b/src/core/client_channel/client_channel_filter.h index 9e11e12d223..5bbafc68d68 100644 --- a/src/core/client_channel/client_channel_filter.h +++ b/src/core/client_channel/client_channel_filter.h @@ -43,7 +43,6 @@ #include "src/core/client_channel/dynamic_filters.h" #include "src/core/client_channel/subchannel.h" #include "src/core/client_channel/subchannel_pool_interface.h" -#include "src/core/lib/channel/call_tracer.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" @@ -70,6 +69,7 @@ #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/resolver.h" #include "src/core/service_config/service_config.h" +#include "src/core/telemetry/call_tracer.h" #include "src/core/util/time_precise.h" // diff --git a/src/core/client_channel/client_channel_internal.h b/src/core/client_channel/client_channel_internal.h index adc09a81172..a2c759ec7d6 100644 --- a/src/core/client_channel/client_channel_internal.h +++ b/src/core/client_channel/client_channel_internal.h @@ -26,12 +26,12 @@ #include -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/gprpp/unique_type_name.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/service_config/service_config_call_data.h" +#include "src/core/telemetry/call_tracer.h" // // This file contains internal interfaces used to allow various plugins diff --git a/src/core/client_channel/subchannel.cc b/src/core/client_channel/subchannel.cc index d0f9edefeab..9ebb91b276e 100644 --- a/src/core/client_channel/subchannel.cc +++ b/src/core/client_channel/subchannel.cc @@ -49,8 +49,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" @@ -67,6 +65,8 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" #include "src/core/util/alloc.h" #include "src/core/util/useful.h" diff --git a/src/core/ext/filters/http/message_compress/compression_filter.cc b/src/core/ext/filters/http/message_compress/compression_filter.cc index ed077de6e70..43fa643bbb8 100644 --- a/src/core/ext/filters/http/message_compress/compression_filter.cc +++ b/src/core/ext/filters/http/message_compress/compression_filter.cc @@ -35,7 +35,6 @@ #include #include "src/core/ext/filters/message_size/message_size_filter.h" -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" @@ -54,6 +53,7 @@ #include "src/core/lib/surface/call_trace.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" namespace grpc_core { diff --git a/src/core/ext/filters/logging/logging_filter.cc b/src/core/ext/filters/logging/logging_filter.cc index 06ee67de012..bd229acb5de 100644 --- a/src/core/ext/filters/logging/logging_filter.cc +++ b/src/core/ext/filters/logging/logging_filter.cc @@ -50,7 +50,6 @@ #include "src/core/client_channel/client_channel_filter.h" #include "src/core/ext/filters/logging/logging_sink.h" -#include "src/core/lib/channel/call_tracer.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" @@ -71,6 +70,7 @@ #include "src/core/lib/transport/transport.h" #include "src/core/lib/uri/uri_parser.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/telemetry/call_tracer.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 5c2d1c5ae20..2b85004c1a6 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -73,12 +73,8 @@ #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h" #include "src/core/ext/transport/chttp2/transport/varint.h" #include "src/core/ext/transport/chttp2/transport/write_size_policy.h" -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" -#include "src/core/lib/channel/tcp_tracer.h" -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/bitset.h" #include "src/core/lib/gprpp/crash.h" @@ -108,6 +104,10 @@ #include "src/core/lib/transport/metadata_info.h" #include "src/core/lib/transport/status_conversion.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" +#include "src/core/telemetry/tcp_tracer.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h index d83b38e8c5c..a98381b489d 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h @@ -29,7 +29,6 @@ #include "src/core/channelz/channelz.h" #include "src/core/ext/transport/chttp2/transport/flow_control.h" -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" @@ -39,6 +38,7 @@ #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" extern grpc_core::TraceFlag grpc_keepalive_trace; extern grpc_core::TraceFlag grpc_trace_http2_stream_state; diff --git a/src/core/ext/transport/chttp2/transport/context_list_entry.h b/src/core/ext/transport/chttp2/transport/context_list_entry.h index cf080874fe7..8d64b321aef 100644 --- a/src/core/ext/transport/chttp2/transport/context_list_entry.h +++ b/src/core/ext/transport/chttp2/transport/context_list_entry.h @@ -28,7 +28,7 @@ #include -#include "src/core/lib/channel/tcp_tracer.h" +#include "src/core/telemetry/tcp_tracer.h" namespace grpc_core { diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc index 4c4500dc280..44ae22ea475 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -44,9 +44,6 @@ #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" #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/lib/channel/call_tracer.h" -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/match.h" #include "src/core/lib/slice/slice.h" @@ -54,6 +51,9 @@ #include "src/core/lib/surface/validate_metadata.h" #include "src/core/lib/transport/metadata_info.h" #include "src/core/lib/transport/parsed_metadata.h" +#include "src/core/telemetry/call_tracer.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" // IWYU pragma: no_include diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.h b/src/core/ext/transport/chttp2/transport/hpack_parser.h index 95f752c3ba8..463e051dc27 100644 --- a/src/core/ext/transport/chttp2/transport/hpack_parser.h +++ b/src/core/ext/transport/chttp2/transport/hpack_parser.h @@ -40,11 +40,11 @@ #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/lib/channel/call_tracer.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_refcount.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/telemetry/call_tracer.h" // IWYU pragma: no_include diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index 058928a596d..aa04864ec00 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -57,9 +57,7 @@ #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h" #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h" #include "src/core/ext/transport/chttp2/transport/write_size_policy.h" -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/tcp_tracer.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/bitset.h" #include "src/core/lib/gprpp/debug_location.h" @@ -79,6 +77,8 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" +#include "src/core/telemetry/tcp_tracer.h" // Flag that this closure barrier may be covering a write in a pollset, and so // we should not complete this closure until we can prove that the write got diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index a49d91263e5..856d3bcb220 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -60,7 +60,6 @@ #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/lib/channel/call_tracer.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" @@ -76,6 +75,7 @@ #include "src/core/lib/transport/http2_errors.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" using grpc_core::HPackParser; diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc index 6b99d9deee8..0cc28270314 100644 --- a/src/core/ext/transport/chttp2/transport/writing.cc +++ b/src/core/ext/transport/chttp2/transport/writing.cc @@ -54,9 +54,6 @@ #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h" #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h" #include "src/core/ext/transport/chttp2/transport/write_size_policy.h" -#include "src/core/lib/channel/call_tracer.h" -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/match.h" @@ -72,6 +69,9 @@ #include "src/core/lib/transport/http2_errors.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" #include "src/core/util/useful.h" // IWYU pragma: no_include "src/core/lib/gprpp/orphanable.h" diff --git a/src/core/handshaker/security/security_handshaker.cc b/src/core/handshaker/security/security_handshaker.cc index 33b21f31d13..bf073a66561 100644 --- a/src/core/handshaker/security/security_handshaker.cc +++ b/src/core/handshaker/security/security_handshaker.cc @@ -51,8 +51,6 @@ #include "src/core/handshaker/security/tsi_error.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" @@ -66,6 +64,8 @@ #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" #include "src/core/tsi/transport_security_grpc.h" #define GRPC_INITIAL_HANDSHAKE_BUFFER_SIZE 256 diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h index 10b326e88d3..9fc6564c8de 100644 --- a/src/core/lib/channel/channel_stack.h +++ b/src/core/lib/channel/channel_stack.h @@ -60,7 +60,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/context.h" -#include "src/core/lib/channel/metrics.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" @@ -73,6 +72,7 @@ #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/transport/call_final_info.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/metrics.h" #include "src/core/util/time_precise.h" struct grpc_channel_element_args { diff --git a/src/core/lib/gprpp/work_serializer.cc b/src/core/lib/gprpp/work_serializer.cc index 88c10c00a8a..653aa8659cf 100644 --- a/src/core/lib/gprpp/work_serializer.cc +++ b/src/core/lib/gprpp/work_serializer.cc @@ -34,8 +34,6 @@ #include #include -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/debug_location.h" @@ -43,6 +41,8 @@ #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index c6fb49cea1a..fa56bfa3e76 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -26,9 +26,9 @@ #include #include -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/gprpp/crash.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" namespace grpc_core { diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index d40b20a93b7..f0021d0ed7e 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -49,8 +49,6 @@ #include #include -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/gprpp/strerror.h" #include "src/core/lib/iomgr/block_annotate.h" @@ -59,6 +57,8 @@ #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/lockfree_event.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index d4c78557f06..02c3bb77c4b 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -41,14 +41,14 @@ #include #include -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/ev_poll_posix.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" #include "src/core/util/useful.h" #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker*)1) diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index a19c13ab7b6..9d6477aaaaf 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -33,14 +33,14 @@ #include #include -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/timer.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" static ULONG g_iocp_kick_token; static OVERLAPPED g_iocp_custom_overlap; diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 1f9f9817e04..6992bcf687c 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -57,8 +57,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/debug/event_log.h" -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/crash.h" @@ -76,6 +74,8 @@ #include "src/core/lib/resource_quota/trace.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" #include "src/core/util/string.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index cd9a15d0bd6..9a54226862b 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -58,13 +58,10 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/call_finalization.h" -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/compression/compression_internal.h" -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/bitset.h" #include "src/core/lib/gprpp/cpp_impl_of.h" @@ -104,6 +101,9 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server_interface.h" +#include "src/core/telemetry/call_tracer.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" #include "src/core/util/alloc.h" #include "src/core/util/time_precise.h" #include "src/core/util/useful.h" diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc index 827d37f06b6..b8134974794 100644 --- a/src/core/lib/surface/channel.cc +++ b/src/core/lib/surface/channel.cc @@ -29,11 +29,11 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/compression/compression_internal.h" -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/api_trace.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" namespace grpc_core { diff --git a/src/core/lib/surface/channel_create.cc b/src/core/lib/surface/channel_create.cc index 0ad87af1f62..5ae280171e7 100644 --- a/src/core/lib/surface/channel_create.cc +++ b/src/core/lib/surface/channel_create.cc @@ -24,11 +24,11 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/lame_client.h" #include "src/core/lib/surface/legacy_channel.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" namespace grpc_core { diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc index b439191f1bb..1c77614f6fb 100644 --- a/src/core/lib/surface/completion_queue.cc +++ b/src/core/lib/surface/completion_queue.cc @@ -41,8 +41,6 @@ #include #include -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/gprpp/atomic_utils.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/ref_counted.h" @@ -55,6 +53,8 @@ #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/event_string.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" #include "src/core/util/spinlock.h" #ifdef GPR_WINDOWS diff --git a/src/core/lib/surface/legacy_channel.cc b/src/core/lib/surface/legacy_channel.cc index d8f53540e32..69a41cf503e 100644 --- a/src/core/lib/surface/legacy_channel.cc +++ b/src/core/lib/surface/legacy_channel.cc @@ -36,10 +36,7 @@ #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" -#include "src/core/lib/channel/metrics.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/dual_ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" @@ -57,6 +54,9 @@ #include "src/core/lib/surface/init_internally.h" #include "src/core/lib/surface/lame_client.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/metrics.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" namespace grpc_core { diff --git a/src/core/lib/surface/legacy_channel.h b/src/core/lib/surface/legacy_channel.h index 3cf3fa0db22..0ebf7b4aacb 100644 --- a/src/core/lib/surface/legacy_channel.h +++ b/src/core/lib/surface/legacy_channel.h @@ -32,7 +32,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" // IWYU pragma: keep -#include "src/core/lib/debug/stats.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/iomgr_fwd.h" @@ -40,6 +39,7 @@ #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/call_arena_allocator.h" +#include "src/core/telemetry/stats.h" namespace grpc_core { diff --git a/src/core/lib/transport/metadata_info.h b/src/core/lib/transport/metadata_info.h index 76569a97c66..02ab305c81b 100644 --- a/src/core/lib/transport/metadata_info.h +++ b/src/core/lib/transport/metadata_info.h @@ -18,9 +18,9 @@ #include #include "src/core/ext/transport/chttp2/transport/hpack_constants.h" -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/telemetry/call_tracer.h" namespace grpc_core { diff --git a/src/core/load_balancing/lb_policy.h b/src/core/load_balancing/lb_policy.h index 68f75e5271a..838d89ae2d5 100644 --- a/src/core/load_balancing/lb_policy.h +++ b/src/core/load_balancing/lb_policy.h @@ -38,7 +38,6 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/metrics.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/dual_ref_counted.h" @@ -52,6 +51,7 @@ #include "src/core/load_balancing/backend_metric_data.h" #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/telemetry/metrics.h" namespace grpc_core { diff --git a/src/core/load_balancing/pick_first/pick_first.cc b/src/core/load_balancing/pick_first/pick_first.cc index ae5cb82489b..d22fe292b6a 100644 --- a/src/core/load_balancing/pick_first/pick_first.cc +++ b/src/core/load_balancing/pick_first/pick_first.cc @@ -43,7 +43,6 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/metrics.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" @@ -65,6 +64,7 @@ #include "src/core/load_balancing/lb_policy_factory.h" #include "src/core/load_balancing/subchannel_interface.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/telemetry/metrics.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/load_balancing/rls/rls.cc b/src/core/load_balancing/rls/rls.cc index 53480d6f091..26bd71d0dda 100644 --- a/src/core/load_balancing/rls/rls.cc +++ b/src/core/load_balancing/rls/rls.cc @@ -70,7 +70,6 @@ #include "src/core/client_channel/client_channel_filter.h" #include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/metrics.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/debug_location.h" @@ -107,6 +106,7 @@ #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/resolver_registry.h" #include "src/core/service_config/service_config_impl.h" +#include "src/core/telemetry/metrics.h" #include "src/proto/grpc/lookup/v1/rls.upb.h" using ::grpc_event_engine::experimental::EventEngine; diff --git a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc index d0a4165f393..f750b0ae0a0 100644 --- a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc +++ b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc @@ -45,10 +45,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/metrics.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/debug_location.h" @@ -74,6 +71,9 @@ #include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h" #include "src/core/load_balancing/weighted_target/weighted_target.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/telemetry/metrics.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" namespace grpc_core { diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc index 0554e28b4e7..6ea74538a36 100644 --- a/src/core/load_balancing/xds/xds_cluster_impl.cc +++ b/src/core/load_balancing/xds/xds_cluster_impl.cc @@ -38,7 +38,6 @@ #include #include "src/core/client_channel/client_channel_internal.h" -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" @@ -67,6 +66,7 @@ #include "src/core/load_balancing/xds/xds_channel_args.h" #include "src/core/resolver/endpoint_addresses.h" #include "src/core/resolver/xds/xds_dependency_manager.h" +#include "src/core/telemetry/call_tracer.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_client_grpc.h" #include "src/core/xds/grpc/xds_endpoint.h" diff --git a/src/core/server/server.cc b/src/core/server/server.cc index b891001f3d4..6397e03a62c 100644 --- a/src/core/server/server.cc +++ b/src/core/server/server.cc @@ -52,7 +52,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/debug/stats.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/debug_location.h" @@ -83,6 +82,7 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/interception_chain.h" +#include "src/core/telemetry/stats.h" #include "src/core/util/useful.h" namespace grpc_core { diff --git a/src/core/server/server.h b/src/core/server/server.h index 01b541c233e..279e1f8362b 100644 --- a/src/core/server/server.h +++ b/src/core/server/server.h @@ -47,7 +47,6 @@ #include "src/core/channelz/channelz.h" #include "src/core/lib/backoff/random_early_detection.h" -#include "src/core/lib/channel/call_tracer.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" @@ -70,6 +69,7 @@ #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" #include "src/core/server/server_interface.h" +#include "src/core/telemetry/call_tracer.h" #define GRPC_ARG_SERVER_MAX_PENDING_REQUESTS "grpc.server.max_pending_requests" #define GRPC_ARG_SERVER_MAX_PENDING_REQUESTS_HARD_LIMIT \ diff --git a/src/core/server/server_call_tracer_filter.cc b/src/core/server/server_call_tracer_filter.cc index 6ceb637d481..7a63b4768b6 100644 --- a/src/core/server/server_call_tracer_filter.cc +++ b/src/core/server/server_call_tracer_filter.cc @@ -26,7 +26,6 @@ #include #include "src/core/lib/channel/call_finalization.h" -#include "src/core/lib/channel/call_tracer.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" @@ -40,6 +39,7 @@ #include "src/core/lib/promise/pipe.h" #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" namespace grpc_core { diff --git a/src/core/lib/channel/call_tracer.cc b/src/core/telemetry/call_tracer.cc similarity index 99% rename from src/core/lib/channel/call_tracer.cc rename to src/core/telemetry/call_tracer.cc index 154bbdfbf06..093664e85f6 100644 --- a/src/core/lib/channel/call_tracer.cc +++ b/src/core/telemetry/call_tracer.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/channel/call_tracer.h" +#include "src/core/telemetry/call_tracer.h" #include #include @@ -27,8 +27,8 @@ #include #include -#include "src/core/lib/channel/tcp_tracer.h" #include "src/core/lib/promise/context.h" +#include "src/core/telemetry/tcp_tracer.h" namespace grpc_core { diff --git a/src/core/lib/channel/call_tracer.h b/src/core/telemetry/call_tracer.h similarity index 97% rename from src/core/lib/channel/call_tracer.h rename to src/core/telemetry/call_tracer.h index f0b74f7e598..3f98c7098e0 100644 --- a/src/core/lib/channel/call_tracer.h +++ b/src/core/telemetry/call_tracer.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_CHANNEL_CALL_TRACER_H -#define GRPC_SRC_CORE_LIB_CHANNEL_CALL_TRACER_H +#ifndef GRPC_SRC_CORE_TELEMETRY_CALL_TRACER_H +#define GRPC_SRC_CORE_TELEMETRY_CALL_TRACER_H #include #include @@ -31,13 +31,13 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" -#include "src/core/lib/channel/tcp_tracer.h" #include "src/core/lib/gprpp/ref_counted_string.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/call_final_info.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/telemetry/tcp_tracer.h" namespace grpc_core { @@ -223,4 +223,4 @@ void AddServerCallTracerToContext(grpc_call_context_element* call_context, } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_CHANNEL_CALL_TRACER_H +#endif // GRPC_SRC_CORE_TELEMETRY_CALL_TRACER_H diff --git a/src/core/lib/debug/histogram_view.cc b/src/core/telemetry/histogram_view.cc similarity index 97% rename from src/core/lib/debug/histogram_view.cc rename to src/core/telemetry/histogram_view.cc index 803f7a2321e..fdfa402d6d2 100644 --- a/src/core/lib/debug/histogram_view.cc +++ b/src/core/telemetry/histogram_view.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/debug/histogram_view.h" +#include "src/core/telemetry/histogram_view.h" #include diff --git a/src/core/lib/debug/histogram_view.h b/src/core/telemetry/histogram_view.h similarity index 86% rename from src/core/lib/debug/histogram_view.h rename to src/core/telemetry/histogram_view.h index dd6dd74fd41..62018d8b840 100644 --- a/src/core/lib/debug/histogram_view.h +++ b/src/core/telemetry/histogram_view.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_DEBUG_HISTOGRAM_VIEW_H -#define GRPC_SRC_CORE_LIB_DEBUG_HISTOGRAM_VIEW_H +#ifndef GRPC_SRC_CORE_TELEMETRY_HISTOGRAM_VIEW_H +#define GRPC_SRC_CORE_TELEMETRY_HISTOGRAM_VIEW_H #include @@ -34,4 +34,4 @@ struct HistogramView { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_DEBUG_HISTOGRAM_VIEW_H +#endif // GRPC_SRC_CORE_TELEMETRY_HISTOGRAM_VIEW_H diff --git a/src/core/lib/channel/metrics.cc b/src/core/telemetry/metrics.cc similarity index 99% rename from src/core/lib/channel/metrics.cc rename to src/core/telemetry/metrics.cc index c3b734fc44d..b403a8649f2 100644 --- a/src/core/lib/channel/metrics.cc +++ b/src/core/telemetry/metrics.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/channel/metrics.h" +#include "src/core/telemetry/metrics.h" #include diff --git a/src/core/lib/channel/metrics.h b/src/core/telemetry/metrics.h similarity index 99% rename from src/core/lib/channel/metrics.h rename to src/core/telemetry/metrics.h index 797be93fd7d..0a02cf9acfc 100644 --- a/src/core/lib/channel/metrics.h +++ b/src/core/telemetry/metrics.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_CHANNEL_METRICS_H -#define GRPC_SRC_CORE_LIB_CHANNEL_METRICS_H +#ifndef GRPC_SRC_CORE_TELEMETRY_METRICS_H +#define GRPC_SRC_CORE_TELEMETRY_METRICS_H #include #include @@ -29,13 +29,13 @@ #include #include -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/gprpp/no_destruct.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/slice/slice.h" +#include "src/core/telemetry/call_tracer.h" namespace grpc_core { @@ -536,4 +536,4 @@ class RegisteredMetricCallback { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_CHANNEL_METRICS_H +#endif // GRPC_SRC_CORE_TELEMETRY_METRICS_H diff --git a/src/core/lib/debug/stats.cc b/src/core/telemetry/stats.cc similarity index 98% rename from src/core/lib/debug/stats.cc rename to src/core/telemetry/stats.cc index e7d6a63169d..c5137e71f85 100644 --- a/src/core/lib/debug/stats.cc +++ b/src/core/telemetry/stats.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/debug/stats.h" +#include "src/core/telemetry/stats.h" #include diff --git a/src/core/lib/debug/stats.h b/src/core/telemetry/stats.h similarity index 89% rename from src/core/lib/debug/stats.h rename to src/core/telemetry/stats.h index 6415a4cd039..b1026abbb28 100644 --- a/src/core/lib/debug/stats.h +++ b/src/core/telemetry/stats.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_DEBUG_STATS_H -#define GRPC_SRC_CORE_LIB_DEBUG_STATS_H +#ifndef GRPC_SRC_CORE_TELEMETRY_STATS_H +#define GRPC_SRC_CORE_TELEMETRY_STATS_H #include @@ -29,9 +29,9 @@ #include -#include "src/core/lib/debug/histogram_view.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/gprpp/no_destruct.h" +#include "src/core/telemetry/histogram_view.h" +#include "src/core/telemetry/stats_data.h" namespace grpc_core { @@ -61,4 +61,4 @@ std::string StatsAsJson(T* data) { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_DEBUG_STATS_H +#endif // GRPC_SRC_CORE_TELEMETRY_STATS_H diff --git a/src/core/lib/debug/stats_data.cc b/src/core/telemetry/stats_data.cc similarity index 99% rename from src/core/lib/debug/stats_data.cc rename to src/core/telemetry/stats_data.cc index a390927e78f..4a317b7fcf0 100644 --- a/src/core/lib/debug/stats_data.cc +++ b/src/core/telemetry/stats_data.cc @@ -14,7 +14,7 @@ // Automatically generated by tools/codegen/core/gen_stats_data.py -#include "src/core/lib/debug/stats_data.h" +#include "src/core/telemetry/stats_data.h" #include diff --git a/src/core/lib/debug/stats_data.h b/src/core/telemetry/stats_data.h similarity index 99% rename from src/core/lib/debug/stats_data.h rename to src/core/telemetry/stats_data.h index 8b9aa2b5fa8..6220a118f20 100644 --- a/src/core/lib/debug/stats_data.h +++ b/src/core/telemetry/stats_data.h @@ -14,8 +14,8 @@ // Automatically generated by tools/codegen/core/gen_stats_data.py -#ifndef GRPC_SRC_CORE_LIB_DEBUG_STATS_DATA_H -#define GRPC_SRC_CORE_LIB_DEBUG_STATS_DATA_H +#ifndef GRPC_SRC_CORE_TELEMETRY_STATS_DATA_H +#define GRPC_SRC_CORE_TELEMETRY_STATS_DATA_H #include @@ -26,8 +26,8 @@ #include -#include "src/core/lib/debug/histogram_view.h" #include "src/core/lib/gprpp/per_cpu.h" +#include "src/core/telemetry/histogram_view.h" namespace grpc_core { class HistogramCollector_100000_20; @@ -576,4 +576,4 @@ class GlobalStatsCollector { }; } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_DEBUG_STATS_DATA_H +#endif // GRPC_SRC_CORE_TELEMETRY_STATS_DATA_H diff --git a/src/core/lib/debug/stats_data.yaml b/src/core/telemetry/stats_data.yaml similarity index 100% rename from src/core/lib/debug/stats_data.yaml rename to src/core/telemetry/stats_data.yaml diff --git a/src/core/lib/channel/tcp_tracer.h b/src/core/telemetry/tcp_tracer.h similarity index 97% rename from src/core/lib/channel/tcp_tracer.h rename to src/core/telemetry/tcp_tracer.h index f6097447014..1068678cab8 100644 --- a/src/core/lib/channel/tcp_tracer.h +++ b/src/core/telemetry/tcp_tracer.h @@ -16,8 +16,8 @@ // // -#ifndef GRPC_SRC_CORE_LIB_CHANNEL_TCP_TRACER_H -#define GRPC_SRC_CORE_LIB_CHANNEL_TCP_TRACER_H +#ifndef GRPC_SRC_CORE_TELEMETRY_TCP_TRACER_H +#define GRPC_SRC_CORE_TELEMETRY_TCP_TRACER_H #include #include @@ -141,4 +141,4 @@ class TcpTracerInterface { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_CHANNEL_TCP_TRACER_H +#endif // GRPC_SRC_CORE_TELEMETRY_TCP_TRACER_H diff --git a/src/core/xds/grpc/xds_client_grpc.cc b/src/core/xds/grpc/xds_client_grpc.cc index 3b00fed06e4..6855e7fa6d8 100644 --- a/src/core/xds/grpc/xds_client_grpc.cc +++ b/src/core/xds/grpc/xds_client_grpc.cc @@ -41,7 +41,6 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/metrics.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gprpp/debug_location.h" @@ -56,6 +55,7 @@ #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/error_utils.h" +#include "src/core/telemetry/metrics.h" #include "src/core/xds/grpc/upb_utils.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_transport_grpc.h" diff --git a/src/core/xds/grpc/xds_client_grpc.h b/src/core/xds/grpc/xds_client_grpc.h index 9fdb9bccceb..babfbf4bc37 100644 --- a/src/core/xds/grpc/xds_client_grpc.h +++ b/src/core/xds/grpc/xds_client_grpc.h @@ -26,11 +26,11 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/metrics.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/telemetry/metrics.h" #include "src/core/util/useful.h" #include "src/core/xds/grpc/certificate_provider_store.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" diff --git a/src/core/xds/xds_client/xds_client_stats.h b/src/core/xds/xds_client/xds_client_stats.h index 1bfc28c3f3e..291a9e25718 100644 --- a/src/core/xds/xds_client/xds_client_stats.h +++ b/src/core/xds/xds_client/xds_client_stats.h @@ -31,12 +31,12 @@ #include -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/gprpp/per_cpu.h" #include "src/core/lib/gprpp/ref_counted.h" #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/telemetry/call_tracer.h" #include "src/core/util/useful.h" #include "src/core/xds/xds_client/xds_bootstrap.h" diff --git a/src/cpp/ext/csm/metadata_exchange.cc b/src/cpp/ext/csm/metadata_exchange.cc index 3a457a63d5a..96b26482ae2 100644 --- a/src/cpp/ext/csm/metadata_exchange.cc +++ b/src/cpp/ext/csm/metadata_exchange.cc @@ -39,7 +39,6 @@ #include #include -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/gprpp/env.h" #include "src/core/lib/gprpp/load_file.h" #include "src/core/lib/iomgr/error.h" @@ -47,6 +46,7 @@ #include "src/core/lib/json/json_object_loader.h" #include "src/core/lib/json/json_reader.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/telemetry/call_tracer.h" #include "src/cpp/ext/otel/key_value_iterable.h" namespace grpc { diff --git a/src/cpp/ext/filters/census/client_filter.cc b/src/cpp/ext/filters/census/client_filter.cc index b7157f01599..efb191da95d 100644 --- a/src/cpp/ext/filters/census/client_filter.cc +++ b/src/cpp/ext/filters/census/client_filter.cc @@ -54,7 +54,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" -#include "src/core/lib/channel/tcp_tracer.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" @@ -63,6 +62,7 @@ #include "src/core/lib/surface/call.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/tcp_tracer.h" #include "src/cpp/ext/filters/census/context.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/cpp/ext/filters/census/measures.h" diff --git a/src/cpp/ext/filters/census/grpc_plugin.cc b/src/cpp/ext/filters/census/grpc_plugin.cc index 3e345c2f6d8..2a4cd786d1b 100644 --- a/src/cpp/ext/filters/census/grpc_plugin.cc +++ b/src/cpp/ext/filters/census/grpc_plugin.cc @@ -30,9 +30,9 @@ #include #include "src/core/ext/filters/logging/logging_filter.h" -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/telemetry/call_tracer.h" #include "src/cpp/ext/filters/census/client_filter.h" #include "src/cpp/ext/filters/census/measures.h" #include "src/cpp/ext/filters/census/server_call_tracer.h" diff --git a/src/cpp/ext/filters/census/open_census_call_tracer.h b/src/cpp/ext/filters/census/open_census_call_tracer.h index b0eb7e3cae0..690677b5d94 100644 --- a/src/cpp/ext/filters/census/open_census_call_tracer.h +++ b/src/cpp/ext/filters/census/open_census_call_tracer.h @@ -37,9 +37,7 @@ #include #include -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/context.h" -#include "src/core/lib/channel/tcp_tracer.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/resource_quota/arena.h" @@ -47,6 +45,8 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" +#include "src/core/telemetry/tcp_tracer.h" // TODO(yashykt): This might not be the right place for this channel arg, but we // don't have a better place for this right now. diff --git a/src/cpp/ext/filters/census/server_call_tracer.cc b/src/cpp/ext/filters/census/server_call_tracer.cc index 39197015d45..e0852065320 100644 --- a/src/cpp/ext/filters/census/server_call_tracer.cc +++ b/src/cpp/ext/filters/census/server_call_tracer.cc @@ -43,16 +43,16 @@ #include #include -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" -#include "src/core/lib/channel/tcp_tracer.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/telemetry/call_tracer.h" +#include "src/core/telemetry/tcp_tracer.h" #include "src/cpp/ext/filters/census/context.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/cpp/ext/filters/census/measures.h" diff --git a/src/cpp/ext/filters/census/server_call_tracer.h b/src/cpp/ext/filters/census/server_call_tracer.h index 4a11b4e8c53..25bb0f19303 100644 --- a/src/cpp/ext/filters/census/server_call_tracer.h +++ b/src/cpp/ext/filters/census/server_call_tracer.h @@ -21,8 +21,8 @@ #include -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/telemetry/call_tracer.h" namespace grpc { namespace internal { diff --git a/src/cpp/ext/otel/otel_client_call_tracer.cc b/src/cpp/ext/otel/otel_client_call_tracer.cc index f22fcbf992e..84123c0444e 100644 --- a/src/cpp/ext/otel/otel_client_call_tracer.cc +++ b/src/cpp/ext/otel/otel_client_call_tracer.cc @@ -48,13 +48,13 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/context.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/channel/tcp_tracer.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/promise/context.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/telemetry/tcp_tracer.h" #include "src/cpp/ext/otel/key_value_iterable.h" #include "src/cpp/ext/otel/otel_plugin.h" diff --git a/src/cpp/ext/otel/otel_client_call_tracer.h b/src/cpp/ext/otel/otel_client_call_tracer.h index ed1465dabb5..366c83064f1 100644 --- a/src/cpp/ext/otel/otel_client_call_tracer.h +++ b/src/cpp/ext/otel/otel_client_call_tracer.h @@ -32,8 +32,6 @@ #include #include -#include "src/core/lib/channel/call_tracer.h" -#include "src/core/lib/channel/tcp_tracer.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/resource_quota/arena.h" @@ -41,6 +39,8 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" +#include "src/core/telemetry/tcp_tracer.h" #include "src/cpp/ext/otel/otel_plugin.h" namespace grpc { diff --git a/src/cpp/ext/otel/otel_plugin.cc b/src/cpp/ext/otel/otel_plugin.cc index acb81be35ee..588404f75df 100644 --- a/src/cpp/ext/otel/otel_plugin.cc +++ b/src/cpp/ext/otel/otel_plugin.cc @@ -36,11 +36,11 @@ #include #include "src/core/client_channel/client_channel_filter.h" -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/match.h" #include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/telemetry/call_tracer.h" #include "src/cpp/ext/otel/key_value_iterable.h" #include "src/cpp/ext/otel/otel_client_call_tracer.h" #include "src/cpp/ext/otel/otel_server_call_tracer.h" diff --git a/src/cpp/ext/otel/otel_plugin.h b/src/cpp/ext/otel/otel_plugin.h index 49d2cc3e384..5bce0cc39ac 100644 --- a/src/cpp/ext/otel/otel_plugin.h +++ b/src/cpp/ext/otel/otel_plugin.h @@ -42,8 +42,8 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/metrics.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/telemetry/metrics.h" namespace grpc { namespace internal { diff --git a/src/cpp/ext/otel/otel_server_call_tracer.cc b/src/cpp/ext/otel/otel_server_call_tracer.cc index 21641f4baa8..d62af3d9081 100644 --- a/src/cpp/ext/otel/otel_server_call_tracer.cc +++ b/src/cpp/ext/otel/otel_server_call_tracer.cc @@ -37,12 +37,12 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/status_util.h" -#include "src/core/lib/channel/tcp_tracer.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/tcp_tracer.h" #include "src/cpp/ext/otel/key_value_iterable.h" #include "src/cpp/ext/otel/otel_plugin.h" diff --git a/src/cpp/ext/otel/otel_server_call_tracer.h b/src/cpp/ext/otel/otel_server_call_tracer.h index 8ae0f051a03..66c460d6b65 100644 --- a/src/cpp/ext/otel/otel_server_call_tracer.h +++ b/src/cpp/ext/otel/otel_server_call_tracer.h @@ -23,8 +23,8 @@ #include -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_args.h" +#include "src/core/telemetry/call_tracer.h" #include "src/cpp/ext/otel/otel_plugin.h" namespace grpc { diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi index 13c7b41ad98..5f5afcfc944 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi @@ -59,7 +59,7 @@ cdef extern from "" namespace "std" nogil: # gRPC Core Declarations -cdef extern from "src/core/lib/channel/call_tracer.h" namespace "grpc_core": +cdef extern from "src/core/telemetry/call_tracer.h" namespace "grpc_core": cdef cppclass ClientCallTracer: pass diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index a6e9be13ead..d79b4c9f96c 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -417,7 +417,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/address_utils/sockaddr_utils.cc', 'src/core/lib/backoff/backoff.cc', 'src/core/lib/backoff/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', 'src/core/lib/channel/channel_stack.cc', @@ -425,7 +424,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/channel/channel_stack_builder_impl.cc', 'src/core/lib/channel/channel_stack_trace.cc', 'src/core/lib/channel/connected_channel.cc', - 'src/core/lib/channel/metrics.cc', 'src/core/lib/channel/promise_based_filter.cc', 'src/core/lib/channel/status_util.cc', 'src/core/lib/compression/compression.cc', @@ -436,9 +434,6 @@ CORE_SOURCE_FILES = [ 'src/core/lib/config/core_configuration.cc', 'src/core/lib/config/load_config.cc', 'src/core/lib/debug/event_log.cc', - 'src/core/lib/debug/histogram_view.cc', - 'src/core/lib/debug/stats.cc', - 'src/core/lib/debug/stats_data.cc', 'src/core/lib/debug/trace.cc', 'src/core/lib/event_engine/ares_resolver.cc', 'src/core/lib/event_engine/cf_engine/cf_engine.cc', @@ -779,6 +774,11 @@ CORE_SOURCE_FILES = [ 'src/core/service_config/service_config_channel_arg_filter.cc', 'src/core/service_config/service_config_impl.cc', 'src/core/service_config/service_config_parser.cc', + 'src/core/telemetry/call_tracer.cc', + 'src/core/telemetry/histogram_view.cc', + 'src/core/telemetry/metrics.cc', + 'src/core/telemetry/stats.cc', + 'src/core/telemetry/stats_data.cc', 'src/core/tsi/alts/crypt/aes_gcm.cc', 'src/core/tsi/alts/crypt/gsec.cc', 'src/core/tsi/alts/frame_protector/alts_counter.cc', diff --git a/src/python/grpcio_observability/grpc_observability/_cyobservability.pxd b/src/python/grpcio_observability/grpc_observability/_cyobservability.pxd index c0c2fb25c61..240bf66e03a 100644 --- a/src/python/grpcio_observability/grpc_observability/_cyobservability.pxd +++ b/src/python/grpcio_observability/grpc_observability/_cyobservability.pxd @@ -34,7 +34,7 @@ cdef extern from "" namespace "std" nogil: cdef cppclass condition_variable: void notify_all() -cdef extern from "src/core/lib/channel/call_tracer.h" namespace "grpc_core": +cdef extern from "src/core/telemetry/call_tracer.h" namespace "grpc_core": cdef cppclass ClientCallTracer: pass diff --git a/src/python/grpcio_observability/grpc_observability/client_call_tracer.h b/src/python/grpcio_observability/grpc_observability/client_call_tracer.h index e100c4bcfc8..117e017cb2c 100644 --- a/src/python/grpcio_observability/grpc_observability/client_call_tracer.h +++ b/src/python/grpcio_observability/grpc_observability/client_call_tracer.h @@ -28,7 +28,7 @@ #include -#include "src/core/lib/channel/call_tracer.h" +#include "src/core/telemetry/call_tracer.h" namespace grpc_observability { diff --git a/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc b/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc index 6524013df17..a9a5a88c60f 100644 --- a/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc +++ b/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc @@ -35,13 +35,13 @@ #include -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" +#include "src/core/telemetry/call_tracer.h" namespace grpc_observability { diff --git a/src/python/grpcio_observability/grpc_observability/server_call_tracer.h b/src/python/grpcio_observability/grpc_observability/server_call_tracer.h index a704a0704a4..974d37d9cec 100644 --- a/src/python/grpcio_observability/grpc_observability/server_call_tracer.h +++ b/src/python/grpcio_observability/grpc_observability/server_call_tracer.h @@ -20,9 +20,9 @@ #include -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/resource_quota/arena.h" #include "src/core/lib/slice/slice.h" +#include "src/core/telemetry/call_tracer.h" namespace grpc_observability { diff --git a/src/python/grpcio_observability/setup.py b/src/python/grpcio_observability/setup.py index ce0d4f9f453..6d07015fb30 100644 --- a/src/python/grpcio_observability/setup.py +++ b/src/python/grpcio_observability/setup.py @@ -207,7 +207,7 @@ elif "linux" in sys.platform or "darwin" in sys.platform: # Fix for Cython build issue in aarch64. # It's required to define this macro before include . -# was included in core/lib/channel/call_tracer.h. +# was included in core/telemetry/call_tracer.h. # This macro should already be defined in grpc/grpc.h through port_platform.h, # but we're still having issue in aarch64, so we manually define the macro here. # TODO(xuanwn): Figure out what's going on in the aarch64 build so we can support diff --git a/test/core/channel/BUILD b/test/core/channel/BUILD index b54cc023fa3..f3c2342998e 100644 --- a/test/core/channel/BUILD +++ b/test/core/channel/BUILD @@ -18,20 +18,6 @@ grpc_package(name = "test/core/channel") licenses(["notice"]) -grpc_cc_test( - name = "call_tracer_test", - srcs = ["call_tracer_test.cc"], - external_deps = ["gtest"], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//:grpc", - "//test/core/test_util:fake_stats_plugin", - "//test/core/test_util:grpc_test_util", - ], -) - grpc_cc_test( name = "channel_args_test", srcs = ["channel_args_test.cc"], @@ -145,20 +131,3 @@ grpc_cc_test( "//test/core/test_util:grpc_test_util", ], ) - -grpc_cc_test( - name = "metrics_test", - srcs = ["metrics_test.cc"], - external_deps = [ - "absl/log:log", - "gtest", - ], - language = "C++", - uses_event_engine = False, - uses_polling = False, - deps = [ - "//src/core:metrics", - "//test/core/test_util:fake_stats_plugin", - "//test/core/test_util:grpc_test_util", - ], -) diff --git a/test/core/channel/server_call_tracer_factory_test.cc b/test/core/channel/server_call_tracer_factory_test.cc index 77862155b6c..fd4b2bac8d9 100644 --- a/test/core/channel/server_call_tracer_factory_test.cc +++ b/test/core/channel/server_call_tracer_factory_test.cc @@ -16,10 +16,10 @@ #include "gtest/gtest.h" -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/resource_quota/arena.h" +#include "src/core/telemetry/call_tracer.h" namespace grpc_core { namespace { diff --git a/test/core/end2end/tests/http2_stats.cc b/test/core/end2end/tests/http2_stats.cc index a2931c98ea6..3cc2e830822 100644 --- a/test/core/end2end/tests/http2_stats.cc +++ b/test/core/end2end/tests/http2_stats.cc @@ -28,14 +28,11 @@ #include #include -#include "src/core/lib/channel/call_tracer.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" #include "src/core/lib/channel/context.h" -#include "src/core/lib/channel/metrics.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/channel/tcp_tracer.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/notification.h" @@ -50,6 +47,9 @@ #include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" +#include "src/core/telemetry/call_tracer.h" +#include "src/core/telemetry/metrics.h" +#include "src/core/telemetry/tcp_tracer.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/test_util/fake_stats_plugin.h" diff --git a/test/core/end2end/tests/simple_request.cc b/test/core/end2end/tests/simple_request.cc index 1e39734d327..cd49842b8af 100644 --- a/test/core/end2end/tests/simple_request.cc +++ b/test/core/end2end/tests/simple_request.cc @@ -30,9 +30,9 @@ #include -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/gprpp/time.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" #include "test/core/end2end/end2end_tests.h" using testing::HasSubstr; diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc index bba8a824651..b1771665d97 100644 --- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc +++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc @@ -30,11 +30,11 @@ #include #include -#include "src/core/lib/debug/stats.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/telemetry/stats.h" #include "src/core/util/useful.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" #include "test/core/test_util/port.h" diff --git a/test/core/gprpp/work_serializer_test.cc b/test/core/gprpp/work_serializer_test.cc index fc1c9ec7a1d..0d92acecba8 100644 --- a/test/core/gprpp/work_serializer_test.cc +++ b/test/core/gprpp/work_serializer_test.cc @@ -35,14 +35,14 @@ #include #include -#include "src/core/lib/debug/histogram_view.h" -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/notification.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/telemetry/histogram_view.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" #include "test/core/event_engine/event_engine_test_utils.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/load_balancing/pick_first_test.cc b/test/core/load_balancing/pick_first_test.cc index 839afa62a3c..469af9c261e 100644 --- a/test/core/load_balancing/pick_first_test.cc +++ b/test/core/load_balancing/pick_first_test.cc @@ -37,7 +37,6 @@ #include #include -#include "src/core/lib/channel/metrics.h" #include "src/core/lib/experiments/experiments.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/orphanable.h" @@ -48,6 +47,7 @@ #include "src/core/lib/json/json.h" #include "src/core/load_balancing/lb_policy.h" #include "src/core/resolver/endpoint_addresses.h" +#include "src/core/telemetry/metrics.h" #include "test/core/load_balancing/lb_policy_test_lib.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" diff --git a/test/core/debug/BUILD b/test/core/telemetry/BUILD similarity index 56% rename from test/core/debug/BUILD rename to test/core/telemetry/BUILD index 7a123f32caa..ea9e61dd534 100644 --- a/test/core/debug/BUILD +++ b/test/core/telemetry/BUILD @@ -1,4 +1,4 @@ -# Copyright 2018 gRPC authors. +# Copyright 2016 gRPC authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,10 +14,41 @@ load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package") -grpc_package(name = "test/core/debug") +grpc_package(name = "test/core/telemetry") licenses(["notice"]) +grpc_cc_test( + name = "call_tracer_test", + srcs = ["call_tracer_test.cc"], + external_deps = ["gtest"], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//:grpc", + "//test/core/test_util:fake_stats_plugin", + "//test/core/test_util:grpc_test_util", + ], +) + +grpc_cc_test( + name = "metrics_test", + srcs = ["metrics_test.cc"], + external_deps = [ + "absl/log:log", + "gtest", + ], + language = "C++", + uses_event_engine = False, + uses_polling = False, + deps = [ + "//src/core:metrics", + "//test/core/test_util:fake_stats_plugin", + "//test/core/test_util:grpc_test_util", + ], +) + grpc_cc_test( name = "stats_test", timeout = "long", diff --git a/test/core/channel/call_tracer_test.cc b/test/core/telemetry/call_tracer_test.cc similarity index 99% rename from test/core/channel/call_tracer_test.cc rename to test/core/telemetry/call_tracer_test.cc index e9058e509a5..3adfb0903d5 100644 --- a/test/core/channel/call_tracer_test.cc +++ b/test/core/telemetry/call_tracer_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/channel/call_tracer.h" +#include "src/core/telemetry/call_tracer.h" #include diff --git a/test/core/channel/metrics_test.cc b/test/core/telemetry/metrics_test.cc similarity index 99% rename from test/core/channel/metrics_test.cc rename to test/core/telemetry/metrics_test.cc index 3d57b32d2ab..51b98831018 100644 --- a/test/core/channel/metrics_test.cc +++ b/test/core/telemetry/metrics_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/channel/metrics.h" +#include "src/core/telemetry/metrics.h" #include diff --git a/test/core/debug/stats_test.cc b/test/core/telemetry/stats_test.cc similarity index 97% rename from test/core/debug/stats_test.cc rename to test/core/telemetry/stats_test.cc index 14899457033..8f6a2f10960 100644 --- a/test/core/debug/stats_test.cc +++ b/test/core/telemetry/stats_test.cc @@ -16,7 +16,7 @@ // // -#include "src/core/lib/debug/stats.h" +#include "src/core/telemetry/stats.h" #include #include @@ -25,8 +25,8 @@ #include -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/telemetry/stats_data.h" #include "test/core/test_util/test_config.h" namespace grpc_core { diff --git a/test/core/test_util/fake_stats_plugin.h b/test/core/test_util/fake_stats_plugin.h index 655dfe0002c..5feeb79cb23 100644 --- a/test/core/test_util/fake_stats_plugin.h +++ b/test/core/test_util/fake_stats_plugin.h @@ -28,11 +28,11 @@ #include "absl/types/span.h" #include "gmock/gmock.h" -#include "src/core/lib/channel/call_tracer.h" -#include "src/core/lib/channel/metrics.h" #include "src/core/lib/channel/promise_based_filter.h" -#include "src/core/lib/channel/tcp_tracer.h" #include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/telemetry/call_tracer.h" +#include "src/core/telemetry/metrics.h" +#include "src/core/telemetry/tcp_tracer.h" namespace grpc_core { diff --git a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc index e8f37fc35e8..f2160f6c070 100644 --- a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc @@ -26,9 +26,9 @@ #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/surface/call.h" +#include "src/core/telemetry/call_tracer.h" #include "src/proto/grpc/testing/xds/v3/orca_load_report.pb.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/scoped_env_var.h" diff --git a/test/cpp/ext/csm/metadata_exchange_test.cc b/test/cpp/ext/csm/metadata_exchange_test.cc index 3f5d8af74b7..f83577cc7d9 100644 --- a/test/cpp/ext/csm/metadata_exchange_test.cc +++ b/test/cpp/ext/csm/metadata_exchange_test.cc @@ -29,9 +29,9 @@ #include #include -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/env.h" +#include "src/core/telemetry/call_tracer.h" #include "src/core/util/tmpfile.h" #include "src/cpp/ext/csm/csm_observability.h" #include "src/cpp/ext/otel/otel_plugin.h" diff --git a/test/cpp/ext/otel/otel_plugin_test.cc b/test/cpp/ext/otel/otel_plugin_test.cc index 4cc39847910..a71dff599af 100644 --- a/test/cpp/ext/otel/otel_plugin_test.cc +++ b/test/cpp/ext/otel/otel_plugin_test.cc @@ -37,8 +37,8 @@ #include #include -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/telemetry/call_tracer.h" #include "test/core/test_util/test_config.h" #include "test/cpp/end2end/test_service_impl.h" #include "test/cpp/ext/otel/otel_test_library.h" diff --git a/test/cpp/ext/otel/otel_test_library.cc b/test/cpp/ext/otel/otel_test_library.cc index 38bac047055..40153f13dda 100644 --- a/test/cpp/ext/otel/otel_test_library.cc +++ b/test/cpp/ext/otel/otel_test_library.cc @@ -30,10 +30,10 @@ #include -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/promise_based_filter.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/notification.h" +#include "src/core/telemetry/call_tracer.h" #include "test/core/test_util/fake_stats_plugin.h" #include "test/core/test_util/test_config.h" #include "test/cpp/end2end/test_service_impl.h" diff --git a/test/cpp/ext/otel/otel_test_library.h b/test/cpp/ext/otel/otel_test_library.h index bd33c30a586..f8573ccaa90 100644 --- a/test/cpp/ext/otel/otel_test_library.h +++ b/test/cpp/ext/otel/otel_test_library.h @@ -33,8 +33,8 @@ #include #include -#include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/telemetry/call_tracer.h" #include "src/cpp/ext/otel/otel_plugin.h" #include "test/core/test_util/test_config.h" #include "test/cpp/end2end/test_service_impl.h" diff --git a/test/cpp/microbenchmarks/helpers.h b/test/cpp/microbenchmarks/helpers.h index 11b7b9b642a..34105a98d63 100644 --- a/test/cpp/microbenchmarks/helpers.h +++ b/test/cpp/microbenchmarks/helpers.h @@ -27,8 +27,8 @@ #include #include -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" class LibraryInitializer { public: diff --git a/test/cpp/naming/cancel_ares_query_test.cc b/test/cpp/naming/cancel_ares_query_test.cc index 29b5a19d65c..03d787d0b69 100644 --- a/test/cpp/naming/cancel_ares_query_test.cc +++ b/test/cpp/naming/cancel_ares_query_test.cc @@ -38,8 +38,6 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/config_vars.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/event_engine/ares_resolver.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/experiments/experiments.h" @@ -53,6 +51,8 @@ #include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/resolver/resolver.h" #include "src/core/resolver/resolver_registry.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" #include "src/core/util/string.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/test_util/cmdline.h" diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index 5811cbaee85..189d972fc2e 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -34,7 +34,6 @@ #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/debug/stats.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/tcp_socket_utils.h" @@ -45,6 +44,7 @@ #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/channel_create.h" #include "src/core/server/server.h" +#include "src/core/telemetry/stats.h" #include "src/cpp/client/create_channel_internal.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" diff --git a/test/cpp/qps/scenario_runner.cc b/test/cpp/qps/scenario_runner.cc index da08af6b619..7ca32f983ca 100644 --- a/test/cpp/qps/scenario_runner.cc +++ b/test/cpp/qps/scenario_runner.cc @@ -15,9 +15,9 @@ #include "absl/flags/flag.h" #include "absl/log/log.h" -#include "src/core/lib/debug/stats.h" -#include "src/core/lib/debug/stats_data.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/telemetry/stats.h" +#include "src/core/telemetry/stats_data.h" #include "src/proto/grpc/testing/control.pb.h" #include "test/core/test_util/test_config.h" #include "test/core/test_util/tls_utils.h" diff --git a/tools/codegen/core/gen_stats_data.py b/tools/codegen/core/gen_stats_data.py index de41f434a19..b7e66f00107 100755 --- a/tools/codegen/core/gen_stats_data.py +++ b/tools/codegen/core/gen_stats_data.py @@ -24,7 +24,7 @@ import sys import yaml -with open("src/core/lib/debug/stats_data.yaml") as f: +with open("src/core/telemetry/stats_data.yaml") as f: attrs = yaml.safe_load(f.read()) REQUIRED_FIELDS = ["name", "doc"] @@ -259,7 +259,7 @@ def snake_to_pascal(name): return "".join([x.capitalize() for x in name.split("_")]) -with open("src/core/lib/debug/stats_data.h", "w") as H: +with open("src/core/telemetry/stats_data.h", "w") as H: # copy-paste copyright notice from this file with open(sys.argv[0]) as my_source: copyright = [] @@ -280,14 +280,14 @@ with open("src/core/lib/debug/stats_data.h", "w") as H: [H], ["Automatically generated by tools/codegen/core/gen_stats_data.py"] ) - print("#ifndef GRPC_SRC_CORE_LIB_DEBUG_STATS_DATA_H", file=H) - print("#define GRPC_SRC_CORE_LIB_DEBUG_STATS_DATA_H", file=H) + print("#ifndef GRPC_SRC_CORE_TELEMETRY_STATS_DATA_H", file=H) + print("#define GRPC_SRC_CORE_TELEMETRY_STATS_DATA_H", file=H) print(file=H) print("#include ", file=H) print("#include ", file=H) print("#include ", file=H) print("#include ", file=H) - print('#include "src/core/lib/debug/histogram_view.h"', file=H) + print('#include "src/core/telemetry/histogram_view.h"', file=H) print('#include "absl/strings/string_view.h"', file=H) print('#include "src/core/lib/gprpp/per_cpu.h"', file=H) print(file=H) @@ -441,9 +441,9 @@ with open("src/core/lib/debug/stats_data.h", "w") as H: print("}", file=H) print(file=H) - print("#endif // GRPC_SRC_CORE_LIB_DEBUG_STATS_DATA_H", file=H) + print("#endif // GRPC_SRC_CORE_TELEMETRY_STATS_DATA_H", file=H) -with open("src/core/lib/debug/stats_data.cc", "w") as C: +with open("src/core/telemetry/stats_data.cc", "w") as C: # copy-paste copyright notice from this file with open(sys.argv[0]) as my_source: copyright = [] @@ -466,7 +466,7 @@ with open("src/core/lib/debug/stats_data.cc", "w") as C: print("#include ", file=C) print(file=C) - print('#include "src/core/lib/debug/stats_data.h"', file=C) + print('#include "src/core/telemetry/stats_data.h"', file=C) print("#include ", file=C) print(file=C) diff --git a/tools/dockerfile/grpc_clang_tidy/clang_tidy_all_the_things.sh b/tools/dockerfile/grpc_clang_tidy/clang_tidy_all_the_things.sh index 81c90600422..6ceda3a0216 100755 --- a/tools/dockerfile/grpc_clang_tidy/clang_tidy_all_the_things.sh +++ b/tools/dockerfile/grpc_clang_tidy/clang_tidy_all_the_things.sh @@ -23,7 +23,7 @@ cd ${CLANG_TIDY_ROOT} # run clang tidy for all source files cat compile_commands.json | jq -r '.[].file' \ | grep -E "(^include/|^src/core/|^src/cpp/|^test/core/|^test/cpp/)" \ - | grep -v -E "src/core/lib/debug/stats_data" \ + | grep -v -E "src/core/telemetry/stats_data" \ | grep -v -E "/upb-gen/|/upbdefs-gen/" \ | sort \ | xargs tools/distrib/run_clang_tidy.py "$@" diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 3f4a53208c2..180bf607854 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -2097,8 +2097,6 @@ src/core/lib/backoff/backoff.h \ src/core/lib/backoff/random_early_detection.cc \ src/core/lib/backoff/random_early_detection.h \ src/core/lib/channel/call_finalization.h \ -src/core/lib/channel/call_tracer.cc \ -src/core/lib/channel/call_tracer.h \ src/core/lib/channel/channel_args.cc \ src/core/lib/channel/channel_args.h \ src/core/lib/channel/channel_args_preconditioning.cc \ @@ -2115,13 +2113,10 @@ src/core/lib/channel/channel_stack_trace.h \ src/core/lib/channel/connected_channel.cc \ src/core/lib/channel/connected_channel.h \ src/core/lib/channel/context.h \ -src/core/lib/channel/metrics.cc \ -src/core/lib/channel/metrics.h \ src/core/lib/channel/promise_based_filter.cc \ src/core/lib/channel/promise_based_filter.h \ src/core/lib/channel/status_util.cc \ src/core/lib/channel/status_util.h \ -src/core/lib/channel/tcp_tracer.h \ src/core/lib/compression/compression.cc \ src/core/lib/compression/compression_internal.cc \ src/core/lib/compression/compression_internal.h \ @@ -2136,12 +2131,6 @@ src/core/lib/config/load_config.cc \ src/core/lib/config/load_config.h \ src/core/lib/debug/event_log.cc \ src/core/lib/debug/event_log.h \ -src/core/lib/debug/histogram_view.cc \ -src/core/lib/debug/histogram_view.h \ -src/core/lib/debug/stats.cc \ -src/core/lib/debug/stats.h \ -src/core/lib/debug/stats_data.cc \ -src/core/lib/debug/stats_data.h \ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace.h \ src/core/lib/event_engine/ares_resolver.cc \ @@ -2867,6 +2856,17 @@ src/core/service_config/service_config_impl.cc \ src/core/service_config/service_config_impl.h \ src/core/service_config/service_config_parser.cc \ src/core/service_config/service_config_parser.h \ +src/core/telemetry/call_tracer.cc \ +src/core/telemetry/call_tracer.h \ +src/core/telemetry/histogram_view.cc \ +src/core/telemetry/histogram_view.h \ +src/core/telemetry/metrics.cc \ +src/core/telemetry/metrics.h \ +src/core/telemetry/stats.cc \ +src/core/telemetry/stats.h \ +src/core/telemetry/stats_data.cc \ +src/core/telemetry/stats_data.h \ +src/core/telemetry/tcp_tracer.h \ src/core/tsi/alts/crypt/aes_gcm.cc \ src/core/tsi/alts/crypt/gsec.cc \ src/core/tsi/alts/crypt/gsec.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 72b1676eeaf..74d2f0c7e17 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1869,8 +1869,6 @@ src/core/lib/backoff/random_early_detection.cc \ src/core/lib/backoff/random_early_detection.h \ src/core/lib/channel/README.md \ src/core/lib/channel/call_finalization.h \ -src/core/lib/channel/call_tracer.cc \ -src/core/lib/channel/call_tracer.h \ src/core/lib/channel/channel_args.cc \ src/core/lib/channel/channel_args.h \ src/core/lib/channel/channel_args_preconditioning.cc \ @@ -1887,13 +1885,10 @@ src/core/lib/channel/channel_stack_trace.h \ src/core/lib/channel/connected_channel.cc \ src/core/lib/channel/connected_channel.h \ src/core/lib/channel/context.h \ -src/core/lib/channel/metrics.cc \ -src/core/lib/channel/metrics.h \ src/core/lib/channel/promise_based_filter.cc \ src/core/lib/channel/promise_based_filter.h \ src/core/lib/channel/status_util.cc \ src/core/lib/channel/status_util.h \ -src/core/lib/channel/tcp_tracer.h \ src/core/lib/compression/compression.cc \ src/core/lib/compression/compression_internal.cc \ src/core/lib/compression/compression_internal.h \ @@ -1908,12 +1903,6 @@ src/core/lib/config/load_config.cc \ src/core/lib/config/load_config.h \ src/core/lib/debug/event_log.cc \ src/core/lib/debug/event_log.h \ -src/core/lib/debug/histogram_view.cc \ -src/core/lib/debug/histogram_view.h \ -src/core/lib/debug/stats.cc \ -src/core/lib/debug/stats.h \ -src/core/lib/debug/stats_data.cc \ -src/core/lib/debug/stats_data.h \ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace.h \ src/core/lib/event_engine/ares_resolver.cc \ @@ -2647,6 +2636,17 @@ src/core/service_config/service_config_impl.cc \ src/core/service_config/service_config_impl.h \ src/core/service_config/service_config_parser.cc \ src/core/service_config/service_config_parser.h \ +src/core/telemetry/call_tracer.cc \ +src/core/telemetry/call_tracer.h \ +src/core/telemetry/histogram_view.cc \ +src/core/telemetry/histogram_view.h \ +src/core/telemetry/metrics.cc \ +src/core/telemetry/metrics.h \ +src/core/telemetry/stats.cc \ +src/core/telemetry/stats.h \ +src/core/telemetry/stats_data.cc \ +src/core/telemetry/stats_data.h \ +src/core/telemetry/tcp_tracer.h \ src/core/tsi/README.md \ src/core/tsi/alts/crypt/aes_gcm.cc \ src/core/tsi/alts/crypt/gsec.cc \