Skip to content
This repository was archived by the owner on Dec 23, 2023. It is now read-only.

Commit 8564d81

Browse files
authored
Prefer library version of gRPC instead of shaded. (#1825)
1 parent 65cb334 commit 8564d81

4 files changed

Lines changed: 33 additions & 1 deletion

File tree

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,11 @@ subprojects {
197197
zipkin_urlconnection: "io.zipkin.reporter2:zipkin-sender-urlconnection:${zipkinReporterVersion}",
198198
jaeger_reporter: "io.jaegertracing:jaeger-client:${jaegerReporterVersion}",
199199
google_cloud_monitoring: "com.google.cloud:google-cloud-monitoring:${googleCloudGaVersion}",
200+
grpc_auth: "io.grpc:grpc-auth:${grpcVersion}",
200201
grpc_context: "io.grpc:grpc-context:${grpcVersion}",
201202
grpc_core: "io.grpc:grpc-core:${grpcVersion}",
202203
grpc_netty: "io.grpc:grpc-netty:${grpcVersion}",
204+
grpc_netty_shaded: "io.grpc:grpc-netty-shaded:${grpcVersion}",
203205
grpc_stub: "io.grpc:grpc-stub:${grpcVersion}",
204206
guava: "com.google.guava:guava:${guavaVersion}",
205207
jsr305: "com.google.code.findbugs:jsr305:${findBugsJsr305Version}",

contrib/log_correlation/stackdriver/build.gradle

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,19 @@ description = 'OpenCensus Stackdriver Log Correlation'
33
apply plugin: 'java'
44

55
dependencies {
6-
compile project(':opencensus-api')
6+
compile project(':opencensus-api'),
7+
libraries.grpc_auth,
8+
libraries.grpc_core,
9+
libraries.grpc_netty_shaded,
10+
libraries.grpc_stub
711

812
compile (libraries.google_cloud_logging) {
13+
// Prefer library version.
14+
exclude group: 'io.grpc', module: 'grpc-auth'
15+
exclude group: 'io.grpc', module: 'grpc-core'
16+
exclude group: 'io.grpc', module: 'grpc-netty-shaded'
17+
exclude group: 'io.grpc', module: 'grpc-stub'
18+
919
// We will always be more up to date.
1020
exclude group: 'io.opencensus', module: 'opencensus-api'
1121
}

exporters/stats/stackdriver/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ dependencies {
1313
project(':opencensus-contrib-resource-util'),
1414
project(':opencensus-exporter-metrics-util'),
1515
libraries.google_auth,
16+
libraries.grpc_auth,
17+
libraries.grpc_core,
18+
libraries.grpc_netty_shaded,
19+
libraries.grpc_stub,
1620
libraries.guava
1721

1822
compile (libraries.google_cloud_monitoring) {
@@ -22,6 +26,12 @@ dependencies {
2226
// Prefer library version.
2327
exclude group: 'com.google.code.findbugs', module: 'jsr305'
2428

29+
// Prefer library version.
30+
exclude group: 'io.grpc', module: 'grpc-auth'
31+
exclude group: 'io.grpc', module: 'grpc-core'
32+
exclude group: 'io.grpc', module: 'grpc-netty-shaded'
33+
exclude group: 'io.grpc', module: 'grpc-stub'
34+
2535
// We will always be more up to date.
2636
exclude group: 'io.opencensus', module: 'opencensus-api'
2737
}

exporters/trace/stackdriver/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ dependencies {
1111
compile project(':opencensus-api'),
1212
project(':opencensus-contrib-resource-util'),
1313
libraries.google_auth,
14+
libraries.grpc_auth,
15+
libraries.grpc_core,
16+
libraries.grpc_netty_shaded,
17+
libraries.grpc_stub,
1418
libraries.guava
1519

1620
compile (libraries.google_cloud_trace) {
@@ -20,6 +24,12 @@ dependencies {
2024
// Prefer library version.
2125
exclude group: 'com.google.code.findbugs', module: 'jsr305'
2226

27+
// Prefer library version.
28+
exclude group: 'io.grpc', module: 'grpc-auth'
29+
exclude group: 'io.grpc', module: 'grpc-core'
30+
exclude group: 'io.grpc', module: 'grpc-netty-shaded'
31+
exclude group: 'io.grpc', module: 'grpc-stub'
32+
2333
// We will always be more up to date.
2434
exclude group: 'io.opencensus', module: 'opencensus-api'
2535
}

0 commit comments

Comments
 (0)