diff --git a/.gitattributes b/.gitattributes index b03b218eb51cc..2661229e94f72 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 6cfbe881c5008..79ee22f7510b1 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/BoringSSL-Package.swift b/BoringSSL-Package.swift index 8a4f6a6d639a9..363c62433efb7 100644 --- a/BoringSSL-Package.swift +++ b/BoringSSL-Package.swift @@ -26,6 +26,7 @@ let package = Package( ], sources: [ + "err_data.c", "src/crypto/asn1/a_bitstr.c", "src/crypto/asn1/a_bool.c", "src/crypto/asn1/a_d2i_fp.c", @@ -116,8 +117,6 @@ let package = Package( "src/crypto/evp/evp.c", "src/crypto/evp/evp_asn1.c", "src/crypto/evp/evp_ctx.c", - "src/crypto/evp/p_dh.c", - "src/crypto/evp/p_dh_asn1.c", "src/crypto/evp/p_dsa_asn1.c", "src/crypto/evp/p_ec.c", "src/crypto/evp/p_ec_asn1.c", @@ -259,7 +258,6 @@ let package = Package( "src/crypto/x509/x_val.c", "src/crypto/x509/x_x509.c", "src/crypto/x509/x_x509a.c", - "src/gen/crypto/err_data.c", "src/ssl/bio_ssl.cc", "src/ssl/d1_both.cc", "src/ssl/d1_lib.cc", @@ -281,7 +279,6 @@ let package = Package( "src/ssl/ssl_buffer.cc", "src/ssl/ssl_cert.cc", "src/ssl/ssl_cipher.cc", - "src/ssl/ssl_credential.cc", "src/ssl/ssl_file.cc", "src/ssl/ssl_key_share.cc", "src/ssl/ssl_lib.cc", diff --git a/CMakeLists.txt b/CMakeLists.txt index d01727288368a..f4090e8b821f8 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 5e22b66b5ee38..d285bd7f42e3e 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 \ @@ -1857,6 +1857,7 @@ endif # deps: [] # transitive_deps: [] LIBBORINGSSL_SRC = \ + third_party/boringssl-with-bazel/err_data.c \ third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c \ third_party/boringssl-with-bazel/src/crypto/asn1/a_bool.c \ third_party/boringssl-with-bazel/src/crypto/asn1/a_d2i_fp.c \ @@ -1947,8 +1948,6 @@ LIBBORINGSSL_SRC = \ third_party/boringssl-with-bazel/src/crypto/evp/evp.c \ third_party/boringssl-with-bazel/src/crypto/evp/evp_asn1.c \ third_party/boringssl-with-bazel/src/crypto/evp/evp_ctx.c \ - third_party/boringssl-with-bazel/src/crypto/evp/p_dh.c \ - third_party/boringssl-with-bazel/src/crypto/evp/p_dh_asn1.c \ third_party/boringssl-with-bazel/src/crypto/evp/p_dsa_asn1.c \ third_party/boringssl-with-bazel/src/crypto/evp/p_ec.c \ third_party/boringssl-with-bazel/src/crypto/evp/p_ec_asn1.c \ @@ -2090,7 +2089,6 @@ LIBBORINGSSL_SRC = \ third_party/boringssl-with-bazel/src/crypto/x509/x_val.c \ third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c \ third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c \ - third_party/boringssl-with-bazel/src/gen/crypto/err_data.c \ third_party/boringssl-with-bazel/src/ssl/bio_ssl.cc \ third_party/boringssl-with-bazel/src/ssl/d1_both.cc \ third_party/boringssl-with-bazel/src/ssl/d1_lib.cc \ @@ -2112,7 +2110,6 @@ LIBBORINGSSL_SRC = \ third_party/boringssl-with-bazel/src/ssl/ssl_buffer.cc \ third_party/boringssl-with-bazel/src/ssl/ssl_cert.cc \ third_party/boringssl-with-bazel/src/ssl/ssl_cipher.cc \ - third_party/boringssl-with-bazel/src/ssl/ssl_credential.cc \ third_party/boringssl-with-bazel/src/ssl/ssl_file.cc \ third_party/boringssl-with-bazel/src/ssl/ssl_key_share.cc \ third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc \ diff --git a/Package.swift b/Package.swift index 2cfe0e1798e4c..cd30f90e60280 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 f72466229e9dd..aaa5f04cc8101 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 672e7101589a9..6d57385d6b5fd 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 \ @@ -1034,6 +1034,7 @@ if test "$PHP_GRPC" != "no"; then third_party/address_sorting/address_sorting.c \ third_party/address_sorting/address_sorting_posix.c \ third_party/address_sorting/address_sorting_windows.c \ + third_party/boringssl-with-bazel/err_data.c \ third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c \ third_party/boringssl-with-bazel/src/crypto/asn1/a_bool.c \ third_party/boringssl-with-bazel/src/crypto/asn1/a_d2i_fp.c \ @@ -1124,8 +1125,6 @@ if test "$PHP_GRPC" != "no"; then third_party/boringssl-with-bazel/src/crypto/evp/evp.c \ third_party/boringssl-with-bazel/src/crypto/evp/evp_asn1.c \ third_party/boringssl-with-bazel/src/crypto/evp/evp_ctx.c \ - third_party/boringssl-with-bazel/src/crypto/evp/p_dh.c \ - third_party/boringssl-with-bazel/src/crypto/evp/p_dh_asn1.c \ third_party/boringssl-with-bazel/src/crypto/evp/p_dsa_asn1.c \ third_party/boringssl-with-bazel/src/crypto/evp/p_ec.c \ third_party/boringssl-with-bazel/src/crypto/evp/p_ec_asn1.c \ @@ -1267,7 +1266,6 @@ if test "$PHP_GRPC" != "no"; then third_party/boringssl-with-bazel/src/crypto/x509/x_val.c \ third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c \ third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c \ - third_party/boringssl-with-bazel/src/gen/crypto/err_data.c \ third_party/boringssl-with-bazel/src/ssl/bio_ssl.cc \ third_party/boringssl-with-bazel/src/ssl/d1_both.cc \ third_party/boringssl-with-bazel/src/ssl/d1_lib.cc \ @@ -1289,7 +1287,6 @@ if test "$PHP_GRPC" != "no"; then third_party/boringssl-with-bazel/src/ssl/ssl_buffer.cc \ third_party/boringssl-with-bazel/src/ssl/ssl_cert.cc \ third_party/boringssl-with-bazel/src/ssl/ssl_cipher.cc \ - third_party/boringssl-with-bazel/src/ssl/ssl_credential.cc \ third_party/boringssl-with-bazel/src/ssl/ssl_file.cc \ third_party/boringssl-with-bazel/src/ssl/ssl_key_share.cc \ third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc \ @@ -1592,6 +1589,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) @@ -1636,6 +1634,7 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/time/internal/cctz/src) PHP_ADD_BUILD_DIR($ext_builddir/third_party/abseil-cpp/absl/types) PHP_ADD_BUILD_DIR($ext_builddir/third_party/address_sorting) + PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/asn1) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/base64) @@ -1678,7 +1677,6 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/stack) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/trust_token) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/crypto/x509) - PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/gen/crypto) PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl-with-bazel/src/ssl) PHP_ADD_BUILD_DIR($ext_builddir/third_party/re2/re2) PHP_ADD_BUILD_DIR($ext_builddir/third_party/re2/util) diff --git a/config.w32 b/config.w32 index c430f747c0a9a..05a2681589b0a 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 " + @@ -999,6 +999,7 @@ if (PHP_GRPC != "no") { "third_party\\address_sorting\\address_sorting.c " + "third_party\\address_sorting\\address_sorting_posix.c " + "third_party\\address_sorting\\address_sorting_windows.c " + + "third_party\\boringssl-with-bazel\\err_data.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\asn1\\a_bitstr.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\asn1\\a_bool.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\asn1\\a_d2i_fp.c " + @@ -1089,8 +1090,6 @@ if (PHP_GRPC != "no") { "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\evp.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\evp_asn1.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\evp_ctx.c " + - "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_dh.c " + - "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_dh_asn1.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_dsa_asn1.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_ec.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\evp\\p_ec_asn1.c " + @@ -1232,7 +1231,6 @@ if (PHP_GRPC != "no") { "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_val.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_x509.c " + "third_party\\boringssl-with-bazel\\src\\crypto\\x509\\x_x509a.c " + - "third_party\\boringssl-with-bazel\\src\\gen\\crypto\\err_data.c " + "third_party\\boringssl-with-bazel\\src\\ssl\\bio_ssl.cc " + "third_party\\boringssl-with-bazel\\src\\ssl\\d1_both.cc " + "third_party\\boringssl-with-bazel\\src\\ssl\\d1_lib.cc " + @@ -1254,7 +1252,6 @@ if (PHP_GRPC != "no") { "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_buffer.cc " + "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_cert.cc " + "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_cipher.cc " + - "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_credential.cc " + "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_file.cc " + "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_key_share.cc " + "third_party\\boringssl-with-bazel\\src\\ssl\\ssl_lib.cc " + @@ -1730,6 +1727,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"); @@ -1831,8 +1829,6 @@ if (PHP_GRPC != "no") { FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\stack"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\trust_token"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\crypto\\x509"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\gen"); - FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\gen\\crypto"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\boringssl-with-bazel\\src\\ssl"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\re2"); FSO.CreateFolder(base_dir+"\\ext\\grpc\\third_party\\re2\\re2"); diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 457103324f918..f96e7926a7d73 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 2d2af17efc592..8096fd0e6cd9a 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 7104853d64fcd..2fec47204017b 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 ) @@ -2451,6 +2451,7 @@ Gem::Specification.new do |s| s.files += %w( third_party/address_sorting/address_sorting_posix.c ) s.files += %w( third_party/address_sorting/address_sorting_windows.c ) s.files += %w( third_party/address_sorting/include/address_sorting/address_sorting.h ) + s.files += %w( third_party/boringssl-with-bazel/err_data.c ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/asn1/a_bool.c ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/asn1/a_d2i_fp.c ) @@ -2556,8 +2557,6 @@ Gem::Specification.new do |s| s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/evp_asn1.c ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/evp_ctx.c ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/internal.h ) - s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/p_dh.c ) - s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/p_dh_asn1.c ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/p_dsa_asn1.c ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/p_ec.c ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/evp/p_ec_asn1.c ) @@ -2728,6 +2727,7 @@ Gem::Specification.new do |s| s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/address.h ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/fors.c ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/fors.h ) + s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/internal.h ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/merkle.c ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/merkle.h ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/spx/params.h ) @@ -2819,7 +2819,6 @@ Gem::Specification.new do |s| s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_val.c ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c ) s.files += %w( third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c ) - s.files += %w( third_party/boringssl-with-bazel/src/gen/crypto/err_data.c ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/aead.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/aes.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/arm_arch.h ) @@ -2860,14 +2859,13 @@ Gem::Specification.new do |s| s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/evp.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/evp_errors.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/ex_data.h ) - s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/experimental/kyber.h ) - s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/experimental/spx.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/hkdf.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/hmac.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/hpke.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/hrss.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/is_boringssl.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/kdf.h ) + s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/kyber.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/lhash.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/md4.h ) s.files += %w( third_party/boringssl-with-bazel/src/include/openssl/md5.h ) @@ -2931,7 +2929,6 @@ Gem::Specification.new do |s| s.files += %w( third_party/boringssl-with-bazel/src/ssl/ssl_buffer.cc ) s.files += %w( third_party/boringssl-with-bazel/src/ssl/ssl_cert.cc ) s.files += %w( third_party/boringssl-with-bazel/src/ssl/ssl_cipher.cc ) - s.files += %w( third_party/boringssl-with-bazel/src/ssl/ssl_credential.cc ) s.files += %w( third_party/boringssl-with-bazel/src/ssl/ssl_file.cc ) s.files += %w( third_party/boringssl-with-bazel/src/ssl/ssl_key_share.cc ) s.files += %w( third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc ) diff --git a/include/grpcpp/impl/call_op_set.h b/include/grpcpp/impl/call_op_set.h index 56ce628908274..d18cafcc33761 100644 --- a/include/grpcpp/impl/call_op_set.h +++ b/include/grpcpp/impl/call_op_set.h @@ -771,7 +771,9 @@ class CallOpRecvInitialMetadata { class CallOpClientRecvStatus { public: CallOpClientRecvStatus() - : recv_status_(nullptr), debug_error_string_(nullptr) {} + : metadata_map_(nullptr), + recv_status_(nullptr), + debug_error_string_(nullptr) {} void ClientRecvStatus(grpc::ClientContext* context, Status* status) { client_context_ = context; diff --git a/package.xml b/package.xml index 3cd01a878052d..b884422e53c76 100644 --- a/package.xml +++ b/package.xml @@ -1080,8 +1080,6 @@ - - @@ -1098,13 +1096,10 @@ - - - @@ -1119,12 +1114,6 @@ - - - - - - @@ -1850,6 +1839,17 @@ + + + + + + + + + + + @@ -2455,6 +2455,7 @@ + @@ -2560,8 +2561,6 @@ - - @@ -2732,6 +2731,7 @@ + @@ -2823,7 +2823,6 @@ - @@ -2864,14 +2863,13 @@ - - + @@ -2935,7 +2933,6 @@ - diff --git a/setup.py b/setup.py index d25e924d594fb..b93637215ff47 100644 --- a/setup.py +++ b/setup.py @@ -441,7 +441,7 @@ def _quote_build_define(argument): # 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 53457328bfd1e..0752f8b056f8a 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 9e11e12d22318..5bbafc68d688b 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 adc09a8117275..a2c759ec7d601 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 d0f9edefeaba4..9ebb91b276e5a 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 ed077de6e702e..43fa643bbb85c 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 06ee67de012b9..bd229acb5de9c 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/binder/transport/binder_transport.cc b/src/core/ext/transport/binder/transport/binder_transport.cc index 7c832505d9d2d..691ac50d6e405 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.cc +++ b/src/core/ext/transport/binder/transport/binder_transport.cc @@ -693,11 +693,6 @@ void grpc_binder_transport::Orphan() { absl::OkStatus()); } -grpc_endpoint* grpc_binder_transport::GetEndpoint() { - gpr_log(GPR_INFO, __func__); - return nullptr; -} - size_t grpc_binder_transport::SizeOfStream() const { return sizeof(grpc_binder_stream); } diff --git a/src/core/ext/transport/binder/transport/binder_transport.h b/src/core/ext/transport/binder/transport/binder_transport.h index d800bcee676ab..20399818762d4 100644 --- a/src/core/ext/transport/binder/transport/binder_transport.h +++ b/src/core/ext/transport/binder/transport/binder_transport.h @@ -60,7 +60,6 @@ struct grpc_binder_transport final : public grpc_core::FilterStackTransport { void SetPollset(grpc_stream*, grpc_pollset*) override {} void SetPollsetSet(grpc_stream*, grpc_pollset_set*) override {} void PerformOp(grpc_transport_op* op) override; - grpc_endpoint* GetEndpoint() override; size_t SizeOfStream() const override; bool HackyDisableStreamOpBatchCoalescingInConnectedChannel() const override { return false; diff --git a/src/core/ext/transport/chaotic_good/client_transport.h b/src/core/ext/transport/chaotic_good/client_transport.h index f07099e296f91..12a96403d9a3a 100644 --- a/src/core/ext/transport/chaotic_good/client_transport.h +++ b/src/core/ext/transport/chaotic_good/client_transport.h @@ -82,7 +82,6 @@ class ChaoticGoodClientTransport final : public ClientTransport { void SetPollset(grpc_stream*, grpc_pollset*) override {} void SetPollsetSet(grpc_stream*, grpc_pollset_set*) override {} void PerformOp(grpc_transport_op*) override; - grpc_endpoint* GetEndpoint() override { return nullptr; } void Orphan() override { AbortWithError(); Unref(); diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h index 140641abcf6bb..2cd1fb5974cd6 100644 --- a/src/core/ext/transport/chaotic_good/server_transport.h +++ b/src/core/ext/transport/chaotic_good/server_transport.h @@ -94,7 +94,6 @@ class ChaoticGoodServerTransport final : public ServerTransport { void SetPollset(grpc_stream*, grpc_pollset*) override {} void SetPollsetSet(grpc_stream*, grpc_pollset_set*) override {} void PerformOp(grpc_transport_op*) override; - grpc_endpoint* GetEndpoint() override { return nullptr; } void Orphan() override; void SetCallDestination( @@ -158,4 +157,4 @@ class ChaoticGoodServerTransport final : public ServerTransport { } // namespace chaotic_good } // namespace grpc_core -#endif // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_TRANSPORT_H \ No newline at end of file +#endif // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_TRANSPORT_H diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 5c2d1c5ae2023..118b1f99488b6 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" @@ -3168,8 +3168,6 @@ const char* grpc_chttp2_initiate_write_reason_string( GPR_UNREACHABLE_CODE(return "unknown"); } -grpc_endpoint* grpc_chttp2_transport::GetEndpoint() { return ep; } - size_t grpc_chttp2_transport::SizeOfStream() const { return sizeof(grpc_chttp2_stream); } diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h index d83b38e8c5c60..a98381b489d36 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 cf080874fe794..8d64b321aefb8 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 4c4500dc280a3..44ae22ea47568 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 95f752c3ba885..463e051dc27a5 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 058928a596d7c..ed596278686cb 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 @@ -256,7 +256,6 @@ struct grpc_chttp2_transport final : public grpc_core::FilterStackTransport, void SetPollsetSet(grpc_stream* stream, grpc_pollset_set* pollset_set) override; void PerformOp(grpc_transport_op* op) override; - grpc_endpoint* GetEndpoint() override; grpc_endpoint* ep; grpc_core::Slice peer_string; diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index a49d91263e533..856d3bcb2201f 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 6b99d9deee855..0cc282703142c 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/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index bd6c4b411dce0..8e1242a3f4bb2 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -131,7 +131,6 @@ struct grpc_cronet_transport final : public grpc_core::FilterStackTransport { void SetPollsetSet(grpc_stream* /*stream*/, grpc_pollset_set* /*pollset_set*/) override {} void PerformOp(grpc_transport_op* op) override; - grpc_endpoint* GetEndpoint() override { return nullptr; } size_t SizeOfStream() const override; void InitStream(grpc_stream* gs, grpc_stream_refcount* refcount, const void* server_data, grpc_core::Arena* arena) override; diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index dbbd3e63123ea..7913e631fe868 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -85,7 +85,6 @@ class InprocServerTransport final : public ServerTransport { Crash("set_accept_stream not supported on inproc transport"); } } - grpc_endpoint* GetEndpoint() override { return nullptr; } void Disconnect(absl::Status error) { if (disconnecting_.exchange(true, std::memory_order_relaxed)) return; @@ -162,7 +161,6 @@ class InprocClientTransport final : public ClientTransport { void SetPollset(grpc_stream*, grpc_pollset*) override {} void SetPollsetSet(grpc_stream*, grpc_pollset_set*) override {} void PerformOp(grpc_transport_op*) override { Crash("unimplemented"); } - grpc_endpoint* GetEndpoint() override { return nullptr; } private: ~InprocClientTransport() override { diff --git a/src/core/ext/transport/inproc/legacy_inproc_transport.cc b/src/core/ext/transport/inproc/legacy_inproc_transport.cc index 9412fe41e4e9d..bf63cc2e3a70d 100644 --- a/src/core/ext/transport/inproc/legacy_inproc_transport.cc +++ b/src/core/ext/transport/inproc/legacy_inproc_transport.cc @@ -135,7 +135,6 @@ struct inproc_transport final : public grpc_core::FilterStackTransport { void SetPollsetSet(grpc_stream* stream, grpc_pollset_set* pollset_set) override; void PerformOp(grpc_transport_op* op) override; - grpc_endpoint* GetEndpoint() override; size_t SizeOfStream() const override; bool HackyDisableStreamOpBatchCoalescingInConnectedChannel() const override { @@ -1214,8 +1213,6 @@ void inproc_transport::SetPollsetSet(grpc_stream* /*gs*/, // Nothing to do here } -grpc_endpoint* inproc_transport::GetEndpoint() { return nullptr; } - //****************************************************************************** // Main inproc transport functions // diff --git a/src/core/handshaker/security/security_handshaker.cc b/src/core/handshaker/security/security_handshaker.cc index 33b21f31d137e..bf073a66561dd 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 10b326e88d3cd..9fc6564c8de65 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 88c10c00a8af8..653aa8659cf07 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 c6fb49cea1ac5..fa56bfa3e76f4 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 d40b20a93b7b2..f0021d0ed7ea2 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 7d290d7d83e36..02c3bb77c4b15 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) @@ -267,19 +267,29 @@ struct grpc_pollset_set { // static void fork_fd_list_remove_node(grpc_fork_fd_list* node) { + gpr_mu_lock(&fork_fd_list_mu); + if (fork_fd_list_head == node) { + fork_fd_list_head = node->next; + } + if (node->prev != nullptr) { + node->prev->next = node->next; + } + if (node->next != nullptr) { + node->next->prev = node->prev; + } + gpr_free(node); + gpr_mu_unlock(&fork_fd_list_mu); +} + +static void fork_fd_list_remove_grpc_fd(grpc_fd* fd) { if (track_fds_for_fork) { - gpr_mu_lock(&fork_fd_list_mu); - if (fork_fd_list_head == node) { - fork_fd_list_head = node->next; - } - if (node->prev != nullptr) { - node->prev->next = node->next; - } - if (node->next != nullptr) { - node->next->prev = node->prev; - } - gpr_free(node); - gpr_mu_unlock(&fork_fd_list_mu); + fork_fd_list_remove_node(fd->fork_fd_list); + } +} + +static void fork_fd_list_remove_wakeup_fd(grpc_cached_wakeup_fd* fd) { + if (track_fds_for_fork) { + fork_fd_list_remove_node(fd->fork_fd_list); } } @@ -361,7 +371,7 @@ static void unref_by(grpc_fd* fd, int n) { if (old == n) { gpr_mu_destroy(&fd->mu); grpc_iomgr_unregister_object(&fd->iomgr_object); - fork_fd_list_remove_node(fd->fork_fd_list); + fork_fd_list_remove_grpc_fd(fd); if (fd->shutdown) { } fd->shutdown_error.~Status(); @@ -860,7 +870,7 @@ static void pollset_destroy(grpc_pollset* pollset) { CHECK(!pollset_has_workers(pollset)); while (pollset->local_wakeup_cache) { grpc_cached_wakeup_fd* next = pollset->local_wakeup_cache->next; - fork_fd_list_remove_node(pollset->local_wakeup_cache->fork_fd_list); + fork_fd_list_remove_wakeup_fd(pollset->local_wakeup_cache); grpc_wakeup_fd_destroy(&pollset->local_wakeup_cache->fd); gpr_free(pollset->local_wakeup_cache); pollset->local_wakeup_cache = next; diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index a19c13ab7b61c..9d6477aaaafb8 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 1f9f9817e046b..6992bcf687c3c 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 cd9a15d0bd6bf..9a54226862be4 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 827d37f06b6a8..b813497479427 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 0ad87af1f6247..5ae280171e79d 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 b439191f1bba1..1c77614f6fbc1 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 d8f53540e329a..69a41cf503e82 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 3cf3fa0db221e..0ebf7b4aacb53 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 76569a97c668e..02ab305c81b59 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/lib/transport/transport.h b/src/core/lib/transport/transport.h index 5dbe2c6695f6c..7d879a91de5cb 100644 --- a/src/core/lib/transport/transport.h +++ b/src/core/lib/transport/transport.h @@ -565,9 +565,6 @@ class Transport : public InternallyRefCounted { op->disconnect_with_error = error; PerformOp(op); } - - // implementation of grpc_transport_get_endpoint - virtual grpc_endpoint* GetEndpoint() = 0; }; class FilterStackTransport : public Transport { diff --git a/src/core/load_balancing/lb_policy.h b/src/core/load_balancing/lb_policy.h index 68f75e5271aa3..838d89ae2d562 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 ae5cb82489b17..d22fe292b6ace 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 53480d6f09148..26bd71d0dda92 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 d0a4165f39317..f750b0ae0a0b4 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 0554e28b4e7ac..6ea74538a3600 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 b891001f3d472..6397e03a62c41 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 01b541c233ef7..279e1f8362bdb 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 6ceb637d48104..7a63b4768b6ad 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 154bbdfbf060a..093664e85f61f 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 f0b74f7e59889..3f98c7098e0f1 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 803f7a2321e0b..fdfa402d6d216 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 dd6dd74fd4141..62018d8b8404b 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 c3b734fc44d8a..b403a8649f213 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 797be93fd7d06..0a02cf9acfc48 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 e7d6a63169d27..c5137e71f85c9 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 6415a4cd0396b..b1026abbb28d7 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 a390927e78ffb..4a317b7fcf01f 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 8b9aa2b5fa866..6220a118f2079 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 f6097447014a2..1068678cab866 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 3b00fed06e4b1..6855e7fa6d852 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 9fdb9bccceb52..babfbf4bc374a 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 1bfc28c3f3e5e..291a9e257182f 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 3a457a63d5af6..96b26482ae24c 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 b7157f015997b..efb191da95db5 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 3e345c2f6d816..2a4cd786d1b10 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 b0eb7e3cae039..690677b5d94e3 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 39197015d4565..e0852065320e7 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 4a11b4e8c53aa..25bb0f1930398 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 f22fcbf992e51..84123c0444e03 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 ed1465dabb539..366c83064f17d 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 acb81be35eea4..588404f75df64 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 49d2cc3e384ee..5bce0cc39ac7f 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 21641f4baa855..d62af3d908196 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 8ae0f051a0387..66c460d6b6522 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/objective-c/BoringSSL-GRPC.podspec b/src/objective-c/BoringSSL-GRPC.podspec index 34bb565a76ff6..1ac42a722fa78 100644 --- a/src/objective-c/BoringSSL-GRPC.podspec +++ b/src/objective-c/BoringSSL-GRPC.podspec @@ -76,7 +76,7 @@ Pod::Spec.new do |s| s.source = { :git => 'https://github.com/google/boringssl.git', - :commit => "5a2bca2124800f2861263959b72bc35cdf18949b", + :commit => "ae72a4514c7afd150596b0a80947f3ca9b8363b5", } s.ios.deployment_target = '10.0' diff --git a/src/objective-c/tests/CFStreamTests/CFStreamClientTests.mm b/src/objective-c/tests/CFStreamTests/CFStreamClientTests.mm index 140d86093147e..c78c090cb0a2c 100644 --- a/src/objective-c/tests/CFStreamTests/CFStreamClientTests.mm +++ b/src/objective-c/tests/CFStreamTests/CFStreamClientTests.mm @@ -85,7 +85,7 @@ - (void)testSucceeds { grpc_closure done; grpc_core::ExecCtx exec_ctx; - gpr_log(GPR_DEBUG, "test_succeeds"); + VLOG(2) << "test_succeeds"; auto resolved_addr = grpc_core::StringToSockaddr("127.0.0.1:0"); CHECK(resolved_addr.ok()); @@ -142,7 +142,7 @@ - (void)testFails { grpc_closure done; int svr_fd; - gpr_log(GPR_DEBUG, "test_fails"); + VLOG(2) << "test_fails"; auto resolved_addr = grpc_core::StringToSockaddr("127.0.0.1:0"); CHECK(resolved_addr.ok()); diff --git a/src/objective-c/tests/CFStreamTests/CFStreamEndpointTests.mm b/src/objective-c/tests/CFStreamTests/CFStreamEndpointTests.mm index 97508b83cb8f9..b516040cdeb6c 100644 --- a/src/objective-c/tests/CFStreamTests/CFStreamEndpointTests.mm +++ b/src/objective-c/tests/CFStreamTests/CFStreamEndpointTests.mm @@ -112,7 +112,7 @@ - (void)setUp { std::promise connected_promise; grpc_closure done; - gpr_log(GPR_DEBUG, "test_succeeds"); + VLOG(2) << "test_succeeds"; auto resolved_addr = grpc_core::StringToSockaddr("127.0.0.1:0"); struct sockaddr_in *addr = reinterpret_cast(resolved_addr->addr); diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi index 13c7b41ad98c5..5f5afcfc944ac 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 a6e9be13ead37..adf321a223864 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -417,7 +417,6 @@ '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 @@ '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 @@ '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 @@ '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', @@ -998,6 +998,7 @@ 'third_party/address_sorting/address_sorting.c', 'third_party/address_sorting/address_sorting_posix.c', 'third_party/address_sorting/address_sorting_windows.c', + 'third_party/boringssl-with-bazel/err_data.c', 'third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c', 'third_party/boringssl-with-bazel/src/crypto/asn1/a_bool.c', 'third_party/boringssl-with-bazel/src/crypto/asn1/a_d2i_fp.c', @@ -1088,8 +1089,6 @@ 'third_party/boringssl-with-bazel/src/crypto/evp/evp.c', 'third_party/boringssl-with-bazel/src/crypto/evp/evp_asn1.c', 'third_party/boringssl-with-bazel/src/crypto/evp/evp_ctx.c', - 'third_party/boringssl-with-bazel/src/crypto/evp/p_dh.c', - 'third_party/boringssl-with-bazel/src/crypto/evp/p_dh_asn1.c', 'third_party/boringssl-with-bazel/src/crypto/evp/p_dsa_asn1.c', 'third_party/boringssl-with-bazel/src/crypto/evp/p_ec.c', 'third_party/boringssl-with-bazel/src/crypto/evp/p_ec_asn1.c', @@ -1231,7 +1230,6 @@ 'third_party/boringssl-with-bazel/src/crypto/x509/x_val.c', 'third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c', 'third_party/boringssl-with-bazel/src/crypto/x509/x_x509a.c', - 'third_party/boringssl-with-bazel/src/gen/crypto/err_data.c', 'third_party/boringssl-with-bazel/src/ssl/bio_ssl.cc', 'third_party/boringssl-with-bazel/src/ssl/d1_both.cc', 'third_party/boringssl-with-bazel/src/ssl/d1_lib.cc', @@ -1253,7 +1251,6 @@ 'third_party/boringssl-with-bazel/src/ssl/ssl_buffer.cc', 'third_party/boringssl-with-bazel/src/ssl/ssl_cert.cc', 'third_party/boringssl-with-bazel/src/ssl/ssl_cipher.cc', - 'third_party/boringssl-with-bazel/src/ssl/ssl_credential.cc', 'third_party/boringssl-with-bazel/src/ssl/ssl_file.cc', 'third_party/boringssl-with-bazel/src/ssl/ssl_key_share.cc', 'third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc', @@ -1418,166 +1415,166 @@ ASM_SOURCE_FILES = { 'crypto_asm': [ + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/chacha/chacha-armv8-apple.S', + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/cipher_extra/chacha20_poly1305_armv8-apple.S', + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/aesv8-armv8-apple.S', + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-apple.S', + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/armv8-mont-apple.S', + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/bn-armv8-apple.S', + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/ghash-neon-armv8-apple.S', + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/ghashv8-armv8-apple.S', + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/p256-armv8-asm-apple.S', + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/p256_beeu-armv8-asm-apple.S', + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/sha1-armv8-apple.S', + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/sha256-armv8-apple.S', + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/sha512-armv8-apple.S', + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/fipsmodule/vpaes-armv8-apple.S', + 'third_party/boringssl-with-bazel/apple-aarch64/crypto/test/trampoline-armv8-apple.S', + 'third_party/boringssl-with-bazel/apple-x86/crypto/chacha/chacha-x86-apple.S', + 'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/aesni-x86-apple.S', + 'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/bn-586-apple.S', + 'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/co-586-apple.S', + 'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/ghash-ssse3-x86-apple.S', + 'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/ghash-x86-apple.S', + 'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/md5-586-apple.S', + 'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/sha1-586-apple.S', + 'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/sha256-586-apple.S', + 'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/sha512-586-apple.S', + 'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/vpaes-x86-apple.S', + 'third_party/boringssl-with-bazel/apple-x86/crypto/fipsmodule/x86-mont-apple.S', + 'third_party/boringssl-with-bazel/apple-x86/crypto/test/trampoline-x86-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/chacha/chacha-x86_64-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/aesni-gcm-x86_64-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/aesni-x86_64-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/ghash-x86_64-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/md5-x86_64-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/p256-x86_64-asm-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/rdrand-x86_64-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/rsaz-avx2-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/sha1-x86_64-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/sha256-x86_64-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/sha512-x86_64-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/vpaes-x86_64-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/x86_64-mont-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/fipsmodule/x86_64-mont5-apple.S', + 'third_party/boringssl-with-bazel/apple-x86_64/crypto/test/trampoline-x86_64-apple.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/chacha/chacha-armv8-linux.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/cipher_extra/chacha20_poly1305_armv8-linux.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/aesv8-armv8-linux.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-linux.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/armv8-mont-linux.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/bn-armv8-linux.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/ghash-neon-armv8-linux.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/ghashv8-armv8-linux.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/p256-armv8-asm-linux.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/p256_beeu-armv8-asm-linux.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/sha1-armv8-linux.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/sha256-armv8-linux.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/sha512-armv8-linux.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/fipsmodule/vpaes-armv8-linux.S', + 'third_party/boringssl-with-bazel/linux-aarch64/crypto/test/trampoline-armv8-linux.S', + 'third_party/boringssl-with-bazel/linux-arm/crypto/chacha/chacha-armv4-linux.S', + 'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/aesv8-armv7-linux.S', + 'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/armv4-mont-linux.S', + 'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/bsaes-armv7-linux.S', + 'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/ghash-armv4-linux.S', + 'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/ghashv8-armv7-linux.S', + 'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/sha1-armv4-large-linux.S', + 'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/sha256-armv4-linux.S', + 'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/sha512-armv4-linux.S', + 'third_party/boringssl-with-bazel/linux-arm/crypto/fipsmodule/vpaes-armv7-linux.S', + 'third_party/boringssl-with-bazel/linux-arm/crypto/test/trampoline-armv4-linux.S', + 'third_party/boringssl-with-bazel/linux-x86/crypto/chacha/chacha-x86-linux.S', + 'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/aesni-x86-linux.S', + 'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/bn-586-linux.S', + 'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/co-586-linux.S', + 'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/ghash-ssse3-x86-linux.S', + 'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/ghash-x86-linux.S', + 'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/md5-586-linux.S', + 'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/sha1-586-linux.S', + 'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/sha256-586-linux.S', + 'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/sha512-586-linux.S', + 'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/vpaes-x86-linux.S', + 'third_party/boringssl-with-bazel/linux-x86/crypto/fipsmodule/x86-mont-linux.S', + 'third_party/boringssl-with-bazel/linux-x86/crypto/test/trampoline-x86-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/chacha/chacha-x86_64-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/aesni-x86_64-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/ghash-x86_64-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/md5-x86_64-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/p256-x86_64-asm-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/rdrand-x86_64-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/rsaz-avx2-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/sha1-x86_64-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/sha256-x86_64-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/sha512-x86_64-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/vpaes-x86_64-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/x86_64-mont-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/fipsmodule/x86_64-mont5-linux.S', + 'third_party/boringssl-with-bazel/linux-x86_64/crypto/test/trampoline-x86_64-linux.S', 'third_party/boringssl-with-bazel/src/crypto/curve25519/asm/x25519-asm-arm.S', 'third_party/boringssl-with-bazel/src/crypto/hrss/asm/poly_rq_mul.S', 'third_party/boringssl-with-bazel/src/crypto/poly1305/poly1305_arm_asm.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesni-gcm-x86_64-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesni-gcm-x86_64-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesni-x86-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesni-x86-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesni-x86_64-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesni-x86_64-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesv8-armv7-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesv8-armv8-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesv8-armv8-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesv8-armv8-win.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesv8-gcm-armv8-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesv8-gcm-armv8-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesv8-gcm-armv8-win.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/armv4-mont-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/armv8-mont-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/armv8-mont-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/armv8-mont-win.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/bn-586-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/bn-586-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/bn-armv8-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/bn-armv8-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/bn-armv8-win.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/bsaes-armv7-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/co-586-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/co-586-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-armv4-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-neon-armv8-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-neon-armv8-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-neon-armv8-win.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-ssse3-x86-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-ssse3-x86-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-ssse3-x86_64-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-ssse3-x86_64-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-x86-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-x86-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-x86_64-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-x86_64-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghashv8-armv7-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghashv8-armv8-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghashv8-armv8-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghashv8-armv8-win.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/md5-586-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/md5-586-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/md5-x86_64-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/md5-x86_64-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/p256-armv8-asm-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/p256-armv8-asm-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/p256-armv8-asm-win.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/p256-x86_64-asm-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/p256-x86_64-asm-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/p256_beeu-armv8-asm-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/p256_beeu-armv8-asm-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/p256_beeu-armv8-asm-win.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/p256_beeu-x86_64-asm-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/p256_beeu-x86_64-asm-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/rdrand-x86_64-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/rdrand-x86_64-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/rsaz-avx2-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/rsaz-avx2-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha1-586-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha1-586-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha1-armv4-large-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha1-armv8-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha1-armv8-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha1-armv8-win.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha1-x86_64-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha1-x86_64-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha256-586-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha256-586-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha256-armv4-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha256-armv8-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha256-armv8-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha256-armv8-win.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha256-x86_64-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha256-x86_64-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha512-586-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha512-586-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha512-armv4-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha512-armv8-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha512-armv8-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha512-armv8-win.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha512-x86_64-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha512-x86_64-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-armv7-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-armv8-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-armv8-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-armv8-win.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-x86-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-x86-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-x86_64-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-x86_64-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/x86-mont-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/x86-mont-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/x86_64-mont-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/x86_64-mont-linux.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/x86_64-mont5-apple.S', - 'third_party/boringssl-with-bazel/src/gen/bcm/x86_64-mont5-linux.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/aes128gcmsiv-x86_64-apple.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/aes128gcmsiv-x86_64-linux.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha-armv4-linux.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha-armv8-apple.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha-armv8-linux.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha-armv8-win.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha-x86-apple.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha-x86-linux.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha-x86_64-apple.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha-x86_64-linux.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha20_poly1305_armv8-apple.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha20_poly1305_armv8-linux.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha20_poly1305_armv8-win.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha20_poly1305_x86_64-apple.S', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha20_poly1305_x86_64-linux.S', - 'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-armv4-linux.S', - 'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-armv8-apple.S', - 'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-armv8-linux.S', - 'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-armv8-win.S', - 'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-x86-apple.S', - 'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-x86-linux.S', - 'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-x86_64-apple.S', - 'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-x86_64-linux.S', 'third_party/boringssl-with-bazel/src/third_party/fiat/asm/fiat_curve25519_adx_mul.S', 'third_party/boringssl-with-bazel/src/third_party/fiat/asm/fiat_curve25519_adx_square.S', 'third_party/boringssl-with-bazel/src/third_party/fiat/asm/fiat_p256_adx_mul.S', 'third_party/boringssl-with-bazel/src/third_party/fiat/asm/fiat_p256_adx_sqr.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/chacha/chacha-armv8-win.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/cipher_extra/chacha20_poly1305_armv8-win.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/aesv8-armv8-win.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/aesv8-gcm-armv8-win.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/armv8-mont-win.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/bn-armv8-win.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/ghash-neon-armv8-win.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/ghashv8-armv8-win.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/p256-armv8-asm-win.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/p256_beeu-armv8-asm-win.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/sha1-armv8-win.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/sha256-armv8-win.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/sha512-armv8-win.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/fipsmodule/vpaes-armv8-win.S', + 'third_party/boringssl-with-bazel/win-aarch64/crypto/test/trampoline-armv8-win.S', ], 'crypto_nasm': [ - 'third_party/boringssl-with-bazel/src/gen/bcm/aesni-gcm-x86_64-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesni-x86-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/aesni-x86_64-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/bn-586-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/co-586-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-ssse3-x86-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-ssse3-x86_64-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-x86-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/ghash-x86_64-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/md5-586-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/md5-x86_64-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/p256-x86_64-asm-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/p256_beeu-x86_64-asm-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/rdrand-x86_64-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/rsaz-avx2-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha1-586-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha1-x86_64-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha256-586-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha256-x86_64-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha512-586-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/sha512-x86_64-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-x86-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/vpaes-x86_64-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/x86-mont-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/x86_64-mont-win.asm', - 'third_party/boringssl-with-bazel/src/gen/bcm/x86_64-mont5-win.asm', - 'third_party/boringssl-with-bazel/src/gen/crypto/aes128gcmsiv-x86_64-win.asm', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha-x86-win.asm', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha-x86_64-win.asm', - 'third_party/boringssl-with-bazel/src/gen/crypto/chacha20_poly1305_x86_64-win.asm', - 'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-x86-win.asm', - 'third_party/boringssl-with-bazel/src/gen/test_support/trampoline-x86_64-win.asm', + 'third_party/boringssl-with-bazel/win-x86/crypto/chacha/chacha-x86-win.asm', + 'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/aesni-x86-win.asm', + 'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/bn-586-win.asm', + 'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/co-586-win.asm', + 'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/ghash-ssse3-x86-win.asm', + 'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/ghash-x86-win.asm', + 'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/md5-586-win.asm', + 'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/sha1-586-win.asm', + 'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/sha256-586-win.asm', + 'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/sha512-586-win.asm', + 'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/vpaes-x86-win.asm', + 'third_party/boringssl-with-bazel/win-x86/crypto/fipsmodule/x86-mont-win.asm', + 'third_party/boringssl-with-bazel/win-x86/crypto/test/trampoline-x86-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/chacha/chacha-x86_64-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/cipher_extra/aes128gcmsiv-x86_64-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/cipher_extra/chacha20_poly1305_x86_64-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/aesni-gcm-x86_64-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/aesni-x86_64-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/ghash-ssse3-x86_64-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/ghash-x86_64-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/md5-x86_64-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/p256-x86_64-asm-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/p256_beeu-x86_64-asm-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/rdrand-x86_64-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/rsaz-avx2-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/sha1-x86_64-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/sha256-x86_64-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/sha512-x86_64-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/vpaes-x86_64-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/x86_64-mont-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/fipsmodule/x86_64-mont5-win.asm', + 'third_party/boringssl-with-bazel/win-x86_64/crypto/test/trampoline-x86_64-win.asm', ], } diff --git a/src/python/grpcio_observability/grpc_observability/_cyobservability.pxd b/src/python/grpcio_observability/grpc_observability/_cyobservability.pxd index c0c2fb25c61ca..240bf66e03ad5 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 e100c4bcfc844..117e017cb2c23 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 6524013df1703..a9a5a88c60f2f 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 a704a0704a47b..974d37d9cec96 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 ce0d4f9f453d8..6d07015fb307b 100644 --- a/src/python/grpcio_observability/setup.py +++ b/src/python/grpcio_observability/setup.py @@ -207,7 +207,7 @@ def get_ext_filename(self, ext_name): # 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 b54cc023fa305..f3c2342998eb1 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/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc index 44193d7f1cae1..ebf0f66c82c76 100644 --- a/test/core/channel/minimal_stack_is_minimal_test.cc +++ b/test/core/channel/minimal_stack_is_minimal_test.cc @@ -74,7 +74,6 @@ class FakeTransport final : public grpc_core::Transport { void SetPollset(grpc_stream*, grpc_pollset*) override {} void SetPollsetSet(grpc_stream*, grpc_pollset_set*) override {} void PerformOp(grpc_transport_op*) override {} - grpc_endpoint* GetEndpoint() override { return nullptr; } void Orphan() override {} private: diff --git a/test/core/channel/server_call_tracer_factory_test.cc b/test/core/channel/server_call_tracer_factory_test.cc index 77862155b6c55..fd4b2bac8d9bb 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/multiple_server_queues_test.cc b/test/core/end2end/multiple_server_queues_test.cc index 4711a7a21479d..4b49412649c28 100644 --- a/test/core/end2end/multiple_server_queues_test.cc +++ b/test/core/end2end/multiple_server_queues_test.cc @@ -37,6 +37,7 @@ int main(int argc, char** argv) { attr.version = 1; attr.cq_completion_type = GRPC_CQ_NEXT; attr.cq_polling_type = GRPC_CQ_DEFAULT_POLLING; + attr.cq_shutdown_cb = nullptr; cq1 = grpc_completion_queue_create( grpc_completion_queue_factory_lookup(&attr), &attr, nullptr); diff --git a/test/core/end2end/tests/http2_stats.cc b/test/core/end2end/tests/http2_stats.cc index a2931c98ea6ec..3cc2e830822b0 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 1e39734d3278c..cd49842b8af0a 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 bba8a824651b4..b1771665d973e 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 fc1c9ec7a1d97..0d92acecba85b 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/iomgr/ios/CFStreamTests/CFStreamClientTests.mm b/test/core/iomgr/ios/CFStreamTests/CFStreamClientTests.mm index 77adb057d247b..0cbd7e997b8c2 100644 --- a/test/core/iomgr/ios/CFStreamTests/CFStreamClientTests.mm +++ b/test/core/iomgr/ios/CFStreamTests/CFStreamClientTests.mm @@ -84,7 +84,7 @@ - (void)testSucceeds { grpc_closure done; grpc_core::ExecCtx exec_ctx; - gpr_log(GPR_DEBUG, "test_succeeds"); + VLOG(2) << "test_succeeds"; auto resolved_addr = grpc_core::StringToSockaddr("127.0.0.1:0"); CHECK(resolved_addr.ok()); @@ -141,7 +141,7 @@ - (void)testFails { grpc_closure done; int svr_fd; - gpr_log(GPR_DEBUG, "test_fails"); + VLOG(2) << "test_fails"; auto resolved_addr = grpc_core::StringToSockaddr("127.0.0.1:0"); CHECK(resolved_addr.ok()); diff --git a/test/core/iomgr/ios/CFStreamTests/CFStreamEndpointTests.mm b/test/core/iomgr/ios/CFStreamTests/CFStreamEndpointTests.mm index c5fe36482c7a0..5ba1c11ed3bb0 100644 --- a/test/core/iomgr/ios/CFStreamTests/CFStreamEndpointTests.mm +++ b/test/core/iomgr/ios/CFStreamTests/CFStreamEndpointTests.mm @@ -111,7 +111,7 @@ - (void)setUp { std::promise connected_promise; grpc_closure done; - gpr_log(GPR_DEBUG, "test_succeeds"); + VLOG(2) << "test_succeeds"; auto resolved_addr = grpc_core::StringToSockaddr("127.0.0.1:0"); struct sockaddr_in *addr = reinterpret_cast(resolved_addr->addr); diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index 469d699050209..235c789717ae3 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -39,6 +39,7 @@ #include #endif +#include #include #include "absl/log/log.h" @@ -330,8 +331,16 @@ static void test_connect(size_t num_connects, const grpc_channel_args* channel_args, test_addrs* dst_addrs, bool test_dst_addrs) { grpc_core::ExecCtx exec_ctx; - grpc_resolved_address resolved_addr; - grpc_resolved_address resolved_addr1; + // Use aligned_stroage to allocate grpc_resolved_address objects on stack + // to meet the alignment requirement of sockaddr_storage type. + std::aligned_storage::type resolved_addr_buffer; + std::aligned_storage::type resolved_addr1_buffer; + grpc_resolved_address& resolved_addr = + *reinterpret_cast(&resolved_addr_buffer); + grpc_resolved_address& resolved_addr1 = + *reinterpret_cast(&resolved_addr1_buffer); struct sockaddr_storage* const addr = reinterpret_cast(resolved_addr.addr); struct sockaddr_storage* const addr1 = diff --git a/test/core/load_balancing/pick_first_test.cc b/test/core/load_balancing/pick_first_test.cc index 839afa62a3c2a..469af9c261e7c 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/server/xds_channel_stack_modifier_test.cc b/test/core/server/xds_channel_stack_modifier_test.cc index f01860e4adbe3..e7cae694aeca8 100644 --- a/test/core/server/xds_channel_stack_modifier_test.cc +++ b/test/core/server/xds_channel_stack_modifier_test.cc @@ -84,7 +84,6 @@ class FakeTransport final : public Transport { void SetPollset(grpc_stream*, grpc_pollset*) override {} void SetPollsetSet(grpc_stream*, grpc_pollset_set*) override {} void PerformOp(grpc_transport_op*) override {} - grpc_endpoint* GetEndpoint() override { return nullptr; } void Orphan() override {} }; } // namespace diff --git a/test/core/surface/completion_queue_test.cc b/test/core/surface/completion_queue_test.cc index 82dbaed6dd6c0..9175196fa1a0e 100644 --- a/test/core/surface/completion_queue_test.cc +++ b/test/core/surface/completion_queue_test.cc @@ -78,7 +78,7 @@ TEST(GrpcCompletionQueueTest, TestNoOp) { grpc_cq_completion_type completion_types[] = {GRPC_CQ_NEXT, GRPC_CQ_PLUCK}; grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; - grpc_completion_queue_attributes attr; + grpc_completion_queue_attributes attr = {}; LOG_TEST("test_no_op"); attr.version = 1; @@ -97,7 +97,7 @@ TEST(GrpcCompletionQueueTest, TestPollsetConversion) { grpc_cq_polling_type polling_types[] = {GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING}; grpc_completion_queue* cq; - grpc_completion_queue_attributes attr; + grpc_completion_queue_attributes attr = {}; LOG_TEST("test_pollset_conversion"); @@ -118,7 +118,7 @@ TEST(GrpcCompletionQueueTest, TestWaitEmpty) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue* cc; - grpc_completion_queue_attributes attr; + grpc_completion_queue_attributes attr = {}; grpc_event event; LOG_TEST("test_wait_empty"); @@ -145,7 +145,7 @@ TEST(GrpcCompletionQueueTest, TestCqEndOp) { grpc_cq_completion completion; grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; - grpc_completion_queue_attributes attr; + grpc_completion_queue_attributes attr = {}; void* tag = create_test_tag(); LOG_TEST("test_cq_end_op"); @@ -178,7 +178,7 @@ TEST(GrpcCompletionQueueTest, TestCqTlsCacheFull) { grpc_cq_completion completion; grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; - grpc_completion_queue_attributes attr; + grpc_completion_queue_attributes attr = {}; void* tag = create_test_tag(); void* res_tag; int ok; @@ -219,7 +219,7 @@ TEST(GrpcCompletionQueueTest, TestCqTlsCacheEmpty) { grpc_completion_queue* cc; grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; - grpc_completion_queue_attributes attr; + grpc_completion_queue_attributes attr = {}; void* res_tag; int ok; @@ -246,7 +246,7 @@ TEST(GrpcCompletionQueueTest, TestShutdownThenNextPolling) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue* cc; - grpc_completion_queue_attributes attr; + grpc_completion_queue_attributes attr = {}; grpc_event event; LOG_TEST("test_shutdown_then_next_polling"); @@ -268,7 +268,7 @@ TEST(GrpcCompletionQueueTest, TestShutdownThenNextWithTimeout) { grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_completion_queue* cc; - grpc_completion_queue_attributes attr; + grpc_completion_queue_attributes attr = {}; grpc_event event; LOG_TEST("test_shutdown_then_next_with_timeout"); @@ -294,7 +294,7 @@ TEST(GrpcCompletionQueueTest, TestPluck) { grpc_cq_completion completions[GPR_ARRAY_SIZE(tags)]; grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; - grpc_completion_queue_attributes attr; + grpc_completion_queue_attributes attr = {}; unsigned i, j; LOG_TEST("test_pluck"); @@ -348,7 +348,7 @@ TEST(GrpcCompletionQueueTest, TestPluckAfterShutdown) { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; grpc_event ev; grpc_completion_queue* cc; - grpc_completion_queue_attributes attr; + grpc_completion_queue_attributes attr = {}; LOG_TEST("test_pluck_after_shutdown"); @@ -372,7 +372,7 @@ TEST(GrpcCompletionQueueTest, TestCallback) { grpc_cq_completion completions[GPR_ARRAY_SIZE(tags)]; grpc_cq_polling_type polling_types[] = { GRPC_CQ_DEFAULT_POLLING, GRPC_CQ_NON_LISTENING, GRPC_CQ_NON_POLLING}; - grpc_completion_queue_attributes attr; + grpc_completion_queue_attributes attr = {}; unsigned i; static gpr_mu mu, shutdown_mu; static gpr_cv cv, shutdown_cv; 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 7a123f32caa3b..ea9e61dd534a4 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 e9058e509a5a7..3adfb0903d510 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 3d57b32d2abdd..51b9883101880 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 14899457033ea..8f6a2f10960da 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 655dfe0002cad..5feeb79cb23bd 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/common/time_jump_test.cc b/test/cpp/common/time_jump_test.cc index 8e7f4f7649c1c..ef7adb4ad027d 100644 --- a/test/cpp/common/time_jump_test.cc +++ b/test/cpp/common/time_jump_test.cc @@ -26,10 +26,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/time/time.h" #include -#include #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/sync.h" @@ -106,7 +106,7 @@ TEST_P(TimeJumpTest, TimerRunning) { gpr_sleep_until(grpc_timeout_milliseconds_to_deadline(kWaitTimeMs)); // We expect 1 wakeup/sec when there are not timer expiries int64_t wakeups = grpc_timer_manager_get_wakeups_testonly(); - gpr_log(GPR_DEBUG, "wakeups: %" PRId64 "", wakeups); + VLOG(2) << "wakeups: " << wakeups; CHECK_LE(wakeups, 3); grpc_timer_cancel(&timer); } @@ -126,8 +126,8 @@ TEST_P(TimeJumpTest, TimedWait) { bool timedout = cond.WaitWithTimeout(&mu, absl::Milliseconds(kWaitTimeMs)); gpr_timespec after = gpr_now(GPR_CLOCK_MONOTONIC); int32_t elapsed_ms = gpr_time_to_millis(gpr_time_sub(after, before)); - gpr_log(GPR_DEBUG, "After wait, timedout = %d elapsed_ms = %d", timedout, - elapsed_ms); + VLOG(2) << "After wait, timedout = " << timedout + << " elapsed_ms = " << elapsed_ms; CHECK_EQ(timedout, 1); CHECK(1 == gpr_time_similar(gpr_time_sub(after, before), gpr_time_from_millis(kWaitTimeMs, GPR_TIMESPAN), @@ -137,7 +137,7 @@ TEST_P(TimeJumpTest, TimedWait) { } // We expect 1 wakeup/sec when there are not timer expiries int64_t wakeups = grpc_timer_manager_get_wakeups_testonly(); - gpr_log(GPR_DEBUG, "wakeups: %" PRId64 "", wakeups); + VLOG(2) << "wakeups: " << wakeups; CHECK_LE(wakeups, 3); } diff --git a/test/cpp/common/timer_test.cc b/test/cpp/common/timer_test.cc index edf5b64055e83..3cc129cefb231 100644 --- a/test/cpp/common/timer_test.cc +++ b/test/cpp/common/timer_test.cc @@ -21,9 +21,9 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include -#include #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/time.h" @@ -105,7 +105,7 @@ TEST_F(TimerTest, OneTimerExpires) { // Actual number of wakeups is more due to bug // https://github.com/grpc/grpc/issues/19947 int64_t wakeups = grpc_timer_manager_get_wakeups_testonly(); - gpr_log(GPR_DEBUG, "wakeups: %" PRId64 "", wakeups); + VLOG(2) << "wakeups: " << wakeups; } TEST_F(TimerTest, MultipleTimersExpire) { @@ -135,7 +135,7 @@ TEST_F(TimerTest, MultipleTimersExpire) { // wakeups. Actual number of wakeups is more due to bug // https://github.com/grpc/grpc/issues/19947 int64_t wakeups = grpc_timer_manager_get_wakeups_testonly(); - gpr_log(GPR_DEBUG, "wakeups: %" PRId64 "", wakeups); + VLOG(2) << "wakeups: " << wakeups; } TEST_F(TimerTest, CancelSomeTimers) { @@ -177,7 +177,7 @@ TEST_F(TimerTest, CancelSomeTimers) { // Actual number of wakeups is more due to bug // https://github.com/grpc/grpc/issues/19947 int64_t wakeups = grpc_timer_manager_get_wakeups_testonly(); - gpr_log(GPR_DEBUG, "wakeups: %" PRId64 "", wakeups); + VLOG(2) << "wakeups: " << wakeups; } // Enable the following test after diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index e2ae51aefb8c3..b4f7657ecfc0e 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -21,13 +21,13 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include #include -#include #include #include #include @@ -276,7 +276,7 @@ std::ostream& operator<<(std::ostream& out, const TestScenario& scenario) { void TestScenario::Log() const { std::ostringstream out; out << *this; - gpr_log(GPR_DEBUG, "%s", out.str().c_str()); + VLOG(2) << out.str(); } class HealthCheck : public health::v1::Health::Service {}; diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc index b811bfde48ffc..88ce497a59084 100644 --- a/test/cpp/end2end/client_callback_end2end_test.cc +++ b/test/cpp/end2end/client_callback_end2end_test.cc @@ -26,6 +26,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/memory/memory.h" #include @@ -81,7 +82,7 @@ std::ostream& operator<<(std::ostream& out, const TestScenario& scenario) { void TestScenario::Log() const { std::ostringstream out; out << *this; - gpr_log(GPR_DEBUG, "%s", out.str().c_str()); + VLOG(2) << out.str(); } class ClientCallbackEnd2endTest @@ -669,7 +670,7 @@ class WriteClient : public grpc::ClientWriteReactor { } } void OnDone(const Status& s) override { - gpr_log(GPR_INFO, "Sent %d messages", num_msgs_sent_); + LOG(INFO) << "Sent " << num_msgs_sent_ << " messages"; int num_to_send = (client_cancel_.cancel) ? std::min(num_msgs_to_send_, client_cancel_.ops_before_cancel) @@ -958,7 +959,7 @@ class ReadClient : public grpc::ClientReadReactor { } } void OnDone(const Status& s) override { - gpr_log(GPR_INFO, "Read %d messages", reads_complete_); + LOG(INFO) << "Read " << reads_complete_ << " messages"; switch (server_try_cancel_) { case DO_NOT_CANCEL: if (!client_cancel_.cancel || client_cancel_.ops_before_cancel > @@ -1119,8 +1120,8 @@ class BidiClient : public grpc::ClientBidiReactor { MaybeWrite(); } void OnDone(const Status& s) override { - gpr_log(GPR_INFO, "Sent %d messages", writes_complete_); - gpr_log(GPR_INFO, "Read %d messages", reads_complete_); + LOG(INFO) << "Sent " << writes_complete_ << " messages"; + LOG(INFO) << "Read " << reads_complete_ << " messages"; switch (server_try_cancel_) { case DO_NOT_CANCEL: if (!client_cancel_.cancel || diff --git a/test/cpp/end2end/client_crash_test_server.cc b/test/cpp/end2end/client_crash_test_server.cc index 1d518a43ff4c1..441e8e3dbcb1a 100644 --- a/test/cpp/end2end/client_crash_test_server.cc +++ b/test/cpp/end2end/client_crash_test_server.cc @@ -21,8 +21,8 @@ #include #include "absl/flags/flag.h" +#include "absl/log/log.h" -#include #include #include #include @@ -46,7 +46,7 @@ class ServiceImpl final : public grpc::testing::EchoTestService::Service { EchoRequest request; EchoResponse response; while (stream->Read(&request)) { - gpr_log(GPR_INFO, "recv msg %s", request.message().c_str()); + LOG(INFO) << "recv msg " << request.message(); response.set_message(request.message()); stream->Write(response); } diff --git a/test/cpp/end2end/context_allocator_end2end_test.cc b/test/cpp/end2end/context_allocator_end2end_test.cc index 78f984b633989..6b9b7a355e7f9 100644 --- a/test/cpp/end2end/context_allocator_end2end_test.cc +++ b/test/cpp/end2end/context_allocator_end2end_test.cc @@ -28,8 +28,8 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" -#include #include #include #include @@ -70,7 +70,7 @@ std::ostream& operator<<(std::ostream& out, const TestScenario& scenario) { void TestScenario::Log() const { std::ostringstream out; out << *this; - gpr_log(GPR_INFO, "%s", out.str().c_str()); + LOG(INFO) << out.str(); } class ContextAllocatorEnd2endTestBase diff --git a/test/cpp/end2end/crl_provider_test.cc b/test/cpp/end2end/crl_provider_test.cc index b88d696d03235..c8e332b0a12b0 100644 --- a/test/cpp/end2end/crl_provider_test.cc +++ b/test/cpp/end2end/crl_provider_test.cc @@ -22,6 +22,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -29,7 +30,6 @@ #include #include -#include #include #include #include @@ -147,8 +147,8 @@ void DoRpc(const std::string& server_addr, if (expect_success) { EXPECT_TRUE(result.ok()); if (!result.ok()) { - gpr_log(GPR_ERROR, "%s, %s", result.error_message().c_str(), - result.error_details().c_str()); + LOG(ERROR) << result.error_message().c_str() << ", " + << result.error_details().c_str(); } EXPECT_EQ(response.message(), kMessage); } else { diff --git a/test/cpp/end2end/hybrid_end2end_test.cc b/test/cpp/end2end/hybrid_end2end_test.cc index bb8b07da8ef21..20b920f627600 100644 --- a/test/cpp/end2end/hybrid_end2end_test.cc +++ b/test/cpp/end2end/hybrid_end2end_test.cc @@ -22,6 +22,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include #include @@ -213,7 +214,7 @@ void HandleGenericCall(AsyncGenericService* service, "/grpc.testing.EchoTestService/RequestStream") { HandleGenericRequestStream(&stream, cq); } else { // other methods not handled yet. - gpr_log(GPR_ERROR, "method: %s", srv_ctx.method().c_str()); + LOG(ERROR) << "method: " << srv_ctx.method(); CHECK(0); } } @@ -572,7 +573,7 @@ class StreamedUnaryDupPkg EchoResponse resp; uint32_t next_msg_sz; stream->NextMessageSize(&next_msg_sz); - gpr_log(GPR_INFO, "Streamed Unary Next Message Size is %u", next_msg_sz); + LOG(INFO) << "Streamed Unary Next Message Size is " << next_msg_sz; CHECK(stream->Read(&req)); resp.set_message(req.message() + "_dup"); CHECK(stream->Write(resp)); @@ -610,7 +611,7 @@ class FullyStreamedUnaryDupPkg EchoResponse resp; uint32_t next_msg_sz; stream->NextMessageSize(&next_msg_sz); - gpr_log(GPR_INFO, "Streamed Unary Next Message Size is %u", next_msg_sz); + LOG(INFO) << "Streamed Unary Next Message Size is " << next_msg_sz; CHECK(stream->Read(&req)); resp.set_message(req.message() + "_dup"); CHECK(stream->Write(resp)); @@ -649,7 +650,7 @@ class SplitResponseStreamDupPkg EchoResponse resp; uint32_t next_msg_sz; stream->NextMessageSize(&next_msg_sz); - gpr_log(GPR_INFO, "Split Streamed Next Message Size is %u", next_msg_sz); + LOG(INFO) << "Split Streamed Next Message Size is " << next_msg_sz; CHECK(stream->Read(&req)); for (int i = 0; i < kServerDefaultResponseStreamsToSend; i++) { resp.set_message(req.message() + std::to_string(i) + "_dup"); @@ -689,7 +690,7 @@ class FullySplitStreamedDupPkg EchoResponse resp; uint32_t next_msg_sz; stream->NextMessageSize(&next_msg_sz); - gpr_log(GPR_INFO, "Split Streamed Next Message Size is %u", next_msg_sz); + LOG(INFO) << "Split Streamed Next Message Size is " << next_msg_sz; CHECK(stream->Read(&req)); for (int i = 0; i < kServerDefaultResponseStreamsToSend; i++) { resp.set_message(req.message() + std::to_string(i) + "_dup"); @@ -728,7 +729,7 @@ class FullyStreamedDupPkg : public duplicate::EchoTestService::StreamedService { EchoResponse resp; uint32_t next_msg_sz; stream->NextMessageSize(&next_msg_sz); - gpr_log(GPR_INFO, "Streamed Unary Next Message Size is %u", next_msg_sz); + LOG(INFO) << "Streamed Unary Next Message Size is " << next_msg_sz; CHECK(stream->Read(&req)); resp.set_message(req.message() + "_dup"); CHECK(stream->Write(resp)); @@ -741,7 +742,7 @@ class FullyStreamedDupPkg : public duplicate::EchoTestService::StreamedService { EchoResponse resp; uint32_t next_msg_sz; stream->NextMessageSize(&next_msg_sz); - gpr_log(GPR_INFO, "Split Streamed Next Message Size is %u", next_msg_sz); + LOG(INFO) << "Split Streamed Next Message Size is " << next_msg_sz; CHECK(stream->Read(&req)); for (int i = 0; i < kServerDefaultResponseStreamsToSend; i++) { resp.set_message(req.message() + std::to_string(i) + "_dup"); @@ -812,8 +813,8 @@ TEST_P(HybridEnd2endTest, CallbackGenericEcho) { ServerGenericBidiReactor* CreateReactor( GenericCallbackServerContext* context) override { EXPECT_EQ(context->method(), "/grpc.testing.EchoTestService/Echo"); - gpr_log(GPR_DEBUG, "Constructor of generic service %d", - static_cast(context->deadline().time_since_epoch().count())); + VLOG(2) << "Constructor of generic service " + << context->deadline().time_since_epoch().count(); class Reactor : public ServerGenericBidiReactor { public: diff --git a/test/cpp/end2end/message_allocator_end2end_test.cc b/test/cpp/end2end/message_allocator_end2end_test.cc index 02ec6cd3fe5ab..5546f5685f523 100644 --- a/test/cpp/end2end/message_allocator_end2end_test.cc +++ b/test/cpp/end2end/message_allocator_end2end_test.cc @@ -29,8 +29,8 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" -#include #include #include #include @@ -99,7 +99,7 @@ std::ostream& operator<<(std::ostream& out, const TestScenario& scenario) { void TestScenario::Log() const { std::ostringstream out; out << *this; - gpr_log(GPR_INFO, "%s", out.str().c_str()); + LOG(INFO) << out.str(); } class MessageAllocatorEnd2endTestBase diff --git a/test/cpp/end2end/mock_test.cc b/test/cpp/end2end/mock_test.cc index 512fe8dcbf1e2..f561ec70a203c 100644 --- a/test/cpp/end2end/mock_test.cc +++ b/test/cpp/end2end/mock_test.cc @@ -22,10 +22,10 @@ #include #include +#include "absl/log/log.h" #include "absl/types/optional.h" #include -#include #include #include #include @@ -253,7 +253,7 @@ class TestServiceImpl : public EchoTestService::Service { EchoRequest request; std::string resp; while (reader->Read(&request)) { - gpr_log(GPR_INFO, "recv msg %s", request.message().c_str()); + LOG(INFO) << "recv msg " << request.message(); resp.append(request.message()); } response->set_message(resp); @@ -277,7 +277,7 @@ class TestServiceImpl : public EchoTestService::Service { EchoRequest request; EchoResponse response; while (stream->Read(&request)) { - gpr_log(GPR_INFO, "recv msg %s", request.message().c_str()); + LOG(INFO) << "recv msg " << request.message(); response.set_message(request.message()); stream->Write(response); } diff --git a/test/cpp/end2end/port_sharing_end2end_test.cc b/test/cpp/end2end/port_sharing_end2end_test.cc index cf6f6f9fdefa0..05c03c79a938f 100644 --- a/test/cpp/end2end/port_sharing_end2end_test.cc +++ b/test/cpp/end2end/port_sharing_end2end_test.cc @@ -22,10 +22,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include #include -#include #include #include #include @@ -85,7 +85,7 @@ std::ostream& operator<<(std::ostream& out, const TestScenario& scenario) { void TestScenario::Log() const { std::ostringstream out; out << *this; - gpr_log(GPR_ERROR, "%s", out.str().c_str()); + LOG(ERROR) << out.str(); } // Set up a test tcp server which is in charge of accepting connections and @@ -115,7 +115,7 @@ class TestTcpServer { void Start() { test_tcp_server_start(&tcp_server_, port_); - gpr_log(GPR_INFO, "Test TCP server started at %s", address_.c_str()); + LOG(INFO) << "Test TCP server started at " << address_; } const std::string& address() { return address_; } @@ -160,7 +160,7 @@ class TestTcpServer { void OnConnect(grpc_endpoint* tcp, grpc_pollset* /*accepting_pollset*/, grpc_tcp_server_acceptor* acceptor) { std::string peer(grpc_endpoint_get_peer(tcp)); - gpr_log(GPR_INFO, "Got incoming connection! from %s", peer.c_str()); + LOG(INFO) << "Got incoming connection! from " << peer; EXPECT_FALSE(acceptor->external_connection); listener_fd_ = grpc_tcp_server_port_fd( acceptor->from_server, acceptor->port_index, acceptor->fd_index); @@ -182,8 +182,9 @@ class TestTcpServer { Slice data(buf, read_bytes); p.read_buffer = ByteBuffer(&data, 1); } - gpr_log(GPR_INFO, "Handing off fd %d with data size %d from listener fd %d", - fd_, static_cast(p.read_buffer.Length()), listener_fd_); + LOG(INFO) << "Handing off fd " << fd_ << " with data size " + << static_cast(p.read_buffer.Length()) + << " from listener fd " << listener_fd_; connection_acceptor_->HandleNewConnection(&p); } @@ -224,8 +225,7 @@ class PortSharingEnd2endTest : public ::testing::TestWithParam { auto creds = GetCredentialsProvider()->GetServerCredentials( GetParam().credentials_type); builder.AddListeningPort(server_address_.str(), creds); - gpr_log(GPR_INFO, "gRPC server listening on %s", - server_address_.str().c_str()); + LOG(INFO) << "gRPC server listening on " << server_address_.str(); } auto server_creds = GetCredentialsProvider()->GetServerCredentials( GetParam().credentials_type); diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc index ca6616fe6b7a2..618b9213c0108 100644 --- a/test/cpp/end2end/rls_end2end_test.cc +++ b/test/cpp/end2end/rls_end2end_test.cc @@ -29,6 +29,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/types/optional.h" @@ -417,7 +418,7 @@ class RlsEnd2endTest : public ::testing::Test { service_(std::forward(args)...) {} void Start() { - gpr_log(GPR_INFO, "starting %s server on port %d", type_.c_str(), port_); + LOG(INFO) << "starting " << type_ << " server on port " << port_; CHECK(!running_); running_ = true; service_.Start(); @@ -429,7 +430,7 @@ class RlsEnd2endTest : public ::testing::Test { thread_ = std::make_unique( std::bind(&ServerThread::Serve, this, &mu, &cond)); cond.Wait(&mu); - gpr_log(GPR_INFO, "%s server startup complete", type_.c_str()); + LOG(INFO) << type_ << " server startup complete"; } void Serve(grpc::internal::Mutex* mu, grpc::internal::CondVar* cond) { @@ -448,11 +449,11 @@ class RlsEnd2endTest : public ::testing::Test { void Shutdown() { if (!running_) return; - gpr_log(GPR_INFO, "%s about to shutdown", type_.c_str()); + LOG(INFO) << type_ << " about to shutdown"; service_.Shutdown(); server_->Shutdown(grpc_timeout_milliseconds_to_deadline(0)); thread_->join(); - gpr_log(GPR_INFO, "%s shutdown completed", type_.c_str()); + LOG(INFO) << type_ << " shutdown completed"; running_ = false; } diff --git a/test/cpp/end2end/server_crash_test.cc b/test/cpp/end2end/server_crash_test.cc index a2cbe5b836a31..6973f054dcbe2 100644 --- a/test/cpp/end2end/server_crash_test.cc +++ b/test/cpp/end2end/server_crash_test.cc @@ -19,10 +19,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/memory/memory.h" #include -#include #include #include #include @@ -59,7 +59,7 @@ class ServiceImpl final : public grpc::testing::EchoTestService::Service { EchoRequest request; EchoResponse response; while (stream->Read(&request)) { - gpr_log(GPR_INFO, "recv msg %s", request.message().c_str()); + LOG(INFO) << "recv msg " << request.message(); response.set_message(request.message()); stream->Write(response); gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), diff --git a/test/cpp/end2end/server_crash_test_client.cc b/test/cpp/end2end/server_crash_test_client.cc index 29f4f1bddb024..4d2e266f025c5 100644 --- a/test/cpp/end2end/server_crash_test_client.cc +++ b/test/cpp/end2end/server_crash_test_client.cc @@ -23,8 +23,8 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" +#include "absl/log/log.h" -#include #include #include #include @@ -67,8 +67,7 @@ int main(int argc, char** argv) { CHECK(stream->Read(&response)); } } else { - gpr_log(GPR_ERROR, "invalid test mode '%s'", - absl::GetFlag(FLAGS_mode).c_str()); + LOG(ERROR) << "invalid test mode '" << absl::GetFlag(FLAGS_mode) << "'"; return 1; } } diff --git a/test/cpp/end2end/shutdown_test.cc b/test/cpp/end2end/shutdown_test.cc index 56cc55e72dab9..baae51856b536 100644 --- a/test/cpp/end2end/shutdown_test.cc +++ b/test/cpp/end2end/shutdown_test.cc @@ -21,9 +21,9 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include -#include #include #include #include @@ -132,7 +132,7 @@ std::vector GetAllCredentialsTypeList() { for (const string& type : credentials_types) { credentials_type_list.append(" " + type); } - gpr_log(GPR_INFO, "%s", credentials_type_list.c_str()); + LOG(INFO) << credentials_type_list; return credentials_types; } diff --git a/test/cpp/end2end/ssl_credentials_test.cc b/test/cpp/end2end/ssl_credentials_test.cc index de505e4b67e7e..325dc79068da7 100644 --- a/test/cpp/end2end/ssl_credentials_test.cc +++ b/test/cpp/end2end/ssl_credentials_test.cc @@ -20,6 +20,7 @@ #include #include +#include "absl/log/log.h" #include "absl/synchronization/notification.h" #include @@ -103,8 +104,7 @@ void DoRpc(const std::string& server_addr, grpc::Status result = stub->Echo(&context, request, &response); EXPECT_TRUE(result.ok()); if (!result.ok()) { - gpr_log(GPR_ERROR, "%s, %s", result.error_message().c_str(), - result.error_details().c_str()); + LOG(ERROR) << result.error_message() << ", " << result.error_details(); } EXPECT_EQ(response.message(), kMessage); std::shared_ptr auth_context = context.auth_context(); diff --git a/test/cpp/end2end/streaming_throughput_test.cc b/test/cpp/end2end/streaming_throughput_test.cc index 33fd20ae0a379..a7a3511d15792 100644 --- a/test/cpp/end2end/streaming_throughput_test.cc +++ b/test/cpp/end2end/streaming_throughput_test.cc @@ -23,9 +23,10 @@ #include +#include "absl/log/log.h" + #include #include -#include #include #include #include @@ -177,7 +178,7 @@ TEST_F(End2endTest, StreamingThroughput) { request.set_message(kLargeString); ASSERT_TRUE(stream->Write(request)); if (i % 1000 == 0) { - gpr_log(GPR_INFO, "Send count = %d", i); + LOG(INFO) << "Send count = " << i; } } stream->WritesDone(); diff --git a/test/cpp/end2end/thread_stress_test.cc b/test/cpp/end2end/thread_stress_test.cc index 0c4b51610f4d1..45460855a10a0 100644 --- a/test/cpp/end2end/thread_stress_test.cc +++ b/test/cpp/end2end/thread_stress_test.cc @@ -22,6 +22,8 @@ #include +#include "absl/log/log.h" + #include #include #include @@ -285,8 +287,8 @@ static void SendRpc(grpc::testing::EchoTestService::Stub* stub, int num_rpcs, if (!s.ok()) { if (!(allow_exhaustion && s.error_code() == StatusCode::RESOURCE_EXHAUSTED)) { - gpr_log(GPR_ERROR, "RPC error: %d: %s", s.error_code(), - s.error_message().c_str()); + LOG(ERROR) << "RPC error: " << s.error_code() << ": " + << s.error_message(); } gpr_atm_no_barrier_fetch_add(errors, gpr_atm{1}); } else { @@ -316,7 +318,7 @@ TYPED_TEST(End2endTest, ThreadStress) { } uint64_t error_cnt = static_cast(gpr_atm_no_barrier_load(&errors)); if (error_cnt != 0) { - gpr_log(GPR_INFO, "RPC error count: %" PRIu64, error_cnt); + LOG(INFO) << "RPC error count: " << error_cnt; } // If this test allows resource exhaustion, expect that it actually sees some if (this->common_.AllowExhaustion()) { @@ -375,7 +377,7 @@ class AsyncClientEnd2endTest : public ::testing::Test { if (!cq_.Next(&got_tag, &ok)) break; AsyncClientCall* call = static_cast(got_tag); if (!ok) { - gpr_log(GPR_DEBUG, "Error: %d", call->status.error_code()); + VLOG(2) << "Error: " << call->status.error_code(); } delete call; diff --git a/test/cpp/end2end/tls_credentials_test.cc b/test/cpp/end2end/tls_credentials_test.cc index 75a3981b8b1d5..9e9c69b257cd3 100644 --- a/test/cpp/end2end/tls_credentials_test.cc +++ b/test/cpp/end2end/tls_credentials_test.cc @@ -20,6 +20,7 @@ #include #include +#include "absl/log/log.h" #include "absl/synchronization/notification.h" #include @@ -114,9 +115,8 @@ void DoRpc(const std::string& server_addr, grpc::Status result = stub->Echo(&context, request, &response); EXPECT_TRUE(result.ok()); if (!result.ok()) { - gpr_log(GPR_ERROR, "Echo failed: %d, %s, %s", - static_cast(result.error_code()), - result.error_message().c_str(), result.error_details().c_str()); + LOG(ERROR) << "Echo failed: " << result.error_code() << ", " + << result.error_message() << ", " << result.error_details(); } EXPECT_EQ(response.message(), kMessage); } diff --git a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc index a162086b69ef8..f2160f6c0708e 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" @@ -913,8 +913,7 @@ TEST_P(EdsTest, LocalityMapUpdateChurn) { } const double kErrorTolerance = 0.2; for (size_t i = 0; i < 3; ++i) { - gpr_log(GPR_INFO, "Locality %" PRIuPTR " rate %f", i, - locality_picked_rates[i]); + LOG(INFO) << "Locality " << i << " rate " << locality_picked_rates[i]; EXPECT_THAT( locality_picked_rates[i], ::testing::AllOf( @@ -947,8 +946,7 @@ TEST_P(EdsTest, LocalityMapUpdateChurn) { kNumRpcs); } for (size_t i = 1; i < 4; ++i) { - gpr_log(GPR_INFO, "Locality %" PRIuPTR " rate %f", i, - locality_picked_rates[i]); + LOG(INFO) << "Locality " << i << " rate " << locality_picked_rates[i]; EXPECT_THAT( locality_picked_rates[i], ::testing::AllOf( @@ -1099,7 +1097,7 @@ TEST_P(EdsTest, DropConfigUpdate) { LOG(INFO) << "========= DONE WITH FIRST BATCH =========="; // The drop rate should be roughly equal to the expectation. double seen_drop_rate = static_cast(num_drops) / kNumRpcsLbOnly; - gpr_log(GPR_INFO, "First batch drop rate %f", seen_drop_rate); + LOG(INFO) << "First batch drop rate " << seen_drop_rate; EXPECT_THAT(seen_drop_rate, ::testing::DoubleNear(kDropRateForLb, kErrorTolerance)); // The second ADS response contains two drop categories, send an update EDS @@ -1136,7 +1134,7 @@ TEST_P(EdsTest, DropConfigUpdate) { LOG(INFO) << "========= DONE WITH SECOND BATCH =========="; // The new drop rate should be roughly equal to the expectation. seen_drop_rate = static_cast(num_drops) / kNumRpcsBoth; - gpr_log(GPR_INFO, "Second batch drop rate %f", seen_drop_rate); + LOG(INFO) << "Second batch drop rate " << seen_drop_rate; EXPECT_THAT(seen_drop_rate, ::testing::DoubleNear(kDropRateForLbAndThrottle, kErrorTolerance)); } diff --git a/test/cpp/end2end/xds/xds_core_end2end_test.cc b/test/cpp/end2end/xds/xds_core_end2end_test.cc index ebc97f4a8e845..abc1d20cf0648 100644 --- a/test/cpp/end2end/xds/xds_core_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_core_end2end_test.cc @@ -22,6 +22,7 @@ #include #include +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "src/core/client_channel/backup_poller.h" @@ -150,9 +151,9 @@ TEST_P(XdsClientTest, XdsStreamErrorPropagation) { balancer_->ads_service()->ForceADSFailure( Status(StatusCode::RESOURCE_EXHAUSTED, kErrorMessage)); auto status = SendRpc(); - gpr_log(GPR_INFO, - "XdsStreamErrorPropagation test: RPC got error: code=%d message=%s", - status.error_code(), status.error_message().c_str()); + LOG(INFO) << "XdsStreamErrorPropagation test: RPC got error: code=" + << status.error_code() + << " message=" << status.error_message().c_str(); EXPECT_THAT(status.error_code(), StatusCode::UNAVAILABLE); EXPECT_THAT(status.error_message(), ::testing::HasSubstr(kErrorMessage)); EXPECT_THAT(status.error_message(), @@ -288,8 +289,8 @@ TEST_P(GlobalXdsClientTest, MultipleBadLdsResources) { response->error_message == expected_message2) { return response; } - gpr_log(GPR_INFO, "non-matching NACK message: %s", - response->error_message.c_str()); + LOG(INFO) << "non-matching NACK message: " + << response->error_message.c_str(); } return absl::nullopt; }); diff --git a/test/cpp/end2end/xds/xds_csds_end2end_test.cc b/test/cpp/end2end/xds/xds_csds_end2end_test.cc index 897fd29814873..cf498e060f892 100644 --- a/test/cpp/end2end/xds/xds_csds_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_csds_end2end_test.cc @@ -20,6 +20,7 @@ #include #include +#include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/strip.h" @@ -343,7 +344,7 @@ TEST_P(ClientStatusDiscoveryServiceTest, XdsConfigDumpVanilla) { CheckRpcSendOk(DEBUG_LOCATION, kNumRpcs); // Fetches the client config auto csds_response = FetchCsdsResponse(); - gpr_log(GPR_INFO, "xDS config dump: %s", csds_response.DebugString().c_str()); + LOG(INFO) << "xDS config dump: " << csds_response.DebugString(); ASSERT_EQ(1, csds_response.config_size()); const auto& client_config = csds_response.config(0); // Validate the Node information diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc index 9a8c8a9c52dc2..10f6e5febf12b 100644 --- a/test/cpp/end2end/xds/xds_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_end2end_test.cc @@ -1077,15 +1077,16 @@ class XdsServerSecurityTest : public XdsEnd2endTest { } if (expected_status.has_value() && *expected_status != status.error_code()) { - gpr_log(GPR_ERROR, - "Expected status does not match Actual(%d) vs Expected(%d)", - status.error_code(), *expected_status); + LOG(ERROR) << "Expected status does not match Actual(" + << status.error_code() << ") vs Expected(" + << *expected_status << ")"; continue; } } else { if (!status.ok()) { - gpr_log(GPR_ERROR, "RPC failed. code=%d message=%s Trying again.", - status.error_code(), status.error_message().c_str()); + LOG(ERROR) << "RPC failed. code=" << status.error_code() + << " message=" << status.error_message() + << " Trying again."; continue; } EXPECT_EQ(response.message(), kRequestMessage); @@ -1095,23 +1096,21 @@ class XdsServerSecurityTest : public XdsEnd2endTest { std::string(entry.data(), entry.size()).c_str()); } if (peer_identity != expected_server_identity) { - gpr_log(GPR_ERROR, - "Expected server identity does not match. (actual) %s vs " - "(expected) %s Trying again.", - absl::StrJoin(peer_identity, ",").c_str(), - absl::StrJoin(expected_server_identity, ",").c_str()); + LOG(ERROR) << "Expected server identity does not match. (actual) " + << absl::StrJoin(peer_identity, ",") << " vs (expected) " + << absl::StrJoin(expected_server_identity, ",") + << " Trying again."; continue; } if (backends_[0]->backend_service()->last_peer_identity() != expected_client_identity) { - gpr_log( - GPR_ERROR, - "Expected client identity does not match. (actual) %s vs " - "(expected) %s Trying again.", - absl::StrJoin( - backends_[0]->backend_service()->last_peer_identity(), ",") - .c_str(), - absl::StrJoin(expected_client_identity, ",").c_str()); + LOG(ERROR) + << "Expected client identity does not match. (actual) " + << absl::StrJoin( + backends_[0]->backend_service()->last_peer_identity(), ",") + << " vs (expected) " + << absl::StrJoin(expected_client_identity, ",") + << " Trying again."; continue; } } diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.cc b/test/cpp/end2end/xds/xds_end2end_test_lib.cc index efccd9e0fb6d6..08d305c2a8ad2 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.cc +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.cc @@ -27,6 +27,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -135,7 +136,7 @@ class XdsEnd2endTest::ServerThread::XdsChannelArgsServerBuilderOption // void XdsEnd2endTest::ServerThread::Start() { - gpr_log(GPR_INFO, "starting %s server on port %d", Type(), port_); + LOG(INFO) << "starting " << Type() << " server on port " << port_; CHECK(!running_); running_ = true; StartAllServices(); @@ -147,38 +148,38 @@ void XdsEnd2endTest::ServerThread::Start() { thread_ = std::make_unique( std::bind(&ServerThread::Serve, this, &mu, &cond)); cond.Wait(&mu); - gpr_log(GPR_INFO, "%s server startup complete", Type()); + LOG(INFO) << Type() << " server startup complete"; } void XdsEnd2endTest::ServerThread::Shutdown() { if (!running_) return; - gpr_log(GPR_INFO, "%s about to shutdown", Type()); + LOG(INFO) << Type() << " about to shutdown"; ShutdownAllServices(); server_->Shutdown(grpc_timeout_milliseconds_to_deadline(0)); thread_->join(); - gpr_log(GPR_INFO, "%s shutdown completed", Type()); + LOG(INFO) << Type() << " shutdown completed"; running_ = false; } void XdsEnd2endTest::ServerThread::StopListeningAndSendGoaways() { - gpr_log(GPR_INFO, "%s sending GOAWAYs", Type()); + LOG(INFO) << Type() << " sending GOAWAYs"; { grpc_core::ExecCtx exec_ctx; auto* server = grpc_core::Server::FromC(server_->c_server()); server->StopListening(); server->SendGoaways(); } - gpr_log(GPR_INFO, "%s done sending GOAWAYs", Type()); + LOG(INFO) << Type() << " done sending GOAWAYs"; } void XdsEnd2endTest::ServerThread::StopListening() { - gpr_log(GPR_INFO, "%s about to stop listening", Type()); + LOG(INFO) << Type() << " about to stop listening"; { grpc_core::ExecCtx exec_ctx; auto* server = grpc_core::Server::FromC(server_->c_server()); server->StopListening(); } - gpr_log(GPR_INFO, "%s stopped listening", Type()); + LOG(INFO) << Type() << " stopped listening"; } void XdsEnd2endTest::ServerThread::Serve(grpc_core::Mutex* mu, @@ -758,10 +759,8 @@ size_t XdsEnd2endTest::WaitForAllBackends( << debug_location.file() << ":" << debug_location.line(); }; } - gpr_log(GPR_INFO, - "========= WAITING FOR BACKENDS [%" PRIuPTR ", %" PRIuPTR - ") ==========", - start_index, stop_index); + LOG(INFO) << "========= WAITING FOR BACKENDS [" << start_index << ", " + << stop_index << ") =========="; size_t num_rpcs = 0; SendRpcsUntil( debug_location, @@ -772,8 +771,7 @@ size_t XdsEnd2endTest::WaitForAllBackends( }, wait_options.timeout_ms, rpc_options); if (wait_options.reset_counters) ResetBackendCounters(); - gpr_log(GPR_INFO, "Backends up; sent %" PRIuPTR " warm up requests", - num_rpcs); + LOG(INFO) << "Backends up; sent " << num_rpcs << " warm up requests"; return num_rpcs; } diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.h b/test/cpp/end2end/xds/xds_end2end_test_lib.h index af68e2b1c60fb..7ac0474a9f42e 100644 --- a/test/cpp/end2end/xds/xds_end2end_test_lib.h +++ b/test/cpp/end2end/xds/xds_end2end_test_lib.h @@ -26,6 +26,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -946,10 +947,8 @@ class XdsEnd2endTest : public ::testing::TestWithParam, size_t num_rpcs = ceil(p * (1 - p) * 5.00 * 5.00 / error_tolerance / error_tolerance); num_rpcs += 1000; // Add 1K as a buffer to avoid flakiness. - gpr_log(GPR_INFO, - "Sending %" PRIuPTR - " RPCs for percentage=%.3f error_tolerance=%.3f", - num_rpcs, p, error_tolerance); + LOG(INFO) << "Sending " << num_rpcs << " RPCs for percentage=" << p + << " error_tolerance=" << error_tolerance; return num_rpcs; } diff --git a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc index 4e8bce1cdc59e..b02ab1ae2ef57 100644 --- a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc @@ -18,6 +18,7 @@ #include #include +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" @@ -89,8 +90,8 @@ class OverrideHostTest : public XdsEnd2endTest { absl::StrSplit(key_value.second, ';'); std::string decoded; EXPECT_TRUE(absl::Base64Unescape(key_value2.first, &decoded)); - gpr_log(GPR_INFO, "set-cookie header: %s (decoded: %s)", - std::string(it->second).c_str(), decoded.c_str()); + LOG(INFO) << "set-cookie header: " << it->second + << " (decoded: " << decoded << ")"; values.emplace_back(ParseCookie(it->second)); EXPECT_FALSE(values.back().value.empty()); EXPECT_THAT(values.back().attributes, ::testing::Contains("HttpOnly")); diff --git a/test/cpp/end2end/xds/xds_routing_end2end_test.cc b/test/cpp/end2end/xds/xds_routing_end2end_test.cc index e9f3fbd0ad73b..e24e78f327328 100644 --- a/test/cpp/end2end/xds/xds_routing_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_routing_end2end_test.cc @@ -20,6 +20,8 @@ #include #include +#include "absl/log/log.h" + #include "src/core/client_channel/backup_poller.h" #include "src/core/lib/config/config_vars.h" #include "src/proto/grpc/testing/xds/v3/fault.grpc.pb.h" @@ -979,8 +981,9 @@ TEST_P(LdsRdsTest, XdsRoutingWeightedCluster) { EXPECT_EQ(0, backends_[2]->backend_service()->request_count()); const int weight_25_request_count = backends_[2]->backend_service1()->request_count(); - gpr_log(GPR_INFO, "target_75 received %d rpcs and target_25 received %d rpcs", - weight_75_request_count, weight_25_request_count); + LOG(INFO) << "target_75 received " << weight_75_request_count + << " rpcs and target_25 received " << weight_25_request_count + << " rpcs"; EXPECT_THAT(static_cast(weight_75_request_count) / kNumEcho1Rpcs, ::testing::DoubleNear(kWeight75Percent, kErrorTolerance)); EXPECT_THAT(static_cast(weight_25_request_count) / kNumEcho1Rpcs, @@ -1061,8 +1064,9 @@ TEST_P(LdsRdsTest, XdsRoutingWeightedClusterNoIntegerOverflow) { EXPECT_EQ(0, backends_[2]->backend_service()->request_count()); const int weight2_request_count = backends_[2]->backend_service1()->request_count(); - gpr_log(GPR_INFO, "target1 received %d rpcs and target2 received %d rpcs", - weight1_request_count, weight2_request_count); + LOG(INFO) << "target1 received " << weight1_request_count + << " rpcs and target2 received " << weight2_request_count + << " rpcs"; EXPECT_THAT(static_cast(weight1_request_count) / kNumEcho1Rpcs, ::testing::DoubleNear(kWeight1Percent, kErrorTolerance)); EXPECT_THAT(static_cast(weight2_request_count) / kNumEcho1Rpcs, @@ -1129,8 +1133,9 @@ TEST_P(LdsRdsTest, RouteActionWeightedTargetDefaultRoute) { backends_[1]->backend_service()->request_count(); const int weight_25_request_count = backends_[2]->backend_service()->request_count(); - gpr_log(GPR_INFO, "target_75 received %d rpcs and target_25 received %d rpcs", - weight_75_request_count, weight_25_request_count); + LOG(INFO) << "target_75 received " << weight_75_request_count + << " rpcs and target_25 received " << weight_25_request_count + << " rpcs"; EXPECT_THAT(static_cast(weight_75_request_count) / kNumEchoRpcs, ::testing::DoubleNear(kWeight75Percent, kErrorTolerance)); EXPECT_THAT(static_cast(weight_25_request_count) / kNumEchoRpcs, @@ -1232,8 +1237,9 @@ TEST_P(LdsRdsTest, XdsRoutingWeightedClusterUpdateWeights) { backends_[2]->backend_service1()->request_count(); EXPECT_EQ(0, backends_[3]->backend_service()->request_count()); EXPECT_EQ(0, backends_[3]->backend_service1()->request_count()); - gpr_log(GPR_INFO, "target_75 received %d rpcs and target_25 received %d rpcs", - weight_75_request_count, weight_25_request_count); + LOG(INFO) << "target_75 received " << weight_75_request_count + << " rpcs and target_25 received " << weight_25_request_count + << " rpcs"; EXPECT_THAT(static_cast(weight_75_request_count) / kNumEcho1Rpcs7525, ::testing::DoubleNear(kWeight75Percent, kErrorTolerance)); EXPECT_THAT(static_cast(weight_25_request_count) / kNumEcho1Rpcs7525, @@ -1363,8 +1369,9 @@ TEST_P(LdsRdsTest, XdsRoutingWeightedClusterUpdateClusters) { EXPECT_EQ(0, backends_[2]->backend_service1()->request_count()); EXPECT_EQ(0, backends_[3]->backend_service()->request_count()); EXPECT_EQ(0, backends_[3]->backend_service1()->request_count()); - gpr_log(GPR_INFO, "target_75 received %d rpcs and target_25 received %d rpcs", - weight_75_request_count, weight_25_request_count); + LOG(INFO) << "target_75 received " << weight_75_request_count + << " rpcs and target_25 received " << weight_25_request_count + << " rpcs"; EXPECT_THAT(static_cast(weight_75_request_count) / kNumEcho1Rpcs7525, ::testing::DoubleNear(kWeight75Percent, kErrorTolerance)); EXPECT_THAT(static_cast(weight_25_request_count) / kNumEcho1Rpcs7525, @@ -1419,8 +1426,9 @@ TEST_P(LdsRdsTest, XdsRoutingWeightedClusterUpdateClusters) { EXPECT_EQ(0, backends_[2]->backend_service1()->request_count()); EXPECT_EQ(0, backends_[3]->backend_service()->request_count()); weight_25_request_count = backends_[3]->backend_service1()->request_count(); - gpr_log(GPR_INFO, "target_75 received %d rpcs and target_25 received %d rpcs", - weight_75_request_count, weight_25_request_count); + LOG(INFO) << "target_75 received " << weight_75_request_count + << " rpcs and target_25 received " << weight_25_request_count + << " rpcs"; EXPECT_THAT(static_cast(weight_75_request_count) / kNumEcho1Rpcs7525, ::testing::DoubleNear(kWeight75Percent, kErrorTolerance)); EXPECT_THAT(static_cast(weight_25_request_count) / kNumEcho1Rpcs7525, diff --git a/test/cpp/end2end/xds/xds_wrr_end2end_test.cc b/test/cpp/end2end/xds/xds_wrr_end2end_test.cc index 9a58443efa0be..da8cea70f5494 100644 --- a/test/cpp/end2end/xds/xds_wrr_end2end_test.cc +++ b/test/cpp/end2end/xds/xds_wrr_end2end_test.cc @@ -19,6 +19,7 @@ #include #include +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -84,10 +85,10 @@ TEST_P(WrrTest, Basic) { size_t num_picks = 0; SendRpcsUntil(DEBUG_LOCATION, [&](const RpcResult&) { if (++num_picks == 13) { - gpr_log(GPR_INFO, "request counts: %" PRIuPTR " %" PRIuPTR " %" PRIuPTR, - backends_[0]->backend_service()->request_count(), - backends_[1]->backend_service()->request_count(), - backends_[2]->backend_service()->request_count()); + LOG(INFO) << "request counts: " + << backends_[0]->backend_service()->request_count() << " " + << backends_[1]->backend_service()->request_count() << " " + << backends_[2]->backend_service()->request_count(); if (backends_[0]->backend_service()->request_count() == 6 && backends_[1]->backend_service()->request_count() == 4 && backends_[2]->backend_service()->request_count() == 3) { diff --git a/test/cpp/ext/csm/metadata_exchange_test.cc b/test/cpp/ext/csm/metadata_exchange_test.cc index 3f5d8af74b751..f83577cc7d921 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/filters/logging/library.h b/test/cpp/ext/filters/logging/library.h index bce76c1a2283f..92b7311c5a6a8 100644 --- a/test/cpp/ext/filters/logging/library.h +++ b/test/cpp/ext/filters/logging/library.h @@ -22,6 +22,7 @@ #include #include // NOLINT +#include "absl/log/log.h" #include "absl/strings/escaping.h" #include "absl/strings/str_cat.h" #include "absl/time/time.h" @@ -58,10 +59,10 @@ class TestLoggingSink : public grpc_core::LoggingSink { grpc::internal::EntryToJsonStructProto(entry, &json); std::string output; ::google::protobuf::TextFormat::PrintToString(json, &output); - gpr_log(GPR_INFO, "%s", output.c_str()); - gpr_log(GPR_INFO, "trace_id: %s", entry.trace_id.c_str()); - gpr_log(GPR_INFO, "span_id: %s", entry.span_id.c_str()); - gpr_log(GPR_INFO, "is_sampled: %d", entry.is_sampled); + LOG(INFO) << output; + LOG(INFO) << "trace_id: " << entry.trace_id; + LOG(INFO) << "span_id: " << entry.span_id; + LOG(INFO) << "is_sampled: " << entry.is_sampled; grpc_core::MutexLock lock(&mu_); entries_.push_back(std::move(entry)); cv_.SignalAll(); diff --git a/test/cpp/ext/otel/otel_plugin_test.cc b/test/cpp/ext/otel/otel_plugin_test.cc index 4cc3984791037..a71dff599af8a 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 38bac047055d4..40153f13dda19 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 bd33c30a5865c..f8573ccaa9046 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/interop/backend_metrics_lb_policy.cc b/test/cpp/interop/backend_metrics_lb_policy.cc index 216c537a9a614..55487bc221b82 100644 --- a/test/cpp/interop/backend_metrics_lb_policy.cc +++ b/test/cpp/interop/backend_metrics_lb_policy.cc @@ -19,6 +19,7 @@ #include "test/cpp/interop/backend_metrics_lb_policy.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include @@ -264,7 +265,7 @@ LoadReportTracker::LoadReportEntry LoadReportTracker::WaitForOobLoadReport( auto report = std::move(oob_load_reports_.front()); oob_load_reports_.pop_front(); if (predicate(report)) { - gpr_log(GPR_DEBUG, "Report #%" PRIuPTR " matched", i + 1); + VLOG(2) << "Report #" << (i + 1) << " matched"; return report; } } diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc index 7d5a9dad71c2b..8a708c345dac5 100644 --- a/test/cpp/interop/client.cc +++ b/test/cpp/interop/client.cc @@ -20,10 +20,10 @@ #include #include "absl/flags/flag.h" +#include "absl/log/log.h" #include #include -#include #include #include #include @@ -186,8 +186,8 @@ ParseAdditionalMetadataFlag(const std::string& flag) { } } - gpr_log(GPR_INFO, "Adding additional metadata with key %s and value %s", - key.c_str(), value.c_str()); + LOG(INFO) << "Adding additional metadata with key " << key << " and value " + << value; additional_metadata.insert({key, value}); if (semicolon_pos == std::string::npos) { @@ -205,16 +205,14 @@ ParseAdditionalMetadataFlag(const std::string& flag) { int main(int argc, char** argv) { grpc::testing::TestEnvironment env(&argc, argv); grpc::testing::InitTest(&argc, &argv, true); - gpr_log(GPR_INFO, "Testing these cases: %s", - absl::GetFlag(FLAGS_test_case).c_str()); + LOG(INFO) << "Testing these cases: " << absl::GetFlag(FLAGS_test_case); int ret = 0; std::string test_case = absl::GetFlag(FLAGS_test_case); auto additional_metadata = ParseAdditionalMetadataFlag(absl::GetFlag(FLAGS_additional_metadata)); if (!additional_metadata.ok()) { - gpr_log(GPR_ERROR, "%s", - std::string(additional_metadata.status().message()).c_str()); + LOG(ERROR) << additional_metadata.status().message(); return 1; } grpc::testing::ChannelCreationFunc channel_creation_func = @@ -351,8 +349,9 @@ int main(int argc, char** argv) { if (!test_cases.empty()) test_cases += "\n"; test_cases += action.first; } - gpr_log(GPR_ERROR, "Unsupported test case %s. Valid options are\n%s", - absl::GetFlag(FLAGS_test_case).c_str(), test_cases.c_str()); + LOG(ERROR) << "Unsupported test case " << absl::GetFlag(FLAGS_test_case) + << ". Valid options are\n" + << test_cases; ret = 1; } diff --git a/test/cpp/interop/client_helper.cc b/test/cpp/interop/client_helper.cc index d9d10f1eeb900..8963aecc4ffb4 100644 --- a/test/cpp/interop/client_helper.cc +++ b/test/cpp/interop/client_helper.cc @@ -25,13 +25,13 @@ #include "absl/flags/declare.h" #include "absl/flags/flag.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/escaping.h" #include "absl/strings/match.h" #include #include #include -#include #include #include #include @@ -70,7 +70,7 @@ std::string GetOauth2AccessToken() { std::shared_ptr creds = GoogleComputeEngineCredentials(); char* token = grpc_test_fetch_oauth2_token_with_credentials(creds->c_creds_); CHECK_NE(token, nullptr); - gpr_log(GPR_INFO, "Get raw oauth2 access token: %s", token); + LOG(INFO) << "Get raw oauth2 access token: " << token; std::string access_token(token + sizeof("Bearer ") - 1); gpr_free(token); return access_token; @@ -147,8 +147,7 @@ static void log_metadata_entry(const std::string& prefix, if (absl::EndsWith(key_str, "-bin")) { value_str = absl::Base64Escape(value_str); } - gpr_log(GPR_ERROR, "%s %s: %s", prefix.c_str(), key_str.c_str(), - value_str.c_str()); + LOG(ERROR) << prefix << " " << key_str << ": " << value_str; } void MetadataAndStatusLoggerInterceptor::Intercept( @@ -170,9 +169,8 @@ void MetadataAndStatusLoggerInterceptor::Intercept( } auto status = methods->GetRecvStatus(); - gpr_log(GPR_ERROR, "GRPC_STATUS %d", status->error_code()); - gpr_log(GPR_ERROR, "GRPC_ERROR_MESSAGE %s", - status->error_message().c_str()); + LOG(ERROR) << "GRPC_STATUS " << status->error_code(); + LOG(ERROR) << "GRPC_ERROR_MESSAGE " << status->error_message(); } methods->Proceed(); diff --git a/test/cpp/interop/istio_echo_server.cc b/test/cpp/interop/istio_echo_server.cc index 78175fdda9b8a..e81b1b2f17039 100644 --- a/test/cpp/interop/istio_echo_server.cc +++ b/test/cpp/interop/istio_echo_server.cc @@ -30,6 +30,7 @@ #include "absl/algorithm/container.h" #include "absl/flags/flag.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" @@ -114,8 +115,7 @@ void RunServer(const std::set& grpc_ports, const std::set& xds_ports, if (xds_ports.find(port) != xds_ports.end()) { xds_builder.AddListeningPort( server_address, XdsServerCredentials(InsecureServerCredentials())); - gpr_log(GPR_INFO, "Server listening on %s over xds", - server_address.c_str()); + LOG(INFO) << "Server listening on " << server_address << " over xds"; has_xds_listeners = true; } else if (tls_ports.find(port) != tls_ports.end()) { // Create Credentials for Tls Servers - @@ -130,12 +130,10 @@ void RunServer(const std::set& grpc_ports, const std::set& xds_ports, options.watch_identity_key_cert_pairs(); options.set_check_call_host(false); builder.AddListeningPort(server_address, TlsServerCredentials(options)); - gpr_log(GPR_INFO, "Server listening on %s over tls", - server_address.c_str()); + LOG(INFO) << "Server listening on " << server_address << " over tls"; } else { builder.AddListeningPort(server_address, InsecureServerCredentials()); - gpr_log(GPR_INFO, "Server listening on %s over insecure", - server_address.c_str()); + LOG(INFO) << "Server listening on " << server_address << " over insecure"; } } // Enable the default health check service, probably not needed though. @@ -206,7 +204,7 @@ int main(int argc, char** argv) { for (const auto& p : absl::GetFlag(FLAGS_xds_grpc_server)) { int port = 0; if (!absl::SimpleAtoi(p, &port)) { - gpr_log(GPR_ERROR, "SimpleAtoi Failure: %s", p.c_str()); + LOG(ERROR) << "SimpleAtoi Failure: " << p; return 1; } xds_ports.insert(port); @@ -220,7 +218,7 @@ int main(int argc, char** argv) { for (const auto& p : absl::GetFlag(FLAGS_tls)) { int port = 0; if (!absl::SimpleAtoi(p, &port)) { - gpr_log(GPR_ERROR, "SimpleAtoi Failure: %s", p.c_str()); + LOG(ERROR) << "SimpleAtoi Failure: " << p; return 1; } tls_ports.insert(port); diff --git a/test/cpp/interop/istio_echo_server_lib.cc b/test/cpp/interop/istio_echo_server_lib.cc index b9b7d3d1b6818..cb39a15cf997c 100644 --- a/test/cpp/interop/istio_echo_server_lib.cc +++ b/test/cpp/interop/istio_echo_server_lib.cc @@ -18,6 +18,7 @@ #include +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_split.h" @@ -109,7 +110,7 @@ Status EchoTestServiceImpl::Echo(ServerContext* context, absl::StrAppend(&s, kHostnameField, "=", this->hostname_, "\n"); absl::StrAppend(&s, "Echo=", request->message(), "\n"); response->set_message(s); - gpr_log(GPR_INFO, "Echo response:\n%s", s.c_str()); + LOG(INFO) << "Echo response:\n" << s; return Status::OK; } @@ -129,8 +130,7 @@ Status EchoTestServiceImpl::ForwardEcho(ServerContext* context, if (scheme == "xds") { // We can optionally add support for TLS creds, but we are primarily // concerned with proxyless-grpc here. - gpr_log(GPR_INFO, "Creating channel to %s using xDS Creds", - raw_url.c_str()); + LOG(INFO) << "Creating channel to " << raw_url << " using xDS Creds"; channel = CreateChannel(raw_url, XdsCredentials(InsecureChannelCredentials())); } else if (scheme == "grpc") { @@ -138,11 +138,11 @@ Status EchoTestServiceImpl::ForwardEcho(ServerContext* context, // this to be supported. If we ever decide to add support for this properly, // we would need to add support for TLS creds here. absl::string_view address = absl::StripPrefix(raw_url, "grpc://"); - gpr_log(GPR_INFO, "Creating channel to %s", std::string(address).c_str()); + LOG(INFO) << "Creating channel to " << address; channel = CreateChannel(std::string(address), InsecureChannelCredentials()); } else { - gpr_log(GPR_INFO, "Protocol %s not supported. Forwarding to %s", - scheme.c_str(), forwarding_address_.c_str()); + LOG(INFO) << "Protocol " << scheme << " not supported. Forwarding to " + << forwarding_address_; ClientContext forwarding_ctx; forwarding_ctx.set_deadline(context->deadline()); return forwarding_stub_->ForwardEcho(&forwarding_ctx, *request, response); @@ -197,11 +197,10 @@ Status EchoTestServiceImpl::ForwardEcho(ServerContext* context, absl::StrAppend(&body, absl::StrFormat("[%d body] %s\n", i, line)); } response->add_output(body); - gpr_log(GPR_INFO, "Forward Echo response:%d\n%s", i, body.c_str()); + LOG(INFO) << "Forward Echo response:" << i << "\n" << body; } else { - gpr_log(GPR_ERROR, "RPC %d failed %d: %s", i, - calls[i].status.error_code(), - calls[i].status.error_message().c_str()); + LOG(ERROR) << "RPC " << i << " failed " << calls[i].status.error_code() + << ": " << calls[i].status.error_message(); response->clear_output(); return calls[i].status; } diff --git a/test/cpp/interop/observability_interop_server_bootstrap.cc b/test/cpp/interop/observability_interop_server_bootstrap.cc index 65287fb0d62ee..f14755b5cd9fc 100644 --- a/test/cpp/interop/observability_interop_server_bootstrap.cc +++ b/test/cpp/interop/observability_interop_server_bootstrap.cc @@ -19,6 +19,7 @@ #include #include "absl/flags/flag.h" +#include "absl/log/log.h" #include @@ -44,7 +45,7 @@ int main(int argc, char** argv) { // TODO(someone): remove deprecated usage // NOLINTNEXTLINE(clang-diagnostic-deprecated-declarations) auto status = grpc::experimental::GcpObservabilityInit(); - gpr_log(GPR_DEBUG, "GcpObservabilityInit() status_code: %d", status.code()); + VLOG(2) << "GcpObservabilityInit() status_code: " << status.code(); if (!status.ok()) { return 1; } diff --git a/test/cpp/interop/reconnect_interop_server.cc b/test/cpp/interop/reconnect_interop_server.cc index b5370bca397fd..656bf77e906bc 100644 --- a/test/cpp/interop/reconnect_interop_server.cc +++ b/test/cpp/interop/reconnect_interop_server.cc @@ -27,9 +27,9 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include -#include #include #include #include @@ -167,7 +167,7 @@ void RunServer() { builder.AddListeningPort(server_address.str(), grpc::InsecureServerCredentials()); std::unique_ptr server(builder.BuildAndStart()); - gpr_log(GPR_INFO, "Server listening on %s", server_address.str().c_str()); + LOG(INFO) << "Server listening on " << server_address.str(); while (!got_sigint) { service.Poll(5); } diff --git a/test/cpp/interop/stress_interop_client.cc b/test/cpp/interop/stress_interop_client.cc index b99e31158fac6..91a33d2547c00 100644 --- a/test/cpp/interop/stress_interop_client.cc +++ b/test/cpp/interop/stress_interop_client.cc @@ -23,9 +23,9 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" -#include #include #include "src/core/lib/gprpp/crash.h" @@ -86,8 +86,8 @@ StressTestInteropClient::StressTestInteropClient( void StressTestInteropClient::MainLoop( const std::shared_ptr& qps_gauge) { - gpr_log(GPR_INFO, "Running test %d. ServerAddr: %s", test_id_, - server_address_.c_str()); + LOG(INFO) << "Running test " << test_id_ + << ". ServerAddr: " << server_address_; gpr_timespec test_end_time; if (test_duration_secs_ < 0) { @@ -103,7 +103,7 @@ void StressTestInteropClient::MainLoop( while (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), test_end_time) < 0) { // Select the test case to execute based on the weights and execute it TestCaseType test_case = test_selector_.GetNextTest(); - gpr_log(GPR_DEBUG, "%d - Executing the test case %d", test_id_, test_case); + VLOG(2) << test_id_ << " - Executing the test case " << test_case; RunTest(test_case); qps_gauge->Incr(); diff --git a/test/cpp/interop/xds_interop_server_lib.cc b/test/cpp/interop/xds_interop_server_lib.cc index 12a26b1649782..d1ee23381af22 100644 --- a/test/cpp/interop/xds_interop_server_lib.cc +++ b/test/cpp/interop/xds_interop_server_lib.cc @@ -20,11 +20,11 @@ #include +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" #include -#include #include #include #include @@ -192,7 +192,7 @@ absl::optional GetStatusForRpcBehaviorMetadata( absl::string_view header_value, absl::string_view hostname) { for (auto part : absl::StrSplit(header_value, ' ')) { if (absl::ConsumePrefix(&part, kHostnameRpcBehaviorFilter)) { - gpr_log(GPR_INFO, "%s", std::string(part).c_str()); + LOG(INFO) << part; if (part.empty()) { return Status( grpc::StatusCode::INVALID_ARGUMENT, @@ -200,10 +200,8 @@ absl::optional GetStatusForRpcBehaviorMetadata( header_value)); } if (part != hostname) { - gpr_log( - GPR_DEBUG, - "RPC behavior for a different host: \"%s\", this one is: \"%s\"", - std::string(part).c_str(), std::string(hostname).c_str()); + VLOG(2) << "RPC behavior for a different host: \"" << std::string(part) + << "\", this one is: \"" << hostname << "\""; return absl::nullopt; } } else if (absl::ConsumePrefix(&part, kErrorCodeRpcBehavior)) { @@ -245,15 +243,14 @@ void RunServer(bool secure_mode, bool enable_csm_observability, int port, absl::StrCat("0.0.0.0:", port), grpc::XdsServerCredentials(grpc::InsecureServerCredentials())); xds_enabled_server = xds_builder.BuildAndStart(); - gpr_log(GPR_INFO, "Server starting on 0.0.0.0:%d", port); + LOG(INFO) << "Server starting on 0.0.0.0:" << port; ServerBuilder builder; maintenance_services.AddToServerBuilder(&builder); server = builder .AddListeningPort(absl::StrCat("0.0.0.0:", maintenance_port), grpc::InsecureServerCredentials()) .BuildAndStart(); - gpr_log(GPR_INFO, "Maintenance server listening on 0.0.0.0:%d", - maintenance_port); + LOG(INFO) << "Maintenance server listening on 0.0.0.0:" << maintenance_port; } else { // CSM Observability requires an xDS enabled server. auto builder = enable_csm_observability @@ -265,7 +262,7 @@ void RunServer(bool secure_mode, bool enable_csm_observability, int port, grpc::InsecureServerCredentials()) .RegisterService(&service) .BuildAndStart(); - gpr_log(GPR_INFO, "Server listening on 0.0.0.0:%d", port); + LOG(INFO) << "Server listening on 0.0.0.0:" << port; } server_callback(server.get()); server->Wait(); diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc index a0c34cc9666e6..9c752a6342fc5 100644 --- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc +++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc @@ -26,11 +26,11 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/random/random.h" #include #include -#include #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h" #include "src/core/ext/transport/chttp2/transport/hpack_parser.h" @@ -135,7 +135,7 @@ static void BM_HpackEncoderEncodeHeader(benchmark::State& state) { logged_representative_output = true; for (size_t i = 0; i < outbuf.count; i++) { char* s = grpc_dump_slice(outbuf.slices[i], GPR_DUMP_HEX); - gpr_log(GPR_DEBUG, "%" PRIdPTR ": %s", i, s); + VLOG(2) << i << ": " << s; gpr_free(s); } } diff --git a/test/cpp/microbenchmarks/helpers.h b/test/cpp/microbenchmarks/helpers.h index 11b7b9b642a5b..34105a98d63b2 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/address_sorting_test.cc b/test/cpp/naming/address_sorting_test.cc index 0ce5a1d5150a4..563ce7d8a36a6 100644 --- a/test/cpp/naming/address_sorting_test.cc +++ b/test/cpp/naming/address_sorting_test.cc @@ -25,10 +25,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include #include -#include #include #include #include @@ -120,8 +120,7 @@ class MockSourceAddrFactory : public address_sorting_source_addr_factory { .value(); auto it = dest_addr_to_src_addr_.find(ip_addr_str); if (it == dest_addr_to_src_addr_.end()) { - gpr_log(GPR_DEBUG, "can't find |%s| in dest to src map", - ip_addr_str.c_str()); + VLOG(2) << "can't find |" << ip_addr_str << "| in dest to src map"; return false; } grpc_resolved_address source_addr_as_resolved_addr = diff --git a/test/cpp/naming/cancel_ares_query_test.cc b/test/cpp/naming/cancel_ares_query_test.cc index 29b5a19d65c5f..03d787d0b690f 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/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc index 78909d9eb17d8..d42e5f7dda162 100644 --- a/test/cpp/naming/resolver_component_test.cc +++ b/test/cpp/naming/resolver_component_test.cc @@ -28,6 +28,7 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/memory/memory.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -35,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -241,8 +241,8 @@ void PollPollsetUntilRequestDone(ArgsStruct* args) { } gpr_timespec time_left = gpr_time_sub(deadline, gpr_now(GPR_CLOCK_REALTIME)); - gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRId64 ".%09d", args->done, - time_left.tv_sec, time_left.tv_nsec); + VLOG(2) << "done=" << args->done << ", time_left=" << time_left.tv_sec + << "." << absl::StrFormat("%09d", time_left.tv_nsec); CHECK_GE(gpr_time_cmp(time_left, gpr_time_0(GPR_TIMESPAN)), 0); grpc_pollset_worker* worker = nullptr; grpc_core::ExecCtx exec_ctx; @@ -342,11 +342,11 @@ class CheckingResultHandler : public ResultHandler { AddActualAddresses(*balancer_addresses, /*is_balancer=*/true, &found_lb_addrs); } - gpr_log(GPR_INFO, - "found %" PRIdPTR " backend addresses and %" PRIdPTR - " balancer addresses", - result.addresses->size(), - balancer_addresses == nullptr ? 0L : balancer_addresses->size()); + LOG(INFO) << "found " << result.addresses->size() + << " backend addresses and " + << (balancer_addresses == nullptr ? 0L + : balancer_addresses->size()) + << " balancer addresses"; if (args->expected_addrs.size() != found_lb_addrs.size()) { grpc_core::Crash(absl::StrFormat("found lb addrs size is: %" PRIdPTR ". expected addrs size is %" PRIdPTR, @@ -359,10 +359,10 @@ class CheckingResultHandler : public ResultHandler { EXPECT_THAT(args->expected_addrs, UnorderedElementsAreArray(found_lb_addrs)); } else { - gpr_log(GPR_ERROR, - "Invalid for setting for --do_ordered_address_comparison. " - "Have %s, want True or False", - absl::GetFlag(FLAGS_do_ordered_address_comparison).c_str()); + LOG(ERROR) << "Invalid for setting for --do_ordered_address_comparison. " + "Have " + << absl::GetFlag(FLAGS_do_ordered_address_comparison) + << ", want True or False"; CHECK(0); } if (!result.service_config.ok()) { @@ -389,7 +389,7 @@ class CheckingResultHandler : public ResultHandler { std::string str = grpc_sockaddr_to_string(&addr.address(), true /* normalize */) .value(); - gpr_log(GPR_INFO, "%s", str.c_str()); + LOG(INFO) << str; out->emplace_back(GrpcLBAddress(std::move(str), is_balancer)); } } @@ -409,11 +409,9 @@ void InjectBrokenNameServerList(ares_channel* channel) { CHECK(grpc_core::SplitHostPort( absl::GetFlag(FLAGS_local_dns_server_address).c_str(), &unused_host, &local_dns_server_port)); - gpr_log(GPR_DEBUG, - "Injecting broken nameserver list. Bad server address:|[::1]:%d|. " - "Good server address:%s", - g_fake_non_responsive_dns_server_port, - absl::GetFlag(FLAGS_local_dns_server_address).c_str()); + VLOG(2) << "Injecting broken nameserver list. Bad server address:|[::1]:" + << g_fake_non_responsive_dns_server_port << "|. Good server address:" + << absl::GetFlag(FLAGS_local_dns_server_address); // Put the non-responsive DNS server at the front of c-ares's nameserver list. dns_server_addrs[0].family = AF_INET6; (reinterpret_cast(&dns_server_addrs[0].addr.addr6))[15] = 0x1; @@ -450,9 +448,8 @@ void RunResolvesRelevantRecordsTest( args.expected_lb_policy = absl::GetFlag(FLAGS_expected_lb_policy); // maybe build the address with an authority std::string whole_uri; - gpr_log(GPR_DEBUG, - "resolver_component_test: --inject_broken_nameserver_list: %s", - absl::GetFlag(FLAGS_inject_broken_nameserver_list).c_str()); + VLOG(2) << "resolver_component_test: --inject_broken_nameserver_list: " + << absl::GetFlag(FLAGS_inject_broken_nameserver_list); std::unique_ptr fake_non_responsive_dns_server; if (absl::GetFlag(FLAGS_inject_broken_nameserver_list) == "True") { @@ -471,16 +468,16 @@ void RunResolvesRelevantRecordsTest( } whole_uri = absl::StrCat("dns:///", absl::GetFlag(FLAGS_target_name)); } else if (absl::GetFlag(FLAGS_inject_broken_nameserver_list) == "False") { - gpr_log(GPR_INFO, "Specifying authority in uris to: %s", - absl::GetFlag(FLAGS_local_dns_server_address).c_str()); + LOG(INFO) << "Specifying authority in uris to: " + << absl::GetFlag(FLAGS_local_dns_server_address); whole_uri = absl::StrFormat("dns://%s/%s", absl::GetFlag(FLAGS_local_dns_server_address), absl::GetFlag(FLAGS_target_name)); } else { grpc_core::Crash("Invalid value for --inject_broken_nameserver_list."); } - gpr_log(GPR_DEBUG, "resolver_component_test: --enable_srv_queries: %s", - absl::GetFlag(FLAGS_enable_srv_queries).c_str()); + VLOG(2) << "resolver_component_test: --enable_srv_queries: " + << absl::GetFlag(FLAGS_enable_srv_queries); // By default, SRV queries are disabled, so tests that expect no SRV query // should avoid setting any channel arg. Test cases that do rely on the SRV // query must explicitly enable SRV though. @@ -489,8 +486,8 @@ void RunResolvesRelevantRecordsTest( } else if (absl::GetFlag(FLAGS_enable_srv_queries) != "False") { grpc_core::Crash("Invalid value for --enable_srv_queries."); } - gpr_log(GPR_DEBUG, "resolver_component_test: --enable_txt_queries: %s", - absl::GetFlag(FLAGS_enable_txt_queries).c_str()); + VLOG(2) << "resolver_component_test: --enable_txt_queries: " + << absl::GetFlag(FLAGS_enable_txt_queries); // By default, TXT queries are disabled, so tests that expect no TXT query // should avoid setting any channel arg. Test cases that do rely on the TXT // query must explicitly enable TXT though. diff --git a/test/cpp/naming/resolver_component_tests_runner_invoker.cc b/test/cpp/naming/resolver_component_tests_runner_invoker.cc index c5e4dc7d8f1c8..4fb67300c5c56 100644 --- a/test/cpp/naming/resolver_component_tests_runner_invoker.cc +++ b/test/cpp/naming/resolver_component_tests_runner_invoker.cc @@ -28,11 +28,11 @@ #include "absl/flags/flag.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include #include -#include #include #include "src/core/lib/gprpp/crash.h" @@ -128,9 +128,8 @@ int main(int argc, char** argv) { // an indication whether the test is running on RBE or not. Find a better way of // doing this. #ifndef GRPC_PORT_ISOLATED_RUNTIME - gpr_log(GPR_ERROR, - "You are invoking the test locally with Bazel, you may need to " - "invoke Bazel with --enable_runfiles=yes."); + LOG(ERROR) << "You are invoking the test locally with Bazel, you may need " + "to invoke Bazel with --enable_runfiles=yes."; #endif // GRPC_PORT_ISOLATED_RUNTIME result = grpc::testing::InvokeResolverComponentTestsRunner( grpc::testing::NormalizeFilePath( diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc index 9bd8f00933470..189d972fc2e13 100644 --- a/test/cpp/performance/writes_per_rpc_test.cc +++ b/test/cpp/performance/writes_per_rpc_test.cc @@ -21,8 +21,8 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" -#include #include #include #include @@ -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" @@ -262,10 +262,9 @@ static double UnaryPingPong(ThreadedFuzzingEventEngine* fuzzing_engine, auto end_stats = grpc_core::global_stats().Collect()->Diff(*baseline); double writes_per_iteration = end_stats->syscall_write / static_cast(kIterations); - gpr_log(GPR_DEBUG, - "UnaryPingPong(%d, %d): writes_per_iteration=%0.3f (total=%lu)", - request_size, response_size, writes_per_iteration, - end_stats->syscall_write); + VLOG(2) << "UnaryPingPong(" << request_size << ", " << response_size + << "): writes_per_iteration=" << writes_per_iteration + << " (total=" << end_stats->syscall_write << ")"; fixture.reset(); server_env[0]->~ServerEnv(); diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc index 18f9b4bad6ec8..11fd6b89e62d7 100644 --- a/test/cpp/qps/client_async.cc +++ b/test/cpp/qps/client_async.cc @@ -28,11 +28,11 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/memory/memory.h" #include #include -#include #include #include #include @@ -227,7 +227,7 @@ class AsyncClient : public ClientImpl { int num_threads = config.async_client_threads(); if (num_threads <= 0) { // Use dynamic sizing num_threads = cores_; - gpr_log(GPR_INFO, "Sizing async client to %d threads", num_threads); + LOG(INFO) << "Sizing async client to " << num_threads << " threads"; } return num_threads; } diff --git a/test/cpp/qps/client_sync.cc b/test/cpp/qps/client_sync.cc index 92ed2c11fff9c..eb1d8aeea72fe 100644 --- a/test/cpp/qps/client_sync.cc +++ b/test/cpp/qps/client_sync.cc @@ -25,10 +25,10 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include #include -#include #include #include #include @@ -182,8 +182,8 @@ class SynchronousStreamingClient : public SynchronousClient { if (!s.ok()) { std::lock_guard l(stream_mu_[thread_idx]); if (!shutdown_[thread_idx].val) { - gpr_log(GPR_ERROR, "Stream %" PRIuPTR " received an error %s", - thread_idx, s.error_message().c_str()); + LOG(ERROR) << "Stream " << thread_idx << " received an error " + << s.error_message(); } } // Lock the stream_mu_ now because the client context could change diff --git a/test/cpp/qps/json_run_localhost.cc b/test/cpp/qps/json_run_localhost.cc index cc44252ea2a1f..8bc842328c99f 100644 --- a/test/cpp/qps/json_run_localhost.cc +++ b/test/cpp/qps/json_run_localhost.cc @@ -29,8 +29,7 @@ #endif #include "absl/log/check.h" - -#include +#include "absl/log/log.h" #include "src/core/lib/gprpp/crash.h" #include "src/core/lib/gprpp/env.h" @@ -71,13 +70,13 @@ static void register_sighandler() { static void LogStatus(int status, const char* label) { if (WIFEXITED(status)) { - gpr_log(GPR_INFO, "%s: subprocess exited with status %d", label, - WEXITSTATUS(status)); + LOG(INFO) << label << ": subprocess exited with status " + << WEXITSTATUS(status); } else if (WIFSIGNALED(status)) { - gpr_log(GPR_INFO, "%s: subprocess terminated with signal %d", label, - WTERMSIG(status)); + LOG(INFO) << label << ": subprocess terminated with signal " + << WTERMSIG(status); } else { - gpr_log(GPR_INFO, "%s: unknown subprocess status: %d", label, status); + LOG(INFO) << label << ": unknown subprocess status: " << status; } } diff --git a/test/cpp/qps/parse_json.cc b/test/cpp/qps/parse_json.cc index c104550f4a1a7..e283c8eae7df5 100644 --- a/test/cpp/qps/parse_json.cc +++ b/test/cpp/qps/parse_json.cc @@ -21,10 +21,9 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" -#include - #include "src/core/lib/gprpp/crash.h" namespace grpc { @@ -40,8 +39,8 @@ void ParseJson(const std::string& json, const std::string& type, type_resolver.get(), "type.googleapis.com/" + type, json, &binary); if (!status.ok()) { std::string errmsg(status.message()); - gpr_log(GPR_ERROR, "Failed to convert json to binary: errcode=%d msg=%s", - static_cast(status.code()), errmsg.c_str()); + LOG(ERROR) << "Failed to convert json to binary: errcode=" << status.code() + << " msg=" << errmsg; grpc_core::Crash(absl::StrFormat("JSON: %s", json.c_str())); } CHECK(msg->ParseFromString(binary)); diff --git a/test/cpp/qps/scenario_runner.cc b/test/cpp/qps/scenario_runner.cc index 1d8f6c8247593..7ca32f983ca0e 100644 --- a/test/cpp/qps/scenario_runner.cc +++ b/test/cpp/qps/scenario_runner.cc @@ -13,12 +13,11 @@ // limitations under the License. #include "absl/flags/flag.h" +#include "absl/log/log.h" -#include - -#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" @@ -40,7 +39,7 @@ static void RunScenario() { grpc_core::testing::GetFileContents(absl::GetFlag(FLAGS_loadtest_config)); Scenarios scenarios; ParseJson(json_str, "grpc.testing.Scenarios", &scenarios); - gpr_log(GPR_INFO, "Running %s", scenarios.scenarios(0).name().c_str()); + LOG(INFO) << "Running " << scenarios.scenarios(0).name(); const auto result = RunScenario(scenarios.scenarios(0).client_config(), 1, scenarios.scenarios(0).server_config(), 1, @@ -49,8 +48,8 @@ static void RunScenario() { kInsecureCredentialsType, {}, false, 0); GetReporter()->ReportQPS(*result); GetReporter()->ReportLatency(*result); - gpr_log(GPR_ERROR, "Global Stats:\n%s", - StatsAsJson(grpc_core::global_stats().Collect().get()).c_str()); + LOG(ERROR) << "Global Stats:\n" + << StatsAsJson(grpc_core::global_stats().Collect().get()); } } // namespace testing diff --git a/test/cpp/qps/server.h b/test/cpp/qps/server.h index 02d7fec717dde..2413d2d566d67 100644 --- a/test/cpp/qps/server.h +++ b/test/cpp/qps/server.h @@ -21,8 +21,9 @@ #include +#include "absl/log/log.h" + #include -#include #include #include #include @@ -133,8 +134,8 @@ class Server { channel_arg.int_value()); break; case ChannelArg::VALUE_NOT_SET: - gpr_log(GPR_ERROR, "Channel arg '%s' does not have a value", - channel_arg.name().c_str()); + LOG(ERROR) << "Channel arg '" << channel_arg.name() + << "' does not have a value"; break; } } diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc index 821a380c58d17..16bb01e8960e4 100644 --- a/test/cpp/qps/server_async.cc +++ b/test/cpp/qps/server_async.cc @@ -23,9 +23,10 @@ #include #include +#include "absl/log/log.h" + #include #include -#include #include #include #include @@ -91,11 +92,9 @@ class AsyncQpsServerTest final : public grpc::testing::Server { int num_threads = config.async_server_threads(); if (num_threads <= 0) { // dynamic sizing num_threads = std::min(64, cores()); - gpr_log(GPR_INFO, - "Sizing async server to %d threads. Defaults to number of cores " - "in machine or 64 threads if machine has more than 64 cores to " - "avoid OOMs.", - num_threads); + LOG(INFO) << "Sizing async server to " << num_threads + << " threads. Defaults to number of cores in machine or 64 " + "threads if machine has more than 64 cores to avoid OOMs."; } int tpc = std::max(1, config.threads_per_cq()); // 1 if unspecified @@ -111,9 +110,9 @@ class AsyncQpsServerTest final : public grpc::testing::Server { server_ = builder->BuildAndStart(); if (server_ == nullptr) { - gpr_log(GPR_ERROR, "Server: Fail to BuildAndStart(port=%d)", port_num); + LOG(ERROR) << "Server: Fail to BuildAndStart(port=" << port_num << ")"; } else { - gpr_log(GPR_INFO, "Server: BuildAndStart(port=%d)", port_num); + LOG(INFO) << "Server: BuildAndStart(port=" << port_num << ")"; } auto process_rpc_bound = diff --git a/test/cpp/qps/server_callback.cc b/test/cpp/qps/server_callback.cc index bb2f2f16c3dbf..c198b3d86b023 100644 --- a/test/cpp/qps/server_callback.cc +++ b/test/cpp/qps/server_callback.cc @@ -15,6 +15,9 @@ // limitations under the License. // // + +#include "absl/log/log.h" + #include #include #include @@ -113,9 +116,9 @@ class CallbackServer final : public grpc::testing::Server { impl_ = builder->BuildAndStart(); if (impl_ == nullptr) { - gpr_log(GPR_ERROR, "Server: Fail to BuildAndStart(port=%d)", port_num); + LOG(ERROR) << "Server: Fail to BuildAndStart(port=" << port_num << ")"; } else { - gpr_log(GPR_INFO, "Server: BuildAndStart(port=%d)", port_num); + LOG(INFO) << "Server: BuildAndStart(port=" << port_num << ")"; } } diff --git a/test/cpp/qps/server_sync.cc b/test/cpp/qps/server_sync.cc index f78e17c21577e..59a688d9b3ef9 100644 --- a/test/cpp/qps/server_sync.cc +++ b/test/cpp/qps/server_sync.cc @@ -19,6 +19,8 @@ #include #include +#include "absl/log/log.h" + #include #include #include @@ -171,9 +173,9 @@ class SynchronousServer final : public grpc::testing::Server { impl_ = builder->BuildAndStart(); if (impl_ == nullptr) { - gpr_log(GPR_ERROR, "Server: Fail to BuildAndStart(port=%d)", port_num); + LOG(ERROR) << "Server: Fail to BuildAndStart(port=" << port_num << ")"; } else { - gpr_log(GPR_INFO, "Server: BuildAndStart(port=%d)", port_num); + LOG(INFO) << "Server: BuildAndStart(port=" << port_num << ")"; } } diff --git a/test/cpp/thread_manager/thread_manager_test.cc b/test/cpp/thread_manager/thread_manager_test.cc index 1b3c8ba00f91f..6c7eb3a3f3461 100644 --- a/test/cpp/thread_manager/thread_manager_test.cc +++ b/test/cpp/thread_manager/thread_manager_test.cc @@ -26,7 +26,8 @@ #include -#include +#include "absl/log/log.h" + #include #include @@ -163,7 +164,7 @@ TEST_P(ThreadManagerTest, TestPollAndWork) { for (auto& tm : thread_manager_) { // Verify that The number of times DoWork() was called is equal to the // number of times WORK_FOUND was returned - gpr_log(GPR_DEBUG, "DoWork() called %d times", tm->num_do_work()); + VLOG(2) << "DoWork() called " << tm->num_do_work() << " times"; EXPECT_GE(tm->num_poll_for_work(), GetParam().max_poll_calls); EXPECT_EQ(tm->num_do_work(), tm->num_work_found()); } diff --git a/third_party/boringssl-with-bazel b/third_party/boringssl-with-bazel index 5a2bca2124800..ae72a4514c7af 160000 --- a/third_party/boringssl-with-bazel +++ b/third_party/boringssl-with-bazel @@ -1 +1 @@ -Subproject commit 5a2bca2124800f2861263959b72bc35cdf18949b +Subproject commit ae72a4514c7afd150596b0a80947f3ca9b8363b5 diff --git a/third_party/protobuf b/third_party/protobuf index 2434ef2adf0c7..7f94235e55259 160000 --- a/third_party/protobuf +++ b/third_party/protobuf @@ -1 +1 @@ -Subproject commit 2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5 +Subproject commit 7f94235e552599141950d7a4a3eaf93bc87d1b22 diff --git a/tools/codegen/core/gen_stats_data.py b/tools/codegen/core/gen_stats_data.py index de41f434a190b..b7e66f00107b2 100755 --- a/tools/codegen/core/gen_stats_data.py +++ b/tools/codegen/core/gen_stats_data.py @@ -24,7 +24,7 @@ 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 @@ def snake_to_pascal(name): [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 @@ def snake_to_pascal(name): 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 @@ def snake_to_pascal(name): 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/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py index 4577c6ddf4962..b6885b9790cec 100644 --- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py +++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py @@ -333,4 +333,4 @@ ] PROTO_INCLUDE='third_party/protobuf/src' -PROTOBUF_SUBMODULE_VERSION="2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5" +PROTOBUF_SUBMODULE_VERSION="7f94235e552599141950d7a4a3eaf93bc87d1b22" 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 81c90600422e9..6ceda3a021622 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 3f4a53208c27e..180bf60785469 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 72b1676eeaf9f..74d2f0c7e17f0 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 \ diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh index 15951cccc756e..a8da8a9fae6a0 100755 --- a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh +++ b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh @@ -131,9 +131,9 @@ configLangArgs32core+=( -l c++ ) runnerLangArgs+=( -l "cxx:${GRPC_CORE_REPO}:${GRPC_CORE_COMMIT}" ) # dotnet -configLangArgs8core+=( -l dotnet ) -configLangArgs32core+=( -l dotnet ) -runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" ) +# configLangArgs8core+=( -l dotnet ) +# configLangArgs32core+=( -l dotnet ) +# runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" ) # # go configLangArgs8core+=( -l go ) diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh index f62d9920b72a4..c3b99af80ebb6 100755 --- a/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh +++ b/tools/internal_ci/linux/grpc_e2e_performance_gke_experiment.sh @@ -125,9 +125,9 @@ configLangArgs32core+=( -l c++ ) runnerLangArgs+=( -l "cxx:${GRPC_CORE_REPO}:${GRPC_CORE_COMMIT}" ) # dotnet -configLangArgs8core+=( -l dotnet ) -configLangArgs32core+=( -l dotnet ) -runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" ) +# configLangArgs8core+=( -l dotnet ) +# configLangArgs32core+=( -l dotnet ) +# runnerLangArgs+=( -l "dotnet:${GRPC_DOTNET_REPO}:${GRPC_DOTNET_COMMIT}" ) # # go configLangArgs8core+=( -l go )