From 90ef03ea3894fa7902cc952174caaa37772e457d Mon Sep 17 00:00:00 2001 From: William Martin Date: Tue, 21 Apr 2026 17:24:17 +0200 Subject: [PATCH] Enable telemetry without env var --- acceptance/testdata/skills/skills-install.txtar | 1 - acceptance/testdata/skills/skills-preview.txtar | 1 - acceptance/testdata/telemetry/command-invocation.txtar | 1 - acceptance/testdata/telemetry/no-telemetry-for-alias.txtar | 1 - acceptance/testdata/telemetry/no-telemetry-for-completion.txtar | 1 - acceptance/testdata/telemetry/no-telemetry-for-extension.txtar | 1 - acceptance/testdata/telemetry/no-telemetry-for-ghes-user.txtar | 1 - .../testdata/telemetry/no-telemetry-for-send-telemetry.txtar | 1 - .../telemetry/telemetry-failure-does-not-break-command.txtar | 1 - .../telemetry/telemetry-for-official-extension-stub.txtar | 1 - internal/ghcmd/cmd.go | 2 +- 11 files changed, 1 insertion(+), 11 deletions(-) diff --git a/acceptance/testdata/skills/skills-install.txtar b/acceptance/testdata/skills/skills-install.txtar index 0311a0db2..442edb797 100644 --- a/acceptance/testdata/skills/skills-install.txtar +++ b/acceptance/testdata/skills/skills-install.txtar @@ -21,7 +21,6 @@ grep 'github-repo' $WORK/custom-skills/git-commit/SKILL.md # Telemetry: skill_install event records agent hosts, repo identifiers, # and (for a public repo) the installed skill name. -env GH_PRIVATE_ENABLE_TELEMETRY=1 env GH_TELEMETRY=log env GH_TELEMETRY_SAMPLE_RATE=100 exec gh skill install github/awesome-copilot git-commit --scope user --force --agent github-copilot diff --git a/acceptance/testdata/skills/skills-preview.txtar b/acceptance/testdata/skills/skills-preview.txtar index af1d0bbbe..76aa9a6ec 100644 --- a/acceptance/testdata/skills/skills-preview.txtar +++ b/acceptance/testdata/skills/skills-preview.txtar @@ -10,7 +10,6 @@ stderr 'not found' # Telemetry: skill_preview event records repo identifiers and, for a # public repo, the skill name. -env GH_PRIVATE_ENABLE_TELEMETRY=1 env GH_TELEMETRY=log env GH_TELEMETRY_SAMPLE_RATE=100 exec gh skill preview github/awesome-copilot git-commit diff --git a/acceptance/testdata/telemetry/command-invocation.txtar b/acceptance/testdata/telemetry/command-invocation.txtar index 86d668da5..d174c5c08 100644 --- a/acceptance/testdata/telemetry/command-invocation.txtar +++ b/acceptance/testdata/telemetry/command-invocation.txtar @@ -1,5 +1,4 @@ # Telemetry log mode outputs command invocation event to stderr -env GH_PRIVATE_ENABLE_TELEMETRY=1 env GH_TELEMETRY=log env GH_TELEMETRY_SAMPLE_RATE=100 diff --git a/acceptance/testdata/telemetry/no-telemetry-for-alias.txtar b/acceptance/testdata/telemetry/no-telemetry-for-alias.txtar index 733bea11f..2bfe0657d 100644 --- a/acceptance/testdata/telemetry/no-telemetry-for-alias.txtar +++ b/acceptance/testdata/telemetry/no-telemetry-for-alias.txtar @@ -2,7 +2,6 @@ # resolved inner command should still record normally — its path is a core # gh command and conveys no user-authored identifier. -env GH_PRIVATE_ENABLE_TELEMETRY=1 env GH_TELEMETRY=log env GH_TELEMETRY_SAMPLE_RATE=100 diff --git a/acceptance/testdata/telemetry/no-telemetry-for-completion.txtar b/acceptance/testdata/telemetry/no-telemetry-for-completion.txtar index 20139ce5f..1204a7913 100644 --- a/acceptance/testdata/telemetry/no-telemetry-for-completion.txtar +++ b/acceptance/testdata/telemetry/no-telemetry-for-completion.txtar @@ -1,5 +1,4 @@ # The completion command should not generate a telemetry event -env GH_PRIVATE_ENABLE_TELEMETRY=1 env GH_TELEMETRY=log env GH_TELEMETRY_SAMPLE_RATE=100 diff --git a/acceptance/testdata/telemetry/no-telemetry-for-extension.txtar b/acceptance/testdata/telemetry/no-telemetry-for-extension.txtar index 19f3d69cc..5e9d2ea5d 100644 --- a/acceptance/testdata/telemetry/no-telemetry-for-extension.txtar +++ b/acceptance/testdata/telemetry/no-telemetry-for-extension.txtar @@ -3,7 +3,6 @@ # organization or project name). [!exec:bash] skip -env GH_PRIVATE_ENABLE_TELEMETRY=1 env GH_TELEMETRY=log env GH_TELEMETRY_SAMPLE_RATE=100 diff --git a/acceptance/testdata/telemetry/no-telemetry-for-ghes-user.txtar b/acceptance/testdata/telemetry/no-telemetry-for-ghes-user.txtar index f04fabf36..e8e1d8ffe 100644 --- a/acceptance/testdata/telemetry/no-telemetry-for-ghes-user.txtar +++ b/acceptance/testdata/telemetry/no-telemetry-for-ghes-user.txtar @@ -1,5 +1,4 @@ # GHES users should not get telemetry even when telemetry is enabled -env GH_PRIVATE_ENABLE_TELEMETRY=1 env GH_TELEMETRY=log env GH_TELEMETRY_SAMPLE_RATE=100 env GH_ENTERPRISE_TOKEN=fake-enterprise-token diff --git a/acceptance/testdata/telemetry/no-telemetry-for-send-telemetry.txtar b/acceptance/testdata/telemetry/no-telemetry-for-send-telemetry.txtar index 28436aaae..15e59fcf5 100644 --- a/acceptance/testdata/telemetry/no-telemetry-for-send-telemetry.txtar +++ b/acceptance/testdata/telemetry/no-telemetry-for-send-telemetry.txtar @@ -1,5 +1,4 @@ # The send-telemetry command should not itself generate a telemetry event -env GH_PRIVATE_ENABLE_TELEMETRY=1 env GH_TELEMETRY=log env GH_TELEMETRY_SAMPLE_RATE=100 env GH_TELEMETRY_ENDPOINT_URL=http://localhost:1 diff --git a/acceptance/testdata/telemetry/telemetry-failure-does-not-break-command.txtar b/acceptance/testdata/telemetry/telemetry-failure-does-not-break-command.txtar index ca1fc4b4a..14c4b67a6 100644 --- a/acceptance/testdata/telemetry/telemetry-failure-does-not-break-command.txtar +++ b/acceptance/testdata/telemetry/telemetry-failure-does-not-break-command.txtar @@ -1,5 +1,4 @@ # Command completes successfully even when telemetry endpoint is unreachable -env GH_PRIVATE_ENABLE_TELEMETRY=1 env GH_TELEMETRY=enabled env GH_TELEMETRY_SAMPLE_RATE=100 env GH_TELEMETRY_ENDPOINT_URL=http://localhost:1 diff --git a/acceptance/testdata/telemetry/telemetry-for-official-extension-stub.txtar b/acceptance/testdata/telemetry/telemetry-for-official-extension-stub.txtar index c64739af4..b200590bf 100644 --- a/acceptance/testdata/telemetry/telemetry-for-official-extension-stub.txtar +++ b/acceptance/testdata/telemetry/telemetry-for-official-extension-stub.txtar @@ -3,7 +3,6 @@ # names come from a fixed, hard-coded registry and do not contain any # user-authored identifiers. -env GH_PRIVATE_ENABLE_TELEMETRY=1 env GH_TELEMETRY=log env GH_TELEMETRY_SAMPLE_RATE=100 diff --git a/internal/ghcmd/cmd.go b/internal/ghcmd/cmd.go index 9512e4b55..67b1564e2 100644 --- a/internal/ghcmd/cmd.go +++ b/internal/ghcmd/cmd.go @@ -84,7 +84,7 @@ func Main() exitCode { telemetryService = &telemetry.NoOpService{} default: telemetryState := telemetry.ParseTelemetryState(cfg.Telemetry().Value) - telemetryDisabled := os.Getenv("GH_PRIVATE_ENABLE_TELEMETRY") == "" || mightBeGHESUser(cfg) + telemetryDisabled := mightBeGHESUser(cfg) switch telemetryState { case telemetry.Disabled: