Skip to content
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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions deps/grpc/.bazelignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ test/distrib/bazel/python
test/distrib/bazel/python_second_test_repo

# Directories build containing own BUILD files.
test/bzlmod
src/python/grpcio_tests/src/
tools/distrib/python/grpcio_tools/build/
tools/distrib/python/grpcio_tools/protobuf/
Expand Down
48 changes: 12 additions & 36 deletions deps/grpc/.bcr/metadata.template.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,12 @@
{
"homepage": "https://github.com/grpc/grpc",
"maintainers": [
{
"email": "veblush@google.com",
"github": "veblush",
"name": "Esun Kim",
"github_user_id": 2793282
},
{
"email": "bpawan@google.com",
"github": "pawbhard",
"name": "Pawan Bhardwaj",
"github_user_id": 13415978
},
{
"email": "eostroukhov@google.com",
"github": "eugeneo",
"name": "Eugene Ostroukhov",
"github_user_id": 287917
},
{
"email": "hork@google.com",
"github": "drfloob",
"name": "Adam Heller",
"github_user_id": 295906
},
{
"email": "rishesh@google.com",
"github": "rishesh007",
Expand All @@ -37,35 +19,29 @@
"name": "Mark Roth",
"github_user_id": 18664614
},
{
"email": "yashkt@google.com",
"github": "yashykt",
"name": "Yash Tibrewal",
"github_user_id": 4181124
},
{
"email": "apolcyn@google.com",
"github": "apolcyn",
"name": "Alexander Polcyn",
"github_user_id": 9566254
},
{
"email": "sergiitk@google.com",
"github": "sergiitk",
"name": "Sergii Tkachenko",
"github_user_id": 672669
},
{
"email": "weizheyuan@google.com",
"github": "yuanweiz",
"name": "Weizhe Yuan",
"github_user_id": 5679340
},
{
"email": "asheshvidyut@google.com",
"github": "asheshvidyut",
"name": "Ashesh Vidyut",
"github_user_id": 134911583
},
{
"email": "ssreenithi@google.com",
"github": "sreenithi",
"name": "Sreenithi Sridharan",
"github_user_id": 22791051
},
{
"email": "stanleycheung@google.com",
"github": "stanley-cheung",
"name": "Stanley Cheung",
"github_user_id": 11674202
}
],
"repository": [
Expand Down
16 changes: 16 additions & 0 deletions deps/grpc/.clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,22 @@ IncludeCategories:
# ruby.h is even more first if it's included
- Regex: '^<ruby/ruby.h>'
Priority: -200
- Regex: '^("absl/)'
Priority: 400
SortPriority: 500
- Regex: '^"gmock/gmock.h"'
Priority: 400
SortPriority: 450
- Regex: '^"gtest/gtest.h"'
Priority: 400
SortPriority: 450
- Regex: '^<.*\.h>'
Priority: 200
- Regex: '^<.*'
Priority: 300
- Regex: '.*'
Priority: 400
SortPriority: 400
---
Language: ObjC
BasedOnStyle: Google
Expand Down
4 changes: 2 additions & 2 deletions deps/grpc/.gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ src/python/grpcio/grpc_core_dependencies.py linguist-generated=true
src/ruby/ext/grpc/rb_grpc_imports.generated.h linguist-generated=true
src/ruby/ext/grpc/rb_grpc_imports.generated.c linguist-generated=true
include/grpc/module.modulemap linguist-generated=true
test/core/security/grpc_tls_credentials_options_comparator_test.cc linguist-generated=true
tools/distrib/python/xds_protos/** linguist-generated=true
py_xds_protos/** linguist-generated=true
tools/doxygen/Doxyfile.c++ linguist-generated=true
tools/doxygen/Doxyfile.c++.internal linguist-generated=true
tools/doxygen/Doxyfile.core linguist-generated=true
Expand All @@ -32,6 +31,7 @@ tools/run_tests/generated/sources_and_headers.json linguist-generated=true
src/core/config/config_vars.h linguist-generated=true
src/core/config/config_vars.cc linguist-generated=true
src/core/credentials/transport/tls/grpc_tls_credentials_options.h linguist-generated=true
test/core/credentials/transport/tls/grpc_tls_credentials_options_comparator_test.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
Expand Down
4 changes: 4 additions & 0 deletions deps/grpc/.pylintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[MAIN]
py-version = 3.9
load-plugins=
pylint.extensions.no_self_use,
pylint.extensions.comparison_placement,
Expand All @@ -10,6 +11,9 @@ ignore=
src/python/grpcio/grpc/framework/common,
src/python/grpcio/grpc/framework/foundation,
src/python/grpcio/grpc/framework/interfaces,
ignore-patterns=
.*pb2\.py,
.*pb2_grpc\.py,

extension-pkg-whitelist=grpc._cython.cygrpc

Expand Down
4 changes: 4 additions & 0 deletions deps/grpc/.pylintrc-examples
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[MAIN]
py-version = 3.9
load-plugins=
pylint.extensions.no_self_use,
pylint.extensions.comparison_placement,
Expand All @@ -10,6 +11,9 @@ ignore=
src/python/grpcio/grpc/framework/common,
src/python/grpcio/grpc/framework/foundation,
src/python/grpcio/grpc/framework/interfaces,
ignore-patterns=
.*pb2\.py,
.*pb2_grpc\.py,

[VARIABLES]

Expand Down
4 changes: 4 additions & 0 deletions deps/grpc/.pylintrc-tests
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[MAIN]
py-version = 3.9
load-plugins=
pylint.extensions.no_self_use,
pylint.extensions.comparison_placement,
Expand All @@ -9,6 +10,9 @@ ignore=
src/python/grpcio_tests/tests/unit/framework,
src/python/grpcio_tests/tests/unit/framework/common,
src/python/grpcio_tests/tests/unit/framework/foundation,
ignore-patterns=
.*pb2\.py,
.*pb2_grpc\.py,

[VARIABLES]

Expand Down
16 changes: 11 additions & 5 deletions deps/grpc/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions deps/grpc/grpc.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
'src/core/call/server_call.cc',
'src/core/call/status_util.cc',
'src/core/client_channel/backup_poller.cc',
'src/core/client_channel/buffered_call.cc',
'src/core/client_channel/client_channel.cc',
'src/core/client_channel/client_channel_factory.cc',
'src/core/client_channel/client_channel_filter.cc',
Expand Down Expand Up @@ -256,6 +257,7 @@
'src/core/ext/transport/chttp2/transport/frame_security.cc',
'src/core/ext/transport/chttp2/transport/frame_settings.cc',
'src/core/ext/transport/chttp2/transport/frame_window_update.cc',
'src/core/ext/transport/chttp2/transport/goaway.cc',
'src/core/ext/transport/chttp2/transport/hpack_encoder.cc',
'src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc',
'src/core/ext/transport/chttp2/transport/hpack_parse_result.cc',
Expand Down
7 changes: 6 additions & 1 deletion deps/grpc/include/grpc/credentials.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@
#ifndef GRPC_CREDENTIALS_H
#define GRPC_CREDENTIALS_H

#include <grpc/grpc.h>
#include <grpc/grpc_security_constants.h>
#include <grpc/impl/grpc_types.h>
#include <grpc/slice.h>
#include <grpc/status.h>
#include <grpc/support/port_platform.h>
#include <grpc/support/time.h>
#include <stdbool.h>

#ifdef __cplusplus
Expand All @@ -34,6 +37,8 @@ extern "C" {
call. These credentials can be composed with a channel credentials object
so that they are sent with every call on this channel. */

typedef struct grpc_server_credentials grpc_server_credentials;
typedef struct grpc_channel_credentials grpc_channel_credentials;
typedef struct grpc_call_credentials grpc_call_credentials;
typedef struct grpc_auth_context grpc_auth_context;

Expand Down
2 changes: 2 additions & 0 deletions deps/grpc/include/grpc/event_engine/memory_allocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ class MemoryAllocator {
MemoryAllocator(MemoryAllocator&&) = default;
MemoryAllocator& operator=(MemoryAllocator&&) = default;

bool IsValid() const { return allocator_ != nullptr; }

/// Drop the underlying allocator and make this an empty object.
/// The object will not be usable after this call unless it's a valid
/// allocator is moved into it.
Expand Down
2 changes: 2 additions & 0 deletions deps/grpc/include/grpc/event_engine/memory_request.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#include <grpc/support/port_platform.h>
#include <stddef.h>

#include <string>

#include "absl/strings/string_view.h"

namespace grpc_event_engine {
Expand Down
5 changes: 5 additions & 0 deletions deps/grpc/include/grpc/impl/channel_arg_names.h
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,11 @@
* Note that this works only with the "ares" DNS resolver; it isn't supported
* by the "native" DNS resolver. Boolean valued. Defaults to false. */
#define GRPC_ARG_DNS_ENABLE_SRV_QUERIES "grpc.dns_enable_srv_queries"
/** The cap for max_connections_per_subchannel when set via service
* config. If the configured value is higher than this, it will be
* capped at this value. Defaults to 10. */
#define GRPC_ARG_MAX_CONNECTIONS_PER_SUBCHANNEL_CAP \
"grpc.max_connections_per_subchannel_cap"
/** If set, determines an upper bound on the number of milliseconds that the
* c-ares based DNS resolver will wait on queries before cancelling them.
* The default value is 120,000ms. Setting this to "0" will disable the
Expand Down
8 changes: 7 additions & 1 deletion deps/grpc/include/grpc/support/metrics.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,17 @@
#ifndef GRPC_SUPPORT_METRICS_H
#define GRPC_SUPPORT_METRICS_H

#include <grpc/event_engine/endpoint_config.h>
#include <grpc/support/port_platform.h>

#include "absl/strings/string_view.h"

// Forward declaration for EndpointConfig
namespace grpc_event_engine {
namespace experimental {
class EndpointConfig; // Forward declaration
} // namespace experimental
} // namespace grpc_event_engine

namespace grpc_core {
namespace experimental {

Expand Down
3 changes: 3 additions & 0 deletions deps/grpc/include/grpcpp/channel.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ class Channel final : public grpc::ChannelInterface,
/// not available.
std::string GetServiceConfigJSON() const;

grpc_event_engine::experimental::MemoryAllocator* memory_allocator()
const override;

private:
template <class InputMessage, class OutputMessage>
friend class grpc::internal::BlockingUnaryCallImpl;
Expand Down
2 changes: 1 addition & 1 deletion deps/grpc/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 deps/grpc/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
Loading
Loading