Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix telemetry error handling #650

Merged
merged 3 commits into from
Mar 7, 2024
Merged

Fix telemetry error handling #650

merged 3 commits into from
Mar 7, 2024

Conversation

ka3de
Copy link
Contributor

@ka3de ka3de commented Mar 7, 2024

No description provided.

ka3de added 3 commits March 7, 2024 12:12
We have to defer error handling through an anonymous function so the
closure captures the err var reference and it can be evaluated correctly
at the end of the function execution.
@ka3de ka3de marked this pull request as ready for review March 7, 2024 12:09
@ka3de ka3de requested a review from a team as a code owner March 7, 2024 12:09
@@ -173,7 +174,7 @@ func (p *RegionPusher) push(m sm.RegionTelemetry) {
)

start := p.metrics.start()
defer p.metrics.end(err, start)
defer func() { p.metrics.end(err, start) }()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, the classic. Been there done that 😅

@ka3de ka3de merged commit 5311af8 into main Mar 7, 2024
4 checks passed
@ka3de ka3de deleted the fix/telemetry-err-handling branch March 7, 2024 13:34
ka3de added a commit that referenced this pull request Mar 11, 2024
* Send adhoc check done logs to Loki without --verbose (#631)
* Chore(deps): Bump github.com/prometheus/prometheus from 0.50.0 to 0.50.1
* Configure blacklist ip range for k6 runner (#633)
* Add telemetry (#621)
* Fix: telemetry region label (#638)
* Chore(deps): Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (#640)
* Chore(deps): Bump google.golang.org/grpc from 1.61.1 to 1.62.0 (#628)
* Chore(deps): Bump golang.org/x/net from 0.21.0 to 0.22.0 (#642)
* Chore(deps): Bump github.com/prometheus/common from 0.47.0 to 0.49.0
* use expfmt.NewFormat instead of now-private formats directly
* Feature: allow checks to run less often (#611)
* Upgrade to grafana-build-tools v0.6.1 (#646)
* Fix telemetry error handling (#650)
* Use github.com/grafana/loki/pkg/pusher instead of logproto (#648)
* Pass a scraper factory from main (#649)
* Chore(deps): Bump google.golang.org/grpc from 1.62.0 to 1.62.1
* Chore(deps): Bump github.com/prometheus/common from 0.49.0 to 0.50.0
* Add telemetry sampled executions (#653)

Signed-off-by: ka3de <[email protected]>
@ka3de ka3de mentioned this pull request Mar 11, 2024
ka3de added a commit that referenced this pull request Mar 11, 2024
* Send adhoc check done logs to Loki without --verbose (#631)
* Chore(deps): Bump github.com/prometheus/prometheus from 0.50.0 to 0.50.1
* Configure blacklist ip range for k6 runner (#633)
* Add telemetry (#621)
* Fix: telemetry region label (#638)
* Chore(deps): Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (#640)
* Chore(deps): Bump google.golang.org/grpc from 1.61.1 to 1.62.0 (#628)
* Chore(deps): Bump golang.org/x/net from 0.21.0 to 0.22.0 (#642)
* Chore(deps): Bump github.com/prometheus/common from 0.47.0 to 0.49.0
* use expfmt.NewFormat instead of now-private formats directly
* Feature: allow checks to run less often (#611)
* Upgrade to grafana-build-tools v0.6.1 (#646)
* Fix telemetry error handling (#650)
* Use github.com/grafana/loki/pkg/pusher instead of logproto (#648)
* Pass a scraper factory from main (#649)
* Chore(deps): Bump google.golang.org/grpc from 1.62.0 to 1.62.1
* Chore(deps): Bump github.com/prometheus/common from 0.49.0 to 0.50.0
* Add telemetry sampled executions (#653)

Signed-off-by: ka3de <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants