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

[bugfix] Let prometheus client do its own compression handling #3232

Merged
merged 1 commit into from
Aug 25, 2024

Conversation

tsmethurst
Copy link
Contributor

@tsmethurst tsmethurst commented Aug 25, 2024

Description

If this is a code change, please include a summary of what you've coded, and link to the issue(s) it closes/implements.

If this is a documentation change, please briefly describe what you've changed and why.

Update routing to not pass our gzip middleware to prometheus http endpoint, but let it do its own compression handling. Because of this change in this PR, prometheus overwrites the content-encoding header to identity (ie., no compression) even if our gzip middleware compresses the body, which was confusing http clients (understandably). Rather than fighting prometheus and trying to hack around this by setting another content-encoding later or something, it's easier to just let prometheus win this round and do its own compression.

Tested this on the testrig and it fixes the issue.

closes #3216

image

Checklist

Please put an x inside each checkbox to indicate that you've read and followed it: [ ] -> [x]

If this is a documentation change, only the first checkbox must be filled (you can delete the others if you want).

  • I/we have read the GoToSocial contribution guidelines.
  • I/we have discussed the proposed changes already, either in an issue on the repository, or in the Matrix chat.
  • I/we have not leveraged AI to create the proposed changes.
  • I/we have performed a self-review of added code.
  • I/we have written code that is legible and maintainable by others.
  • I/we have commented the added code, particularly in hard-to-understand areas.
  • I/we have made any necessary changes to documentation.
  • I/we have added tests that cover new code.
  • I/we have run tests and they pass locally with the changes.
  • I/we have run go fmt ./... and golangci-lint run.

@tsmethurst tsmethurst merged commit d3887bf into main Aug 25, 2024
3 checks passed
@tsmethurst tsmethurst deleted the you_know_what_prometheus_you_win branch August 25, 2024 11:25
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.

[bug] Metrics endpoint does not return correct Content-Encoding
2 participants