[Gpr_To_Absl_Logging] [Gpr_To_Absl_Logging] Remove gpr logging header include from other headers

6 months ago · 9b2b3b325b
parent 0fa05242e9
commit 9b2b3b325b
48 changed files with 9 additions and 43 deletions
--- a/include/grpc/event_engine/slice.h
+++ b/include/grpc/event_engine/slice.h
@ -25,7 +25,6 @@

 #include <grpc/event_engine/internal/slice_cast.h>
 #include <grpc/slice.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>

 // This public slice definition largely based of the internal grpc_core::Slice
--- a/include/grpc/event_engine/slice_buffer.h
+++ b/include/grpc/event_engine/slice_buffer.h
@ -28,7 +28,6 @@
 #include <grpc/impl/codegen/slice.h>
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>

 namespace grpc_event_engine {
--- a/include/grpc/impl/codegen/log.h
+++ b/include/grpc/impl/codegen/log.h
@ -24,6 +24,5 @@
 #include <grpc/impl/codegen/port_platform.h>

 /// TODO(chengyuc): Remove this file after solving compatibility.
-#include <grpc/support/log.h>

 #endif /* GRPC_IMPL_CODEGEN_LOG_H */
--- a/include/grpcpp/client_context.h
+++ b/include/grpcpp/client_context.h
@ -42,7 +42,6 @@

 #include <grpc/impl/compression_types.h>
 #include <grpc/impl/propagation_bits.h>
-#include <grpc/support/log.h>
 #include <grpcpp/impl/create_auth_context.h>
 #include <grpcpp/impl/metadata_map.h>
 #include <grpcpp/impl/rpc_method.h>
--- a/include/grpcpp/completion_queue.h
+++ b/include/grpcpp/completion_queue.h
@ -38,7 +38,6 @@

 #include <grpc/grpc.h>
 #include <grpc/support/atm.h>
-#include <grpc/support/log.h>
 #include <grpc/support/time.h>
 #include <grpcpp/impl/codegen/rpc_service_method.h>
 #include <grpcpp/impl/codegen/status.h>
--- a/include/grpcpp/impl/interceptor_common.h
+++ b/include/grpcpp/impl/interceptor_common.h
@ -25,7 +25,6 @@
 #include "absl/log/absl_check.h"

 #include <grpc/impl/grpc_types.h>
-#include <grpc/support/log.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/call_op_set_interface.h>
 #include <grpcpp/impl/intercepted_channel.h>
--- a/include/grpcpp/impl/metadata_map.h
+++ b/include/grpcpp/impl/metadata_map.h
@ -22,7 +22,6 @@
 #include <map>

 #include <grpc/grpc.h>
-#include <grpc/support/log.h>
 #include <grpcpp/support/slice.h>

 namespace grpc {
--- a/include/grpcpp/impl/proto_utils.h
+++ b/include/grpcpp/impl/proto_utils.h
@ -26,7 +26,6 @@
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpc/slice.h>
-#include <grpc/support/log.h>
 #include <grpcpp/impl/codegen/config_protobuf.h>
 #include <grpcpp/impl/serialization_traits.h>
 #include <grpcpp/support/byte_buffer.h>
--- a/include/grpcpp/impl/server_callback_handlers.h
+++ b/include/grpcpp/impl/server_callback_handlers.h
@ -22,7 +22,6 @@

 #include <grpc/grpc.h>
 #include <grpc/impl/call.h>
-#include <grpc/support/log.h>
 #include <grpcpp/impl/rpc_service_method.h>
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/message_allocator.h>
--- a/include/grpcpp/impl/service_type.h
+++ b/include/grpcpp/impl/service_type.h
@ -21,7 +21,6 @@

 #include "absl/log/absl_check.h"

-#include <grpc/support/log.h>
 #include <grpcpp/impl/rpc_service_method.h>
 #include <grpcpp/impl/serialization_traits.h>
 #include <grpcpp/server_interface.h>
--- a/include/grpcpp/impl/sync.h
+++ b/include/grpcpp/impl/sync.h
@ -30,7 +30,6 @@
 #include "absl/log/absl_check.h"
 #include "absl/synchronization/mutex.h"

-#include <grpc/support/log.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>

--- a/include/grpcpp/security/tls_certificate_provider.h
+++ b/include/grpcpp/security/tls_certificate_provider.h
@ -24,7 +24,6 @@
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
-#include <grpc/support/log.h>
 #include <grpcpp/support/config.h>

 namespace grpc {
--- a/include/grpcpp/security/tls_certificate_verifier.h
+++ b/include/grpcpp/security/tls_certificate_verifier.h
@ -25,7 +25,6 @@

 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
-#include <grpc/support/log.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/impl/sync.h>
 #include <grpcpp/support/config.h>
--- a/include/grpcpp/security/tls_credentials_options.h
+++ b/include/grpcpp/security/tls_credentials_options.h
@ -25,7 +25,6 @@
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
-#include <grpc/support/log.h>
 #include <grpcpp/security/tls_certificate_provider.h>
 #include <grpcpp/security/tls_certificate_verifier.h>
 #include <grpcpp/security/tls_crl_provider.h>
--- a/include/grpcpp/server_interface.h
+++ b/include/grpcpp/server_interface.h
@ -23,7 +23,6 @@

 #include <grpc/grpc.h>
 #include <grpc/impl/grpc_types.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 #include <grpcpp/impl/call.h>
--- a/include/grpcpp/support/async_stream.h
+++ b/include/grpcpp/support/async_stream.h
@ -22,7 +22,6 @@
 #include "absl/log/absl_check.h"

 #include <grpc/grpc.h>
-#include <grpc/support/log.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/channel_interface.h>
 #include <grpcpp/impl/service_type.h>
--- a/include/grpcpp/support/async_unary_call.h
+++ b/include/grpcpp/support/async_unary_call.h
@ -22,7 +22,6 @@
 #include "absl/log/absl_check.h"

 #include <grpc/grpc.h>
-#include <grpc/support/log.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/call_op_set.h>
--- a/include/grpcpp/support/byte_buffer.h
+++ b/include/grpcpp/support/byte_buffer.h
@ -23,7 +23,6 @@

 #include <grpc/byte_buffer.h>
 #include <grpc/grpc.h>
-#include <grpc/support/log.h>
 #include <grpcpp/impl/serialization_traits.h>
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/slice.h>
--- a/include/grpcpp/support/callback_common.h
+++ b/include/grpcpp/support/callback_common.h
@ -25,7 +25,6 @@

 #include <grpc/grpc.h>
 #include <grpc/impl/grpc_types.h>
-#include <grpc/support/log.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/codegen/channel_interface.h>
 #include <grpcpp/impl/completion_queue_tag.h>
--- a/include/grpcpp/support/client_callback.h
+++ b/include/grpcpp/support/client_callback.h
@ -26,7 +26,6 @@

 #include <grpc/grpc.h>
 #include <grpc/impl/call.h>
-#include <grpc/support/log.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/call_op_set.h>
 #include <grpcpp/impl/sync.h>
--- a/include/grpcpp/support/client_interceptor.h
+++ b/include/grpcpp/support/client_interceptor.h
@ -24,7 +24,6 @@

 #include "absl/log/absl_check.h"

-#include <grpc/support/log.h>
 #include <grpcpp/impl/rpc_method.h>
 #include <grpcpp/support/interceptor.h>
 #include <grpcpp/support/string_ref.h>
--- a/include/grpcpp/support/method_handler.h
+++ b/include/grpcpp/support/method_handler.h
@ -22,7 +22,6 @@
 #include "absl/log/absl_check.h"

 #include <grpc/byte_buffer.h>
-#include <grpc/support/log.h>
 #include <grpcpp/impl/rpc_service_method.h>
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/sync_stream.h>
--- a/include/grpcpp/support/proto_buffer_reader.h
+++ b/include/grpcpp/support/proto_buffer_reader.h
@ -28,7 +28,6 @@
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpc/slice.h>
-#include <grpc/support/log.h>
 #include <grpcpp/impl/codegen/config_protobuf.h>
 #include <grpcpp/impl/serialization_traits.h>
 #include <grpcpp/support/byte_buffer.h>
--- a/include/grpcpp/support/proto_buffer_writer.h
+++ b/include/grpcpp/support/proto_buffer_writer.h
@ -28,7 +28,6 @@
 #include <grpc/impl/grpc_types.h>
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
-#include <grpc/support/log.h>
 #include <grpcpp/impl/codegen/config_protobuf.h>
 #include <grpcpp/impl/serialization_traits.h>
 #include <grpcpp/support/byte_buffer.h>
--- a/include/grpcpp/support/server_interceptor.h
+++ b/include/grpcpp/support/server_interceptor.h
@ -24,7 +24,6 @@

 #include "absl/log/absl_check.h"

-#include <grpc/support/log.h>
 #include <grpcpp/impl/rpc_method.h>
 #include <grpcpp/support/interceptor.h>
 #include <grpcpp/support/string_ref.h>
--- a/include/grpcpp/support/sync_stream.h
+++ b/include/grpcpp/support/sync_stream.h
@ -21,7 +21,6 @@

 #include "absl/log/absl_check.h"

-#include <grpc/support/log.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/impl/call.h>
--- a/src/core/lib/surface/init.cc
+++ b/src/core/lib/surface/init.cc
@ -24,6 +24,7 @@
 #include <grpc/fork.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
--- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
+++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
@ -29,7 +29,6 @@

 #include "absl/log/check.h"

-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 #include <grpcpp/alarm.h>
 #include <grpcpp/grpcpp.h>
--- a/test/core/end2end/end2end_tests.h
+++ b/test/core/end2end/end2end_tests.h
@ -46,7 +46,6 @@
 #include <grpc/impl/propagation_bits.h>
 #include <grpc/status.h>
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/time.h>

 #include "src/core/lib/channel/channel_args.h"
--- a/test/core/end2end/fixtures/h2_oauth2_common.h
+++ b/test/core/end2end/fixtures/h2_oauth2_common.h
@ -26,7 +26,6 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
-#include <grpc/support/log.h>

 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
--- a/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h
+++ b/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h
@ -26,7 +26,6 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
-#include <grpc/support/log.h>

 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
--- a/test/core/end2end/fixtures/h2_ssl_tls_common.h
+++ b/test/core/end2end/fixtures/h2_ssl_tls_common.h
@ -26,7 +26,6 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
-#include <grpc/support/log.h>

 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
--- a/test/core/end2end/fixtures/h2_tls_common.h
+++ b/test/core/end2end/fixtures/h2_tls_common.h
@ -34,7 +34,6 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
-#include <grpc/support/log.h>

 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
--- a/test/core/end2end/fixtures/secure_fixture.h
+++ b/test/core/end2end/fixtures/secure_fixture.h
@ -24,7 +24,6 @@
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
-#include <grpc/support/log.h>

 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/host_port.h"
--- a/test/core/end2end/fixtures/sockpair_fixture.h
+++ b/test/core/end2end/fixtures/sockpair_fixture.h
@ -26,7 +26,6 @@
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
-#include <grpc/support/log.h>

 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
--- a/test/core/end2end/fuzzers/fuzzing_common.h
+++ b/test/core/end2end/fuzzers/fuzzing_common.h
@ -32,7 +32,6 @@
 #include "absl/types/span.h"

 #include <grpc/grpc.h>
-#include <grpc/support/log.h>

 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
--- a/test/core/event_engine/test_suite/event_engine_test_framework.h
+++ b/test/core/event_engine/test_suite/event_engine_test_framework.h
@ -23,7 +23,6 @@
 #include "absl/log/check.h"

 #include <grpc/event_engine/event_engine.h>
-#include <grpc/support/log.h>

 extern absl::AnyInvocable<
    std::shared_ptr<grpc_event_engine::experimental::EventEngine>()>*
--- a/test/core/promise/mpsc_test.cc
+++ b/test/core/promise/mpsc_test.cc
@ -21,6 +21,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"

+#include <grpc/support/log.h>
+
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/promise.h"
 #include "test/core/promise/poll_matcher.h"
--- a/test/core/promise/observable_test.cc
+++ b/test/core/promise/observable_test.cc
@ -23,6 +23,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"

+#include <grpc/support/log.h>
+
 #include "src/core/lib/gprpp/notification.h"
 #include "src/core/lib/promise/loop.h"
 #include "src/core/lib/promise/map.h"
--- a/test/core/resource_quota/call_checker.h
+++ b/test/core/resource_quota/call_checker.h
@ -19,8 +19,6 @@

 #include "absl/log/check.h"

-#include <grpc/support/log.h>
-
 namespace grpc_core {
 namespace testing {

--- a/test/core/resource_quota/memory_quota_fuzzer.cc
+++ b/test/core/resource_quota/memory_quota_fuzzer.cc
@ -27,6 +27,7 @@

 #include <grpc/event_engine/memory_allocator.h>
 #include <grpc/event_engine/memory_request.h>
+#include <grpc/support/log.h>

 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/config.h"
--- a/test/core/resource_quota/memory_quota_test.cc
+++ b/test/core/resource_quota/memory_quota_test.cc
@ -25,6 +25,7 @@
 #include "gtest/gtest.h"

 #include <grpc/slice.h>
+#include <grpc/support/log.h>

 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "test/core/resource_quota/call_checker.h"
--- a/test/core/resource_quota/periodic_update_test.cc
+++ b/test/core/resource_quota/periodic_update_test.cc
@ -22,6 +22,7 @@

 #include "gtest/gtest.h"

+#include <grpc/support/log.h>
 #include <grpc/support/time.h>

 #include "src/core/lib/iomgr/exec_ctx.h"
--- a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h
+++ b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h
@ -24,8 +24,6 @@
 #include "absl/memory/memory.h"
 #include "absl/status/status.h"

-#include <grpc/support/log.h>
-
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/wire_reader.h"
 #include "src/core/lib/gprpp/crash.h"
--- a/test/core/transport/interception_chain_test.cc
+++ b/test/core/transport/interception_chain_test.cc
@ -21,6 +21,7 @@
 #include "gtest/gtest.h"

 #include <grpc/grpc.h>
+#include <grpc/support/log.h>

 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
--- a/test/cpp/end2end/xds/xds_server.h
+++ b/test/cpp/end2end/xds/xds_server.h
@ -27,7 +27,6 @@
 #include "absl/log/log.h"
 #include "absl/types/optional.h"

-#include <grpc/support/log.h>
 #include <grpcpp/support/status.h>

 #include "src/core/lib/address_utils/parse_address.h"
--- a/test/cpp/microbenchmarks/fullstack_context_mutators.h
+++ b/test/cpp/microbenchmarks/fullstack_context_mutators.h
@ -19,7 +19,6 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_CONTEXT_MUTATORS_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_CONTEXT_MUTATORS_H

-#include <grpc/support/log.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/create_channel.h>
 #include <grpcpp/security/credentials.h>
--- a/test/cpp/microbenchmarks/fullstack_fixtures.h
+++ b/test/cpp/microbenchmarks/fullstack_fixtures.h
@ -23,7 +23,6 @@

 #include <grpc/grpc.h>
 #include <grpc/support/atm.h>
-#include <grpc/support/log.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/create_channel.h>
 #include <grpcpp/security/credentials.h>