Update opencensus to 0.11.0 and remove extra dependencies.

Bogdan Drutu · ejona86 · commit af936919f3a9 · 2018-01-26T13:04:26.000-08:00
diff --git a/build.gradle b/build.gradle
@@ -105,6 +105,7 @@ subprojects {
         protobufVersion = '3.5.1'
         protocVersion = '3.5.1-1'
         protobufNanoVersion = '3.0.0-alpha-5'
+        opencensusVersion = '0.11.0'
 
         configureProtoCompilation = {
           String generatedSourcePath = "${projectDir}/src/generated"
@@ -196,10 +197,10 @@ subprojects {
                 google_auth_credentials: 'com.google.auth:google-auth-library-credentials:0.9.0',
                 okhttp: 'com.squareup.okhttp:okhttp:2.5.0',
                 okio: 'com.squareup.okio:okio:1.13.0',
-                opencensus_api: 'io.opencensus:opencensus-api:0.10.0',
-                opencensus_contrib_grpc_metrics: 'io.opencensus:opencensus-contrib-grpc-metrics:0.10.0',
-                opencensus_impl: 'io.opencensus:opencensus-impl:0.10.0',
-                opencensus_impl_lite: 'io.opencensus:opencensus-impl-lite:0.10.0',
+                opencensus_api: "io.opencensus:opencensus-api:${opencensusVersion}",
+                opencensus_contrib_grpc_metrics: "io.opencensus:opencensus-contrib-grpc-metrics:${opencensusVersion}",
+                opencensus_impl: "io.opencensus:opencensus-impl:${opencensusVersion}",
+                opencensus_impl_lite: "io.opencensus:opencensus-impl-lite:${opencensusVersion}",
                 instrumentation_api: 'com.google.instrumentation:instrumentation-api:0.4.3',
                 protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}",
                 protobuf_lite: "com.google.protobuf:protobuf-lite:3.0.1",
diff --git a/context/BUILD.bazel b/context/BUILD.bazel
@@ -8,6 +8,5 @@ java_library(
         "@com_google_code_findbugs_jsr305//jar",
         "@com_google_errorprone_error_prone_annotations//jar",
         "@com_google_guava_guava//jar",
-        "@com_google_instrumentation_instrumentation_api//jar",
     ],
 )
diff --git a/core/BUILD.bazel b/core/BUILD.bazel
@@ -12,7 +12,6 @@ java_library(
         "@com_google_code_findbugs_jsr305//jar",
         "@com_google_errorprone_error_prone_annotations//jar",
         "@com_google_guava_guava//jar",
-        "@com_google_instrumentation_instrumentation_api//jar",
         "@io_opencensus_opencensus_api//jar",
     ],
 )
@@ -44,7 +43,6 @@ java_library(
         "@com_google_errorprone_error_prone_annotations//jar",
         "@com_google_code_gson_gson//jar",
         "@com_google_guava_guava//jar",
-        "@com_google_instrumentation_instrumentation_api//jar",
         "@io_opencensus_opencensus_api//jar",
         "@io_opencensus_opencensus_contrib_grpc_metrics//jar",
     ],
