impr: Stop canceling timer for manual transactions (#4380)

Avoid canceling the deadline timer on the main thread when there is no deadline timer when finishing a transaction.
getsentry · Sep 30, 2024 · a3ce1a9 · a3ce1a9
1 parent f3c0746
commit a3ce1a9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 - Speed up HTTP tracking for multiple requests in parallel (#4366)
 - Slightly speed up SentryInAppLogic (#4370)
+- Stop canceling timer for manual transactions (#4380)
 
 ## 8.37.0-beta.1
 

diff --git a/Sources/Sentry/SentryTracer.m b/Sources/Sentry/SentryTracer.m
@@ -307,6 +307,10 @@ - (void)deadlineTimerFired
 
 - (void)cancelDeadlineTimer
 {
+    if (self.deadlineTimer == nil) {
+        return;
+    }
+
     // If the main thread is busy the tracer could be deallocated in between.
     __weak SentryTracer *weakSelf = self;
 

diff --git a/Tests/SentryTests/Transaction/SentryTracerTests.swift b/Tests/SentryTests/Transaction/SentryTracerTests.swift
@@ -349,6 +349,18 @@ class SentryTracerTests: XCTestCase {
 
         fixture.timerFactory.fire()
     }
+
+    func testDeadlineTimerForManualTransaction_NoWorkQueuedOnMainQueue() {
+        let sut = fixture.getSut(waitForChildren: false, idleTimeout: 0.0)
+
+        let invocationsBeforeFinish = fixture.dispatchQueue.blockOnMainInvocations.count
+
+        sut.finish()
+
+        let invocationsAfterFinish = fixture.dispatchQueue.blockOnMainInvocations.count
+
+        XCTAssertEqual(invocationsBeforeFinish, invocationsAfterFinish)
+    }
 
     func testFramesofSpans_SetsDebugMeta() {
         let sut = fixture.getSut()