From 18501eb54f92293185328f1714020f834fdb3385 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Fri, 26 Apr 2024 09:00:20 +0100
Subject: [PATCH] Selectively report analytics.

Only report for `install`, `style`, `audit`, `linkage`, and `test`
steps for now. Everything else is a bit too noisy (and not flaky).
---
 lib/test.rb           |  4 ++--
 lib/tests/formulae.rb | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/test.rb b/lib/test.rb
index 3fc1d427..c29e219c 100644
--- a/lib/test.rb
+++ b/lib/test.rb
@@ -43,7 +43,7 @@ def info_header(text)
       puts Formatter.headline(text, color: :cyan)
     end
 
-    def test(*arguments, named_args: nil, env: {}, verbose: @verbose, ignore_failures: false)
+    def test(*arguments, named_args: nil, env: {}, verbose: @verbose, ignore_failures: false, report_analytics: false)
       step = Step.new(
         arguments,
         named_args:,
@@ -55,7 +55,7 @@ def test(*arguments, named_args: nil, env: {}, verbose: @verbose, ignore_failure
       step.run(dry_run: @dry_run, fail_fast: @fail_fast)
       @steps << step
 
-      if ENV["HOMEBREW_TEST_BOT_ANALYTICS"].present?
+      if ENV["HOMEBREW_TEST_BOT_ANALYTICS"].present? && report_analytics
         ::Utils::Analytics.report_test_bot_test(step.command_short, step.passed?)
       end
 
diff --git a/lib/tests/formulae.rb b/lib/tests/formulae.rb
index cd3b444a..7513cfc9 100644
--- a/lib/tests/formulae.rb
+++ b/lib/tests/formulae.rb
@@ -499,14 +499,14 @@ def formula!(formula_name, args:)
           test("brew", "install", *install_args,
                named_args:      formula_name,
                env:             env.merge({ "HOMEBREW_DEVELOPER" => nil }),
-               ignore_failures:)
+               ignore_failures:, report_analytics: true)
           steps.last.passed?
         end
 
         livecheck(formula) if !args.skip_livecheck? && !skip_online_checks
 
-        test "brew", "style", "--formula", formula_name
-        test "brew", "audit", "--formula", *audit_args unless formula.deprecated?
+        test "brew", "style", "--formula", formula_name, report_analytics: true
+        test "brew", "audit", "--formula", *audit_args, report_analytics: true unless formula.deprecated?
         unless install_step_passed
           if ignore_failures
             skipped formula_name, "install failed"
@@ -530,7 +530,7 @@ def formula!(formula_name, args:)
           bottle_reinstall_formula(formula, new_formula, args:)
         end
         @built_formulae << formula.full_name
-        test("brew", "linkage", "--test", named_args: formula_name, ignore_failures:)
+        test("brew", "linkage", "--test", named_args: formula_name, ignore_failures:, report_analytics: true)
         failed_linkage_or_test_messages ||= []
         failed_linkage_or_test_messages << "linkage failed" unless steps.last.passed?
 
@@ -557,7 +557,7 @@ def formula!(formula_name, args:)
 
           # Intentionally not passing --retry here to avoid papering over
           # flaky tests when a formula isn't being pulled in as a dependent.
-          test("brew", "test", "--verbose", named_args: formula_name, env:, ignore_failures:)
+          test("brew", "test", "--verbose", named_args: formula_name, env:, ignore_failures:, report_analytics: true)
           failed_linkage_or_test_messages << "test failed" unless steps.last.passed?
         end