From c6d3451b4bc6ff7e3e5f8cb4843e8fed2d9c6c85 Mon Sep 17 00:00:00 2001 From: metonymic-smokey Date: Sat, 12 Feb 2022 13:18:54 +0530 Subject: [PATCH 1/3] added tenant id tag Signed-off-by: metonymic-smokey --- pkg/store/multitsdb.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/store/multitsdb.go b/pkg/store/multitsdb.go index 12b848230c..feb3acc41b 100644 --- a/pkg/store/multitsdb.go +++ b/pkg/store/multitsdb.go @@ -169,9 +169,9 @@ func (s *tenantSeriesSetServer) Context() context.Context { return s.ctx } func (s *tenantSeriesSetServer) Series(store storepb.StoreServer, r *storepb.SeriesRequest) { var err error - tracing.DoInSpan(s.ctx, "multitsdb_tenant_series", func(_ context.Context) { + tracing.DoInSpan(s.ctx, "multitsdb_tenant_series", func(ctx context.Context) { err = store.Series(r, s) - }) + }, opentracing.Tags{"tenant.id": s.tenant}) if err != nil { if r.PartialResponseDisabled || r.PartialResponseStrategy == storepb.PartialResponseStrategy_ABORT { s.err = errors.Wrapf(err, "get series for tenant %s", s.tenant) From fe116272583470e44b918abc8c9fce3a454b251d Mon Sep 17 00:00:00 2001 From: metonymic-smokey Date: Sat, 12 Feb 2022 13:22:03 +0530 Subject: [PATCH 2/3] added changelog entry Signed-off-by: metonymic-smokey --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ce98be8b6..c0a7305a0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re - [#4667](https://github.com/thanos-io/thanos/pull/4667) Add a pure aws-sdk auth for s3 storage. - [#5111](https://github.com/thanos-io/thanos/pull/5111) Add matcher support to Query Rules endpoint. - [#5117](https://github.com/thanos-io/thanos/pull/5117) Bucket replicate: Added flag `--ignore-marked-for-deletion` to avoid replication of blocks with the deletion mark. +- [#5148](https://github.com/thanos-io/thanos/pull/5148) Receive: Add tenant tag for tracing spans. ## Changed - [#5144](https://github.com/thanos-io/thanos/pull/5144) UI: Improve graph color From 89b41bf1ec8a4644dc9f899bfec4861ede7ae286 Mon Sep 17 00:00:00 2001 From: metonymic-smokey Date: Sat, 12 Feb 2022 13:25:02 +0530 Subject: [PATCH 3/3] removed ctx var Signed-off-by: metonymic-smokey --- pkg/store/multitsdb.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/store/multitsdb.go b/pkg/store/multitsdb.go index feb3acc41b..297434ef72 100644 --- a/pkg/store/multitsdb.go +++ b/pkg/store/multitsdb.go @@ -169,7 +169,7 @@ func (s *tenantSeriesSetServer) Context() context.Context { return s.ctx } func (s *tenantSeriesSetServer) Series(store storepb.StoreServer, r *storepb.SeriesRequest) { var err error - tracing.DoInSpan(s.ctx, "multitsdb_tenant_series", func(ctx context.Context) { + tracing.DoInSpan(s.ctx, "multitsdb_tenant_series", func(_ context.Context) { err = store.Series(r, s) }, opentracing.Tags{"tenant.id": s.tenant}) if err != nil {