-
Notifications
You must be signed in to change notification settings - Fork 3.4k
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
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
9138776
fix: enable service detection for otlp endoint
trevorwhitney 974ebfb
Update pkg/loghttp/push/otlp.go
trevorwhitney ee90614
Update pkg/loghttp/push/push_test.go
trevorwhitney 002e976
Update pkg/loghttp/push/push_test.go
trevorwhitney 4000f15
Update pkg/loghttp/push/push_test.go
trevorwhitney 725d520
Update pkg/loghttp/push/push_test.go
trevorwhitney 9ec3c65
Update pkg/loghttp/push/push_test.go
trevorwhitney 85b2307
chore: clean up tests
trevorwhitney 9f14c68
test: fix tests
trevorwhitney a2a7c1d
Update pkg/loghttp/push/push_test.go
trevorwhitney 0316265
test: remove unused stub
trevorwhitney e140d34
Merge branch 'main' into otlp-service-detection
trevorwhitney 9756cc0
docs: update generated docs
trevorwhitney dc5b612
ci: lint and format
trevorwhitney File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
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 likeshouldDisdoverService := len(discoverServiceName) > 0
and use that also here?There was a problem hiding this comment.
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