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

[k184] Skip optimization for DownstreamSampleExpr #11653

Merged
merged 1 commit into from
Jan 11, 2024
Merged

[k184] Skip optimization for DownstreamSampleExpr #11653

merged 1 commit into from
Jan 11, 2024

Conversation

grafanabot
Copy link
Collaborator

Backport 88e957a from #11651

What this PR does / why we need it:
This fixes a four year old bug. The optimizeSampleExpr was switching on the wrong DownstreamSampleExpr type.

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 @grafana-delivery-bot
Skip optimization for DownstreamSampleExpr (#11651)
f6c9307 
This fixes a four year old bug. The `optimizeSampleExpr` was switching on the wrong `DownstreamSampleExpr` type.
This bug only surfaced because of the recent fix how binop expressions are executed.

(cherry picked from commit 88e957a)
@grafanabot grafanabot requested a review from a team as a code owner January 11, 2024 10:57
@grafanabot grafanabot added backport size/M type/bug Somehing is not working as expected labels Jan 11, 2024
@grafanabot grafanabot requested a review from chaudum January 11, 2024 10:57
@github-actions GitHub Actions
Copy link
Contributor

Trivy scan found the following vulnerabilities:

  • HIGH, Target: docker.io/grafana/loki:k184-19841a6 (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libcrypto3 v3.1.3-r0. Fixed in v3.1.4-r0
  • HIGH, Target: docker.io/grafana/loki:k184-19841a6 (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libssl3 v3.1.3-r0. Fixed in v3.1.4-r0
    \nTo see more details on these vulnerabilities, and how/where to fix them, please run docker build -t grafana/loki:k184-19841a6 -f cmd/loki/Dockerfile .
    trivy i grafana/loki:k184-19841a6 on your branch. If these were not introduced by your PR, please considering fixing them in via a subsequent PR. Thanks!

@chaudum chaudum merged commit e047bd6 into k184 Jan 11, 2024
14 checks passed
@chaudum chaudum deleted the backport-11651-to-k184 branch January 11, 2024 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chaudum chaudum chaudum approved these changes

Assignees
No one assigned
Labels
backport size/M type/bug Somehing is not working as expected
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@grafanabot @chaudum @jeschkies