Skip to content

[metrics] Split reporting of installs into name:triplet #39

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
ras0219-msft merged 1 commit into from
Mar 30, 2021
Merged

[metrics] Split reporting of installs into name:triplet #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions include/vcpkg/install.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,6 @@ namespace vcpkg::Install
Triplet default_triplet,
Triplet host_triplet) const override;
};

void track_install_plan(Dependencies::ActionPlan& plan);
}
2 changes: 2 additions & 0 deletions src/vcpkg/commands.setinstalled.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ namespace vcpkg::Commands::SetInstalled
Checks::exit_success(VCPKG_LINE_INFO);
}

Install::track_install_plan(action_plan);

const auto summary = Install::perform(args,
action_plan,
Install::KeepGoing::NO,
Expand Down
48 changes: 32 additions & 16 deletions src/vcpkg/install.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,20 +983,6 @@ namespace vcpkg::Install
// install plan will be empty if it is already installed - need to change this at status paragraph part
Checks::check_exit(VCPKG_LINE_INFO, !action_plan.empty(), "Install plan cannot be empty");

// log the plan
std::string specs_string;
for (auto&& remove_action : action_plan.remove_actions)
{
if (!specs_string.empty()) specs_string.push_back(',');
specs_string += "R$" + Hash::get_string_hash(remove_action.spec.to_string(), Hash::Algorithm::Sha256);
}

for (auto&& install_action : action_plan.install_actions)
{
if (!specs_string.empty()) specs_string.push_back(',');
specs_string += Hash::get_string_hash(install_action.spec.to_string(), Hash::Algorithm::Sha256);
}

#if defined(_WIN32)
const auto maybe_common_triplet = common_projection(
action_plan.install_actions, [](const InstallPlanAction& to_install) { return to_install.spec.triplet(); });
Expand Down Expand Up @@ -1030,8 +1016,6 @@ namespace vcpkg::Install
}
#endif // defined(_WIN32)

Metrics::g_metrics.lock()->track_property("installplan_1", specs_string);

Dependencies::print_plan(action_plan, is_recursive, paths.builtin_ports_directory());

auto it_pkgsconfig = options.settings.find(OPTION_WRITE_PACKAGES_CONFIG);
Expand All @@ -1051,6 +1035,8 @@ namespace vcpkg::Install
Checks::exit_success(VCPKG_LINE_INFO);
}

track_install_plan(action_plan);

const InstallSummary summary =
perform(args,
action_plan,
Expand Down Expand Up @@ -1156,4 +1142,34 @@ namespace vcpkg::Install
}
return xunit_doc;
}

void track_install_plan(Dependencies::ActionPlan& plan)
{
Cache<Triplet, std::string> triplet_hashes;

auto hash_triplet = [&triplet_hashes](Triplet t) -> const std::string& {
return triplet_hashes.get_lazy(
t, [t]() { return Hash::get_string_hash(t.canonical_name(), Hash::Algorithm::Sha256); });
};

std::string specs_string;
for (auto&& remove_action : plan.remove_actions)
{
if (!specs_string.empty()) specs_string.push_back(',');
specs_string += Strings::concat("R$",
Hash::get_string_hash(remove_action.spec.name(), Hash::Algorithm::Sha256),
":",
hash_triplet(remove_action.spec.triplet()));
}

for (auto&& install_action : plan.install_actions)
{
if (!specs_string.empty()) specs_string.push_back(',');
specs_string += Strings::concat(Hash::get_string_hash(install_action.spec.name(), Hash::Algorithm::Sha256),
":",
hash_triplet(install_action.spec.triplet()));
}

Metrics::g_metrics.lock()->track_property("installplan_1", specs_string);
}
}