From 983299ba515b5df728d0b6b2e7dd96222a801ed1 Mon Sep 17 00:00:00 2001 From: ctiller Date: Wed, 10 Jan 2024 21:07:51 +0000 Subject: [PATCH] Automated change: Fix sanity tests --- CMakeLists.txt | 3 +++ Makefile | 2 ++ Package.swift | 2 ++ build_autogenerated.yaml | 6 ++++++ config.m4 | 1 + config.w32 | 1 + gRPC-C++.podspec | 2 ++ gRPC-Core.podspec | 3 +++ grpc.gemspec | 2 ++ grpc.gyp | 3 +++ package.xml | 2 ++ src/core/lib/transport/call_final_info.cc | 2 ++ src/core/lib/transport/call_final_info.h | 8 +++++--- src/python/grpcio/grpc_core_dependencies.py | 1 + tools/doxygen/Doxyfile.c++.internal | 2 ++ tools/doxygen/Doxyfile.core.internal | 2 ++ 16 files changed, 39 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4455b799b10..eb2eac86917 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2500,6 +2500,7 @@ add_library(grpc src/core/lib/surface/version.cc src/core/lib/transport/batch_builder.cc src/core/lib/transport/bdp_estimator.cc + src/core/lib/transport/call_final_info.cc src/core/lib/transport/connectivity_state.cc src/core/lib/transport/error_utils.cc src/core/lib/transport/handshaker.cc @@ -3193,6 +3194,7 @@ add_library(grpc_unsecure src/core/lib/surface/version.cc src/core/lib/transport/batch_builder.cc src/core/lib/transport/bdp_estimator.cc + src/core/lib/transport/call_final_info.cc src/core/lib/transport/connectivity_state.cc src/core/lib/transport/error_utils.cc src/core/lib/transport/handshaker.cc @@ -5179,6 +5181,7 @@ add_library(grpc_authorization_provider src/core/lib/surface/validate_metadata.cc src/core/lib/surface/version.cc src/core/lib/transport/batch_builder.cc + src/core/lib/transport/call_final_info.cc src/core/lib/transport/connectivity_state.cc src/core/lib/transport/error_utils.cc src/core/lib/transport/handshaker.cc diff --git a/Makefile b/Makefile index 1d547978b3d..9f76d67a533 100644 --- a/Makefile +++ b/Makefile @@ -1701,6 +1701,7 @@ LIBGRPC_SRC = \ src/core/lib/surface/version.cc \ src/core/lib/transport/batch_builder.cc \ src/core/lib/transport/bdp_estimator.cc \ + src/core/lib/transport/call_final_info.cc \ src/core/lib/transport/connectivity_state.cc \ src/core/lib/transport/error_utils.cc \ src/core/lib/transport/handshaker.cc \ @@ -2244,6 +2245,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/lib/surface/version.cc \ src/core/lib/transport/batch_builder.cc \ src/core/lib/transport/bdp_estimator.cc \ + src/core/lib/transport/call_final_info.cc \ src/core/lib/transport/connectivity_state.cc \ src/core/lib/transport/error_utils.cc \ src/core/lib/transport/handshaker.cc \ diff --git a/Package.swift b/Package.swift index 909c493af11..5bf0a78e600 100644 --- a/Package.swift +++ b/Package.swift @@ -1887,6 +1887,8 @@ let package = Package( "src/core/lib/transport/batch_builder.h", "src/core/lib/transport/bdp_estimator.cc", "src/core/lib/transport/bdp_estimator.h", + "src/core/lib/transport/call_final_info.cc", + "src/core/lib/transport/call_final_info.h", "src/core/lib/transport/connectivity_state.cc", "src/core/lib/transport/connectivity_state.h", "src/core/lib/transport/custom_metadata.h", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index aa1179bd3e5..3a956abcf0c 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -1168,6 +1168,7 @@ libs: - src/core/lib/surface/wait_for_cq_end_op.h - src/core/lib/transport/batch_builder.h - src/core/lib/transport/bdp_estimator.h + - src/core/lib/transport/call_final_info.h - src/core/lib/transport/connectivity_state.h - src/core/lib/transport/custom_metadata.h - src/core/lib/transport/error_utils.h @@ -1964,6 +1965,7 @@ libs: - src/core/lib/surface/version.cc - src/core/lib/transport/batch_builder.cc - src/core/lib/transport/bdp_estimator.cc + - src/core/lib/transport/call_final_info.cc - src/core/lib/transport/connectivity_state.cc - src/core/lib/transport/error_utils.cc - src/core/lib/transport/handshaker.cc @@ -2601,6 +2603,7 @@ libs: - src/core/lib/surface/wait_for_cq_end_op.h - src/core/lib/transport/batch_builder.h - src/core/lib/transport/bdp_estimator.h + - src/core/lib/transport/call_final_info.h - src/core/lib/transport/connectivity_state.h - src/core/lib/transport/custom_metadata.h - src/core/lib/transport/error_utils.h @@ -3015,6 +3018,7 @@ libs: - src/core/lib/surface/version.cc - src/core/lib/transport/batch_builder.cc - src/core/lib/transport/bdp_estimator.cc + - src/core/lib/transport/call_final_info.cc - src/core/lib/transport/connectivity_state.cc - src/core/lib/transport/error_utils.cc - src/core/lib/transport/handshaker.cc @@ -4738,6 +4742,7 @@ libs: - src/core/lib/surface/validate_metadata.h - src/core/lib/surface/wait_for_cq_end_op.h - src/core/lib/transport/batch_builder.h + - src/core/lib/transport/call_final_info.h - src/core/lib/transport/connectivity_state.h - src/core/lib/transport/custom_metadata.h - src/core/lib/transport/error_utils.h @@ -5061,6 +5066,7 @@ libs: - src/core/lib/surface/validate_metadata.cc - src/core/lib/surface/version.cc - src/core/lib/transport/batch_builder.cc + - src/core/lib/transport/call_final_info.cc - src/core/lib/transport/connectivity_state.cc - src/core/lib/transport/error_utils.cc - src/core/lib/transport/handshaker.cc diff --git a/config.m4 b/config.m4 index eaafbe168f0..157bc2a173d 100644 --- a/config.m4 +++ b/config.m4 @@ -833,6 +833,7 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/surface/version.cc \ src/core/lib/transport/batch_builder.cc \ src/core/lib/transport/bdp_estimator.cc \ + src/core/lib/transport/call_final_info.cc \ src/core/lib/transport/connectivity_state.cc \ src/core/lib/transport/error_utils.cc \ src/core/lib/transport/handshaker.cc \ diff --git a/config.w32 b/config.w32 index 787f9184edd..d36b3beb2fb 100644 --- a/config.w32 +++ b/config.w32 @@ -798,6 +798,7 @@ if (PHP_GRPC != "no") { "src\\core\\lib\\surface\\version.cc " + "src\\core\\lib\\transport\\batch_builder.cc " + "src\\core\\lib\\transport\\bdp_estimator.cc " + + "src\\core\\lib\\transport\\call_final_info.cc " + "src\\core\\lib\\transport\\connectivity_state.cc " + "src\\core\\lib\\transport\\error_utils.cc " + "src\\core\\lib\\transport\\handshaker.cc " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 3cae944ab45..4b54894cee7 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -1263,6 +1263,7 @@ Pod::Spec.new do |s| 'src/core/lib/surface/wait_for_cq_end_op.h', 'src/core/lib/transport/batch_builder.h', 'src/core/lib/transport/bdp_estimator.h', + 'src/core/lib/transport/call_final_info.h', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', 'src/core/lib/transport/error_utils.h', @@ -2508,6 +2509,7 @@ Pod::Spec.new do |s| 'src/core/lib/surface/wait_for_cq_end_op.h', 'src/core/lib/transport/batch_builder.h', 'src/core/lib/transport/bdp_estimator.h', + 'src/core/lib/transport/call_final_info.h', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', 'src/core/lib/transport/error_utils.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 64a9a422c20..f6e9adef455 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1986,6 +1986,8 @@ Pod::Spec.new do |s| 'src/core/lib/transport/batch_builder.h', 'src/core/lib/transport/bdp_estimator.cc', 'src/core/lib/transport/bdp_estimator.h', + 'src/core/lib/transport/call_final_info.cc', + 'src/core/lib/transport/call_final_info.h', 'src/core/lib/transport/connectivity_state.cc', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', @@ -3277,6 +3279,7 @@ Pod::Spec.new do |s| 'src/core/lib/surface/wait_for_cq_end_op.h', 'src/core/lib/transport/batch_builder.h', 'src/core/lib/transport/bdp_estimator.h', + 'src/core/lib/transport/call_final_info.h', 'src/core/lib/transport/connectivity_state.h', 'src/core/lib/transport/custom_metadata.h', 'src/core/lib/transport/error_utils.h', diff --git a/grpc.gemspec b/grpc.gemspec index 7c770a8a534..88f659135d9 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1889,6 +1889,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/transport/batch_builder.h ) s.files += %w( src/core/lib/transport/bdp_estimator.cc ) s.files += %w( src/core/lib/transport/bdp_estimator.h ) + s.files += %w( src/core/lib/transport/call_final_info.cc ) + s.files += %w( src/core/lib/transport/call_final_info.h ) s.files += %w( src/core/lib/transport/connectivity_state.cc ) s.files += %w( src/core/lib/transport/connectivity_state.h ) s.files += %w( src/core/lib/transport/custom_metadata.h ) diff --git a/grpc.gyp b/grpc.gyp index 37f7bb50dd0..c528adf8120 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -1020,6 +1020,7 @@ 'src/core/lib/surface/version.cc', 'src/core/lib/transport/batch_builder.cc', 'src/core/lib/transport/bdp_estimator.cc', + 'src/core/lib/transport/call_final_info.cc', 'src/core/lib/transport/connectivity_state.cc', 'src/core/lib/transport/error_utils.cc', 'src/core/lib/transport/handshaker.cc', @@ -1504,6 +1505,7 @@ 'src/core/lib/surface/version.cc', 'src/core/lib/transport/batch_builder.cc', 'src/core/lib/transport/bdp_estimator.cc', + 'src/core/lib/transport/call_final_info.cc', 'src/core/lib/transport/connectivity_state.cc', 'src/core/lib/transport/error_utils.cc', 'src/core/lib/transport/handshaker.cc', @@ -2280,6 +2282,7 @@ 'src/core/lib/surface/validate_metadata.cc', 'src/core/lib/surface/version.cc', 'src/core/lib/transport/batch_builder.cc', + 'src/core/lib/transport/call_final_info.cc', 'src/core/lib/transport/connectivity_state.cc', 'src/core/lib/transport/error_utils.cc', 'src/core/lib/transport/handshaker.cc', diff --git a/package.xml b/package.xml index 9df45c5f2ea..8bfc9459ed8 100644 --- a/package.xml +++ b/package.xml @@ -1871,6 +1871,8 @@ + + diff --git a/src/core/lib/transport/call_final_info.cc b/src/core/lib/transport/call_final_info.cc index f9f425c1db7..88be823abf5 100644 --- a/src/core/lib/transport/call_final_info.cc +++ b/src/core/lib/transport/call_final_info.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "src/core/lib/transport/call_final_info.h" #include diff --git a/src/core/lib/transport/call_final_info.h b/src/core/lib/transport/call_final_info.h index d7e6108daa0..8f7165f05f7 100644 --- a/src/core/lib/transport/call_final_info.h +++ b/src/core/lib/transport/call_final_info.h @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef CALL_FINAL_STATS_H -#define CALL_FINAL_STATS_H +#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FINAL_INFO_H +#define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FINAL_INFO_H + +#include #include @@ -49,4 +51,4 @@ struct grpc_call_final_info { const char* error_string = nullptr; }; -#endif +#endif // GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FINAL_INFO_H diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index b6f72dccf97..021c7350538 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -807,6 +807,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/surface/version.cc', 'src/core/lib/transport/batch_builder.cc', 'src/core/lib/transport/bdp_estimator.cc', + 'src/core/lib/transport/call_final_info.cc', 'src/core/lib/transport/connectivity_state.cc', 'src/core/lib/transport/error_utils.cc', 'src/core/lib/transport/handshaker.cc', diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 8d399e8d873..608c24cf634 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -2888,6 +2888,8 @@ src/core/lib/transport/batch_builder.cc \ src/core/lib/transport/batch_builder.h \ src/core/lib/transport/bdp_estimator.cc \ src/core/lib/transport/bdp_estimator.h \ +src/core/lib/transport/call_final_info.cc \ +src/core/lib/transport/call_final_info.h \ src/core/lib/transport/connectivity_state.cc \ src/core/lib/transport/connectivity_state.h \ src/core/lib/transport/custom_metadata.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 095b92ed667..fcfa3664029 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -2669,6 +2669,8 @@ src/core/lib/transport/batch_builder.cc \ src/core/lib/transport/batch_builder.h \ src/core/lib/transport/bdp_estimator.cc \ src/core/lib/transport/bdp_estimator.h \ +src/core/lib/transport/call_final_info.cc \ +src/core/lib/transport/call_final_info.h \ src/core/lib/transport/connectivity_state.cc \ src/core/lib/transport/connectivity_state.h \ src/core/lib/transport/custom_metadata.h \