Skip to content

Commit

Permalink
fix(metrics): Bump generic extraction version (#2692)
Browse files Browse the repository at this point in the history
External relays of version 23.9.1 (and possibly below) set the
`metrics_extracted` flag on transaction items even if transaction
metrics extraction is disabled:
https://github.com/getsentry/relay/blob/ffebe6020a2a6d42fde90857868736e5769a77d2/relay-server/src/actors/processor.rs#L2099-L2104

We recently [bumped](getsentry/sentry#57759)
the transaction metrics version, causing external relays to skip
extraction. But because old external relays set the `metrics_extracted`
flag anyway, even our internal PoPs skip metrics extraction now.

This PR is a one-time fix to force old external relays to stop
extracting generic metrics as well.
  • Loading branch information
jjbayer authored Nov 7, 2023
1 parent b368c39 commit 7f0e641
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
- Collect `http.decoded_response_content_length`. ([#2638](https://github.com/getsentry/relay/pull/2638))
- Add TTID and TTFD tags to mobile spans. ([#2662](https://github.com/getsentry/relay/pull/2662))
- Scrub all DB Core Data spans differently. ([#2686](https://github.com/getsentry/relay/pull/2686))
- Support generic metrics extraction version 2. ([#2692](https://github.com/getsentry/relay/pull/2692))

## 23.10.1

Expand Down
4 changes: 3 additions & 1 deletion relay-dynamic-config/src/metrics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,9 @@ pub struct MetricExtractionConfig {

impl MetricExtractionConfig {
/// The latest version for this config struct.
pub const VERSION: u16 = 1;
///
/// This is the maximum version supported by this Relay instance.
pub const VERSION: u16 = 2;

/// Returns an empty `MetricExtractionConfig` with the latest version.
///
Expand Down

0 comments on commit 7f0e641

Please sign in to comment.