fix(eap): Normalize segment names for standalone spans #6163
+64
−14
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,10 @@ use crate::span::tag_extraction::{ | |
| domain_from_scrubbed_http, domain_from_server_address, span_op_to_category, | ||
| sql_action_from_query, sql_tables_from_query, | ||
| }; | ||
| use crate::{ | ||
| ClientHints, FromUserAgentInfo as _, RawUserAgentInfo, TransactionNameRule, | ||
| normalize_transaction_name, | ||
| }; | ||
|
|
||
| mod ai; | ||
| mod mobile; | ||
|
|
@@ -849,6 +852,32 @@ pub fn normalize_web_vital_span_segment(span: &mut SpanV2) { | |
| } | ||
| } | ||
|
|
||
| /// Normalize the [`SENTRY__SEGMENT__NAME`] attribute (aka the transaction) | ||
| /// by running [`normalize_transaction_name`] on it. | ||
| /// | ||
| /// This exists for parity with the legacy standalone span pipeline. | ||
| pub fn normalize_segment_name( | ||
| attributes: &mut Annotated<Attributes>, | ||
| tx_name_rules: &[TransactionNameRule], | ||
| ) { | ||
| let Some(attributes) = attributes.value_mut() else { | ||
| return; | ||
| }; | ||
|
|
||
| let Some(attr_value) = attributes.get_annotated_value_mut(SENTRY__SEGMENT__NAME) else { | ||
| return; | ||
| }; | ||
|
|
||
| let mut segment_name = match &attr_value.0 { | ||
| Some(Value::String(s)) => Annotated(Some(s.to_owned()), attr_value.1.clone()), | ||
| _ => return, | ||
| }; | ||
|
|
||
| normalize_transaction_name(&mut segment_name, tx_name_rules); | ||
|
|
||
| *attr_value = segment_name.map_value(Value::String); | ||
| } | ||
|
There was a problem hiding this comment. Duplicate transaction left unnormalizedMedium Severity
Additional Locations (1)  Reviewed by Cursor Bugbot for commit 2efc5b5. Configure here. |
||
|
|
||
| /// Double writes sentry conventions attributes into legacy attributes. | ||
| /// | ||
| /// This achieves backwards compatibility as it allows products to continue using legacy attributes | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The code in this function is tortous and ugly because I need to get from an attribute to an
Annotated<String>fornormalize_transaction_name. Suggestions for improvements are very welcome.