Skip to content

Commit 71be4ea

Browse files
illicitonionphilwo
illicitonion
authored and
philwo
committed
And mnemonic and label to remote metadata
This reflects bazelbuild/remote-apis#186 Closes #13109. PiperOrigin-RevId: 368763391
1 parent ee7a421 commit 71be4ea

13 files changed

Lines changed: 39 additions & 24 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ private static List<PathMetadata> processQueryResult(
152152
private ListenableFuture<ImmutableIterable<PathMetadata>> queryRemoteCache(
153153
ImmutableList<ListenableFuture<PathMetadata>> allPaths) throws Exception {
154154
RequestMetadata metadata =
155-
TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "bes-upload");
155+
TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "bes-upload", null);
156156
RemoteActionExecutionContext context = RemoteActionExecutionContext.create(metadata);
157157

158158
List<PathMetadata> knownRemotePaths = new ArrayList<>(allPaths.size());
@@ -188,7 +188,7 @@ private ListenableFuture<ImmutableIterable<PathMetadata>> queryRemoteCache(
188188
private ListenableFuture<List<PathMetadata>> uploadLocalFiles(
189189
ImmutableIterable<PathMetadata> allPaths) {
190190
RequestMetadata metadata =
191-
TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "bes-upload");
191+
TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "bes-upload", null);
192192
RemoteActionExecutionContext context = RemoteActionExecutionContext.create(metadata);
193193

194194
ImmutableList.Builder<ListenableFuture<PathMetadata>> allPathsUploaded =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private Completable downloadFileAsync(Path path, FileArtifactValue metadata) {
154154
() -> {
155155
RequestMetadata requestMetadata =
156156
TracingMetadataUtils.buildMetadata(
157-
buildRequestId, commandId, metadata.getActionId());
157+
buildRequestId, commandId, metadata.getActionId(), null);
158158
RemoteActionExecutionContext context =
159159
RemoteActionExecutionContext.create(requestMetadata);
160160

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public ExecutionResult execute(
106106
Duration timeout)
107107
throws IOException, InterruptedException {
108108
RequestMetadata metadata =
109-
TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "repository_rule");
109+
TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "repository_rule", null);
110110
RemoteActionExecutionContext context = RemoteActionExecutionContext.create(metadata);
111111

112112
Platform platform = PlatformUtils.buildPlatformProto(executionProperties);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private CapabilitiesBlockingStub capabilitiesBlockingStub(RemoteActionExecutionC
6969
public ServerCapabilities get(String buildRequestId, String commandId)
7070
throws IOException, InterruptedException {
7171
RequestMetadata metadata =
72-
TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "capabilities");
72+
TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "capabilities", null);
7373
RemoteActionExecutionContext context = RemoteActionExecutionContext.create(metadata);
7474
try {
7575
GetCapabilitiesRequest request =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public CacheHandle lookup(Spawn spawn, SpawnExecutionContext context)
153153

154154
RequestMetadata metadata =
155155
TracingMetadataUtils.buildMetadata(
156-
buildRequestId, commandId, actionKey.getDigest().getHash());
156+
buildRequestId, commandId, actionKey.getDigest().getHash(), spawn.getResourceOwner());
157157
RemoteActionExecutionContext remoteActionExecutionContext =
158158
RemoteActionExecutionContext.create(metadata);
159159

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public SpawnResult exec(Spawn spawn, SpawnExecutionContext context)
250250

