Skip to content

Commit f0bd906

Browse files
Add ActionCacheStatistics to BEP (#18914)
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.
1 parent dc1c7b3 commit f0bd906

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ proto_library(
2626
name = "build_event_stream_proto",
2727
srcs = ["build_event_stream.proto"],
2828
deps = [
29+
"//src/main/protobuf:action_cache_proto",
2930
"//src/main/protobuf:command_line_proto",
3031
"//src/main/protobuf:failure_details_proto",
3132
"//src/main/protobuf:invocation_policy_proto",

src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package build_event_stream;
1818

1919
import "google/protobuf/duration.proto";
2020
import "google/protobuf/timestamp.proto";
21+
import "src/main/protobuf/action_cache.proto";
2122
import "src/main/protobuf/command_line.proto";
2223
import "src/main/protobuf/failure_details.proto";
2324
import "src/main/protobuf/invocation_policy.proto";
@@ -874,6 +875,8 @@ message BuildMetrics {
874875
int32 count = 2;
875876
}
876877
repeated RunnerCount runner_count = 6;
878+
879+
blaze.ActionCacheStatistics action_cache_statistics = 7;
877880
}
878881
ActionSummary action_summary = 1;
879882

src/main/java/com/google/devtools/build/lib/metrics/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ java_library(
4848
"//src/main/java/com/google/devtools/build/lib/worker:worker_metric",
4949
"//src/main/java/com/google/devtools/build/skyframe:skyframe_graph_stats_event",
5050
"//src/main/java/com/google/devtools/common/options",
51+
"//src/main/protobuf:action_cache_java_proto",
5152
"//third_party:error_prone_annotations",
5253
"//third_party:guava",
5354
],

src/main/java/com/google/devtools/build/lib/metrics/MetricsCollector.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.devtools.build.lib.actions.ActionResultReceivedEvent;
2424
import com.google.devtools.build.lib.actions.AnalysisGraphStatsEvent;
2525
import com.google.devtools.build.lib.actions.TotalAndConfiguredTargetOnlyMetric;
26+
import com.google.devtools.build.lib.actions.cache.Protos.ActionCacheStatistics;
2627
import com.google.devtools.build.lib.analysis.AnalysisPhaseCompleteEvent;
2728
import com.google.devtools.build.lib.analysis.AnalysisPhaseStartedEvent;
2829
import com.google.devtools.build.lib.analysis.NoBuildRequestFinishedEvent;
@@ -214,6 +215,12 @@ private ImmutableList<WorkerMetrics> createWorkerMetrics() {
214215
.collect(toImmutableList());
215216
}
216217

218+
@SuppressWarnings("unused")
219+
@Subscribe
220+
private void logActionCacheStatistics(ActionCacheStatistics stats) {
221+
actionSummary.setActionCacheStatistics(stats);
222+
}
223+
217224
private BuildMetrics createBuildMetrics() {
218225
BuildMetrics.Builder buildMetrics =
219226
BuildMetrics.newBuilder()

0 commit comments

Comments
 (0)