Skip to content

Fix metrics errors #3444

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

Merged
cjreynol merged 4 commits into from
Oct 28, 2026
Merged

Fix metrics errors #3444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa9f6b9
Ensure the local `cvd` directory exists
cjreynol Oct 27, 2026
d7bd9d1
Allow `user_id` lookup to fail
cjreynol Oct 27, 2026
e906891
Same as `user_id` reading, allow failures
cjreynol Oct 27, 2026
0b042c7
Use the invoker helper elsewhere
cjreynol Oct 27, 2026
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 base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,7 @@ cf_cc_library(
"//cuttlefish/host/libs/config/defaults",
"//cuttlefish/host/libs/vhal_proxy_server",
"//cuttlefish/host/libs/vm_manager",
"//cuttlefish/metrics/host:invoker",
"//cuttlefish/result",
"@abseil-cpp//absl/log",
"@abseil-cpp//absl/strings",
Expand Down
4 changes: 2 additions & 2 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
#include "cuttlefish/common/libs/utils/base64.h"
#include "cuttlefish/common/libs/utils/container.h"
#include "cuttlefish/common/libs/utils/contains.h"
#include "cuttlefish/common/libs/utils/environment.h"
#include "cuttlefish/common/libs/utils/files.h"
#include "cuttlefish/common/libs/utils/host_info.h"
#include "cuttlefish/common/libs/utils/known_paths.h"
Expand Down Expand Up @@ -109,6 +108,7 @@
#include "cuttlefish/host/libs/vm_manager/gem5_manager.h"
#include "cuttlefish/host/libs/vm_manager/qemu_manager.h"
#include "cuttlefish/host/libs/vm_manager/vm_manager.h"
#include "cuttlefish/metrics/host/invoker.h"
#include "cuttlefish/result/result.h"

#define GET_FLAG_STR_VALUE(name) \
Expand Down Expand Up @@ -915,7 +915,7 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
(default_on_arch.find(
guest_configs[instance_index].target_arch) !=
default_on_arch.end() ||
StringFromEnv("CVD_INVOKER").value_or("") == "podcvd")) {
GetInvoker() == Invoker::Podcvd)) {
instance.set_vhost_user_vsock(true);
} else {
instance.set_vhost_user_vsock(false);
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/run_cvd/launch/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,6 @@ cf_cc_library(
hdrs = ["streamer.h"],
deps = [
"//cuttlefish/common/libs/fs",
"//cuttlefish/common/libs/utils:environment",
"//cuttlefish/common/libs/utils:files",
"//cuttlefish/host/commands/run_cvd:reporting",
"//cuttlefish/host/commands/run_cvd/launch:enable_multitouch",
Expand All @@ -475,6 +474,7 @@ cf_cc_library(
"//cuttlefish/host/libs/config:gpu_mode",
"//cuttlefish/host/libs/config:known_paths",
"//cuttlefish/host/libs/feature",
"//cuttlefish/metrics/host:invoker",
"//cuttlefish/posix:strerror",
"//cuttlefish/process:command",
"//cuttlefish/process:subprocess",
Expand Down
5 changes: 2 additions & 3 deletions base/cvd/cuttlefish/host/commands/run_cvd/launch/streamer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

#include <sys/socket.h>

#include <optional>
#include <string>
#include <unordered_set>
#include <utility>
Expand All @@ -31,7 +30,6 @@
#include "fruit/macro.h"

#include "cuttlefish/common/libs/fs/shared_fd.h"
#include "cuttlefish/common/libs/utils/environment.h"
#include "cuttlefish/common/libs/utils/files.h"
#include "cuttlefish/host/commands/run_cvd/launch/enable_multitouch.h"
#include "cuttlefish/host/commands/run_cvd/launch/input_paths_provider.h"
Expand All @@ -47,6 +45,7 @@
#include "cuttlefish/host/libs/feature/command_source.h"
#include "cuttlefish/host/libs/feature/feature.h"
#include "cuttlefish/host/libs/feature/kernel_log_pipe_provider.h"
#include "cuttlefish/metrics/host/invoker.h"
#include "cuttlefish/posix/strerror.h"
#include "cuttlefish/process/command.h"
#include "cuttlefish/process/subprocess.h"
Expand Down Expand Up @@ -225,7 +224,7 @@ class WebRtcServer : public virtual CommandSource,
return {};
}
std::string url;
if (StringFromEnv("CVD_INVOKER").value_or("") == "podcvd") {
if (GetInvoker() == Invoker::Podcvd) {
// Container image used by podcvd always contains `cuttlefish-user` debian
// package. URL starting with `https://localhost:1443` is required as port
// 1443 in the container is exposed via port forwarding. When printing
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/metrics/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ cf_cc_library(
"//cuttlefish/metrics/conversion:metrics_data",
"//cuttlefish/metrics/external_proto:cf_log_cc_proto",
"//cuttlefish/metrics/host:host_metrics",
"//cuttlefish/metrics/host:invoker",
"//cuttlefish/metrics/io:enabled",
"//cuttlefish/metrics/io:metrics_transmitter",
"//cuttlefish/metrics/io:metrics_writer",
"//cuttlefish/metrics/io:unique_id_file",
"//cuttlefish/result",
"@abseil-cpp//absl/log",
"@fmt",
],
)
10 changes: 2 additions & 8 deletions base/cvd/cuttlefish/metrics/host/host_metrics.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include "cuttlefish/metrics/host/host_metrics.h"

#include <optional>
#include <string>

#include "cuttlefish/common/libs/utils/host_info.h"
#include "cuttlefish/metrics/host/gce_environment.h"
Expand Down Expand Up @@ -47,15 +46,10 @@ Result<Environment> GetEnvironment() {
} // namespace

Result<HostMetrics> GetHostMetrics() {
Invoker invoker = GetInvoker();
std::string user_id;
if (invoker != Invoker::Podcvd) {
user_id = CF_EXPECT(ReadUserIdFile());
}
return HostMetrics{.os = GetHostInfo(),
.invoker = invoker,
.invoker = GetInvoker(),
.environment = CF_EXPECT(GetEnvironment()),
.user_id = user_id};
.user_id = ReadUserIdFile().value_or("")};
Comment thread
cjreynol marked this conversation as resolved.
Resolved
}

} // namespace cuttlefish
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/metrics/io/unique_id_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Result<void> GenerateUniqueIdFile(const std::string& directory,
return {};
}
const std::string unique_id = GenerateUuid();
CF_EXPECT(EnsureDirectoryExists(directory));
CF_EXPECT(WriteNewFile(filepath, unique_id));
return {};
}
Expand Down
8 changes: 4 additions & 4 deletions base/cvd/cuttlefish/metrics/metrics_orchestration.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <string>
#include <string_view>

#include "absl/log/log.h"
#include "fmt/format.h"

#include "cuttlefish/common/libs/utils/files.h"
Expand All @@ -31,7 +32,6 @@
#include "cuttlefish/metrics/conversion/metrics_data.h"
#include "cuttlefish/metrics/external_proto/cf_log.pb.h"
#include "cuttlefish/metrics/host/host_metrics.h"
#include "cuttlefish/metrics/host/invoker.h"
#include "cuttlefish/metrics/io/enabled.h"
#include "cuttlefish/metrics/io/metrics_transmitter.h"
#include "cuttlefish/metrics/io/metrics_writer.h"
Expand All @@ -53,9 +53,9 @@ std::chrono::milliseconds GetEpochTime() {
Result<void> SetUpMetrics(const std::string& metrics_directory) {
CF_EXPECT(EnsureDirectoryExists(metrics_directory));
CF_EXPECT(GenerateSessionIdFile(metrics_directory));
// TODO: b/578071683 - remove restriction once user id filepath is writable
if (GetInvoker() != Invoker::Podcvd) {
CF_EXPECT(GenerateUserIdFile());
Result<void> user_id_result = GenerateUserIdFile();
if (!user_id_result) {
VLOG(0) << "Failed to generate user ID file: " << user_id_result.error();
}
return {};
}
Expand Down
Loading