Skip to content

Commit 60e03bf

Browse files
authored
[7.0.0] Stop including the walltime field in the execution log. (#20200)
We now unconditionally emit the full spawn metrics, which already include the wall time; the extra field is wasteful and potentially confusing. Progress on #18643. PiperOrigin-RevId: 582282615 Change-Id: I73f87f3e1c54679506acde860991ef57947262d3
1 parent 0ca0510 commit 60e03bf

3 files changed

Lines changed: 1 addition & 9 deletions

File tree

‎src/main/java/com/google/devtools/build/lib/exec/SpawnLogContext.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ public void logSpawn(
190190
}
191191

192192
builder.setMnemonic(spawn.getMnemonic());
193-
builder.setWalltime(millisToProto(result.getMetrics().executionWallTimeInMs()));
194193

195194
if (spawn.getTargetLabel() != null) {
196195
builder.setTargetLabel(spawn.getTargetLabel());

‎src/main/protobuf/spawn.proto‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,6 @@ message SpawnExec {
173173
// Was the Spawn result allowed to be cached remotely.
174174
bool remote_cacheable = 16;
175175

176-
// The wall time it took to execute the Spawn. This is only the time spent in
177-
// the subprocess, not including the time doing setup and teardown.
178-
google.protobuf.Duration walltime = 17;
179-
180176
// Canonical label of the target that emitted this spawn, may not always be
181177
// set.
182178
string target_label = 18;
@@ -189,5 +185,5 @@ message SpawnExec {
189185
// Timing, size and memory statistics.
190186
SpawnMetrics metrics = 20;
191187

192-
reserved 9;
188+
reserved 9, 17;
193189
}

‎src/test/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategyTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
import com.google.devtools.build.lib.vfs.SyscallCache;
7070
import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
7171
import com.google.devtools.common.options.Options;
72-
import com.google.protobuf.Duration;
7372
import com.google.testing.junit.testparameterinjector.TestParameter;
7473
import com.google.testing.junit.testparameterinjector.TestParameterInjector;
7574
import java.io.IOException;
@@ -466,7 +465,6 @@ public void testLogSpawn(@TestParameter LogSpawnMode mode) throws Exception {
466465
.setRemoteCacheable(true)
467466
.setMnemonic("MyMnemonic")
468467
.setRunner("runner")
469-
.setWalltime(Duration.getDefaultInstance())
470468
.setTargetLabel("//dummy:label")
471469
.setMetrics(Protos.SpawnMetrics.getDefaultInstance())
472470
.setDigest(DIGEST)
@@ -684,7 +682,6 @@ private static SpawnExec.Builder defaultSpawnExecBuilder(String cmd) {
684682
.setStatus("NON_ZERO_EXIT")
685683
.setExitCode(23)
686684
.setRemoteCacheable(true)
687-
.setWalltime(Duration.getDefaultInstance())
688685
.setTargetLabel("//dummy:label")
689686
.setDigest(DIGEST)
690687
.setMetrics(Protos.SpawnMetrics.getDefaultInstance());

0 commit comments

Comments
 (0)