Skip to content

Automated fix for refs/heads/test_748410400 #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: test_748410400
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion include/grpcpp/ext/csm_observability.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

#include <memory>

#include "opentelemetry/metrics/meter_provider.h"
#include "absl/functional/any_invocable.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "opentelemetry/metrics/meter_provider.h"

namespace grpc {

Expand Down
6 changes: 3 additions & 3 deletions include/grpcpp/ext/otel_plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@

#include <memory>

#include "opentelemetry/context/propagation/text_map_propagator.h"
#include "opentelemetry/metrics/meter_provider.h"
#include "opentelemetry/trace/tracer_provider.h"
#include "absl/functional/any_invocable.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "opentelemetry/context/propagation/text_map_propagator.h"
#include "opentelemetry/metrics/meter_provider.h"
#include "opentelemetry/trace/tracer_provider.h"

namespace grpc {
namespace internal {
Expand Down
12 changes: 8 additions & 4 deletions include/grpcpp/impl/codegen/config_protobuf.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,26 @@
#ifndef GRPC_CUSTOM_DESCRIPTORDATABASE
#include <google/protobuf/descriptor_database.h>
#define GRPC_CUSTOM_DESCRIPTORDATABASE ::google::protobuf::DescriptorDatabase
#define GRPC_CUSTOM_SIMPLEDESCRIPTORDATABASE ::google::protobuf::SimpleDescriptorDatabase
#define GRPC_CUSTOM_SIMPLEDESCRIPTORDATABASE \
::google::protobuf::SimpleDescriptorDatabase
#endif

#ifndef GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM
#include <google/protobuf/io/coded_stream.h>
#include <google/protobuf/io/zero_copy_stream.h>
#define GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM ::google::protobuf::io::ZeroCopyOutputStream
#define GRPC_CUSTOM_ZEROCOPYINPUTSTREAM ::google::protobuf::io::ZeroCopyInputStream
#define GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM \
::google::protobuf::io::ZeroCopyOutputStream
#define GRPC_CUSTOM_ZEROCOPYINPUTSTREAM \
::google::protobuf::io::ZeroCopyInputStream
#define GRPC_CUSTOM_CODEDINPUTSTREAM ::google::protobuf::io::CodedInputStream
#define GRPC_CUSTOM_CODEDOUTPUTSTREAM ::google::protobuf::io::CodedOutputStream
#endif

#ifndef GRPC_CUSTOM_JSONUTIL
#include "absl/status/status.h"
#include <google/protobuf/util/json_util.h>
#include <google/protobuf/util/type_resolver_util.h>

#include "absl/status/status.h"
#define GRPC_CUSTOM_JSONUTIL ::google::protobuf::util
#define GRPC_CUSTOM_UTIL_STATUS ::absl::Status
#endif
Expand Down
9 changes: 6 additions & 3 deletions src/compiler/config_protobuf.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
#ifndef GRPC_CUSTOM_CODEGENERATOR
#include <google/protobuf/compiler/code_generator.h>
#define GRPC_CUSTOM_CODEGENERATOR ::google::protobuf::compiler::CodeGenerator
#define GRPC_CUSTOM_GENERATORCONTEXT ::google::protobuf::compiler::GeneratorContext
#define GRPC_CUSTOM_GENERATORCONTEXT \
::google::protobuf::compiler::GeneratorContext
#endif

#ifndef GRPC_CUSTOM_PRINTER
Expand All @@ -33,7 +34,8 @@
#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
#define GRPC_CUSTOM_PRINTER ::google::protobuf::io::Printer
#define GRPC_CUSTOM_CODEDOUTPUTSTREAM ::google::protobuf::io::CodedOutputStream
#define GRPC_CUSTOM_STRINGOUTPUTSTREAM ::google::protobuf::io::StringOutputStream
#define GRPC_CUSTOM_STRINGOUTPUTSTREAM \
::google::protobuf::io::StringOutputStream
#endif

#ifndef GRPC_CUSTOM_PLUGINMAIN
Expand All @@ -49,7 +51,8 @@

#ifndef GRPC_CUSTOM_CSHARP_GETCLASSNAME
#include <google/protobuf/compiler/csharp/names.h>
#define GRPC_CUSTOM_CSHARP_GETCLASSNAME ::google::protobuf::compiler::csharp::GetClassName
#define GRPC_CUSTOM_CSHARP_GETCLASSNAME \
::google::protobuf::compiler::csharp::GetClassName
#define GRPC_CUSTOM_CSHARP_GETFILENAMESPACE \
::google::protobuf::compiler::csharp::GetFileNamespace
#define GRPC_CUSTOM_CSHARP_GETOUTPUTFILE \
Expand Down
5 changes: 3 additions & 2 deletions src/compiler/objective_c_generator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,20 @@

#include "src/compiler/objective_c_generator.h"

#include <google/protobuf/compiler/objectivec/names.h>

#include <map>
#include <set>
#include <sstream>

#include "src/compiler/config.h"
#include "src/compiler/objective_c_generator_helpers.h"
#include <google/protobuf/compiler/objectivec/names.h>

using ::google::protobuf::compiler::objectivec::ClassName;
using ::grpc::protobuf::FileDescriptor;
using ::grpc::protobuf::MethodDescriptor;
using ::grpc::protobuf::ServiceDescriptor;
using ::grpc::protobuf::io::Printer;
using ::google::protobuf::compiler::objectivec::ClassName;
using ::std::map;
using ::std::set;

Expand Down
6 changes: 4 additions & 2 deletions src/compiler/objective_c_generator_helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@
#ifndef GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_HELPERS_H
#define GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_HELPERS_H

#include <google/protobuf/compiler/objectivec/names.h>

#include <map>

#include "src/compiler/config.h"
#include "src/compiler/generator_helpers.h"
#include <google/protobuf/compiler/objectivec/names.h>

namespace grpc_objective_c_generator {

Expand All @@ -39,7 +40,8 @@ inline bool AsciiIsUpper(char c) { return c >= 'A' && c <= 'Z'; }

inline ::std::string ServiceClassName(const ServiceDescriptor* service) {
const FileDescriptor* file = service->file();
::std::string prefix = google::protobuf::compiler::objectivec::FileClassPrefix(file);
::std::string prefix =
google::protobuf::compiler::objectivec::FileClassPrefix(file);
::std::string class_name(service->name());
// We add the prefix in the cases where the string is missing a prefix.
// We define "missing a prefix" as where 'input':
Expand Down
9 changes: 6 additions & 3 deletions src/compiler/objective_c_plugin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@

// Generates Objective C gRPC service interface out of Protobuf IDL.

#include <google/protobuf/compiler/objectivec/names.h>

#include <memory>

#include "src/compiler/config.h"
#include "src/compiler/objective_c_generator.h"
#include "src/compiler/objective_c_generator_helpers.h"
#include <google/protobuf/compiler/objectivec/names.h>

using ::google::protobuf::compiler::objectivec::IsProtobufLibraryBundledProtoFile;
using ::google::protobuf::compiler::objectivec::
IsProtobufLibraryBundledProtoFile;
using ::google::protobuf::compiler::objectivec::ProtobufLibraryFrameworkName;
#ifdef SUPPORT_OBJC_PREFIX_VALIDATION
using ::google::protobuf::compiler::objectivec::ValidateObjCClassPrefixes;
Expand Down Expand Up @@ -156,7 +158,8 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
static const ::std::string kForwardDeclare =
"GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO";

::std::string file_name = google::protobuf::compiler::objectivec::FilePath(file);
::std::string file_name =
google::protobuf::compiler::objectivec::FilePath(file);

grpc_objective_c_generator::Parameters generator_params;
generator_params.no_v1_compatibility = false;
Expand Down
5 changes: 3 additions & 2 deletions src/compiler/php_generator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,21 @@
*
*/

#include <google/protobuf/compiler/php/names.h>

#include <map>

#include "src/compiler/config.h"
#include "src/compiler/generator_helpers.h"
#include "src/compiler/php_generator_helpers.h"
#include <google/protobuf/compiler/php/names.h>

using google::protobuf::compiler::php::GeneratedClassName;
using grpc::protobuf::Descriptor;
using grpc::protobuf::FileDescriptor;
using grpc::protobuf::MethodDescriptor;
using grpc::protobuf::ServiceDescriptor;
using grpc::protobuf::io::Printer;
using grpc::protobuf::io::StringOutputStream;
using google::protobuf::compiler::php::GeneratedClassName;
using std::map;

namespace grpc_php_generator {
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/php_plugin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
#include "src/compiler/php_generator.h"
#include "src/compiler/php_generator_helpers.h"

using google::protobuf::compiler::ParseGeneratorParameter;
using grpc_php_generator::GenerateFile;
using grpc_php_generator::GetPHPServiceFilename;
using google::protobuf::compiler::ParseGeneratorParameter;

class PHPGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
public:
Expand Down
4 changes: 2 additions & 2 deletions src/core/call/call_filters.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

#include <grpc/support/port_platform.h>

#include "src/core/call/metadata.h"
#include "src/core/util/crash.h"
#include "absl/log/check.h"
#include "absl/log/log.h"
#include "src/core/call/metadata.h"
#include "src/core/util/crash.h"

namespace grpc_core {
// Call data for those calls that don't have any call data
Expand Down
2 changes: 1 addition & 1 deletion src/core/call/call_filters.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <ostream>
#include <type_traits>

#include "absl/log/check.h"
#include "src/core/call/call_state.h"
#include "src/core/call/message.h"
#include "src/core/call/metadata.h"
Expand All @@ -38,7 +39,6 @@
#include "src/core/util/dump_args.h"
#include "src/core/util/ref_counted.h"
#include "src/core/util/ref_counted_ptr.h"
#include "absl/log/check.h"

// CallFilters tracks a list of filters that are attached to a call.
// At a high level, a filter (for the purposes of this module) is a class
Expand Down
2 changes: 1 addition & 1 deletion src/core/call/call_spine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

#include <grpc/support/port_platform.h>

#include "absl/functional/any_invocable.h"
#include "src/core/lib/event_engine/event_engine_context.h"
#include "src/core/lib/promise/for_each.h"
#include "src/core/lib/promise/try_seq.h"
#include "absl/functional/any_invocable.h"

namespace grpc_core {

Expand Down
2 changes: 1 addition & 1 deletion src/core/call/call_spine.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <grpc/support/port_platform.h>

#include "absl/log/check.h"
#include "src/core/call/call_arena_allocator.h"
#include "src/core/call/call_filters.h"
#include "src/core/call/message.h"
Expand All @@ -31,7 +32,6 @@
#include "src/core/lib/promise/status_flag.h"
#include "src/core/lib/promise/try_seq.h"
#include "src/core/util/dual_ref_counted.h"
#include "absl/log/check.h"

namespace grpc_core {

Expand Down
6 changes: 3 additions & 3 deletions src/core/call/client_call.cc
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
#include <string>
#include <utility>

#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/strings/string_view.h"
#include "src/core/call/metadata.h"
#include "src/core/lib/event_engine/event_engine_context.h"
#include "src/core/lib/promise/all_ok.h"
Expand All @@ -54,9 +57,6 @@
#include "src/core/util/latent_see.h"
#include "src/core/util/ref_counted.h"
#include "src/core/util/ref_counted_ptr.h"
#include "absl/log/check.h"
#include "absl/status/status.h"
#include "absl/strings/string_view.h"

namespace grpc_core {

Expand Down
6 changes: 3 additions & 3 deletions src/core/call/client_call.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
#include <cstdint>
#include <string>

#include "absl/status/status.h"
#include "absl/strings/str_format.h"
#include "absl/strings/string_view.h"
#include "src/core/call/metadata.h"
#include "src/core/lib/promise/status_flag.h"
#include "src/core/lib/resource_quota/arena.h"
Expand All @@ -46,9 +49,6 @@
#include "src/core/util/ref_counted.h"
#include "src/core/util/ref_counted_ptr.h"
#include "src/core/util/single_set_ptr.h"
#include "absl/status/status.h"
#include "absl/strings/str_format.h"
#include "absl/strings/string_view.h"

namespace grpc_core {

Expand Down
4 changes: 2 additions & 2 deletions src/core/call/filter_fusion.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
#include <type_traits>
#include <utility>

#include "absl/log/log.h"
#include "absl/status/status.h"
#include "src/core/call/call_filters.h"
#include "src/core/call/metadata.h"
#include "src/core/lib/channel/promise_based_filter.h"
#include "src/core/lib/transport/call_final_info.h"
#include "src/core/util/type_list.h"
#include "absl/log/log.h"
#include "absl/status/status.h"

struct grpc_transport_op;

Expand Down
2 changes: 1 addition & 1 deletion src/core/call/metadata_batch.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
#include <algorithm>
#include <string>

#include "src/core/lib/transport/timeout_encoding.h"
#include "absl/base/no_destructor.h"
#include "absl/container/flat_hash_set.h"
#include "absl/strings/escaping.h"
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
#include "src/core/lib/transport/timeout_encoding.h"

namespace grpc_core {
namespace metadata_detail {
Expand Down
12 changes: 6 additions & 6 deletions src/core/call/metadata_batch.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@
#include <type_traits>
#include <utility>

#include "absl/container/inlined_vector.h"
#include "absl/functional/function_ref.h"
#include "absl/log/check.h"
#include "absl/meta/type_traits.h"
#include "absl/strings/numbers.h"
#include "absl/strings/string_view.h"
#include "src/core/call/custom_metadata.h"
#include "src/core/call/metadata_compression_traits.h"
#include "src/core/call/parsed_metadata.h"
Expand All @@ -43,12 +49,6 @@
#include "src/core/util/packed_table.h"
#include "src/core/util/time.h"
#include "src/core/util/type_list.h"
#include "absl/container/inlined_vector.h"
#include "absl/functional/function_ref.h"
#include "absl/log/check.h"
#include "absl/meta/type_traits.h"
#include "absl/strings/numbers.h"
#include "absl/strings/string_view.h"

namespace grpc_core {

Expand Down
2 changes: 1 addition & 1 deletion src/core/call/metadata_info.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include <cstddef>
#include <string>

#include "src/core/lib/slice/slice.h"
#include "absl/strings/str_cat.h"
#include "src/core/lib/slice/slice.h"

namespace grpc_core {

Expand Down
4 changes: 2 additions & 2 deletions src/core/call/parsed_metadata.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
#include <type_traits>
#include <utility>

#include "src/core/lib/slice/slice.h"
#include "src/core/util/time.h"
#include "absl/functional/function_ref.h"
#include "absl/meta/type_traits.h"
#include "absl/strings/escaping.h"
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
#include "src/core/lib/slice/slice.h"
#include "src/core/util/time.h"

namespace grpc_core {

Expand Down
2 changes: 1 addition & 1 deletion src/core/call/request_buffer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#include <cstdint>
#include <optional>

#include "src/core/util/match.h"
#include "absl/strings/str_cat.h"
#include "src/core/util/match.h"

namespace grpc_core {

Expand Down
Loading