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: enable service detection for otlp endoint #14036

Merged
merged 14 commits into from
Sep 4, 2024

Conversation

trevorwhitney
Copy link
Collaborator

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

@trevorwhitney trevorwhitney requested a review from a team as a code owner September 3, 2024 23:29
@@ -135,6 +146,10 @@ func otlpToLokiPushRequest(ctx context.Context, ld plog.Logs, userID string, ten
return true
})

if !hasServiceName && len(discoverServiceName) > 0 && !stats.IsAggregatedMetric {
Copy link
Contributor

Choose a reason for hiding this comment

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

The len(discoverServiceName) > 0 guard is another way of turning of service detection, I guess? Would it make sense to add a new var somewhere before this line like shouldDisdoverService := len(discoverServiceName) > 0 and use that also here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

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

Copy link
Contributor

@ashwanthgoli ashwanthgoli left a comment

Choose a reason for hiding this comment

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

LGTM. left a couple of nits

pkg/loghttp/push/push_test.go Outdated Show resolved Hide resolved
pkg/loghttp/push/push_test.go Outdated Show resolved Hide resolved
pkg/loghttp/push/push_test.go Show resolved Hide resolved
pkg/loghttp/push/push_test.go Outdated Show resolved Hide resolved
pkg/loghttp/push/push_test.go Outdated Show resolved Hide resolved
trevorwhitney and others added 7 commits September 4, 2024 12:52
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 trevorwhitney added type/bug Somehing is not working as expected product-approved backport k218 labels Sep 4, 2024
Co-authored-by: JordanRushing <rushing.jordan@gmail.com>
@grafanabot
Copy link
Collaborator

This PR must be merged before a backport PR will be created.

@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Sep 4, 2024
@trevorwhitney trevorwhitney merged commit 4f962ef into main Sep 4, 2024
61 checks passed
@trevorwhitney trevorwhitney deleted the otlp-service-detection branch September 4, 2024 19:49
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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport k218 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.

OTLP Not Detecting Service Name
5 participants