Fix multitenancy when using OTLP HTTP#1781
Conversation
gouthamve
requested review from
annanay25,
joe-elliott,
mapno,
mdisibio,
yvrhdn and
zalegrala
as code owners
|
|
gouthamve
force-pushed
the
make-multitenancy-work-with-otlp-http
branch
from
2a7b8cc to
7839cd6
Compare
zalegrala
left a comment
zalegrala
left a comment
There was a problem hiding this comment.
This looks okay to me, thanks for the PR. I'll give my teammates a chance to review also.
mapno
left a comment
mapno
left a comment
There was a problem hiding this comment.
LGTM. Could you add a changelog entry?
gouthamve
force-pushed
the
make-multitenancy-work-with-otlp-http
branch
from
7839cd6 to
391aa3b
Compare
|
Done! |
| 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 <gouthamve@gmail.com>
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
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 🙏 |
* Fix multitenancy when using OTLP HTTP Fixes grafana#495 Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com> * review feedback Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com> Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
|
great👍，thanks |
6 participants
Which issue(s) this PR fixes:
Fixes #495
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]