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

chore: [k218] fix: enable service detection for otlp endoint #14052

Merged
merged 1 commit into from
Sep 4, 2024

Conversation

grafanabot
Copy link
Collaborator

Backport 4f962ef from #14036


What this PR does / why we need it:

#13702 moved service detection further up in the distributor logic, from here to the push request parsing here. The problem with that is we pass multiple push request parsers to that pushHandler, so now service detection was limited to only in one of them, the traditional push path. This PR adds service detection to the OTLP parser, so it happens at the same time in the distributors logic (honoring the spirit of #13702), but now doing so for OTLP pushes as well.

Which issue(s) this PR fixes:
Fixes #14035

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • 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

Co-authored-by: Sven Grossmann <Svennergr@gmail.com>
Co-authored-by: Ashwanth <iamashwanth@gmail.com>
Co-authored-by: JordanRushing <rushing.jordan@gmail.com>
(cherry picked from commit 4f962ef)
@grafanabot grafanabot requested a review from a team as a code owner September 4, 2024 19:50
@grafanabot grafanabot added backport product-approved size/L type/bug Somehing is not working as expected type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories labels Sep 4, 2024
@trevorwhitney trevorwhitney merged commit 3b48709 into k218 Sep 4, 2024
66 checks passed
@trevorwhitney trevorwhitney deleted the backport-14036-to-k218 branch September 4, 2024 20:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport product-approved size/L type/bug Somehing is not working as expected type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants