Fixed an issue allowing conditions to change spans endDate to an earlier date (#478)

Co-authored-by: Robert Bartoszewski <robert.smartbear@gmail.com>

Author: robert-smartbear

CHANGELOG.md

@@ -9,6 +9,9 @@ Changelog
 
 ### Bug fixes
 
+* Fixed an issue allowing conditions to change spans endDate to an earlier date.
+  [478](https://github.com/bugsnag/bugsnag-cocoa-performance/pull/478)
+
 * Fixed an issue preventing spans that have ended but are still blocked to be blocked with another condition.
   [471](https://github.com/bugsnag/bugsnag-cocoa-performance/pull/471)
 

Sources/BugsnagPerformance/Private/Tracer.mm

@@ -220,7 +220,7 @@
     }
     BugsnagPerformanceSpanCondition *condition = [BugsnagPerformanceSpanCondition conditionWithSpan:span onClosedCallback:^(BugsnagPerformanceSpanCondition *c, CFAbsoluteTime endTime) {
         __strong BugsnagPerformanceSpan *strongSpan = c.span;
-        if (strongSpan.state == SpanStateEnded) {
+        if (strongSpan.state == SpanStateEnded && endTime > strongSpan.endAbsTime) {
             [strongSpan markEndAbsoluteTime:endTime];
         }
     } onUpgradedCallback:^BugsnagPerformanceSpanContext *(BugsnagPerformanceSpanCondition *c) {

features/default/automatic_spans.feature

@@ -72,7 +72,7 @@ Feature: Automatic instrumentation spans
     * a span named "[ViewLoadPhase/Subview layout]/Fixture.ViewController" is a child of span named "[ViewLoad/UIKit]/Fixture.ViewController"
     * a span named "[ViewLoadPhase/viewDidLayoutSubviews]/Fixture.ViewController" is a child of span named "[ViewLoad/UIKit]/Fixture.ViewController"
     * a span named "[AppStart/iOSCold]" ended at the same time as a span named "[AppStartPhase/UI init]"
-    * a span named "[ViewLoad/UIKit]/Fixture.ViewController" ended at the same time as a span named "[AppStartPhase/UI init]"
+    * a span named "[ViewLoad/UIKit]/Fixture.ViewController" ended before a span named "[AppStartPhase/UI init]"
 
   Scenario: AutoInstrumentViewLoadScenario
     Given I run "AutoInstrumentViewLoadScenario"

features/default/conditions.feature

@@ -0,0 +1,53 @@
+Feature: Conditions
+
+  Scenario: Manually creating and ending conditions
+    Given I run "ConditionsBasicScenario"
+    And I wait for 1 span
+    Then the trace "Content-Type" header equals "application/json"
+    * the trace "Bugsnag-Integrity" header matches the regex "^sha1 [A-Fa-f0-9]{40}$"
+    * the trace "Bugsnag-Span-Sampling" header equals "1:1"
+    * the trace "Bugsnag-Sent-At" header matches the regex "^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\dZ$"
+    * every span field "name" equals "ConditionsBasicScenario"
+    * every span field "spanId" matches the regex "^[A-Fa-f0-9]{16}$"
+    * every span field "traceId" matches the regex "^[A-Fa-f0-9]{32}$"
+    * every span field "kind" equals 1
+    * every span field "startTimeUnixNano" matches the regex "^[0-9]+$"
+    * every span field "endTimeUnixNano" matches the regex "^[0-9]+$"
+    * every span bool attribute "bugsnag.span.first_class" is true
+    * every span string attribute "bugsnag.span.category" equals "custom"
+    * a span named "ConditionsBasicScenario" duration is equal or greater than 1.0
+
+  Scenario: Span can be blocked again after being ended as long as it is still blocked
+    Given I run "ConditionsBlockingBlockedEndedSpanScenario"
+    And I wait for 1 span
+    Then the trace "Content-Type" header equals "application/json"
+    * the trace "Bugsnag-Integrity" header matches the regex "^sha1 [A-Fa-f0-9]{40}$"
+    * the trace "Bugsnag-Span-Sampling" header equals "1:1"
+    * the trace "Bugsnag-Sent-At" header matches the regex "^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\dZ$"
+    * every span field "name" equals "ConditionsBlockingBlockedEndedSpanScenario"
+    * every span field "spanId" matches the regex "^[A-Fa-f0-9]{16}$"
+    * every span field "traceId" matches the regex "^[A-Fa-f0-9]{32}$"
+    * every span field "kind" equals 1
+    * every span field "startTimeUnixNano" matches the regex "^[0-9]+$"
+    * every span field "endTimeUnixNano" matches the regex "^[0-9]+$"
+    * every span bool attribute "bugsnag.span.first_class" is true
+    * every span string attribute "bugsnag.span.category" equals "custom"
+    * a span named "ConditionsBlockingBlockedEndedSpanScenario" duration is equal or greater than 2.0
+
+  Scenario: Condition should not override endTime to an earlier time
+    Given I run "ConditionsOverrideEndTimeBackwardsScenario"
+    And I wait for 1 span
+    Then the trace "Content-Type" header equals "application/json"
+    * the trace "Bugsnag-Integrity" header matches the regex "^sha1 [A-Fa-f0-9]{40}$"
+    * the trace "Bugsnag-Span-Sampling" header equals "1:1"
+    * the trace "Bugsnag-Sent-At" header matches the regex "^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\dZ$"
+    * every span field "name" equals "ConditionsOverrideEndTimeBackwardsScenario"
+    * every span field "spanId" matches the regex "^[A-Fa-f0-9]{16}$"
+    * every span field "traceId" matches the regex "^[A-Fa-f0-9]{32}$"
+    * every span field "kind" equals 1
+    * every span field "startTimeUnixNano" matches the regex "^[0-9]+$"
+    * every span field "endTimeUnixNano" matches the regex "^[0-9]+$"
+    * every span bool attribute "bugsnag.span.first_class" is true
+    * every span string attribute "bugsnag.span.category" equals "custom"
+    * a span named "ConditionsOverrideEndTimeBackwardsScenario" duration is equal or greater than 1.0
+

features/fixtures/ios/Fixture.xcodeproj/project.pbxproj

@@ -78,6 +78,9 @@
 		9691A9E12CA7588700707CDF /* FrameMetricsNonFirstClassSpanInstrumentRenderingOnScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9691A9E02CA7588700707CDF /* FrameMetricsNonFirstClassSpanInstrumentRenderingOnScenario.swift */; };
 		96986D9E2D5060E600A44C34 /* SpanConditionsSimpleConditionScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96986D9D2D5060E600A44C34 /* SpanConditionsSimpleConditionScenario.swift */; };
 		96986DA02D50654500A44C34 /* SpanConditionsMultipleConditionsScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96986D9F2D50654500A44C34 /* SpanConditionsMultipleConditionsScenario.swift */; };
+		969EE0E22E784E6400600F63 /* ConditionsBasicScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 969EE0E02E784E6400600F63 /* ConditionsBasicScenario.swift */; };
+		969EE0E32E784E6400600F63 /* ConditionsOverrideEndTimeBackwardsScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 969EE0E12E784E6400600F63 /* ConditionsOverrideEndTimeBackwardsScenario.swift */; };
+		969EE0E92E7851F000600F63 /* ConditionsBlockingBlockedEndedSpanScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 969EE0E82E7851F000600F63 /* ConditionsBlockingBlockedEndedSpanScenario.swift */; };
 		96A25F3C2D6BC98100A18116 /* AutoInstrumentAppStartsWithViewLoadScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A25F3A2D6BC98100A18116 /* AutoInstrumentAppStartsWithViewLoadScenario.swift */; };
 		96D528CC2C72B14300FEA2E2 /* AppDataOverrideScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D528CB2C72B14300FEA2E2 /* AppDataOverrideScenario.swift */; };
 		96D528CE2C75DC7000FEA2E2 /* FixedSamplingProbabilityOneScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D528CD2C75DC7000FEA2E2 /* FixedSamplingProbabilityOneScenario.swift */; };
