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: remove retries on the stats handlers because they already retry #13608

Merged
merged 1 commit into from
Jul 22, 2024

Conversation

slim-bean
Copy link
Collaborator

What this PR does / why we need it:

#13584 added retries to the stats handlers because I had seen some 5xx errors on stats functions not being retried. it was pointed out we already have retries on the statshandler, the tripperware used here already includes it.

Instead it seems the 5xx's that were not retried were fixed in #13592 so this PR removes the duplicate retry

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

Signed-off-by: Edward Welch <edward.welch@grafana.com>
@slim-bean slim-bean requested a review from a team as a code owner July 22, 2024 11:48
Copy link
Contributor

@ashwanthgoli ashwanthgoli left a comment

Choose a reason for hiding this comment

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

LGTM

@grafanabot
Copy link
Collaborator

Hello @ashwanthgoli!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@ashwanthgoli ashwanthgoli added type/bug Somehing is not working as expected and removed missing-labels labels Jul 22, 2024
@grafanabot
Copy link
Collaborator

Hello @ashwanthgoli!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@grafanabot
Copy link
Collaborator

This PR must be merged before a backport PR will be created.

@slim-bean slim-bean merged commit 1008315 into main Jul 22, 2024
67 checks passed
@slim-bean slim-bean deleted the remove-extra-retry branch July 22, 2024 12:26
grafanabot pushed a commit that referenced this pull request Jul 22, 2024
…13608)

Signed-off-by: Edward Welch <edward.welch@grafana.com>
(cherry picked from commit 1008315)
grafanabot pushed a commit that referenced this pull request Jul 22, 2024
…13608)

Signed-off-by: Edward Welch <edward.welch@grafana.com>
(cherry picked from commit 1008315)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport k211 backport k212 size/XS type/bug Somehing is not working as expected
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants