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.

Sign up for GitHub

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

Jump to bottom

Wrap VolumeResponse. #11402

Merged
merged 4 commits into from
Dec 8, 2023
Merged

Wrap VolumeResponse. #11402

merged 4 commits into from
Dec 8, 2023

Conversation

jeschkies
Copy link
Contributor

What this PR does / why we need it:
This fixes a regression in frontend.encoding=protobuf:

body rpc error: code = Internal desc = invalid response format, got (*queryrange.VolumeResponse)

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

@jeschkies jeschkies requested a review from cstyan December 7, 2023 05:47
@jeschkies jeschkies requested a review from a team as a code owner December 7, 2023 05:47
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 7, 2023

Trivy scan found the following vulnerabilities:

dannykopping
dannykopping reviewed Dec 7, 2023
View reviewed changes
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.

We must've missed this due to a missing test
Can you add one pls?

@jeschkies
Copy link
Contributor Author

jeschkies commented Dec 7, 2023 •
edited
Loading

We must've missed this due to a missing test

It's tricky. If I would have thought about adding VolumeResponse in a test I would have thought about using it in the wrap. I can test the wrap so that no refactoring will break it in the future. Ideally we would run all integration tests with the new encoding though.

I wish the compiler would check this. We can go there by adding Wrap() QueryResponse to the queryrangebase.Response interface. However, that results in a circular dependency.

@pull-request-size pull-request-size bot added size/S and removed size/XS labels Dec 7, 2023
dannykopping
dannykopping approved these changes Dec 7, 2023
View reviewed changes
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, thanks!

@jeschkies jeschkies merged commit 51567ad into grafana:main Dec 8, 2023
7 checks passed
@jeschkies jeschkies deleted the karsten/wrap-volume-response branch December 8, 2023 10:12
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
@jeschkies @rhnasc
Wrap VolumeResponse. (grafana#11402)
3bf0d18 
**What this PR does / why we need it**:
This fixes a regression in `frontend.encoding=protobuf`:

```
body rpc error: code = Internal desc = invalid response format, got (*queryrange.VolumeResponse)
```

**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](grafana@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](grafana@0d4416a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dannykopping dannykopping dannykopping approved these changes

@cstyan cstyan Awaiting requested review from cstyan

Assignees
No one assigned
Labels
size/S
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jeschkies @dannykopping