admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #14658 from MikeMcQuaid/analytics_report_event

Browse Source 
utils/analytics: cleanup reporting.
This commit is contained in:
Mike McQuaid 2023-02-16 13:58:39 +00:00 committed by GitHub
commit c9fdce3e3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/utils/analytics.rb
View File

@ -78,7 +78,7 @@ module Utils
def report_influx(measurement, package_and_options, on_request, additional_tags = {}) def report_influx(measurement, package_and_options, on_request, additional_tags = {})
# Append general information to device information # Append general information to device information
tags = additional_tags.merge(package_and_options: package_and_options, on_request: !on_request.nil?) tags = additional_tags.merge(package_and_options: package_and_options, on_request: !on_request.nil?)
.compact_blank .compact
.map { |k, v| "#{k}=#{v.to_s.sub(" ", "\\ ")}" } # convert to key/value parameters .map { |k, v| "#{k}=#{v.to_s.sub(" ", "\\ ")}" } # convert to key/value parameters
.join(",") .join(",")
@ -161,7 +161,7 @@ module Utils
else else
formula_full_name formula_full_name
end end
report_event("BuildError", package_and_options) report_google_event("BuildError", package_and_options)
end end
sig { params(exception: Exception).void } sig { params(exception: Exception).void }
@ -177,7 +177,7 @@ module Utils
else else
formula_full_name formula_full_name
end end
report_event(:build_error, package_and_options) report_influx_event(:build_error, package_and_options)
end end
def messages_displayed? def messages_displayed?
@ -346,6 +346,10 @@ module Utils
version = "#{version}-dev" if HOMEBREW_VERSION.include?("-") version = "#{version}-dev" if HOMEBREW_VERSION.include?("-")
prefix = Homebrew.default_prefix? ? HOMEBREW_PREFIX.to_s : "custom-prefix" prefix = Homebrew.default_prefix? ? HOMEBREW_PREFIX.to_s : "custom-prefix"
# Cleanup quotes and patch/patchset versions to reduce cardinality.
os_version = OS_VERSION.tr('"', "")
.gsub(/(\d+\.\d+)(\.\d+)?(-\d)?/, '\1')
{ {
version: version, version: version,
prefix: prefix, prefix: prefix,
@ -354,7 +358,7 @@ module Utils
developer: Homebrew::EnvConfig.developer?, developer: Homebrew::EnvConfig.developer?,
arch: HOMEBREW_PHYSICAL_PROCESSOR, arch: HOMEBREW_PHYSICAL_PROCESSOR,
os: HOMEBREW_SYSTEM, os: HOMEBREW_SYSTEM,
os_name_and_version: OS_VERSION, os_name_and_version: os_version,
} }
end end
end end