Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ActionCacheStatistics to BEP #17615

Closed
wants to merge 7 commits into from
Closed

Add ActionCacheStatistics to BEP #17615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5f68c8f
Add ActionCacheStatistics to BEP
crydell-ericsson Feb 28, 2023
faeed87
Merge branch 'master' into action_cache_bep
crydell-ericsson Apr 6, 2023
509e3ed
Merge branch 'master' into action_cache_bep
crydell-ericsson Apr 21, 2023
6014fc0
Merge branch 'master' into action_cache_bep
crydell-ericsson Apr 25, 2023
82d8dad
Merge branch 'master' into action_cache_bep
crydell-ericsson Apr 28, 2023
d3976b2
Merge branch 'master' into action_cache_bep
crydell-ericsson May 3, 2023
203ac5e
Merge branch 'master' into action_cache_bep
crydell-ericsson Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/google/devtools/build/lib/metrics/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/google/devtools/build/lib/metrics/MetricsCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
Expand Down
Loading