And mnemonic and label to remote metadata

This reflects bazelbuild/remote-apis#186

Closes bazelbuild#13109.

PiperOrigin-RevId: 368763391

Author: illicitonion

src/main/java/com/google/devtools/build/lib/remote/ByteStreamBuildEventArtifactUploader.java

@@ -152,7 +152,7 @@ private static List<PathMetadata> processQueryResult(
   private ListenableFuture<ImmutableIterable<PathMetadata>> queryRemoteCache(
       ImmutableList<ListenableFuture<PathMetadata>> allPaths) throws Exception {
     RequestMetadata metadata =
-        TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "bes-upload");
+        TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "bes-upload", null);
     RemoteActionExecutionContext context = RemoteActionExecutionContext.create(metadata);
 
     List<PathMetadata> knownRemotePaths = new ArrayList<>(allPaths.size());
@@ -188,7 +188,7 @@ private ListenableFuture<ImmutableIterable<PathMetadata>> queryRemoteCache(
   private ListenableFuture<List<PathMetadata>> uploadLocalFiles(
       ImmutableIterable<PathMetadata> allPaths) {
     RequestMetadata metadata =
-        TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "bes-upload");
+        TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "bes-upload", null);
     RemoteActionExecutionContext context = RemoteActionExecutionContext.create(metadata);
 
     ImmutableList.Builder<ListenableFuture<PathMetadata>> allPathsUploaded =

src/main/java/com/google/devtools/build/lib/remote/RemoteActionInputFetcher.java

@@ -154,7 +154,7 @@ private Completable downloadFileAsync(Path path, FileArtifactValue metadata) {
                 () -> {
                   RequestMetadata requestMetadata =
                       TracingMetadataUtils.buildMetadata(
-                          buildRequestId, commandId, metadata.getActionId());
+                          buildRequestId, commandId, metadata.getActionId(), null);
                   RemoteActionExecutionContext context =
                       RemoteActionExecutionContext.create(requestMetadata);
 

src/main/java/com/google/devtools/build/lib/remote/RemoteRepositoryRemoteExecutor.java

@@ -106,7 +106,7 @@ public ExecutionResult execute(
       Duration timeout)
       throws IOException, InterruptedException {
     RequestMetadata metadata =
-        TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "repository_rule");
+        TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "repository_rule", null);
     RemoteActionExecutionContext context = RemoteActionExecutionContext.create(metadata);
 
     Platform platform = PlatformUtils.buildPlatformProto(executionProperties);

src/main/java/com/google/devtools/build/lib/remote/RemoteServerCapabilities.java

@@ -69,7 +69,7 @@ private CapabilitiesBlockingStub capabilitiesBlockingStub(RemoteActionExecutionC
   public ServerCapabilities get(String buildRequestId, String commandId)
       throws IOException, InterruptedException {
     RequestMetadata metadata =
-        TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "capabilities");
+        TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "capabilities", null);
     RemoteActionExecutionContext context = RemoteActionExecutionContext.create(metadata);
     try {
       GetCapabilitiesRequest request =

src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java

@@ -153,7 +153,7 @@ public CacheHandle lookup(Spawn spawn, SpawnExecutionContext context)
 
     RequestMetadata metadata =
         TracingMetadataUtils.buildMetadata(
-            buildRequestId, commandId, actionKey.getDigest().getHash());
+            buildRequestId, commandId, actionKey.getDigest().getHash(), spawn.getResourceOwner());
     RemoteActionExecutionContext remoteActionExecutionContext =
         RemoteActionExecutionContext.create(metadata);
 

src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java

@@ -250,7 +250,7 @@ public SpawnResult exec(Spawn spawn, SpawnExecutionContext context)
 
     RequestMetadata metadata =
         TracingMetadataUtils.buildMetadata(
-            buildRequestId, commandId, actionKey.getDigest().getHash());
+            buildRequestId, commandId, actionKey.getDigest().getHash(), spawn.getResourceOwner());
     RemoteActionExecutionContext remoteActionExecutionContext =
         RemoteActionExecutionContext.create(metadata);
     Profiler prof = Profiler.instance();

src/main/java/com/google/devtools/build/lib/remote/downloader/GrpcRemoteDownloader.java

@@ -114,7 +114,7 @@ public void download(
       com.google.common.base.Optional<String> type)
       throws IOException, InterruptedException {
     RequestMetadata metadata =
-        TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "remote_downloader");
+        TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "remote_downloader", null);
     RemoteActionExecutionContext remoteActionExecutionContext =
         RemoteActionExecutionContext.create(metadata);
 

src/main/java/com/google/devtools/build/lib/remote/util/TracingMetadataUtils.java

@@ -17,6 +17,7 @@
 import build.bazel.remote.execution.v2.ToolDetails;
 import com.google.common.annotations.VisibleForTesting;
 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.remote.options.RemoteOptions;
 import io.grpc.ClientInterceptor;
