Skip to content

Commit f289c20

Browse files
markdrothmarkdroth
committed
Merge remote-tracking branch 'upstream/master' into client_channel_combine_subchannel_maps
2 parents 6899f17 + 06f6f5d commit f289c20

File tree

1,728 files changed

+6014
-5144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,728 files changed

+6014
-5144
lines changed

‎.clang-format‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,22 @@ IncludeCategories:
88
# ruby.h is even more first if it's included
99
- Regex: '^<ruby/ruby.h>'
1010
Priority: -200
11+
- Regex: '^("absl/)'
12+
Priority: 400
13+
SortPriority: 500
14+
- Regex: '^"gmock/gmock.h"'
15+
Priority: 400
16+
SortPriority: 450
17+
- Regex: '^"gtest/gtest.h"'
18+
Priority: 400
19+
SortPriority: 450
20+
- Regex: '^<.*\.h>'
21+
Priority: 200
22+
- Regex: '^<.*'
23+
Priority: 300
24+
- Regex: '.*'
25+
Priority: 400
26+
SortPriority: 400
1127
---
1228
Language: ObjC
1329
BasedOnStyle: Google

‎BUILD‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,6 @@ grpc_cc_library(
615615
"absl/status:statusor",
616616
"absl/strings",
617617
"absl/time:time",
618-
"address_sorting",
619618
"absl/functional:any_invocable",
620619
],
621620
public_hdrs = GRPC_PUBLIC_HDRS,
@@ -658,6 +657,7 @@ grpc_cc_library(
658657
"//src/core:slice",
659658
"//src/core:sync",
660659
"//src/core:tcp_connect_handshaker",
660+
"//third_party/address_sorting",
661661
],
662662
)
663663

@@ -701,7 +701,6 @@ grpc_cc_library(
701701
"absl/status:statusor",
702702
"absl/strings",
703703
"absl/time:time",
704-
"address_sorting",
705704
"absl/functional:any_invocable",
706705
],
707706
public_hdrs = GRPC_PUBLIC_HDRS,
@@ -777,6 +776,7 @@ grpc_cc_library(
777776
"//src/core:sync",
778777
"//src/core:tcp_connect_handshaker",
779778
"//src/core:useful",
779+
"//third_party/address_sorting",
780780
],
781781
)
782782

@@ -4119,7 +4119,6 @@ grpc_cc_library(
41194119
"absl/status:statusor",
41204120
"absl/strings",
41214121
"absl/strings:str_format",
4122-
"address_sorting",
41234122
"cares",
41244123
],
41254124
deps = [
@@ -4159,6 +4158,7 @@ grpc_cc_library(
41594158
"//src/core:status_helper",
41604159
"//src/core:sync",
41614160
"//src/core:time",
4161+
"//third_party/address_sorting",
41624162
],
41634163
)
41644164

‎CMakeLists.txt‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bazel/BUILD‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,3 +242,8 @@ package_group(
242242
name = "socket_mutator",
243243
packages = [],
244244
)
245+
246+
package_group(
247+
name = "transport_common",
248+
packages = [],
249+
)

‎bazel/grpc_build_system.bzl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ def _get_external_deps(external_deps):
6464
for dep in external_deps:
6565
if dep.startswith("@"):
6666
ret.append(dep)
67-
elif dep == "address_sorting":
68-
ret.append("//third_party/address_sorting")
6967
elif dep == "xxhash":
7068
ret.append("//third_party/xxhash")
7169
elif dep == "cares":

‎build_autogenerated.yaml‎

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/cpp/auth/ssl_client.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
#include <mutex>
2525
#include <string>
2626

27+
#include "helper.h"
2728
#include "absl/flags/flag.h"
2829
#include "absl/flags/parse.h"
2930
#include "absl/log/initialize.h"
30-
#include "helper.h"
3131

3232
#ifdef BAZEL_BUILD
3333
#include "examples/protos/helloworld.grpc.pb.h"

‎examples/cpp/auth/ssl_server.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
#include <memory>
1919
#include <string>
2020

21+
#include "helper.h"
2122
#include "absl/flags/flag.h"
2223
#include "absl/flags/parse.h"
2324
#include "absl/log/initialize.h"
2425
#include "absl/strings/str_format.h"
25-
#include "helper.h"
2626

2727
#ifdef BAZEL_BUILD
2828
#include "examples/protos/helloworld.grpc.pb.h"

‎examples/cpp/csm/csm_greeter_client.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
#include <optional>
2929
#include <string>
3030

31+
#include "opentelemetry/exporters/prometheus/exporter_factory.h"
32+
#include "opentelemetry/exporters/prometheus/exporter_options.h"
33+
#include "opentelemetry/sdk/metrics/meter_provider.h"
3134
#include "absl/flags/flag.h"
3235
#include "absl/flags/parse.h"
3336
#include "absl/log/initialize.h"
3437
#include "absl/strings/str_join.h"
3538
#include "absl/strings/str_split.h"
36-
#include "opentelemetry/exporters/prometheus/exporter_factory.h"
37-
#include "opentelemetry/exporters/prometheus/exporter_options.h"
38-
#include "opentelemetry/sdk/metrics/meter_provider.h"
3939

4040
#ifdef BAZEL_BUILD
4141
#include "examples/protos/helloworld.grpc.pb.h"

‎examples/cpp/csm/csm_greeter_server.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
#include <memory>
2828
#include <string>
2929

30+
#include "opentelemetry/exporters/prometheus/exporter_factory.h"
31+
#include "opentelemetry/exporters/prometheus/exporter_options.h"
32+
#include "opentelemetry/sdk/metrics/meter_provider.h"
33+
#include "src/core/util/gethostname.h"
3034
#include "absl/flags/flag.h"
3135
#include "absl/flags/parse.h"
3236
#include "absl/log/initialize.h"
3337
#include "absl/log/log.h"
3438
#include "absl/strings/str_cat.h"
35-
#include "opentelemetry/exporters/prometheus/exporter_factory.h"
36-
#include "opentelemetry/exporters/prometheus/exporter_options.h"
37-
#include "opentelemetry/sdk/metrics/meter_provider.h"
38-
#include "src/core/util/gethostname.h"
3939

4040
#ifdef BAZEL_BUILD
4141
#include "examples/protos/helloworld.grpc.pb.h"

0 commit comments

Comments
 (0)