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

Extract query tags from HTTP requests. #11147

Merged
merged 1 commit into from
Nov 7, 2023

Conversation

jeschkies
Copy link
Contributor

@jeschkies jeschkies commented Nov 6, 2023

What this PR does / why we need it:
#10858 removed the code that would inject query tags into the context of the querier. This change adds an extraction in the decode method.

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
    • If the change is worth mentioning in the release notes, add add-to-release-notes label
  • 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

@grafanabot
Copy link
Collaborator

Hello @jeschkies!
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!

Copy link
Contributor

@dannykopping dannykopping left a comment

Choose a reason for hiding this comment

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

LGTM @jeschkies! Can you add some tests and a description pls?

@jeschkies
Copy link
Contributor Author

Can you add some tests and a description pls?

Ofc, it was a very quick write up. We should add an integration test.

Copy link
Contributor

@dannykopping dannykopping left a comment

Choose a reason for hiding this comment

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

LGTM, we're gonna merge this in for now to fix a production issue but please follow up with another PR including tests. Thanks!

@dannykopping dannykopping merged commit 6d95a86 into grafana:main Nov 7, 2023
15 checks passed
@jeschkies jeschkies mentioned this pull request Nov 7, 2023
8 tasks
grafanabot pushed a commit that referenced this pull request Nov 7, 2023
**What this PR does / why we need it**:
#10858 removed the code that would
inject query tags into the context of the querier. This change adds an
extraction in the decode method.

(cherry picked from commit 6d95a86)
slim-bean pushed a commit that referenced this pull request Nov 7, 2023
Backport 6d95a86 from #11147

---

**What this PR does / why we need it**:
#10858 removed the code that would
inject query tags into the context of the querier. This change adds an
extraction in the decode method.

**Checklist**
- [ ] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] 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](d10549e)
- [ ] 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](0d4416a)

Co-authored-by: Karsten Jeschkies <[email protected]>
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
**What this PR does / why we need it**:
grafana#10858 removed the code that would
inject query tags into the context of the querier. This change adds an
extraction in the decode method.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport k174 size/S type/bug Somehing is not working as expected
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants