disentangle grpc deps from skywalking data definition (#54)

* disentangle grpc deps from skywalking data definition * fix * fix
SkyAPM · Jan 26, 2021 · 591e0dc · 591e0dc
1 parent 05ff62e
commit 591e0dc
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 103 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -0,0 +1 @@
+3.7.2
diff --git a/cpp2sky/BUILD b/cpp2sky/BUILD
@@ -25,22 +25,6 @@ cc_library(
     "time.h",
   ],
   deps = [
-    "@com_github_grpc_grpc//:grpc++",
-    "@skywalking_data_collect_protocol//language-agent:tracing_protocol_cc_grpc",
-    ":config_cc_proto",
-  ],
-  visibility = ["//visibility:public"],
-)
-
-cc_library(
-  name = "cpp2sky_internal_interface",
-  hdrs = [
-    "internal/async_client.h",
-    "internal/random_generator.h",
-  ],
-  deps = [
-    "@com_github_grpc_grpc//:grpc++",
-    "@skywalking_data_collect_protocol//language-agent:tracing_protocol_cc_grpc",
     ":config_cc_proto",
   ],
   visibility = ["//visibility:public"],

diff --git a/cpp2sky/internal/BUILD b/cpp2sky/internal/BUILD
@@ -0,0 +1,24 @@
+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
+
+licenses(["notice"])  # Apache 2
+
+cc_library(
+  name = "async_client_interface",
+  hdrs = [
+    "async_client.h",
+  ],
+  deps = [
+    "@com_github_grpc_grpc//:grpc++",
+    "@skywalking_data_collect_protocol//language-agent:tracing_protocol_cc_grpc",
+  ],
+  visibility = ["//visibility:public"],
+)
+
+cc_library(
+  name = "random_generator_interface",
+  hdrs = [
+    "random_generator.h",
+  ],
+  visibility = ["//visibility:public"],
+)
diff --git a/source/BUILD b/source/BUILD
@@ -18,8 +18,8 @@ cc_library(
     "@skywalking_data_collect_protocol//language-agent:tracing_protocol_cc_proto",
     "@skywalking_data_collect_protocol//language-agent:tracing_protocol_cc_grpc",
     "@com_github_grpc_grpc//:grpc++",
+    "//cpp2sky/internal:async_client_interface",
     "//cpp2sky:cpp2sky_interface",
-    "//cpp2sky:cpp2sky_internal_interface",
     "//source/utils:util_lib",
   ],
   visibility = ["//visibility:public"],

diff --git a/source/grpc_async_client_impl.cc b/source/grpc_async_client_impl.cc
@@ -19,7 +19,6 @@
 #include <thread>
 
 #include "cpp2sky/exception.h"
-#include "utils/grpc_status.h"
 
 namespace cpp2sky {
 

diff --git a/source/utils/BUILD b/source/utils/BUILD
@@ -5,11 +5,10 @@ cc_library(
   hdrs = [
     "base64.h",
     "random_generator.h",
-    "grpc_status.h",
     "circular_buffer.h",
   ],
   deps = [
-    "//cpp2sky:cpp2sky_internal_interface",
+    "//cpp2sky/internal:random_generator_interface",
   ],
   visibility = ["//visibility:public"],
 )
diff --git a/source/utils/grpc_status.h b/source/utils/grpc_status.h
diff --git a/test/BUILD b/test/BUILD
@@ -8,7 +8,8 @@ cc_library(
   deps = [
     "@skywalking_data_collect_protocol//language-agent:tracing_protocol_cc_proto",
     "@com_google_googletest//:gtest_main",
-    "//cpp2sky:cpp2sky_internal_interface",
+    "//cpp2sky/internal:async_client_interface",
+    "//cpp2sky/internal:random_generator_interface",
   ]
 )