@@ -183,6 +186,9 @@
 		9691A9E02CA7588700707CDF /* FrameMetricsNonFirstClassSpanInstrumentRenderingOnScenario.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameMetricsNonFirstClassSpanInstrumentRenderingOnScenario.swift; sourceTree = "<group>"; };
 		96986D9D2D5060E600A44C34 /* SpanConditionsSimpleConditionScenario.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpanConditionsSimpleConditionScenario.swift; sourceTree = "<group>"; };
 		96986D9F2D50654500A44C34 /* SpanConditionsMultipleConditionsScenario.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpanConditionsMultipleConditionsScenario.swift; sourceTree = "<group>"; };
+		969EE0E02E784E6400600F63 /* ConditionsBasicScenario.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConditionsBasicScenario.swift; sourceTree = "<group>"; };
+		969EE0E12E784E6400600F63 /* ConditionsOverrideEndTimeBackwardsScenario.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConditionsOverrideEndTimeBackwardsScenario.swift; sourceTree = "<group>"; };
+		969EE0E82E7851F000600F63 /* ConditionsBlockingBlockedEndedSpanScenario.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConditionsBlockingBlockedEndedSpanScenario.swift; sourceTree = "<group>"; };
 		96A25F3A2D6BC98100A18116 /* AutoInstrumentAppStartsWithViewLoadScenario.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutoInstrumentAppStartsWithViewLoadScenario.swift; sourceTree = "<group>"; };
 		96D528CB2C72B14300FEA2E2 /* AppDataOverrideScenario.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDataOverrideScenario.swift; sourceTree = "<group>"; };
 		96D528CD2C75DC7000FEA2E2 /* FixedSamplingProbabilityOneScenario.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FixedSamplingProbabilityOneScenario.swift; sourceTree = "<group>"; };
@@ -320,6 +326,9 @@
 				CBAAE2582912601D006D4AA0 /* BatchingScenario.swift */,
 				CB0496932913CA300097E526 /* BatchingWithTimeoutScenario.swift */,
 				09301DC02B63A65A000A7C12 /* ComplexViewScenario.swift */,