diff --git a/core/build.gradle b/core/build.gradle
@@ -6,16 +6,10 @@ dependencies {
             libraries.guava,
             libraries.errorprone,
             libraries.jsr305
-    compile (libraries.instrumentation_api) {
-        // prefer 2.0.19 from libraries instead of 2.0.11
-        exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
-        // we'll always be more up-to-date
-        exclude group: 'io.grpc', module: 'grpc-context'
-    }
     compile (libraries.opencensus_api) {
         // prefer 3.0.0 from libraries instead of 3.0.1
         exclude group: 'com.google.code.findbugs', module: 'jsr305'
-        // prefer 2.0.19 from libraries instead of 2.0.11
+        // prefer 2.1.2 from libraries instead of 2.2.0
         exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
         // we'll always be more up-to-date
         exclude group: 'io.grpc', module: 'grpc-context'
@@ -25,6 +19,8 @@ dependencies {
         exclude group: 'com.google.code.findbugs', module: 'jsr305'
         // we'll always be more up-to-date
         exclude group: 'io.grpc', module: 'grpc-context'
+        // prefer 2.1.2 from libraries instead of 2.2.0
+        exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
     }
 
     testCompile project(':grpc-context').sourceSets.test.output,
diff --git a/repositories.bzl b/repositories.bzl
@@ -7,7 +7,6 @@ def grpc_java_repositories(
     omit_com_google_code_gson=False,
     omit_com_google_errorprone_error_prone_annotations=False,
     omit_com_google_guava=False,
-    omit_com_google_instrumentation_api=False,
     omit_com_google_protobuf=False,
     omit_com_google_protobuf_java=False,
     omit_com_google_protobuf_nano_protobuf_javanano=False,
@@ -41,8 +40,6 @@ def grpc_java_repositories(
     com_google_errorprone_error_prone_annotations()
   if not omit_com_google_guava:
     com_google_guava()
-  if not omit_com_google_instrumentation_api:
-    com_google_instrumentation_api()
   if not omit_com_google_protobuf:
     com_google_protobuf()
   if omit_com_google_protobuf_java:
@@ -135,13 +132,6 @@ def com_google_guava():
       sha1 = "6ce200f6b23222af3d8abb6b6459e6c44f4bb0e9",
   )
 
-def com_google_instrumentation_api():
-  native.maven_jar(
-      name = "com_google_instrumentation_instrumentation_api",
-      artifact = "com.google.instrumentation:instrumentation-api:0.4.3",
-      sha1 = "41614af3429573dc02645d541638929d877945a2",
-  )
-
 def com_google_protobuf():
   # proto_library rules implicitly depend on @com_google_protobuf//:protoc,
   # which is the proto-compiler.
@@ -261,15 +251,15 @@ def io_netty_tcnative_boringssl_static():
 def io_opencensus_api():
   native.maven_jar(
       name = "io_opencensus_opencensus_api",
-      artifact = "io.opencensus:opencensus-api:0.10.0",
-      sha1 = "46bcf07e0bd835022ccd531d99c3eb813382d4d8",
+      artifact = "io.opencensus:opencensus-api:0.11.0",
+      sha1 = "c1ff1f0d737a689d900a3e2113ddc29847188c64",
   )
 
 def io_opencensus_grpc_metrics():
   native.maven_jar(
       name = "io_opencensus_opencensus_contrib_grpc_metrics",
-      artifact = "io.opencensus:opencensus-contrib-grpc-metrics:0.10.0",
-      sha1 = "e47f918dc577b6316f57a884c500b13a98d3c11b",
+      artifact = "io.opencensus:opencensus-contrib-grpc-metrics:0.11.0",
+      sha1 = "d57b877f1a28a613452d45e35c7faae5af585258",
   )
 
 def junit_junit():
diff --git a/services/build.gradle b/services/build.gradle
@@ -13,6 +13,12 @@ description = "gRPC: Services"
 dependencies {
     compile project(':grpc-protobuf'),
             project(':grpc-stub')
+    compile (libraries.instrumentation_api) {
+        // prefer 2.0.19 from libraries instead of 2.0.11
+        exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
+        // we'll always be more up-to-date
+        exclude group: 'io.grpc', module: 'grpc-context'
+    }
     testCompile project(':grpc-testing'),
             libraries.netty_epoll // for DomainSocketAddress
     signature "org.codehaus.mojo.signature:java16:1.1@signature"
diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel
@@ -31,6 +31,5 @@ java_library(
     deps = [
         "//core",
         "//core:internal",
-        "@com_google_instrumentation_instrumentation_api//jar",
     ],
 )

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,5 @@ java_library(`
`8`	`8`	`"@com_google_code_findbugs_jsr305//jar",`
`9`	`9`	`"@com_google_errorprone_error_prone_annotations//jar",`
`10`	`10`	`"@com_google_guava_guava//jar",`
`11`		`- "@com_google_instrumentation_instrumentation_api//jar",`
`12`	`11`	`],`
`13`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,5 @@ java_library(`
`31`	`31`	`deps = [`
`32`	`32`	`"//core",`
`33`	`33`	`"//core:internal",`
`34`		`- "@com_google_instrumentation_instrumentation_api//jar",`
`35`	`34`	`],`
`36`	`35`	`)`