And mnemonic and label to remote metadata

This reflects bazelbuild/remote-apis#186

Author: illicitonion

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

@@ -159,7 +159,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());
@@ -195,7 +195,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

@@ -163,7 +163,7 @@ private ListenableFuture<Void> downloadFileAsync(Path path, FileArtifactValue me
       ListenableFuture<Void> download = downloadsInProgress.get(path);
       if (download == null) {
         RequestMetadata requestMetadata =
-            TracingMetadataUtils.buildMetadata(buildRequestId, commandId, metadata.getActionId());
+            TracingMetadataUtils.buildMetadata(buildRequestId, commandId, metadata.getActionId(), null);
         RemoteActionExecutionContext context = RemoteActionExecutionContext.create(requestMetadata);
 
         Digest digest = DigestUtil.buildDigest(metadata.getDigest(), metadata.getSize());

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

@@ -154,7 +154,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

@@ -253,7 +253,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/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/concurrent",
         "//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/util/TracingMetadataUtils.java

@@ -17,7 +17,9 @@
 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.cmdline.Label;
 import com.google.devtools.build.lib.remote.options.RemoteOptions;
 import io.grpc.ClientInterceptor;
 import io.grpc.Context;
@@ -46,19 +48,24 @@ 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()
+    RequestMetadata.Builder builder = RequestMetadata.newBuilder()
         .setCorrelatedInvocationsId(buildRequestId)
         .setToolInvocationId(commandId)
         .setActionId(actionId)
         .setToolDetails(
             ToolDetails.newBuilder()
                 .setToolName("bazel")
-                .setToolVersion(BlazeVersionInfo.instance().getVersion()))
-        .build();
+                .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

@@ -119,7 +119,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));
@@ -668,7 +669,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

@@ -153,7 +153,7 @@ 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

@@ -115,7 +115,7 @@ 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/main");

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

@@ -96,7 +96,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

third_party/remoteapis/BUILD.bazel

@@ -54,8 +54,10 @@ proto_library(
     srcs = ["build/bazel/remote/execution/v2/remote_execution.proto"],
     deps = [
         ":build_bazel_semver_semver_proto",
+        "@com_google_protobuf//:any_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:timestamp_proto",
+        "@com_google_protobuf//:wrappers_proto",
         "@googleapis//:google_api_annotations_proto",
         "@googleapis//:google_api_http_proto",
         "@googleapis//:google_longrunning_operations_proto",