From 93fc76534d83bebeb4bebbc107066f1244427705 Mon Sep 17 00:00:00 2001 From: Komey Date: Sat, 6 May 2023 17:35:02 +0800 Subject: [PATCH 1/3] Update middleware.go Log client ip to help identify which client is no org id --- modules/distributor/receiver/middleware.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/distributor/receiver/middleware.go b/modules/distributor/receiver/middleware.go index b7730627eea..f643b901461 100644 --- a/modules/distributor/receiver/middleware.go +++ b/modules/distributor/receiver/middleware.go @@ -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()) 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 } From f4cd51b7b36061020ed556b73167a6f35f5d5e66 Mon Sep 17 00:00:00 2001 From: Komey Date: Tue, 16 May 2023 11:51:17 +0800 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 254de6d6941..6cfac36ae2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) From 6cead93292940c91edf22e92a8257021cd09a9e3 Mon Sep 17 00:00:00 2001 From: Komey Date: Fri, 19 May 2023 10:30:59 +0800 Subject: [PATCH 3/3] Update middleware.go --- modules/distributor/receiver/middleware.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/distributor/receiver/middleware.go b/modules/distributor/receiver/middleware.go index f643b901461..99fe1e56a88 100644 --- a/modules/distributor/receiver/middleware.go +++ b/modules/distributor/receiver/middleware.go @@ -60,15 +60,18 @@ func (m *multiTenancyMiddleware) Wrap(next consumer.Traces) consumer.Traces { // Maybe its a HTTP request. info := client.FromContext(ctx) orgIDs := info.Metadata.Get(user.OrgIDHeaderName) + clientAddr := "unknown" + if info.Addr != nil { + clientAddr = info.Addr.String() + } if len(orgIDs) == 0 { log.Logger.Log("msg", "failed to extract org id from both grpc and HTTP", - "err", err, "client", info.Addr.String()) + "err", err, "client", clientAddr) return err } if len(orgIDs) > 1 { - log.Logger.Log("msg", "more than one orgID found", "orgIDs", orgIDs, - "client", info.Addr.String()) + log.Logger.Log("msg", "more than one orgID found", "orgIDs", orgIDs, "client", clientAddr) return err }