Skip to content

Tidy up cURL error messages in metrics cases #2508

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 2 commits into from
May 5, 2026
Merged

Tidy up cURL error messages in metrics cases #2508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a03fdef
Tidy up cURL error messages by adding them to log
cjreynol May 4, 2026
4a2fddc
Update constant usage for bools to comments
cjreynol May 4, 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/.clang-tidy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# `parse_headers` bazel feature.

Checks: &checks >-
bugprone-argument-comment,
clang-analyzer-*,
clang-diagnostic-*,
-clang-diagnostic-pragma-once-outside-header,
Expand Down
3 changes: 2 additions & 1 deletion base/cvd/cuttlefish/host/commands/cvd/cli/commands/login.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ class CvdLoginCommand : public CvdCommandHandler {
}

CurlGlobalInit init;
std::unique_ptr<HttpClient> http_client = CurlHttpClient(true);
std::unique_ptr<HttpClient> http_client =
CurlHttpClient(/*use_logging_debug_function=*/true);
CF_EXPECT(http_client.get(), "Failed to create a http client");

if (!oauth2_request.is_ssh) {
Expand Down
3 changes: 1 addition & 2 deletions base/cvd/cuttlefish/host/commands/cvd/fetch/downloaders.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ Result<Downloaders> Downloaders::Create(const BuildApiFlags& flags,
const std::string& cache_base_path) {
std::unique_ptr<Downloaders::Impl> impl(new Downloaders::Impl());

const bool use_logging_debug_function = true;
impl->curl_ = CurlHttpClient(use_logging_debug_function);
impl->curl_ = CurlHttpClient(/*use_logging_debug_function=*/true);
impl->retrying_http_client_ = RetryingServerErrorHttpClient(
*impl->curl_, 10, std::chrono::milliseconds(5000));

Expand Down
3 changes: 1 addition & 2 deletions base/cvd/cuttlefish/host/commands/metrics/metrics_transmission.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,8 @@ Result<void> TransmitMetricsEvent(
const wireless_android_play_playlog::LogRequest& log_request,
ClearcutEnvironment environment) {
CurlGlobalInit curl_global_init;
const bool use_logging_debug_function = true;
std::unique_ptr<HttpClient> http_client =
CurlHttpClient(use_logging_debug_function);
CurlHttpClient(/*use_logging_debug_function=*/true);
CF_EXPECT(http_client.get() != nullptr,
"Unable to create cURL client for metrics transmission");
CF_EXPECT(
Expand Down
3 changes: 2 additions & 1 deletion base/cvd/cuttlefish/host/libs/metrics/gce_environment.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ Result<std::string> GetZoneValue(std::string_view response_string) {

Result<std::optional<GceEnvironment>> DetectGceEnvironment() {
CurlGlobalInit curl_init;
std::unique_ptr<HttpClient> http_client = CurlHttpClient();
std::unique_ptr<HttpClient> http_client =
CurlHttpClient(/*use_logging_debug_function=*/true);
if (!CF_EXPECT(IsGceEnvironment(*http_client))) {
return std::nullopt;
}
Expand Down
Loading