From 6e70d7a8675f280223249026eb2d08496bf1d781 Mon Sep 17 00:00:00 2001 From: Brandon Croft Date: Tue, 30 Jun 2026 13:17:14 -0600 Subject: [PATCH 1/4] fix: don't retry on telemetry server errors --- internal/pkg/telemetry/telemetry.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/pkg/telemetry/telemetry.go b/internal/pkg/telemetry/telemetry.go index d24f87d..b4ccf19 100644 --- a/internal/pkg/telemetry/telemetry.go +++ b/internal/pkg/telemetry/telemetry.go @@ -166,6 +166,9 @@ func Init(ctx context.Context, cfg Config) *Telemetry { hostname := resolveEndpoint() opts := []otlptracehttp.Option{ otlptracehttp.WithEndpoint(hostname), + otlptracehttp.WithRetry(otlptracehttp.RetryConfig{ + Enabled: false, + }), } if strings.HasPrefix(hostname, "localhost") { opts = append(opts, otlptracehttp.WithInsecure()) From 7b091aa9c7c219dcf079d238b4b99615db73d7f1 Mon Sep 17 00:00:00 2001 From: Brandon Croft Date: Tue, 30 Jun 2026 13:18:59 -0600 Subject: [PATCH 2/4] Create BUG FIXES-20260630-131853.yaml --- .changes/unreleased/BUG FIXES-20260630-131853.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changes/unreleased/BUG FIXES-20260630-131853.yaml diff --git a/.changes/unreleased/BUG FIXES-20260630-131853.yaml b/.changes/unreleased/BUG FIXES-20260630-131853.yaml new file mode 100644 index 0000000..77a8beb --- /dev/null +++ b/.changes/unreleased/BUG FIXES-20260630-131853.yaml @@ -0,0 +1,3 @@ +kind: BUG FIXES +body: Don't attempt to retry telemetry transmission on server errors, like rate limiting 429 errors. +time: 2026-06-30T13:18:53.530515-06:00 From 6013288a713c627b6010ade08e201d896d774fce Mon Sep 17 00:00:00 2001 From: Brandon Croft Date: Tue, 30 Jun 2026 13:22:08 -0600 Subject: [PATCH 3/4] Update pull_request_template.md --- .github/pull_request_template.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1588807..5c33e59 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -11,7 +11,7 @@ go run github.com/homeport/termshot/cmd/termshot@v0.6.1 -c -f ~/screenshot.png - ### PR Checklist -- [ ] Ensure you have [changie](https://changie.dev/guide/installation/) installed for release notes prep. +- [ ] Run `npx changie new` or install [changie](https://changie.dev/guide/installation/) to prepare a new changelog entry for the next set of release notes. - [ ] Ensure any command changes are sensitive to these global flags: - `--json` — Force machine readable output to stdout. Does not apply to stderr. - `--markdown` — Force markdown output to stdout. Does not apply to stderr. @@ -20,7 +20,6 @@ go run github.com/homeport/termshot/cmd/termshot@v0.6.1 -c -f ~/screenshot.png - - [ ] Get the logging interface from the context and add debug logging for interesting conditions and nonfatal situations. - [ ] Run `make gen/screenshot` if the root command output changes. - [ ] Add the `Autocomplete` field to **positional arguments** and **flags** to assist shell autocomplete. -- [ ] Run `changie new` to prepare a new changelog entry for the next set of release notes. ## PCI review checklist From db7106350fcbaa33aa2d9a9400765243b8e08b1d Mon Sep 17 00:00:00 2001 From: Brandon Croft Date: Tue, 30 Jun 2026 13:22:45 -0600 Subject: [PATCH 4/4] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 351d631..eac6bb3 100644 --- a/README.md +++ b/README.md @@ -930,7 +930,7 @@ $ tfctl --version #### PR Preparation Checklist -1. Ensure you have [changie](https://changie.dev/guide/installation/) installed for release notes prep. +1. Run `npx changie new` to prepare a new changelog entry for the next set of release notes. 1. Ensure any command changes are sensitive to these global flags: - `--json` — Force machine readable output to stdout. Does not apply to stderr. - `--markdown` — Force markdown output to stdout. Does not apply to stderr. @@ -939,4 +939,3 @@ $ tfctl --version 1. Get the logging interface from the context and add debug logging for interesting conditions and nonfatal situations. 1. Run `make gen/screenshot` if the root command output changes. 1. Add the `Autocomplete` field to positional arguments and flags to assist shell autocomplete. -1. Run `changie new` to prepare a new changelog entry for the next set of release notes.