Remote: Check the return value of ActionOwner.getLabel() since it cou…

…ld be `null`. Fixes #13368. Closes #13369. PiperOrigin-RevId: 369451029
bazelbuild · Apr 20, 2021 · 4840a68 · 4840a68
1 parent c9f9eed
commit 4840a68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/remote/util/BUILD b/src/main/java/com/google/devtools/build/lib/remote/util/BUILD
@@ -19,6 +19,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions:execution_requirements",
         "//src/main/java/com/google/devtools/build/lib/analysis:blaze_version_info",
         "//src/main/java/com/google/devtools/build/lib/authandtls",
+        "//src/main/java/com/google/devtools/build/lib/cmdline",
         "//src/main/java/com/google/devtools/build/lib/remote:ExecutionStatusException",
         "//src/main/java/com/google/devtools/build/lib/remote/common",
         "//src/main/java/com/google/devtools/build/lib/remote/options",

diff --git a/src/main/java/com/google/devtools/build/lib/remote/util/TracingMetadataUtils.java b/src/main/java/com/google/devtools/build/lib/remote/util/TracingMetadataUtils.java
@@ -19,6 +19,7 @@
 import com.google.common.base.Preconditions;
 import com.google.devtools.build.lib.actions.ActionExecutionMetadata;
 import com.google.devtools.build.lib.analysis.BlazeVersionInfo;
+import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.remote.options.RemoteOptions;
 import io.grpc.ClientInterceptor;
 import io.grpc.Context;
@@ -65,7 +66,10 @@ public static RequestMetadata buildMetadata(
                     .setToolVersion(BlazeVersionInfo.instance().getVersion()));
     if (actionMetadata != null) {
       builder.setActionMnemonic(actionMetadata.getMnemonic());
-      builder.setTargetId(actionMetadata.getOwner().getLabel().getCanonicalForm());
+      Label label = actionMetadata.getOwner().getLabel();
+      if (label != null) {
+        builder.setTargetId(label.getCanonicalForm());
+      }
       builder.setConfigurationId(actionMetadata.getOwner().getConfigurationChecksum());
     }
     return builder.build();