251251
RequestMetadata metadata =
252252
TracingMetadataUtils.buildMetadata(
253-
buildRequestId, commandId, actionKey.getDigest().getHash());
253+
buildRequestId, commandId, actionKey.getDigest().getHash(), spawn.getResourceOwner());
254254
RemoteActionExecutionContext remoteActionExecutionContext =
255255
RemoteActionExecutionContext.create(metadata);
256256
Profiler prof = Profiler.instance();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void download(
114114
com.google.common.base.Optional<String> type)
115115
throws IOException, InterruptedException {
116116
RequestMetadata metadata =
117-
TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "remote_downloader");
117+
TracingMetadataUtils.buildMetadata(buildRequestId, commandId, "remote_downloader", null);
118118
RemoteActionExecutionContext remoteActionExecutionContext =
119119
RemoteActionExecutionContext.create(metadata);
120120

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

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import build.bazel.remote.execution.v2.ToolDetails;
1818
import com.google.common.annotations.VisibleForTesting;
1919
import com.google.common.base.Preconditions;
20+
import com.google.devtools.build.lib.actions.ActionExecutionMetadata;
2021
import com.google.devtools.build.lib.analysis.BlazeVersionInfo;
2122
import com.google.devtools.build.lib.remote.options.RemoteOptions;
2223
import io.grpc.ClientInterceptor;
@@ -46,19 +47,28 @@ private TracingMetadataUtils() {}
4647
ProtoUtils.keyForProto(RequestMetadata.getDefaultInstance());
4748

4849
public static RequestMetadata buildMetadata(
49-
String buildRequestId, String commandId, String actionId) {
50+
String buildRequestId,
51+
String commandId,
52+
String actionId,
53+
@Nullable ActionExecutionMetadata actionMetadata) {
5054
Preconditions.checkNotNull(buildRequestId);
5155
Preconditions.checkNotNull(commandId);
5256
Preconditions.checkNotNull(actionId);
53-
return RequestMetadata.newBuilder()
54-
.setCorrelatedInvocationsId(buildRequestId)
55-
.setToolInvocationId(commandId)
56-
.setActionId(actionId)
57-
.setToolDetails(
58-
ToolDetails.newBuilder()
59-
.setToolName("bazel")
60-
.setToolVersion(BlazeVersionInfo.instance().getVersion()))
61-
.build();
57+
RequestMetadata.Builder builder =
58+
RequestMetadata.newBuilder()
59+
.setCorrelatedInvocationsId(buildRequestId)
60+
.setToolInvocationId(commandId)
61+
.setActionId(actionId)
62+
.setToolDetails(
63+
ToolDetails.newBuilder()
64+
.setToolName("bazel")
65+
.setToolVersion(BlazeVersionInfo.instance().getVersion()));
66+
if (actionMetadata != null) {
67+
builder.setActionMnemonic(actionMetadata.getMnemonic());
68+
builder.setTargetId(actionMetadata.getOwner().getLabel().getCanonicalForm());
69+
builder.setConfigurationId(actionMetadata.getOwner().getConfigurationChecksum());
70+
}
71+
return builder.build();
6272
}
6373

6474
/**

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ public int maxConcurrency() {
132132
TracingMetadataUtils.buildMetadata(
133133
"none",
134134
"none",
135-
DIGEST_UTIL.asActionKey(Digest.getDefaultInstance()).getDigest().getHash());
135+
DIGEST_UTIL.asActionKey(Digest.getDefaultInstance()).getDigest().getHash(),
136+
null);
136137
context = RemoteActionExecutionContext.create(metadata);
137138

138139
retryService = MoreExecutors.listeningDecorator(Executors.newScheduledThreadPool(1));
@@ -679,7 +680,8 @@ public void queryWriteStatus(
679680
TracingMetadataUtils.buildMetadata(
680681
"build-req-id",
681682
"command-id",
682-
DIGEST_UTIL.asActionKey(actionDigest).getDigest().getHash());
683+
DIGEST_UTIL.asActionKey(actionDigest).getDigest().getHash(),
684+
null);
683685
RemoteActionExecutionContext remoteActionExecutionContext =
684686
RemoteActionExecutionContext.create(metadata);
685687
uploads.add(

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ public final void setUp() throws Exception {
156156
FileSystemUtils.createDirectoryAndParents(stderr.getParentDirectory());
157157
outErr = new FileOutErr(stdout, stderr);
158158
RequestMetadata metadata =
159-
TracingMetadataUtils.buildMetadata("none", "none", Digest.getDefaultInstance().getHash());
159+
TracingMetadataUtils.buildMetadata(
160+
"none", "none", Digest.getDefaultInstance().getHash(), null);
160161
context = RemoteActionExecutionContext.create(metadata);
161162
retryService = MoreExecutors.listeningDecorator(Executors.newScheduledThreadPool(1));
162163
}

0 commit comments

Comments
 (0)