[mq] working branch - merge aadcd56 on top of main at 660c550

{"baseBranch":"main","baseCommit":"660c550b6311a209d9cf7de762e54b6b7109bcdb","createdAt":"2025-12-17T14:26:13.986719Z","headSha":"aadcd56467a351a44620e63f12c059412083bd8b","id":"6048ac56-4daa-4b5f-8fff-af8d4a7bcbf1","nextMergeabilityCheckAt":"2025-12-17T14:27:13.750373Z","priority":"200","pullRequestNumber":"1373","queuedAt":"2025-12-17T14:49:11.528377Z","status":"STATUS_QUEUED"}

Author: dd-mergequeue[bot]

libdd-trace-normalization/src/normalize_utils.rs

@@ -56,7 +56,7 @@ pub fn normalize_span_start_duration(start: &mut i64, duration: &mut i64) {
     if *duration < 0 {
         *duration = 0;
     }
-    if *duration > i64::MAX - *start {
+    if (*start).checked_add(*duration).is_none() {
         *duration = 0;
     }
 
@@ -286,6 +286,23 @@ mod tests {
     use super::*;
     use duplicate::duplicate_item;
 
+    #[test]
+    fn test_normalize_span_start_duration_handles_min_start() {
+        let mut start = i64::MIN;
+        let mut duration = 1;
+        normalize_span_start_duration(&mut start, &mut duration);
+        assert_eq!(duration, 1);
+        assert!(start > YEAR_2000_NANOSEC_TS);
+    }
+
+    #[test]
+    fn test_normalize_span_start_duration_handles_max_start() {
+        let mut start = i64::MAX;
+        let mut duration = 1;
+        normalize_span_start_duration(&mut start, &mut duration);
+        assert_eq!(duration, 0);
+    }
+
     #[duplicate_item(
         test_name                       input                               expected;
         [test_normalize_empty_string]   [""]                                ["unnamed_operation"];