update telemetry

This commit is contained in:
dan-shaw 2019-11-22 15:07:00 -08:00
parent 4984408bed
commit 0a0440c1a8
6 changed files with 9 additions and 20 deletions

View File

@ -5,12 +5,7 @@ For more information about how Microsoft protects your privacy, see https://priv
## Scope ## Scope
We explicitly ONLY collect information from invocations of the tool itself; we do NOT add any tracking information into the produced libraries. Telemetry is collected when using any of the `vcpkg` commands, such as: We explicitly ONLY collect information from invocations of the tool itself; we do NOT add any tracking information into the produced libraries. Telemetry is collected when using any of the `vcpkg` commands.
```
vcpkg install
vcpkg build
```
## How to opt out ## How to opt out
@ -27,7 +22,7 @@ vcpkg displays text similar to the following when you build vcpkg. This is how M
``` ```
Telemetry Telemetry
--------- ---------
vcpkg collects usage data in order to help us improve your experience. The data collected by Microsoft is anonymous. You can opt-out of telemetry by adding -disableMetrics after the bootstrap-vcpkg script. vcpkg collects usage data in order to help us improve your experience. The data collected by Microsoft is anonymous. You can opt-out of telemetry by re-running the bootstrap-vcpkg script with -disableMetrics.
Read more about vcpkg telemetry at docs/about/privacy.md Read more about vcpkg telemetry at docs/about/privacy.md
``` ```

View File

@ -415,7 +415,7 @@ Write-Host "`nBuilding vcpkg.exe... done.`n"
Write-Host @" Write-Host @"
Telemetry Telemetry
--------- ---------
vcpkg collects usage data in order to help us improve your experience. The data collected by Microsoft is anonymous. You can opt-out of telemetry by adding -disableMetrics after the bootstrap-vcpkg.bat script. vcpkg collects usage data in order to help us improve your experience. The data collected by Microsoft is anonymous. You can opt-out of telemetry by re-running bootstrap-vcpkg.bat with -disableMetrics.
Read more about vcpkg telemetry at docs/about/privacy.md Read more about vcpkg telemetry at docs/about/privacy.md
"@ "@

View File

@ -265,6 +265,6 @@ cp "$buildDir/vcpkg" "$vcpkgRootDir/"
echo "Telemetry" echo "Telemetry"
echo "---------" echo "---------"
echo "vcpkg collects usage data in order to help us improve your experience. The data collected by Microsoft is anonymous. You can opt-out of telemetry by adding -disableMetrics after the bootstrap-vcpkg.sh script." echo "vcpkg collects usage data in order to help us improve your experience. The data collected by Microsoft is anonymous. You can opt-out of telemetry by re-running bootstrap-vcpkg.sh with -disableMetrics"
echo "Read more about vcpkg telemetry at docs/about/privacy.md" echo "Read more about vcpkg telemetry at docs/about/privacy.md"
echo "" echo ""

View File

@ -584,7 +584,7 @@ namespace vcpkg::Build
locked_metrics->track_buildtime(Hash::get_string_hash(spec.to_string(), Hash::Algorithm::Sha256) + ":[" + locked_metrics->track_buildtime(Hash::get_string_hash(spec.to_string(), Hash::Algorithm::Sha256) + ":[" +
Strings::join(",", Strings::join(",",
config.feature_list, config.feature_list,
[](std::string feature) { [](const std::string& feature) {
return Hash::get_string_hash(feature, return Hash::get_string_hash(feature,
Hash::Algorithm::Sha256); Hash::Algorithm::Sha256);
}) + }) +

View File

@ -697,7 +697,7 @@ namespace vcpkg::Install
Checks::unreachable(VCPKG_LINE_INFO); Checks::unreachable(VCPKG_LINE_INFO);
}); });
Metrics::g_metrics.lock()->track_property("installplan", specs_string); Metrics::g_metrics.lock()->track_property("installplan_1", specs_string);
Dependencies::print_plan(action_plan, is_recursive, paths.ports); Dependencies::print_plan(action_plan, is_recursive, paths.ports);

View File

@ -184,15 +184,9 @@ namespace vcpkg::Metrics
if (buildtime_names.size() > 0) if (buildtime_names.size() > 0)
{ {
if (props_plus_buildtimes.size() > 0) props_plus_buildtimes.push_back(','); if (props_plus_buildtimes.size() > 0) props_plus_buildtimes.push_back(',');
props_plus_buildtimes.append( props_plus_buildtimes.append(Strings::format(R"("buildnames_1": [%s], "buildtimes": [%s])",
Strings::format(R"("buildnames": [%s], "buildtimes": [%s])", Strings::join(",", buildtime_names, to_json_string),
Strings::join(",", Strings::join(",", buildtime_times)));
buildtime_names,
[](std::string buildname) {
return to_json_string(vcpkg::Hash::get_string_hash(
buildname, Hash::Algorithm::Sha256));
}),
Strings::join(",", buildtime_times)));
} }
const std::string& session_id = get_session_id(); const std::string& session_id = get_session_id();