Rename opencensus_proto to io_*, add grpc-java dep.

Signed-off-by: Emil Mikulic <g-easy@users.noreply.github.com>
g-easy · Aug 23, 2019 · f6be129 · f6be129
1 parent 58f322f
commit f6be129
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/api/bazel/repositories.bzl b/api/bazel/repositories.bzl
@@ -26,7 +26,7 @@ def api_dependencies():
         build_file_content = PROMETHEUSMETRICS_BUILD_CONTENT,
     )
     envoy_http_archive(
-        name = "opencensus_proto",
+        name = "io_opencensus_proto",
         locations = REPOSITORY_LOCATIONS,
     )
     envoy_http_archive(

diff --git a/api/bazel/repository_locations.bzl b/api/bazel/repository_locations.bzl
@@ -44,7 +44,7 @@ REPOSITORY_LOCATIONS = dict(
         strip_prefix = "client_model-" + PROMETHEUS_GIT_SHA,
         urls = ["https://github.com/prometheus/client_model/archive/" + PROMETHEUS_GIT_SHA + ".tar.gz"],
     ),
-    opencensus_proto = dict(
+    io_opencensus_proto = dict(
         sha256 = OPENCENSUS_PROTO_SHA256,
         strip_prefix = "opencensus-proto-" + OPENCENSUS_PROTO_RELEASE + "/src",
         urls = ["https://github.com/census-instrumentation/opencensus-proto/archive/v" + OPENCENSUS_PROTO_RELEASE + ".tar.gz"],

diff --git a/api/envoy/config/trace/v2/BUILD b/api/envoy/config/trace/v2/BUILD
@@ -10,7 +10,7 @@ api_proto_library_internal(
     ],
     deps = [
         "//envoy/api/v2/core:grpc_service",
-        "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto",
+        "@io_opencensus_proto//opencensus/proto/trace/v1:trace_config_proto",
     ],
 )
 
@@ -19,6 +19,6 @@ api_go_proto_library(
     proto = ":trace",
     deps = [
         "//envoy/api/v2/core:grpc_service_go_proto",
-        "@opencensus_proto//opencensus/proto/trace/v1:trace_and_config_proto_go",
+        "@io_opencensus_proto//opencensus/proto/trace/v1:trace_and_config_proto_go",
     ],
 )
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
@@ -147,6 +147,7 @@ def envoy_dependencies(skip_targets = []):
     _com_google_googletest()
     _com_google_protobuf()
     _io_opencensus_cpp()
+    _grpc_java()
     _com_github_curl()
     _com_github_envoyproxy_sqlparser()
     _com_googlesource_quiche()
@@ -566,6 +567,14 @@ def _io_opencensus_cpp():
         actual = "@io_opencensus_cpp//opencensus/exporters/trace/zipkin:zipkin_exporter",
     )
 
+def _grpc_java():
+    # Used by @io_opencensus_proto.
+    location = REPOSITORY_LOCATIONS["grpc_java"]
+    http_archive(
+        name = "grpc_java",
+        **location
+    )
+
 def _com_github_curl():
     # Used by OpenCensus Zipkin exporter.
     location = REPOSITORY_LOCATIONS["com_github_curl"]

diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -237,6 +237,11 @@ REPOSITORY_LOCATIONS = dict(
         # 2019-07-31
         urls = ["https://github.com/census-instrumentation/opencensus-cpp/archive/cad0d03ff3474cf14389fc249e16847ab7b6895f.tar.gz"],
     ),
+    grpc_java = dict(
+        sha256 = "9618a6f4ec0f2bdb77d9b6e01865af9796f370e63e1352210798bacfc99ccdac",
+        strip_prefix = "grpc-java-1.23.0",
+        urls = ["https://github.com/grpc/grpc-java/archive/v1.23.0.tar.gz"],
+    ),
     com_github_curl = dict(
         sha256 = "4376ac72b95572fb6c4fbffefb97c7ea0dd083e1974c0e44cd7e49396f454839",
         strip_prefix = "curl-7.65.3",