@@ -46,19 +47,28 @@ private TracingMetadataUtils() {}
       ProtoUtils.keyForProto(RequestMetadata.getDefaultInstance());
 
   public static RequestMetadata buildMetadata(
-      String buildRequestId, String commandId, String actionId) {
+      String buildRequestId,
+      String commandId,
+      String actionId,
+      @Nullable ActionExecutionMetadata actionMetadata) {
     Preconditions.checkNotNull(buildRequestId);
     Preconditions.checkNotNull(commandId);
     Preconditions.checkNotNull(actionId);
-    return RequestMetadata.newBuilder()
-        .setCorrelatedInvocationsId(buildRequestId)
-        .setToolInvocationId(commandId)
-        .setActionId(actionId)
-        .setToolDetails(
-            ToolDetails.newBuilder()
-                .setToolName("bazel")
-                .setToolVersion(BlazeVersionInfo.instance().getVersion()))
-        .build();
+    RequestMetadata.Builder builder =
+        RequestMetadata.newBuilder()
+            .setCorrelatedInvocationsId(buildRequestId)
+            .setToolInvocationId(commandId)
+            .setActionId(actionId)
+            .setToolDetails(
+                ToolDetails.newBuilder()
+                    .setToolName("bazel")
+                    .setToolVersion(BlazeVersionInfo.instance().getVersion()));
+    if (actionMetadata != null) {
+      builder.setActionMnemonic(actionMetadata.getMnemonic());
+      builder.setTargetId(actionMetadata.getOwner().getLabel().getCanonicalForm());
+      builder.setConfigurationId(actionMetadata.getOwner().getConfigurationChecksum());
+    }
+    return builder.build();
   }
 
   /**

src/test/java/com/google/devtools/build/lib/remote/ByteStreamUploaderTest.java

@@ -132,7 +132,8 @@ public int maxConcurrency() {
         TracingMetadataUtils.buildMetadata(
             "none",
             "none",
-            DIGEST_UTIL.asActionKey(Digest.getDefaultInstance()).getDigest().getHash());
+            DIGEST_UTIL.asActionKey(Digest.getDefaultInstance()).getDigest().getHash(),
+            null);
     context = RemoteActionExecutionContext.create(metadata);
 
     retryService = MoreExecutors.listeningDecorator(Executors.newScheduledThreadPool(1));
@@ -679,7 +680,8 @@ public void queryWriteStatus(
           TracingMetadataUtils.buildMetadata(
               "build-req-id",
               "command-id",
-              DIGEST_UTIL.asActionKey(actionDigest).getDigest().getHash());
+              DIGEST_UTIL.asActionKey(actionDigest).getDigest().getHash(),
+              null);
       RemoteActionExecutionContext remoteActionExecutionContext =
           RemoteActionExecutionContext.create(metadata);
       uploads.add(

src/test/java/com/google/devtools/build/lib/remote/GrpcCacheClientTest.java

@@ -156,7 +156,8 @@ public final void setUp() throws Exception {
     FileSystemUtils.createDirectoryAndParents(stderr.getParentDirectory());
     outErr = new FileOutErr(stdout, stderr);
     RequestMetadata metadata =
-        TracingMetadataUtils.buildMetadata("none", "none", Digest.getDefaultInstance().getHash());
+        TracingMetadataUtils.buildMetadata(
+            "none", "none", Digest.getDefaultInstance().getHash(), null);
     context = RemoteActionExecutionContext.create(metadata);
     retryService = MoreExecutors.listeningDecorator(Executors.newScheduledThreadPool(1));
   }

src/test/java/com/google/devtools/build/lib/remote/RemoteCacheTests.java

@@ -114,7 +114,8 @@ public class RemoteCacheTests {
   public void setUp() throws Exception {
     MockitoAnnotations.initMocks(this);
     RequestMetadata metadata =
-        TracingMetadataUtils.buildMetadata("none", "none", Digest.getDefaultInstance().getHash());
+        TracingMetadataUtils.buildMetadata(
+            "none", "none", Digest.getDefaultInstance().getHash(), null);
     context = RemoteActionExecutionContext.create(metadata);
     fs = new InMemoryFileSystem(new JavaClock(), DigestHashFunction.SHA256);
     execRoot = fs.getPath("/execroot");

src/test/java/com/google/devtools/build/lib/remote/downloader/GrpcRemoteDownloaderTest.java

@@ -99,7 +99,8 @@ public final void setUp() throws Exception {
         TracingMetadataUtils.buildMetadata(
             "none",
             "none",
-            DIGEST_UTIL.asActionKey(Digest.getDefaultInstance()).getDigest().getHash());
+            DIGEST_UTIL.asActionKey(Digest.getDefaultInstance()).getDigest().getHash(),
+            null);
     context = RemoteActionExecutionContext.create(metadata);
 
     retryService = MoreExecutors.listeningDecorator(Executors.newScheduledThreadPool(1));

src/test/java/com/google/devtools/build/lib/remote/http/HttpCacheClientTest.java

@@ -301,7 +301,7 @@ public void setUp() throws Exception {
     remoteActionExecutionContext =
         RemoteActionExecutionContext.create(
             TracingMetadataUtils.buildMetadata(
-                "none", "none", Digest.getDefaultInstance().getHash()));
+                "none", "none", Digest.getDefaultInstance().getHash(), null));
   }
 
   @Test