fix: enable service detection for otlp endoint #14036
Merged
+160
−15
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
svennergr
reviewed
Sep 4, 2024
pkg/loghttp/push/otlp.go
Outdated
| @@ -135,6 +146,10 @@ func otlpToLokiPushRequest(ctx context.Context, ld plog.Logs, userID string, ten | |||
| return true | |||
| }) | |||
|
|
|||
| if !hasServiceName && len(discoverServiceName) > 0 && !stats.IsAggregatedMetric { | |||
There was a problem hiding this comment.
I created the the variable and reused where I could, not sure if the line #s in your links were off, but it I don't think this can replace the hasServiceName logic, I think we need both
svennergr
reviewed
Sep 4, 2024
ashwanthgoli
approved these changes
Sep 4, 2024
Co-authored-by: Sven Grossmann <Svennergr@gmail.com>
Co-authored-by: Ashwanth <iamashwanth@gmail.com>
Co-authored-by: Ashwanth <iamashwanth@gmail.com>
Co-authored-by: Ashwanth <iamashwanth@gmail.com>
Co-authored-by: Ashwanth <iamashwanth@gmail.com>
Co-authored-by: Ashwanth <iamashwanth@gmail.com>
trevorwhitney
added
type/bug
Co-authored-by: JordanRushing <rushing.jordan@gmail.com>
|
This PR must be merged before a backport PR will be created. |
github-actions
bot
added
the
type/docs
grafanabot
pushed a commit
that referenced
this pull request
Sep 4, 2024
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)
7 tasks
This was referenced Oct 14, 2024
This was referenced Oct 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
CONTRIBUTING.mdguide (required)featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.mdproduction/helm/loki/Chart.yamland updateproduction/helm/loki/CHANGELOG.mdandproduction/helm/loki/README.md. Example PRdeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR