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

Refactor queueManager into generic queue.Queue #1796

Merged
merged 12 commits into from
Oct 14, 2022
Merged

Refactor queueManager into generic queue.Queue #1796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
53d9c48
Refactor queueManager into generic queue.Queue
Blinkuu Oct 12, 2022
730dcd8
Update CHANGELOG.md
Blinkuu Oct 12, 2022
95b9175
Create shared processFun method and a helper function for queue creation
Blinkuu Oct 13, 2022
eb2ae58
Remove returning error from ProcessFunc and update chan *request[T] t…
Blinkuu Oct 13, 2022
2513ff7
Fix unit tests
Blinkuu Oct 13, 2022
a029156
Replace go.uber.org/atomic with sync/atomic
Blinkuu Oct 13, 2022
ba22c7e
Remove redundant accessor
Blinkuu Oct 13, 2022
f3d2b36
Fix processFunc definition
Blinkuu Oct 13, 2022
8c9ad24
Add breaking change to CHANGELOG.md
Blinkuu Oct 13, 2022
291de28
Define metrics on the package level to overcome Prometheus DefaultReg…
Blinkuu Oct 13, 2022
be45e88
Fix tests in queue_test.go
Blinkuu Oct 13, 2022
f995cac
Deprecate generatorForwarder metrics in favor of queue.Queue metrics
Blinkuu Oct 13, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## main / unreleased

* [ENHANCEMENT] Refactor queueManager into generic queue.Queue [#1796](https://github.com/grafana/tempo/pull/1796) (@Blinkuu)
- **BREAKING CHANGE** Rename `tempo_distributor_forwarder_queue_length` metric to `tempo_distributor_queue_length`. New metric has two custom labels: `name` and `tenant`.
- Deprecated `tempo_distributor_forwarder_pushes_total` metric in favor of `tempo_distributor_queue_pushes_total`.
- Deprecated `tempo_distributor_forwarder_pushes_failures_total` metric in favor of `tempo_distributor_queue_pushes_failures_total`.
* [ENHANCEMENT] Filter namespace by cluster in tempo dashboards variables [#1771](https://github.com/grafana/tempo/pull/1771) (@electron0zero)
* [ENHANCEMENT] Exit early from sharded search requests [#1742](https://github.com/grafana/tempo/pull/1742) (@electron0zero)
* [CHANGE] Identify bloom that could not be retrieved from backend block [#1737](https://github.com/grafana/tempo/pull/1737) (@AlexDHoffer)
Expand Down
4 changes: 2 additions & 2 deletions modules/distributor/distributor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ type Distributor struct {
generatorClientCfg generator_client.Config
generatorsRing ring.ReadRing
generatorsPool *ring_client.Pool
generatorForwarder *forwarder
generatorForwarder *generatorForwarder

// Per-user rate limiter.
ingestionRateLimiter *limiter.RateLimiter
Expand Down Expand Up @@ -223,7 +223,7 @@ func New(cfg Config, clientCfg ingester_client.Config, ingestersRing ring.ReadRi

subservices = append(subservices, d.generatorsPool)

d.generatorForwarder = newForwarder(d.sendToGenerators, o)
d.generatorForwarder = newGeneratorForwarder(logger, reg, d.sendToGenerators, o)
subservices = append(subservices, d.generatorForwarder)
}

Expand Down
Loading