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.

Sign up for GitHub

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

[ENHANCEMENT] log client ip to help identify which client is no org id #2436

Merged
merged 6 commits into from
May 23, 2023
Merged

[ENHANCEMENT] log client ip to help identify which client is no org id #2436

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
93fc765
Update middleware.go
Komey May 6, 2023
b4cf2ba
[ENHANCEMENT] log client ip to help identify which client is no org id
Komey May 6, 2023
c9f531d
Merge branch 'grafana:main' into main
Komey May 16, 2023
f4cd51b
Update CHANGELOG.md
Komey May 16, 2023
6db8a22
Merge branch 'grafana:main' into main
Komey May 19, 2023
6cead93
Update middleware.go
Komey May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## main / unreleased

* [ENHANCEMENT] log client ip to help identify which client is no org id [#2436](https://github.com/grafana/tempo/pull/2436)
* [ENHANCEMENT] Add `spss` parameter to `/api/search/tags`[#2308] to configure the spans per span set in response
* [CHANGE] Change log level of two compactor messages from `debug` to `info`. [#2443](https://github.com/grafana/tempo/pull/2443) (@dylanguedes)
* [CHANGE] Remove `tenant_header_key` option from `tempo-query` config [#2414](https://github.com/grafana/tempo/pull/2414) (@kousikmitra)
Expand Down
6 changes: 4 additions & 2 deletions modules/distributor/receiver/middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Copy link
Member

Choose a reason for hiding this comment

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

This is causing a panic when info.Addr == nil. You need to add a check for that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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

Copy link
Member

Choose a reason for hiding this comment

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

net.Addr is an interface, so it panics when undefined. See example https://go.dev/play/p/dx6a1BYB16J.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mapno Thanks for the correction, the panics has been fixed

return err
}

if len(orgIDs) > 1 {
log.Logger.Log("msg", "more than one orgID found", "orgIDs", orgIDs)
log.Logger.Log("msg", "more than one orgID found", "orgIDs", orgIDs,
"client", info.Addr.String())
return err
}

Expand Down