+				969EE0E02E784E6400600F63 /* ConditionsBasicScenario.swift */,
+				969EE0E82E7851F000600F63 /* ConditionsBlockingBlockedEndedSpanScenario.swift */,
+				969EE0E12E784E6400600F63 /* ConditionsOverrideEndTimeBackwardsScenario.swift */,
 				098FC87B2D40EAB8001B627D /* CPUMetricsScenario.swift */,
 				09DC62292C6DE242000AA8E1 /* EarlySpanOnEndScenario.swift */,
 				CBC90CDD29CDCFF700280884 /* FirstClassNoScenario.swift */,
@@ -477,12 +486,15 @@
 				09E045612C98649D003882D3 /* SetAttributeCountLimitScenario.swift in Sources */,
 				962CE7EE2E62240E00380522 /* LoadingIndicatorViewSimpleStopScenario.swift in Sources */,
 				962CE7F12E62240E00380522 /* LoadingIndicatorViewSimpleRemoveScenario.swift in Sources */,
+				969EE0E92E7851F000600F63 /* ConditionsBlockingBlockedEndedSpanScenario.swift in Sources */,
 				09637A432B0617FE00F4F776 /* MazeRunnerCommand.swift in Sources */,
 				09F3F5302D6F17B300BAA0A3 /* RenderingMetricsScenario.swift in Sources */,
 				966634E22C9DE648004A934D /* FrameMetricsNoSlowFramesScenario.swift in Sources */,
 				9691A9DF2CA5E62800707CDF /* FrameMetricsSpanInstrumentRenderingOffScenario.swift in Sources */,
 				09F025092BA08817007D9F73 /* AutoInstrumentNetworkNullURLScenario.swift in Sources */,
 				0185C47228F6C983006F9BDC /* AutoInstrumentViewLoadScenario.swift in Sources */,
