Fix multitenancy when using OTLP HTTP #1781
Merged
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
gouthamve
requested review from
joe-elliott,
annanay25,
mdisibio,
mapno,
yvrhdn and
zalegrala
as code owners
|
|
gouthamve
force-pushed
the
make-multitenancy-work-with-otlp-http
branch
from
2a7b8cc to
7839cd6
Compare
zalegrala
reviewed
Oct 4, 2022
mapno
approved these changes
Oct 5, 2022
gouthamve
force-pushed
the
make-multitenancy-work-with-otlp-http
branch
from
7839cd6 to
391aa3b
Compare
|
Done! |
joe-elliott
reviewed
Oct 5, 2022
| info := client.FromContext(ctx) | ||
| orgIDs := info.Metadata.Get(user.OrgIDHeaderName) | ||
| if len(orgIDs) != 1 { | ||
| log.Logger.Log("msg", "failed to extract org id", "err", err) |
There was a problem hiding this comment.
can we add more detail to this error message? now it represents 2 errors in a row. failure to pull the orgid from grpc and failure to pull the orgid from http. perhaps we can log the value of orgIDs as well?
There was a problem hiding this comment.
I've updated the error message @joe-elliott
But note that https://github.com/weaveworks/common/blob/master/user/grpc.go#L8-L22 the GRPC extractor doesn't log when multiple orgids are present.
gouthamve
force-pushed
the
make-multitenancy-work-with-otlp-http
branch
from
2ca81ec to
4c9e645
Compare
Fixes grafana#495 Signed-off-by: Goutham Veeramachaneni <[email protected]>
Signed-off-by: Goutham Veeramachaneni <[email protected]>
gouthamve
force-pushed
the
make-multitenancy-work-with-otlp-http
branch
from
4c9e645 to
50f8b0e
Compare
|
Thanks @gouthamve! I think you just fixed one of our oldest open issues 🙏 |
joe-elliott
pushed a commit
to joe-elliott/tempo
that referenced
this pull request
Oct 7, 2022
* Fix multitenancy when using OTLP HTTP Fixes grafana#495 Signed-off-by: Goutham Veeramachaneni <[email protected]> * review feedback Signed-off-by: Goutham Veeramachaneni <[email protected]> Signed-off-by: Goutham Veeramachaneni <[email protected]>
|
great👍，thanks |
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.
Which issue(s) this PR fixes:
Fixes #495
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]