Merge 4500bda into ee127f4

getsentry · Oct 4, 2022 · b00b932 · b00b932
2 parents ee127f4 + 4500bda
commit b00b932
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Fixes
 
+- Add app start to first finished transaction (#2252)
 - Return SentryNoOpSpan when starting a child on a finished transaction (#2239)
 
 ## 7.27.0

diff --git a/Sources/Sentry/SentryTracer.m b/Sources/Sentry/SentryTracer.m
@@ -58,6 +58,7 @@ @implementation SentryTracer {
     BOOL _waitForChildren;
     SentryTraceContext *_traceContext;
     SentryProfilesSamplerDecision *_profilesSamplerDecision;
+    SentryAppStartMeasurement *appStartMeasurement;
     NSMutableDictionary<NSString *, id> *_tags;
     NSMutableDictionary<NSString *, id> *_data;
     dispatch_block_t _idleTimeoutBlock;
@@ -162,6 +163,7 @@ - (instancetype)initWithTransactionContext:(SentryTransactionContext *)transacti
         self.finishStatus = kSentrySpanStatusUndefined;
         self.idleTimeout = idleTimeout;
         self.dispatchQueueWrapper = dispatchQueueWrapper;
+        appStartMeasurement = [self getAppStartMeasurement];
 
         if ([self hasIdleTimeout]) {
             [self dispatchIdleTimeout];
@@ -557,9 +559,7 @@ - (void)trimEndTimestamp
 
 - (SentryTransaction *)toTransaction
 {
-    SentryAppStartMeasurement *appStartMeasurement = [self getAppStartMeasurement];
-
-    NSArray<id<SentrySpan>> *appStartSpans = [self buildAppStartSpans:appStartMeasurement];
+    NSArray<id<SentrySpan>> *appStartSpans = [self buildAppStartSpans];
 
     NSArray<id<SentrySpan>> *spans;
     @synchronized(_children) {
@@ -573,7 +573,7 @@ - (SentryTransaction *)toTransaction
 
     SentryTransaction *transaction = [[SentryTransaction alloc] initWithTrace:self children:spans];
     transaction.transaction = self.transactionContext.name;
-    [self addMeasurements:transaction appStartMeasurement:appStartMeasurement];
+    [self addMeasurements:transaction];
     return transaction;
 }
 
@@ -626,8 +626,7 @@ - (nullable SentryAppStartMeasurement *)getAppStartMeasurement
     return measurement;
 }
 
-- (NSArray<SentrySpan *> *)buildAppStartSpans:
-    (nullable SentryAppStartMeasurement *)appStartMeasurement
+- (NSArray<SentrySpan *> *)buildAppStartSpans
 {
     if (appStartMeasurement == nil) {
         return @[];
@@ -687,7 +686,6 @@ - (nullable SentryAppStartMeasurement *)getAppStartMeasurement
 }
 
 - (void)addMeasurements:(SentryTransaction *)transaction
-    appStartMeasurement:(nullable SentryAppStartMeasurement *)appStartMeasurement
 {
     NSString *valueKey = @"value";
 

diff --git a/Tests/SentryTests/Performance/SentryTracerTests.swift b/Tests/SentryTests/Performance/SentryTracerTests.swift
@@ -432,19 +432,41 @@ class SentryTracerTests: XCTestCase {
         let appStartMeasurement = fixture.getAppStartMeasurement(type: .warm)
         SentrySDK.setAppStartMeasurement(appStartMeasurement)
 
+        advanceTime(bySeconds: -(fixture.appStartDuration + 4))
+
         let sut = fixture.getSut()
-        sut.startTimestamp = fixture.appStartEnd.addingTimeInterval(-5)
+        advanceTime(bySeconds: 1)
         sut.finish()
         fixture.hub.group.wait()
 
         XCTAssertEqual(1, fixture.hub.capturedEventsWithScopes.count)
-        let serializedTransaction = fixture.hub.capturedEventsWithScopes.first!.event.serialize()
-        let measurements = serializedTransaction["measurements"] as? [String: [String: Int]]
 
-        XCTAssertEqual(["app_start_warm": ["value": 500]], measurements)
+        assertAppStartMeasurementOn(transaction: fixture.hub.capturedEventsWithScopes.first!.event as! Transaction, appStartMeasurement: appStartMeasurement)
+    }
+
+    func testAddColdStartMeasurement_PutOnFirstStartedTransaction() {
+        let appStartMeasurement = fixture.getAppStartMeasurement(type: .warm)
+        SentrySDK.setAppStartMeasurement(appStartMeasurement)
 
-        let transaction = fixture.hub.capturedEventsWithScopes.first!.event as! Transaction
-        assertAppStartsSpanAdded(transaction: transaction, startType: "Warm Start", operation: fixture.appStartWarmOperation, appStartMeasurement: appStartMeasurement)
+        advanceTime(bySeconds: 0.5)
+
+        let firstTransaction = fixture.getSut()
+        advanceTime(bySeconds: 0.5)
+
+        let secondTransaction = fixture.getSut()
+        advanceTime(bySeconds: 0.5)
+        secondTransaction.finish()
+
+        fixture.hub.group.wait()
+        XCTAssertEqual(1, fixture.hub.capturedEventsWithScopes.count)
+        let serializedSecondTransaction = fixture.hub.capturedEventsWithScopes.first!.event.serialize()
+        XCTAssertNil(serializedSecondTransaction["measurements"])
+
+        firstTransaction.finish()
+        fixture.hub.group.wait()
+
+        XCTAssertEqual(2, fixture.hub.capturedEventsWithScopes.count)
+        assertAppStartMeasurementOn(transaction: fixture.hub.capturedEventsWithScopes[1].event as! Transaction, appStartMeasurement: appStartMeasurement)
     }
 
     func testAddUnknownAppStartMeasurement_NotPutOnNextTransaction() {
@@ -488,8 +510,10 @@ class SentryTracerTests: XCTestCase {
         let appStartMeasurement = fixture.getAppStartMeasurement(type: .warm)
         SentrySDK.setAppStartMeasurement(appStartMeasurement)
 
+        advanceTime(bySeconds: fixture.appStartDuration + 5.01)
+
         let sut = fixture.getSut()
-        sut.startTimestamp = fixture.appStartEnd.addingTimeInterval(5.1)
+        advanceTime(bySeconds: 1.0)
         sut.finish()
         fixture.hub.group.wait()
 
@@ -500,8 +524,10 @@ class SentryTracerTests: XCTestCase {
         let appStartMeasurement = fixture.getAppStartMeasurement(type: .warm)
         SentrySDK.setAppStartMeasurement(appStartMeasurement)
 
+        advanceTime(bySeconds: -(fixture.appStartDuration + 4.01))
+
         let sut = fixture.getSut()
-        sut.startTimestamp = fixture.appStartEnd.addingTimeInterval(-5.1)
+        advanceTime(bySeconds: 1.0)
         sut.finish()
         fixture.hub.group.wait()
 
@@ -821,6 +847,15 @@ class SentryTracerTests: XCTestCase {
         assertSpan("Initial Frame Render", appStartMeasurement.didFinishLaunchingTimestamp, fixture.appStartEnd)
     }
 
+    private func assertAppStartMeasurementOn(transaction: Transaction, appStartMeasurement: SentryAppStartMeasurement) {
+        let serializedTransaction = transaction.serialize()
+        let measurements = serializedTransaction["measurements"] as? [String: [String: Int]]
+
+        XCTAssertEqual(["app_start_warm": ["value": 500]], measurements)
+
+        assertAppStartsSpanAdded(transaction: transaction, startType: "Warm Start", operation: fixture.appStartWarmOperation, appStartMeasurement: appStartMeasurement)
+    }
+
     private func assertAppStartMeasurementNotPutOnTransaction() {
         XCTAssertEqual(1, fixture.hub.capturedEventsWithScopes.count)
         let serializedTransaction = fixture.hub.capturedEventsWithScopes.first!.event.serialize()