Add ActionCacheStatistics to BEP

Solves #17315 . The field action_cache_statistics has been added to the ActionSummary message of the BuildMetrics message in the build event protocol. This field is defined with the already-existing ActionCacheStatistics message and is set in the MetricsCollector when the action cache is saved. Closes #17615. PiperOrigin-RevId: 547254460 Change-Id: I3ffe57a7a3e665ba0d44ec750411f773ec985f45
bazelbuild · Jul 11, 2023 · 7963528 · 7963528
1 parent 2ce1a1b
commit 7963528
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD
@@ -27,6 +27,7 @@ proto_library(
     srcs = ["build_event_stream.proto"],
     deps = [
         "//src/main/java/com/google/devtools/build/lib/packages/metrics:package_load_metrics_proto",
+        "//src/main/protobuf:action_cache_proto",
         "//src/main/protobuf:command_line_proto",
         "//src/main/protobuf:failure_details_proto",
         "//src/main/protobuf:invocation_policy_proto",

diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto b/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
@@ -19,6 +19,7 @@ package build_event_stream;
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "src/main/java/com/google/devtools/build/lib/packages/metrics/package_load_metrics.proto";
+import "src/main/protobuf/action_cache.proto";
 import "src/main/protobuf/command_line.proto";
 import "src/main/protobuf/failure_details.proto";
 import "src/main/protobuf/invocation_policy.proto";
@@ -890,6 +891,8 @@ message BuildMetrics {
       string exec_kind = 3;
     }
     repeated RunnerCount runner_count = 6;
+
+    blaze.ActionCacheStatistics action_cache_statistics = 7;
   }
   ActionSummary action_summary = 1;
 

diff --git a/src/main/java/com/google/devtools/build/lib/metrics/BUILD b/src/main/java/com/google/devtools/build/lib/metrics/BUILD
@@ -54,6 +54,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/worker:worker_metric",
         "//src/main/java/com/google/devtools/build/skyframe:skyframe_graph_stats_event",
         "//src/main/java/com/google/devtools/common/options",
+        "//src/main/protobuf:action_cache_java_proto",
         "//third_party:auto_value",
         "//third_party:error_prone_annotations",
         "//third_party:flogger",

diff --git a/src/main/java/com/google/devtools/build/lib/metrics/MetricsCollector.java b/src/main/java/com/google/devtools/build/lib/metrics/MetricsCollector.java
@@ -21,6 +21,7 @@
 import com.google.devtools.build.lib.actions.ActionResultReceivedEvent;
 import com.google.devtools.build.lib.actions.AnalysisGraphStatsEvent;
 import com.google.devtools.build.lib.actions.TotalAndConfiguredTargetOnlyMetric;
+import com.google.devtools.build.lib.actions.cache.Protos.ActionCacheStatistics;
 import com.google.devtools.build.lib.analysis.AnalysisPhaseCompleteEvent;
 import com.google.devtools.build.lib.analysis.AnalysisPhaseStartedEvent;
 import com.google.devtools.build.lib.analysis.NoBuildRequestFinishedEvent;
@@ -283,6 +284,12 @@ private void postBuildMetricsEvent() {
     env.getEventBus().post(new BuildMetricsEvent(createBuildMetrics()));
   }
 
+  @SuppressWarnings("unused")
+  @Subscribe
+  private void logActionCacheStatistics(ActionCacheStatistics stats) {
+    actionSummary.setActionCacheStatistics(stats);
+  }
+
   private BuildMetrics createBuildMetrics() {
     BuildMetrics.Builder buildMetrics =
         BuildMetrics.newBuilder()