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 dropped metric panic with OTLP #3040

Merged
merged 4 commits into from
Sep 26, 2022

Conversation

gouthamve
Copy link
Member

@gouthamve gouthamve commented Sep 26, 2022

Which issue(s) this PR fixes or relates to

Fixes #3037

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Tests are pending

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Copy link
Contributor

@aknuds1 aknuds1 left a comment

Choose a reason for hiding this comment

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

LGTM (see nit)!

pkg/util/push/push_test.go Outdated Show resolved Hide resolved
gouthamve and others added 2 commits September 26, 2022 13:17
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
@aknuds1 aknuds1 merged commit 5c11f6b into grafana:main Sep 26, 2022
aknuds1 added a commit that referenced this pull request Sep 26, 2022
* Fix dropped metric panic with OTLP

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1 added a commit that referenced this pull request Sep 26, 2022
* Fix dropped metric panic with OTLP

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
andyasp pushed a commit that referenced this pull request Sep 26, 2022
* Fix dropped metric panic with OTLP

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
@grafanabot
Copy link
Contributor

The backport to release-2.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3040-to-release-2.3 origin/release-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 5c11f6b9933e0fc60994f8d09316dd86ea39ab0d
# Push it to GitHub
git push --set-upstream origin backport-3040-to-release-2.3
git switch main
# Remove the local backport branch
git branch -D backport-3040-to-release-2.3

Then, create a pull request where the base branch is release-2.3 and the compare/head branch is backport-3040-to-release-2.3.

treid314 pushed a commit that referenced this pull request Sep 26, 2022
* Fix dropped metric panic with OTLP

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 5c11f6b)
treid314 pushed a commit that referenced this pull request Sep 26, 2022
* Fix dropped metric panic with OTLP

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 5c11f6b)

Co-authored-by: Goutham Veeramachaneni <gouthamve@gmail.com>
sysedwinistrator pushed a commit to sysedwinistrator/mimir that referenced this pull request Nov 21, 2022
* Fix dropped metric panic with OTLP

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Panic in the error handling of the OTLP ingestion in the distributor
4 participants