Prefer library version of gRPC instead of shaded. (#1825)

4 files changed, 33 insertions, 1 deletions

diff --git a/build.gradle b/build.gradle
index 76cac526..22763a48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -197,9 +197,11 @@ subprojects {
                 zipkin_urlconnection: "io.zipkin.reporter2:zipkin-sender-urlconnection:${zipkinReporterVersion}",
                 jaeger_reporter: "io.jaegertracing:jaeger-client:${jaegerReporterVersion}",
                 google_cloud_monitoring: "com.google.cloud:google-cloud-monitoring:${googleCloudGaVersion}",
+                grpc_auth: "io.grpc:grpc-auth:${grpcVersion}",
                 grpc_context: "io.grpc:grpc-context:${grpcVersion}",
                 grpc_core: "io.grpc:grpc-core:${grpcVersion}",
                 grpc_netty: "io.grpc:grpc-netty:${grpcVersion}",
+                grpc_netty_shaded: "io.grpc:grpc-netty-shaded:${grpcVersion}",
                 grpc_stub: "io.grpc:grpc-stub:${grpcVersion}",
                 guava: "com.google.guava:guava:${guavaVersion}",
                 jsr305: "com.google.code.findbugs:jsr305:${findBugsJsr305Version}",
diff --git a/contrib/log_correlation/stackdriver/build.gradle b/contrib/log_correlation/stackdriver/build.gradle
index e398f434..67cd2654 100644
--- a/contrib/log_correlation/stackdriver/build.gradle
+++ b/contrib/log_correlation/stackdriver/build.gradle
@@ -3,9 +3,19 @@ description = 'OpenCensus Stackdriver Log Correlation'
 apply plugin: 'java'
 
 dependencies {
-    compile project(':opencensus-api')
+    compile project(':opencensus-api'),
+            libraries.grpc_auth,
+            libraries.grpc_core,
+            libraries.grpc_netty_shaded,
+            libraries.grpc_stub
 
     compile (libraries.google_cloud_logging) {
+        // Prefer library version.
+        exclude group: 'io.grpc', module: 'grpc-auth'
+        exclude group: 'io.grpc', module: 'grpc-core'
+        exclude group: 'io.grpc', module: 'grpc-netty-shaded'
+        exclude group: 'io.grpc', module: 'grpc-stub'
+
         // We will always be more up to date.
         exclude group: 'io.opencensus', module: 'opencensus-api'
     }
diff --git a/exporters/stats/stackdriver/build.gradle b/exporters/stats/stackdriver/build.gradle
index 91f4a670..12fc355d 100644
--- a/exporters/stats/stackdriver/build.gradle
+++ b/exporters/stats/stackdriver/build.gradle
@@ -13,6 +13,10 @@ dependencies {
             project(':opencensus-contrib-resource-util'),
             project(':opencensus-exporter-metrics-util'),
             libraries.google_auth,
+            libraries.grpc_auth,
+            libraries.grpc_core,
+            libraries.grpc_netty_shaded,
+            libraries.grpc_stub,
             libraries.guava
 
     compile (libraries.google_cloud_monitoring) {
@@ -22,6 +26,12 @@ dependencies {
         // Prefer library version.
         exclude group: 'com.google.code.findbugs', module: 'jsr305'
 
+        // Prefer library version.
+        exclude group: 'io.grpc', module: 'grpc-auth'
+        exclude group: 'io.grpc', module: 'grpc-core'
+        exclude group: 'io.grpc', module: 'grpc-netty-shaded'
+        exclude group: 'io.grpc', module: 'grpc-stub'
+
         // We will always be more up to date.
         exclude group: 'io.opencensus', module: 'opencensus-api'
     }
diff --git a/exporters/trace/stackdriver/build.gradle b/exporters/trace/stackdriver/build.gradle
index 2d9af566..bacdefb2 100644
--- a/exporters/trace/stackdriver/build.gradle
+++ b/exporters/trace/stackdriver/build.gradle
@@ -11,6 +11,10 @@ dependencies {
     compile project(':opencensus-api'),
             project(':opencensus-contrib-resource-util'),
             libraries.google_auth,
+            libraries.grpc_auth,
+            libraries.grpc_core,
+            libraries.grpc_netty_shaded,
+            libraries.grpc_stub,
             libraries.guava
 
     compile (libraries.google_cloud_trace) {
@@ -20,6 +24,12 @@ dependencies {
         // Prefer library version.
         exclude group: 'com.google.code.findbugs', module: 'jsr305'
 
+        // Prefer library version.
+        exclude group: 'io.grpc', module: 'grpc-auth'
+        exclude group: 'io.grpc', module: 'grpc-core'
+        exclude group: 'io.grpc', module: 'grpc-netty-shaded'
+        exclude group: 'io.grpc', module: 'grpc-stub'
+
         // We will always be more up to date.
         exclude group: 'io.opencensus', module: 'opencensus-api'
     }