From 5a2b7df4faaf484c587aa0c2be949c9880286f07 Mon Sep 17 00:00:00 2001
From: Chi Wang <chiwang@google.com>
Date: Wed, 28 Oct 2020 03:26:58 -0700
Subject: [PATCH] Fixed a bug that could fail the build if unable to
 findMissingBlobs.

Closes #12369.

PiperOrigin-RevId: 339427586
---
 .../google/devtools/build/lib/remote/GrpcCacheClient.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/google/devtools/build/lib/remote/GrpcCacheClient.java b/src/main/java/com/google/devtools/build/lib/remote/GrpcCacheClient.java
index 13c3a4502e06e9..85c0e6ba362625 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/GrpcCacheClient.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/GrpcCacheClient.java
@@ -26,6 +26,7 @@
 import build.bazel.remote.execution.v2.FindMissingBlobsRequest;
 import build.bazel.remote.execution.v2.FindMissingBlobsResponse;
 import build.bazel.remote.execution.v2.GetActionResultRequest;
+import build.bazel.remote.execution.v2.RequestMetadata;
 import build.bazel.remote.execution.v2.UpdateActionResultRequest;
 import com.google.bytestream.ByteStreamGrpc;
 import com.google.bytestream.ByteStreamGrpc.ByteStreamStub;
@@ -198,6 +199,8 @@ public ListenableFuture<ImmutableSet<Digest>> findMissingDigests(Iterable<Digest
                   return result.build();
                 },
                 MoreExecutors.directExecutor());
+
+    RequestMetadata requestMetadata = TracingMetadataUtils.fromCurrentContext();
     return Futures.catchingAsync(
         success,
         RuntimeException.class,
@@ -207,7 +210,7 @@ public ListenableFuture<ImmutableSet<Digest>> findMissingDigests(Iterable<Digest
                     String.format(
                         "findMissingBlobs(%d) for %s: %s",
                         requestBuilder.getBlobDigestsCount(),
-                        TracingMetadataUtils.fromCurrentContext().getActionId(),
+                        requestMetadata.getActionId(),
                         e.getMessage()),
                     e)),
         MoreExecutors.directExecutor());