fixup! wip: profiling concurrent transactions

- send profile payload in separate envelope from transaction. used to be the only corresponding transaction, would've had to choose one with concurrent, likely the last one. this will help keep minimal separate payloads, which will come with benefits in backend components.
getsentry · Aug 31, 2022 · 061086e · 061086e
1 parent caf471b
commit 061086e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/Sources/Sentry/SentryProfiler.mm b/Sources/Sentry/SentryProfiler.mm
@@ -219,7 +219,7 @@ - (void)stop
     }
 }
 
-- (SentryEnvelopeItem *)buildEnvelopeItemForTransactions:
+- (SentryEnvelope *)buildEnvelopeItemForTransactions:
                             (NSArray<SentryTransaction *> *)transactions
                                                frameInfo:(SentryScreenFrames *)frameInfo
 {
@@ -256,7 +256,8 @@ - (SentryEnvelopeItem *)buildEnvelopeItemForTransactions:
     profile[@"device_is_emulator"] = @(isSimulatorBuild());
     profile[@"device_physical_memory_bytes"] =
         [@(NSProcessInfo.processInfo.physicalMemory) stringValue];
-    profile[@"profile_id"] = [[SentryId alloc] init].sentryIdString;
+    const auto profileID = [[SentryId alloc] init];
+    profile[@"profile_id"] = profileID.sentryIdString;
     profile[@"duration_ns"] = [@(getDurationNs(_startTimestamp, getAbsoluteTime())) stringValue];
 
     const auto bundle = NSBundle.mainBundle;
@@ -306,7 +307,7 @@ - (SentryEnvelopeItem *)buildEnvelopeItemForTransactions:
             @"trace_id" : transaction.trace.context.traceId.sentryIdString,
             @"name" : transaction.transaction,
             @"relative_start_ns" : transaction.startTimestamp,
-            @"relative_end_ns" :
+            @"relative_end_ns" : @"" // TODO: how to compute this? transactions use NSDate, we use mach_absolute_time
         }];
     }
     profile[@"transactions"] = transactionsInfo;
@@ -323,7 +324,10 @@ - (SentryEnvelopeItem *)buildEnvelopeItemForTransactions:
 
     const auto header = [[SentryEnvelopeItemHeader alloc] initWithType:SentryEnvelopeItemTypeProfile
                                                                 length:JSONData.length];
-    return [[SentryEnvelopeItem alloc] initWithHeader:header data:JSONData];
+    const auto item = [[SentryEnvelopeItem alloc] initWithHeader:header data:JSONData];
+
+    const auto envelopeHeader = [[SentryEnvelopeHeader alloc] initWithId:profileID];
+    return [[SentryEnvelope alloc] initWithHeader:envelopeHeader singleItem:item];
 }
 
 - (BOOL)isRunning

diff --git a/Sources/Sentry/SentryTracer.m b/Sources/Sentry/SentryTracer.m
@@ -524,27 +524,23 @@ - (void)finishInternal
         return;
     }
 
-    NSMutableArray<SentryEnvelopeItem *> *additionalEnvelopeItems = [NSMutableArray array];
-
 #if SENTRY_TARGET_PROFILING_SUPPORTED
+    SentryEnvelope *profileEnvelope;
     if (_profilesSamplerDecision.decision == kSentrySampleDecisionYes) {
         [profilerLock lock];
         if (profiler != nil) {
-            SentryEnvelopeItem *profile =
+            profileEnvelope =
                 [profiler buildEnvelopeItemForTransactions:_gProfiledTransactions
                                                  frameInfo:frameInfo];
-            if (profile != nil) {
-                [additionalEnvelopeItems addObject:profile];
-            }
             profiler = nil;
         }
         [profilerLock unlock];
     }
 #endif
 
     [_hub captureTransaction:transaction
-                      withScope:_hub.scope
-        additionalEnvelopeItems:additionalEnvelopeItems];
+                      withScope:_hub.scope];
+    [_hub.client captureEnvelope:profileEnvelope];
 }
 
 - (void)trimEndTimestamp

diff --git a/Sources/Sentry/include/SentryProfiler.h b/Sources/Sentry/include/SentryProfiler.h
@@ -25,7 +25,8 @@ NSString *parseBacktraceSymbolsFunctionName(const char *symbol);
 
 SENTRY_EXTERN_C_END
 
-@class SentryEnvelopeItem, SentryTransaction;
+@class SentryEnvelope;
+@class SentryTransaction;
 
 @interface SentryProfiler : NSObject
 
@@ -41,7 +42,7 @@ SENTRY_EXTERN_C_END
 /**
  * Builds an envelope item using the currently accumulated profile data.
  */
-- (nullable SentryEnvelopeItem *)
+- (nullable SentryEnvelope *)
     buildEnvelopeItemForTransactions:(NSArray<SentryTransaction *> *)transactions
                            frameInfo:(nullable SentryScreenFrames *)frameInfo;