Log count and size of output files and top-level files seen this build to the BEP. Augment existing logging for source files to log count in addition to size. PiperOrigin-RevId: 354612893
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java index a6d72be..c25ed89 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java +++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
@@ -966,6 +966,11 @@ } @Override + public TreeArtifactValue getTreeArtifactValue(SpecialArtifact treeArtifact) { + throw new UnsupportedOperationException(); + } + + @Override public FileArtifactValue constructMetadataForDigest( Artifact output, FileStatus statNoFollow, byte[] digest) { throw new UnsupportedOperationException();
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java index e533f72..c3c157a 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTestCase.java
@@ -52,7 +52,6 @@ import java.io.IOException; import java.util.LinkedHashSet; import java.util.UUID; -import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; import org.junit.Before; @@ -107,7 +106,9 @@ new AtomicReference<>(UnixGlob.DEFAULT_SYSCALLS), externalFilesHelper)) .put(FileValue.FILE, new FileFunction(pkgLocator)) - .put(Artifact.ARTIFACT, new ArtifactFunction(() -> true, new AtomicLong())) + .put( + Artifact.ARTIFACT, + new ArtifactFunction(() -> true, MetadataConsumerForMetrics.NO_OP)) .put(SkyFunctions.ACTION_EXECUTION, new SimpleActionExecutionFunction()) .put( SkyFunctions.PACKAGE,
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD index 091758a..6b2a59e 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/BUILD +++ b/src/test/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -40,6 +40,7 @@ "//src/main/java/com/google/devtools/build/lib/packages", "//src/main/java/com/google/devtools/build/lib/rules/platform", "//src/main/java/com/google/devtools/build/lib/skyframe:configured_target_key", + "//src/main/java/com/google/devtools/build/lib/skyframe:metadata_consumer_for_metrics", "//src/main/java/com/google/devtools/build/lib/skyframe:package_value", "//src/main/java/com/google/devtools/build/lib/skyframe:sky_functions", "//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster", @@ -202,6 +203,7 @@ "//src/main/java/com/google/devtools/build/lib/skyframe:glob_value", "//src/main/java/com/google/devtools/build/lib/skyframe:local_repository_lookup_value", "//src/main/java/com/google/devtools/build/lib/skyframe:managed_directories_knowledge", + "//src/main/java/com/google/devtools/build/lib/skyframe:metadata_consumer_for_metrics", "//src/main/java/com/google/devtools/build/lib/skyframe:output_store", "//src/main/java/com/google/devtools/build/lib/skyframe:package_error_message_value", "//src/main/java/com/google/devtools/build/lib/skyframe:package_lookup_function",
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index d23b8b3..54edfbf 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
@@ -127,7 +127,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nullable; import org.junit.Before; @@ -241,6 +240,8 @@ final SkyframeActionExecutor skyframeActionExecutor = new SkyframeActionExecutor( actionKeyContext, + MetadataConsumerForMetrics.NO_OP, + MetadataConsumerForMetrics.NO_OP, new AtomicReference<>(statusReporter), /*sourceRootSupplier=*/ () -> ImmutableList.of()); @@ -262,7 +263,9 @@ new AtomicReference<>(UnixGlob.DEFAULT_SYSCALLS), externalFilesHelper)) .put(FileValue.FILE, new FileFunction(pkgLocator)) - .put(Artifact.ARTIFACT, new ArtifactFunction(() -> true, new AtomicLong())) + .put( + Artifact.ARTIFACT, + new ArtifactFunction(() -> true, MetadataConsumerForMetrics.NO_OP)) .put( SkyFunctions.ACTION_EXECUTION, new ActionExecutionFunction(skyframeActionExecutor, directories, tsgmRef))