Skip to content

Commit 591e0dc

Browse files
authored
disentangle grpc deps from skywalking data definition (#54)
* disentangle grpc deps from skywalking data definition * fix * fix
1 parent 05ff62e commit 591e0dc

File tree

8 files changed

+29
-103
lines changed

8 files changed

+29
-103
lines changed

.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.7.2

cpp2sky/BUILD

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,6 @@ cc_library(
2525
"time.h",
2626
],
2727
deps = [
28-
"@com_github_grpc_grpc//:grpc++",
29-
"@skywalking_data_collect_protocol//language-agent:tracing_protocol_cc_grpc",
30-
":config_cc_proto",
31-
],
32-
visibility = ["//visibility:public"],
33-
)
34-
35-
cc_library(
36-
name = "cpp2sky_internal_interface",
37-
hdrs = [
38-
"internal/async_client.h",
39-
"internal/random_generator.h",
40-
],
41-
deps = [
42-
"@com_github_grpc_grpc//:grpc++",
43-
"@skywalking_data_collect_protocol//language-agent:tracing_protocol_cc_grpc",
4428
":config_cc_proto",
4529
],
4630
visibility = ["//visibility:public"],

cpp2sky/internal/BUILD

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
2+
load("@rules_proto//proto:defs.bzl", "proto_library")
3+
4+
licenses(["notice"]) # Apache 2
5+
6+
cc_library(
7+
name = "async_client_interface",
8+
hdrs = [
9+
"async_client.h",
10+
],
11+
deps = [
12+
"@com_github_grpc_grpc//:grpc++",
13+
"@skywalking_data_collect_protocol//language-agent:tracing_protocol_cc_grpc",
14+
],
15+
visibility = ["//visibility:public"],
16+
)
17+
18+
cc_library(
19+
name = "random_generator_interface",
20+
hdrs = [
21+
"random_generator.h",
22+
],
23+
visibility = ["//visibility:public"],
24+
)

source/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ cc_library(
1818
"@skywalking_data_collect_protocol//language-agent:tracing_protocol_cc_proto",
1919
"@skywalking_data_collect_protocol//language-agent:tracing_protocol_cc_grpc",
2020
"@com_github_grpc_grpc//:grpc++",
21+
"//cpp2sky/internal:async_client_interface",
2122
"//cpp2sky:cpp2sky_interface",
22-
"//cpp2sky:cpp2sky_internal_interface",
2323
"//source/utils:util_lib",
2424
],
2525
visibility = ["//visibility:public"],

source/grpc_async_client_impl.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <thread>
2020

2121
#include "cpp2sky/exception.h"
22-
#include "utils/grpc_status.h"
2322

2423
namespace cpp2sky {
2524

source/utils/BUILD

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ cc_library(
55
hdrs = [
66
"base64.h",
77
"random_generator.h",
8-
"grpc_status.h",
98
"circular_buffer.h",
109
],
1110
deps = [
12-
"//cpp2sky:cpp2sky_internal_interface",
11+
"//cpp2sky/internal:random_generator_interface",
1312
],
1413
visibility = ["//visibility:public"],
1514
)

source/utils/grpc_status.h

Lines changed: 0 additions & 82 deletions
This file was deleted.

test/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ cc_library(
88
deps = [
99
"@skywalking_data_collect_protocol//language-agent:tracing_protocol_cc_proto",
1010
"@com_google_googletest//:gtest_main",
11-
"//cpp2sky:cpp2sky_internal_interface",
11+
"//cpp2sky/internal:async_client_interface",
12+
"//cpp2sky/internal:random_generator_interface",
1213
]
1314
)
1415

0 commit comments

Comments
 (0)