Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Receive: Added tenant ID tag for span #5148

Merged
merged 5 commits into from
Feb 12, 2022
Merged

Receive: Added tenant ID tag for span #5148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6d3451
added tenant id tag
metonymic-smokey Feb 12, 2022
8dad3a1
Merge branch 'thanos-io:main' into receive2
metonymic-smokey Feb 12, 2022
fe11627
added changelog entry
metonymic-smokey Feb 12, 2022
7a1cbbe
Merge branch 'receive2' of https://github.com/metonymic-smokey/thanos…
metonymic-smokey Feb 12, 2022
89b41bf
removed ctx var
metonymic-smokey Feb 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/store/multitsdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func (s *tenantSeriesSetServer) Series(store storepb.StoreServer, r *storepb.Ser
var err error
tracing.DoInSpan(s.ctx, "multitsdb_tenant_series", func(_ 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)
Expand Down