Skip to content

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

Merged
mapno merged 6 commits intografana:mainfrom
Komey:main
May 23, 2023
Merged

[ENHANCEMENT] log client ip to help identify which client is no org id#2436
mapno merged 6 commits intografana:mainfrom
Komey:main

Conversation

@Komey
Copy link
Copy Markdown
Contributor

@Komey Komey commented May 6, 2023

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

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Komey added 2 commits May 6, 2023 17:35
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
@CLAassistant
Copy link
Copy Markdown

CLAassistant commented May 6, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Copy Markdown
Contributor

@mapno mapno left a comment

Choose a reason for hiding this comment

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

LGTM, but the panic needs to be fixed.

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
Copy Markdown
Contributor

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
Copy Markdown
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
Copy Markdown
Contributor

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
Copy Markdown
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

Copy link
Copy Markdown
Contributor

@mapno mapno left a comment

Choose a reason for hiding this comment

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

LGTM, thank you for the contribution.

@mapno mapno enabled auto-merge (squash) May 23, 2023 07:16
@mapno mapno merged commit 5e0870a into grafana:main May 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants