-
Notifications
You must be signed in to change notification settings - Fork 206
Gather data for fetch metrics (but do not transmit) V2 #2391
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.
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
Open
cjreynol
wants to merge
9
commits into
google:main
Choose a base branch
from
cjreynol:fetch_metrics_plumbing_v2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+446
−59
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
53c971f
Pass event to writer as str field instead of enum
cjreynol e11d53a
Split the device data from `MetricsInput`
cjreynol a5b8c46
Put the enabled notice in a shared location
cjreynol 4dabd11
Gather fetch metrics data from fetch containers
cjreynol 36486ff
Introduce new fetch metrics orchestration helpers
cjreynol 345d7e0
Call new fetch metrics helpers from `cvd fetch`
cjreynol c9d653e
Add full filepath to test error output
cjreynol 45f62d6
Add metrics directory gathering to test teardown
cjreynol 3c2df9a
Relax restriction to always generate session_ids
cjreynol File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| * Copyright (C) 2026 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include "cuttlefish/host/libs/metrics/fetch_metrics.h" | ||
|
|
||
| #include <algorithm> | ||
| #include <vector> | ||
|
|
||
| #include "cuttlefish/host/commands/cvd/fetch/builds.h" | ||
| #include "cuttlefish/host/commands/cvd/fetch/fetch_cvd.h" | ||
| #include "cuttlefish/host/commands/cvd/fetch/fetch_cvd_parser.h" | ||
| #include "cuttlefish/result/result.h" | ||
|
|
||
| namespace cuttlefish { | ||
| namespace { | ||
|
|
||
| struct GetEventLabel { | ||
| std::string operator()(const FetchStartMetrics&) { return "fetch_start"; } | ||
| std::string operator()(const FetchCompleteMetrics&) { | ||
| return "fetch_complete"; | ||
| } | ||
| std::string operator()(const FetchFailedMetrics&) { return "fetch_failed"; } | ||
| }; | ||
|
|
||
| Result<FetchMetrics> GetFetchMetrics(const FetchFlags& fetch_flags) { | ||
| return FetchStartMetrics{ | ||
| .enable_local_caching = fetch_flags.build_api_flags.enable_caching, | ||
| .dynamic_super_image_mixing = | ||
| std::any_of(fetch_flags.vector_flags.dynamic_super_image.cbegin(), | ||
| fetch_flags.vector_flags.dynamic_super_image.cend(), | ||
| [](bool x) { return x; }), | ||
| }; | ||
| } | ||
|
|
||
| Result<FetchMetrics> GetFetchMetrics(const FetchResult& fetch_result) { | ||
| std::vector<Builds> builds; | ||
| for (const FetchArtifacts& artifact : fetch_result.fetch_artifacts) { | ||
| builds.push_back(artifact.builds); | ||
| } | ||
| return FetchCompleteMetrics{ | ||
| .status_blocked = | ||
| std::any_of(fetch_result.fetch_artifacts.cbegin(), | ||
| fetch_result.fetch_artifacts.cend(), | ||
| [](const FetchArtifacts& x) { return x.status_blocked; }), | ||
| .fetch_size_bytes = fetch_result.fetch_size_bytes, | ||
| .fetched_builds = builds, | ||
| }; | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| std::string ToEventLabel(const FetchMetrics& fetch_metrics) { | ||
| return std::visit(GetEventLabel(), fetch_metrics); | ||
| } | ||
|
|
||
| Result<FetchMetrics> GetFetchMetrics(const FetchInput& fetch_input) { | ||
| Result<FetchMetrics> result = | ||
| std::visit([](auto&& arg) { return GetFetchMetrics(arg); }, fetch_input); | ||
| return CF_EXPECT(std::move(result)); | ||
| } | ||
|
|
||
| } // namespace cuttlefish |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Copyright (C) 2026 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <stdint.h> | ||
|
|
||
| #include <string> | ||
| #include <variant> | ||
| #include <vector> | ||
|
|
||
| #include "cuttlefish/host/commands/cvd/fetch/builds.h" | ||
| #include "cuttlefish/host/commands/cvd/fetch/fetch_cvd.h" | ||
| #include "cuttlefish/host/commands/cvd/fetch/fetch_cvd_parser.h" | ||
| #include "cuttlefish/result/result.h" | ||
|
|
||
| namespace cuttlefish { | ||
|
|
||
| using FetchInput = std::variant<FetchFlags, FetchResult>; | ||
|
|
||
| struct FetchStartMetrics { | ||
| bool enable_local_caching = false; | ||
| bool dynamic_super_image_mixing = false; | ||
|
cjreynol marked this conversation as resolved.
|
||
| }; | ||
|
|
||
| struct FetchCompleteMetrics { | ||
| bool status_blocked = false; | ||
| uint64_t fetch_size_bytes = 0; | ||
| std::vector<Builds> fetched_builds; | ||
| }; | ||
|
|
||
| struct FetchFailedMetrics {}; | ||
|
|
||
| using FetchMetrics = | ||
| std::variant<FetchStartMetrics, FetchCompleteMetrics, FetchFailedMetrics>; | ||
|
|
||
| std::string ToEventLabel(const FetchMetrics& fetch_metrics); | ||
|
|
||
| Result<FetchMetrics> GetFetchMetrics(const FetchInput& fetch_input); | ||
|
|
||
| } // namespace cuttlefish | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.