fix(metrics): Fetch project states during aggregator shutdown [INGEST-784 INGEST-997] #1205
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jjbayer
changed the title
jjbayer
changed the title
untitaker
approved these changes
Mar 7, 2022
jjbayer
commented
Mar 7, 2022
| relay_statsd::metric!(gauge(MetricGauges::Buckets) = self.buckets.len() as u64); | ||
|
|
||
| let mut buckets = HashMap::<ProjectKey, Vec<Bucket>>::new(); | ||
|
|
||
| let force = matches!(&self.state, AggregatorState::ShuttingDown); | ||
|
|
||
| relay_statsd::metric!(timer(MetricTimers::BucketsScanDuration), { | ||
| let bucket_interval = self.config.bucket_interval; | ||
| self.buckets.retain(|key, entry| { |
There was a problem hiding this comment.
@jan-auer I did not refactor this into a force and non-force branch after all. Since we need to iterate through self.buckets in order to construct the return value, I did not see much benefit.
Yes. |
jan-auer
approved these changes
Mar 7, 2022
More descriptive changelog. Co-authored-by: Jan Michael Auer <mail@jauer.org>
jan-auer
added a commit
that referenced
this pull request
Mar 9, 2022
* master: ref(make): Simplify M1 exports in Makefile (#1206) fix(metrics): Wait for project states during aggregator shutdown (#1205) fix(test): Find librdkafka on Apple M1 (#1204) build: Bump sentry-relay in dev dependencies to 0.8.9 (#1202) ref(metrics): Tag backdated bucket creations in statsd (#1200) feat(metrics): Extract user satisfaction as tag (#1197) fix(statsd): Add new metric_type tag to existing metrics (#1199) fix: Apply clippy 1.59 suggestions (#1198)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The metrics aggregator currently force flushes all metrics during graceful shutdown, but only for projects which have up-to-date project configs (metrics for stale projects are dropped). This PR makes the aggregator attempt to flush everything multiple times, such that the project cache has time to update the project state.