+				969EE0E22E784E6400600F63 /* ConditionsBasicScenario.swift in Sources */,
+				969EE0E32E784E6400600F63 /* ConditionsOverrideEndTimeBackwardsScenario.swift in Sources */,
 				09D59E172BDFA23600199E1B /* ManualNetworkTracePropagationScenario.swift in Sources */,
 				96D528D02C77F38400FEA2E2 /* FixedSamplingProbabilityZeroScenario.swift in Sources */,
 				09D59E1D2BE105F700199E1B /* AutoInstrumentNetworkTracePropagationScenario.swift in Sources */,

features/fixtures/ios/FixtureXcFramework.xcodeproj/project.pbxproj

@@ -77,6 +77,9 @@
 		96986DA42D506B8F00A44C34 /* SpanConditionsMultipleConditionsScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96986DA12D506B8F00A44C34 /* SpanConditionsMultipleConditionsScenario.swift */; };
 		96986DA52D506B8F00A44C34 /* SpanConditionsConditionTimedOutScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96986DA22D506B8F00A44C34 /* SpanConditionsConditionTimedOutScenario.swift */; };
 		96986DA62D506B8F00A44C34 /* SpanConditionsSimpleConditionScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96986DA32D506B8F00A44C34 /* SpanConditionsSimpleConditionScenario.swift */; };
+		969EE0E72E784E7A00600F63 /* ConditionsBasicScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 969EE0E42E784E7A00600F63 /* ConditionsBasicScenario.swift */; };
+		969EE0EC2E78521500600F63 /* ConditionsOverrideEndTimeBackwardsScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 969EE0EB2E78521500600F63 /* ConditionsOverrideEndTimeBackwardsScenario.swift */; };
+		969EE0ED2E78521500600F63 /* ConditionsBlockingBlockedEndedSpanScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 969EE0EA2E78521500600F63 /* ConditionsBlockingBlockedEndedSpanScenario.swift */; };
 		96A25F402D6BC9BF00A18116 /* AutoInstrumentAppStartsWithViewLoadScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96A25F3E2D6BC9BF00A18116 /* AutoInstrumentAppStartsWithViewLoadScenario.swift */; };
 		96D528CC2C72B14300FEA2E2 /* AppDataOverrideScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D528CB2C72B14300FEA2E2 /* AppDataOverrideScenario.swift */; };
 		96D528CE2C75DC7000FEA2E2 /* FixedSamplingProbabilityOneScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D528CD2C75DC7000FEA2E2 /* FixedSamplingProbabilityOneScenario.swift */; };
@@ -197,6 +200,9 @@
 		96986DA12D506B8F00A44C34 /* SpanConditionsMultipleConditionsScenario.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpanConditionsMultipleConditionsScenario.swift; sourceTree = "<group>"; };
 		96986DA22D506B8F00A44C34 /* SpanConditionsConditionTimedOutScenario.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpanConditionsConditionTimedOutScenario.swift; sourceTree = "<group>"; };
 		96986DA32D506B8F00A44C34 /* SpanConditionsSimpleConditionScenario.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpanConditionsSimpleConditionScenario.swift; sourceTree = "<group>"; };
+		969EE0E42E784E7A00600F63 /* ConditionsBasicScenario.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConditionsBasicScenario.swift; sourceTree = "<group>"; };
+		969EE0EA2E78521500600F63 /* ConditionsBlockingBlockedEndedSpanScenario.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConditionsBlockingBlockedEndedSpanScenario.swift; sourceTree = "<group>"; };
+		969EE0EB2E78521500600F63 /* ConditionsOverrideEndTimeBackwardsScenario.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConditionsOverrideEndTimeBackwardsScenario.swift; sourceTree = "<group>"; };
 		96A25F3E2D6BC9BF00A18116 /* AutoInstrumentAppStartsWithViewLoadScenario.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutoInstrumentAppStartsWithViewLoadScenario.swift; sourceTree = "<group>"; };
 		96D528CB2C72B14300FEA2E2 /* AppDataOverrideScenario.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDataOverrideScenario.swift; sourceTree = "<group>"; };
 		96D528CD2C75DC7000FEA2E2 /* FixedSamplingProbabilityOneScenario.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FixedSamplingProbabilityOneScenario.swift; sourceTree = "<group>"; };
@@ -336,6 +342,9 @@
 				CBAAE2582912601D006D4AA0 /* BatchingScenario.swift */,
 				CB0496932913CA300097E526 /* BatchingWithTimeoutScenario.swift */,
 				09301DC02B63A65A000A7C12 /* ComplexViewScenario.swift */,
