Update gRPC version to 1.14. (#1404)

* Update gRPC version to 0.14.

* Fix fingbugs warning.

* Add more comments about the workaround.

3 files changed, 11 insertions, 3 deletions

diff --git a/build.gradle b/build.gradle
index 07e4f8d2..14c52111 100644
--- a/build.gradle
+++ b/build.gradle
@@ -149,7 +149,7 @@ subprojects {
         findBugsAnnotationsVersion = '3.0.1'
         findBugsJsr305Version = '3.0.2'
         errorProneVersion = '2.3.1'
-        grpcVersion = '1.12.0'
+        grpcVersion = '1.14.0'
         guavaVersion = '20.0'
         googleAuthVersion = '0.10.0'
         googleCloudBetaVersion = '0.58.0-beta'
diff --git a/contrib/agent/src/integration-test/java/io/opencensus/contrib/agent/instrumentation/ThreadInstrumentationIT.java b/contrib/agent/src/integration-test/java/io/opencensus/contrib/agent/instrumentation/ThreadInstrumentationIT.java
index 4da80440..4c93601c 100644
--- a/contrib/agent/src/integration-test/java/io/opencensus/contrib/agent/instrumentation/ThreadInstrumentationIT.java
+++ b/contrib/agent/src/integration-test/java/io/opencensus/contrib/agent/instrumentation/ThreadInstrumentationIT.java
@@ -18,6 +18,7 @@ package io.opencensus.contrib.agent.instrumentation;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.common.base.Preconditions;
 import io.grpc.Context;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -114,7 +115,10 @@ public class ThreadInstrumentationIT {
             // been wrapped in a different context (by automatic instrumentation of
             // Executor#execute), that context will be attached when executing the Runnable.
             Context context2 = Context.current().withValue(KEY, "wrong context");
-            context2.attach();
+            // Work around findbugs warning. Context.attach() is marked as @CheckReturnValue so we
+            // need to check the return
+            // value here, otherwise findbugs will fail.
+            Preconditions.checkNotNull(context2.attach(), "context2.attach()");
             Thread thread = new Thread(command);
             thread.start();
             try {
diff --git a/contrib/agent/src/main/java/io/opencensus/contrib/agent/instrumentation/ContextStrategyImpl.java b/contrib/agent/src/main/java/io/opencensus/contrib/agent/instrumentation/ContextStrategyImpl.java
index e99fbd3b..8a6d8a6c 100644
--- a/contrib/agent/src/main/java/io/opencensus/contrib/agent/instrumentation/ContextStrategyImpl.java
+++ b/contrib/agent/src/main/java/io/opencensus/contrib/agent/instrumentation/ContextStrategyImpl.java
@@ -16,6 +16,7 @@
 
 package io.opencensus.contrib.agent.instrumentation;
 
+import com.google.common.base.Preconditions;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import io.grpc.Context;
@@ -67,7 +68,10 @@ final class ContextStrategyImpl implements ContextStrategy {
       Context context = savedContexts.getIfPresent(thread);
       if (context != null) {
         savedContexts.invalidate(thread);
-        context.attach();
+        // Work around findbugs warning. Context.attach() is marked as @CheckReturnValue so we need
+        // to check the return
+        // value here, otherwise findbugs will fail.
+        Preconditions.checkNotNull(context.attach(), "context.attach()");
       }
     }
   }