grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core,okhttp: bump census to 0.10.0 which should fix GAE issue (#3833)

This commit is contained in:
zpencer 2017-12-08 11:30:52 -08:00 committed by GitHub
parent 2b3885bbc2
commit b6f556c088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle
View File

@ -182,7 +182,7 @@ subprojects {
epoll_suffix = ":" + osdetector.classifier epoll_suffix = ":" + osdetector.classifier
} }
libraries = [ libraries = [
errorprone: "com.google.errorprone:error_prone_annotations:2.0.19", errorprone: "com.google.errorprone:error_prone_annotations:2.1.2",
guava: "com.google.guava:guava:${guavaVersion}", guava: "com.google.guava:guava:${guavaVersion}",
hpack: 'com.twitter:hpack:0.10.1', hpack: 'com.twitter:hpack:0.10.1',
jsr305: 'com.google.code.findbugs:jsr305:3.0.0', jsr305: 'com.google.code.findbugs:jsr305:3.0.0',
@ -191,9 +191,10 @@ subprojects {
google_auth_credentials: 'com.google.auth:google-auth-library-credentials:0.9.0', google_auth_credentials: 'com.google.auth:google-auth-library-credentials:0.9.0',
okhttp: 'com.squareup.okhttp:okhttp:2.5.0', okhttp: 'com.squareup.okhttp:okhttp:2.5.0',
okio: 'com.squareup.okio:okio:1.13.0', okio: 'com.squareup.okio:okio:1.13.0',
opencensus_api: 'io.opencensus:opencensus-api:0.8.0', opencensus_api: 'io.opencensus:opencensus-api:0.10.0',
opencensus_contrib_grpc_metrics: 'io.opencensus:opencensus-contrib-grpc-metrics:0.8.0', opencensus_contrib_grpc_metrics: 'io.opencensus:opencensus-contrib-grpc-metrics:0.10.0',
opencensus_impl: 'io.opencensus:opencensus-impl:0.8.0', opencensus_impl: 'io.opencensus:opencensus-impl:0.10.0',
opencensus_impl_lite: 'io.opencensus:opencensus-impl-lite:0.10.0',
instrumentation_api: 'com.google.instrumentation:instrumentation-api:0.4.3', instrumentation_api: 'com.google.instrumentation:instrumentation-api:0.4.3',
protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}", protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}",
protobuf_lite: "com.google.protobuf:protobuf-lite:3.0.1", protobuf_lite: "com.google.protobuf:protobuf-lite:3.0.1",

6
gae-interop-testing/gae-jdk7/build.gradle
View File

@ -45,7 +45,11 @@ dependencies {
compile project(":grpc-okhttp") compile project(":grpc-okhttp")
compile project(":grpc-protobuf") compile project(":grpc-protobuf")
compile project(":grpc-stub") compile project(":grpc-stub")
compile project(":grpc-interop-testing") compile (project(":grpc-interop-testing")) {
exclude group: 'io.opencensus', module: 'opencensus-impl'
}
// The lite version of opencensus is required for jdk7 GAE
runtime libraries.opencensus_impl_lite
} }
// [START model] // [START model]

6
okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java
View File

@ -120,12 +120,6 @@ public class OkHttpChannelBuilder extends
private OkHttpChannelBuilder(String target) { private OkHttpChannelBuilder(String target) {
super(target); super(target);
// TODO(zpencer): re-enable after census issue is resolved
// census-instrumentation/opencensus-java/issues/777
if (GrpcUtil.IS_RESTRICTED_APPENGINE) {
setTracingEnabled(false);
setStatsEnabled(false);
}
} }
@VisibleForTesting @VisibleForTesting