+				969EE0E42E784E7A00600F63 /* ConditionsBasicScenario.swift */,
+				969EE0EA2E78521500600F63 /* ConditionsBlockingBlockedEndedSpanScenario.swift */,
+				969EE0EB2E78521500600F63 /* ConditionsOverrideEndTimeBackwardsScenario.swift */,
 				09F3F5292D6C72B300BAA0A3 /* CPUMetricsScenario.swift */,
 				09DC62292C6DE242000AA8E1 /* EarlySpanOnEndScenario.swift */,
 				CBC90CDD29CDCFF700280884 /* FirstClassNoScenario.swift */,
@@ -484,6 +493,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				CBE43A9929A8EFA3000B4205 /* ProbabilityExpiryScenario.swift in Sources */,
+				969EE0EC2E78521500600F63 /* ConditionsOverrideEndTimeBackwardsScenario.swift in Sources */,
+				969EE0ED2E78521500600F63 /* ConditionsBlockingBlockedEndedSpanScenario.swift in Sources */,
 				CBE0872B29F81BBB007455F2 /* AutoInstrumentNetworkNoParentScenario.swift in Sources */,
 				962CE7F62E62242500380522 /* LoadingIndicatorViewSimpleRemoveScenario.swift in Sources */,
 				962CE7F82E62242500380522 /* LoadingIndicatorViewSimpleStopScenario.swift in Sources */,
@@ -573,6 +584,7 @@
 				01E7918A28EC7B5E00855993 /* ManualSpanBeforeStartScenario.swift in Sources */,
 				962CE8012E64FF6100380522 /* LoadingIndicatorViewNestedViewStopScenario.swift in Sources */,
 				09DC622A2C6DE242000AA8E1 /* EarlySpanOnEndScenario.swift in Sources */,
+				969EE0E72E784E7A00600F63 /* ConditionsBasicScenario.swift in Sources */,
 				CBE615F729A4C1F0000E72D8 /* ParentSpanScenario.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

features/fixtures/ios/Scenarios/AppDataOverrideScenario.swift

@@ -2,7 +2,7 @@
 //  AppDataOverrideScenario.swift
 //  Fixture
 //
-//  Created by Robert B on 16/08/2024.
+//  Created by Robert Bartoszewski on 16/08/2024.
 //
 
 import BugsnagPerformance

features/fixtures/ios/Scenarios/AutoInstrumentAppStartsWithViewLoadScenario.swift

@@ -2,7 +2,7 @@
 //  AutoInstrumentAppStartsWithViewLoadScenario.swift
 //  Fixture
 //
-//  Created by Robert B on 20/02/2025.
+//  Created by Robert Bartoszewski on 20/02/2025.
 //
 
 import BugsnagPerformance

features/fixtures/ios/Scenarios/AutoInstrumentGenericViewLoadScenario.swift

@@ -2,7 +2,7 @@
 //  AutoInstrumentGenericViewLoadScenario.swift
 //  Fixture
 //
-//  Created by Robert B on 07/12/2023.
+//  Created by Robert Bartoszewski on 07/12/2023.
 //
 
 import UIKit

features/fixtures/ios/Scenarios/AutoInstrumentNavigationViewLoadScenario.swift

@@ -2,7 +2,7 @@
 //  AutoInstrumentNavigationViewLoadScenario.swift
 //  Fixture
 //
-//  Created by Robert B on 16/06/2023.
+//  Created by Robert Bartoszewski on 16/06/2023.
 //
 
 import Foundation