review feedback

Signed-off-by: Goutham Veeramachaneni <[email protected]>
grafana · Oct 6, 2022 · 50f8b0e · 50f8b0e
1 parent 1c374dc
commit 50f8b0e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/modules/distributor/receiver/middleware.go b/modules/distributor/receiver/middleware.go
@@ -60,8 +60,13 @@ func (m *multiTenancyMiddleware) Wrap(next consumer.Traces) consumer.Traces {
 			// Maybe its a HTTP request.
 			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)
+			if len(orgIDs) == 0 {
+				log.Logger.Log("msg", "failed to extract org id from both grpc and HTTP", "err", err)
+				return err
+			}
+
+			if len(orgIDs) > 1 {
+				log.Logger.Log("msg", "more than one orgID found", "orgIDs", orgIDs)
 				return err
 			}