Skip to content

Commit 4a1a10b

Browse files
mackenziestarrittaiz
authored andcommitted
fix grpc opencensus stats integration (#762)
* fix grpc opencensus stats integration - upgrade opencensus-java packages to the latest (0.22.1) - add opencensus-impl and opencensus-impl-core * add opencensus-impl transitive dependency com.lmax:disruptor
1 parent 73e266b commit 4a1a10b

File tree

2 files changed

+46
-4
lines changed

2 files changed

+46
-4
lines changed

scala_proto/default_dep_sets.bzl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ DEFAULT_SCALAPB_GRPC_DEPS = [
2424
"//external:io_bazel_rules_scala/dependency/proto/grpc_context",
2525
"//external:io_bazel_rules_scala/dependency/proto/guava",
2626
"//external:io_bazel_rules_scala/dependency/proto/opencensus_api",
27+
"//external:io_bazel_rules_scala/dependency/proto/opencensus_impl",
28+
"//external:io_bazel_rules_scala/dependency/proto/disruptor",
29+
"//external:io_bazel_rules_scala/dependency/proto/opencensus_impl_core",
2730
"//external:io_bazel_rules_scala/dependency/proto/opencensus_contrib_grpc_metrics",
2831
"//external:io_bazel_rules_scala/dependency/proto/google_instrumentation",
2932
"//external:io_bazel_rules_scala/dependency/proto/netty_codec",

scala_proto/private/scala_proto_default_repositories.bzl

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,8 @@ def scala_proto_default_repositories(
370370

371371
_scala_maven_import_external(
372372
name = "scala_proto_rules_opencensus_api",
373-
artifact = "io.opencensus:opencensus-api:0.18.0",
374-
jar_sha256 = "45421ffe95271aba94686ed8d4c5070fe77dc2ff0b922688097f0dd40f1931b1",
373+
artifact = "io.opencensus:opencensus-api:0.22.1",
374+
jar_sha256 = "62a0503ee81856ba66e3cde65dee3132facb723a4fa5191609c84ce4cad36127",
375375
licenses = ["notice"],
376376
server_urls = maven_servers,
377377
)
@@ -381,10 +381,49 @@ def scala_proto_default_repositories(
381381
actual = "@scala_proto_rules_opencensus_api//jar",
382382
)
383383

384+
_scala_maven_import_external(
385+
name = "scala_proto_rules_opencensus_impl",
386+
artifact = "io.opencensus:opencensus-impl:0.22.1",
387+
jar_sha256 = "9e8b209da08d1f5db2b355e781b9b969b2e0dab934cc806e33f1ab3baed4f25a",
388+
licenses = ["notice"],
389+
server_urls = maven_servers,
390+
)
391+
392+
native.bind(
393+
name = "io_bazel_rules_scala/dependency/proto/opencensus_impl",
394+
actual = "@scala_proto_rules_opencensus_impl//jar",
395+
)
396+
397+
_scala_maven_import_external(
398+
name = "scala_proto_rules_disruptor",
399+
artifact = "com.lmax:disruptor:3.4.2",
400+
jar_sha256 = "f412ecbb235c2460b45e63584109723dea8d94b819c78c9bfc38f50cba8546c0",
401+
licenses = ["notice"],
402+
server_urls = maven_servers,
403+
)
404+
405+
native.bind(
406+
name = "io_bazel_rules_scala/dependency/proto/disruptor",
407+
actual = "@scala_proto_rules_disruptor//jar",
408+
)
409+
410+
_scala_maven_import_external(
411+
name = "scala_proto_rules_opencensus_impl_core",
412+
artifact = "io.opencensus:opencensus-impl-core:0.22.1",
413+
jar_sha256 = "04607d100e34bacdb38f93c571c5b7c642a1a6d873191e25d49899668514db68",
414+
licenses = ["notice"],
415+
server_urls = maven_servers,
416+
)
417+
418+
native.bind(
419+
name = "io_bazel_rules_scala/dependency/proto/opencensus_impl_core",
420+
actual = "@scala_proto_rules_opencensus_impl_core//jar",
421+
)
422+
384423
_scala_maven_import_external(
385424
name = "scala_proto_rules_opencensus_contrib_grpc_metrics",
386-
artifact = "io.opencensus:opencensus-contrib-grpc-metrics:0.18.0",
387-
jar_sha256 = "1f90585e777b1e0493dbf22e678303369a8d5b7c750b4eda070a34ca99271607",
425+
artifact = "io.opencensus:opencensus-contrib-grpc-metrics:0.22.1",
426+
jar_sha256 = "3f6f4d5bd332c516282583a01a7c940702608a49ed6e62eb87ef3b1d320d144b",
388427
licenses = ["notice"],
389428
server_urls = maven_servers,
390429
)

0 commit comments

Comments
 (0)