Automated change: Fix sanity tests
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e98315..fc99547 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -2857,6 +2857,7 @@ 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/default_tcp_tracer.cc src/core/telemetry/histogram_view.cc src/core/telemetry/metrics.cc src/core/telemetry/stats.cc @@ -3605,6 +3606,7 @@ 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/default_tcp_tracer.cc src/core/telemetry/histogram_view.cc src/core/telemetry/metrics.cc src/core/telemetry/stats.cc
diff --git a/Makefile b/Makefile index 7c1d8ba..12d4eab 100644 --- a/Makefile +++ b/Makefile
@@ -1393,6 +1393,7 @@ 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/default_tcp_tracer.cc \ src/core/telemetry/histogram_view.cc \ src/core/telemetry/metrics.cc \ src/core/telemetry/stats.cc \
diff --git a/Package.swift b/Package.swift index 97bb065..880aa56 100644 --- a/Package.swift +++ b/Package.swift
@@ -1783,6 +1783,8 @@ "src/core/service_config/service_config_parser.h", "src/core/telemetry/call_tracer.cc", "src/core/telemetry/call_tracer.h", + "src/core/telemetry/default_tcp_tracer.cc", + "src/core/telemetry/default_tcp_tracer.h", "src/core/telemetry/histogram_view.cc", "src/core/telemetry/histogram_view.h", "src/core/telemetry/metrics.cc",
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 206cde9..224fddd 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml
@@ -1116,6 +1116,7 @@ - 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/default_tcp_tracer.h - src/core/telemetry/histogram_view.h - src/core/telemetry/metrics.h - src/core/telemetry/stats.h @@ -1980,6 +1981,7 @@ - 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/default_tcp_tracer.cc - src/core/telemetry/histogram_view.cc - src/core/telemetry/metrics.cc - src/core/telemetry/stats.cc @@ -2680,6 +2682,7 @@ - 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/default_tcp_tracer.h - src/core/telemetry/histogram_view.h - src/core/telemetry/metrics.h - src/core/telemetry/stats.h @@ -3115,6 +3118,7 @@ - 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/default_tcp_tracer.cc - src/core/telemetry/histogram_view.cc - src/core/telemetry/metrics.cc - src/core/telemetry/stats.cc
diff --git a/config.m4 b/config.m4 index 2f32547..bc17221 100644 --- a/config.m4 +++ b/config.m4
@@ -767,6 +767,7 @@ 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/default_tcp_tracer.cc \ src/core/telemetry/histogram_view.cc \ src/core/telemetry/metrics.cc \ src/core/telemetry/stats.cc \
diff --git a/config.w32 b/config.w32 index b9513c3..7ae879b 100644 --- a/config.w32 +++ b/config.w32
@@ -733,6 +733,7 @@ "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\\default_tcp_tracer.cc " + "src\\core\\telemetry\\histogram_view.cc " + "src\\core\\telemetry\\metrics.cc " + "src\\core\\telemetry\\stats.cc " +
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index c06ba64..945ba36 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec
@@ -1205,6 +1205,7 @@ '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/default_tcp_tracer.h', 'src/core/telemetry/histogram_view.h', 'src/core/telemetry/metrics.h', 'src/core/telemetry/stats.h', @@ -2514,6 +2515,7 @@ '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/default_tcp_tracer.h', 'src/core/telemetry/histogram_view.h', 'src/core/telemetry/metrics.h', 'src/core/telemetry/stats.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index a25a0d6..7d61868 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec
@@ -1899,6 +1899,8 @@ 'src/core/service_config/service_config_parser.h', 'src/core/telemetry/call_tracer.cc', 'src/core/telemetry/call_tracer.h', + 'src/core/telemetry/default_tcp_tracer.cc', + 'src/core/telemetry/default_tcp_tracer.h', 'src/core/telemetry/histogram_view.cc', 'src/core/telemetry/histogram_view.h', 'src/core/telemetry/metrics.cc', @@ -3372,6 +3374,7 @@ '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/default_tcp_tracer.h', 'src/core/telemetry/histogram_view.h', 'src/core/telemetry/metrics.h', 'src/core/telemetry/stats.h',
diff --git a/grpc.gemspec b/grpc.gemspec index e9da3ec..219f333 100644 --- a/grpc.gemspec +++ b/grpc.gemspec
@@ -1785,6 +1785,8 @@ 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/default_tcp_tracer.cc ) + s.files += %w( src/core/telemetry/default_tcp_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 )
diff --git a/package.xml b/package.xml index a3dfd64..0ed90b8 100644 --- a/package.xml +++ b/package.xml
@@ -1767,6 +1767,8 @@ <file baseinstalldir="/" name="src/core/service_config/service_config_parser.h" role="src" /> <file baseinstalldir="/" name="src/core/telemetry/call_tracer.cc" role="src" /> <file baseinstalldir="/" name="src/core/telemetry/call_tracer.h" role="src" /> + <file baseinstalldir="/" name="src/core/telemetry/default_tcp_tracer.cc" role="src" /> + <file baseinstalldir="/" name="src/core/telemetry/default_tcp_tracer.h" role="src" /> <file baseinstalldir="/" name="src/core/telemetry/histogram_view.cc" role="src" /> <file baseinstalldir="/" name="src/core/telemetry/histogram_view.h" role="src" /> <file baseinstalldir="/" name="src/core/telemetry/metrics.cc" role="src" />
diff --git a/src/core/telemetry/default_tcp_tracer.cc b/src/core/telemetry/default_tcp_tracer.cc index 43f45ff..bdb9ee0 100644 --- a/src/core/telemetry/default_tcp_tracer.cc +++ b/src/core/telemetry/default_tcp_tracer.cc
@@ -18,8 +18,7 @@ namespace grpc_core { -void DefaultTcpTracer::RecordConnectionMetrics( - grpc_core::TcpConnectionMetrics metrics) { +void DefaultTcpTracer::RecordConnectionMetrics(TcpConnectionMetrics metrics) { MutexLock lock(&mu_); connection_metrics_ = metrics; }
diff --git a/src/core/telemetry/default_tcp_tracer.h b/src/core/telemetry/default_tcp_tracer.h index a724ae2..20a87cf 100644 --- a/src/core/telemetry/default_tcp_tracer.h +++ b/src/core/telemetry/default_tcp_tracer.h
@@ -25,17 +25,16 @@ namespace grpc_core { -class DefaultTcpTracer final : public grpc_core::TcpConnectionTracer { +class DefaultTcpTracer final : public TcpConnectionTracer { public: DefaultTcpTracer() = default; ~DefaultTcpTracer() override = default; // Records per-connection metrics. - void RecordConnectionMetrics( - grpc_core::TcpConnectionMetrics metrics) override; + void RecordConnectionMetrics(TcpConnectionMetrics metrics) override; private: - grpc_core::Mutex mu_; - grpc_core::TcpConnectionMetrics connection_metrics_ ABSL_GUARDED_BY(mu_); + Mutex mu_; + TcpConnectionMetrics connection_metrics_ ABSL_GUARDED_BY(mu_); }; } // namespace grpc_core
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index c02c7f6..f0146f25 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -742,6 +742,7 @@ '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/default_tcp_tracer.cc', 'src/core/telemetry/histogram_view.cc', 'src/core/telemetry/metrics.cc', 'src/core/telemetry/stats.cc',
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 7f5e54e..e2f458d 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal
@@ -2752,6 +2752,8 @@ src/core/service_config/service_config_parser.h \ src/core/telemetry/call_tracer.cc \ src/core/telemetry/call_tracer.h \ +src/core/telemetry/default_tcp_tracer.cc \ +src/core/telemetry/default_tcp_tracer.h \ src/core/telemetry/histogram_view.cc \ src/core/telemetry/histogram_view.h \ src/core/telemetry/metrics.cc \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 0c803ba..b732924 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal
@@ -2564,6 +2564,8 @@ src/core/service_config/service_config_parser.h \ src/core/telemetry/call_tracer.cc \ src/core/telemetry/call_tracer.h \ +src/core/telemetry/default_tcp_tracer.cc \ +src/core/telemetry/default_tcp_tracer.h \ src/core/telemetry/histogram_view.cc \ src/core/telemetry/histogram_view.h \ src/core/telemetry/metrics.cc \