[ENHANCEMENT] log client ip to help identify which client is no org id #2436
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
Log client ip to help identify which client is no org id
[ENHANCEMENT] log client ip to help identify which client is no org id
Komey
requested review from
joe-elliott,
annanay25,
mdisibio,
mapno,
kvrhdn,
zalegrala,
electron0zero,
ie-pham and
stoewer
as code owners
|
|
electron0zero
approved these changes
May 8, 2023
mapno
reviewed
May 16, 2023
| @@ -61,12 +61,14 @@ func (m *multiTenancyMiddleware) Wrap(next consumer.Traces) consumer.Traces { | |||
| info := client.FromContext(ctx) | |||
| orgIDs := info.Metadata.Get(user.OrgIDHeaderName) | |||
| if len(orgIDs) == 0 { | |||
| log.Logger.Log("msg", "failed to extract org id from both grpc and HTTP", "err", err) | |||
| log.Logger.Log("msg", "failed to extract org id from both grpc and HTTP", | |||
| "err", err, "client", info.Addr.String()) | |||
There was a problem hiding this comment.
This is causing a panic when info.Addr == nil. You need to add a check for that.
There was a problem hiding this comment.
HI @mapno,
Thanks for the reviews, for version v0.74.0 of the opentelemetry-collector SDK, info.Addr is not a pointer. we should pay attention to future updates.
https://github.com/open-telemetry/opentelemetry-collector/blob/v0.74.0/client/client.go#L104
There was a problem hiding this comment.
net.Addr is an interface, so it panics when undefined. See example https://go.dev/play/p/dx6a1BYB16J.
There was a problem hiding this comment.
@mapno Thanks for the correction, the panics has been fixed
mapno
approved these changes
May 23, 2023
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:
add log for client ip to help identify which client is no org id
Which issue(s) this PR fixes:
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]