Merge branch 'release/8.14' into alwx/backport/8.14-craft-disttag

Author: alwx

CHANGELOG.md

@@ -6,6 +6,12 @@
 > make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
 <!-- prettier-ignore-end -->
 
+## 8.14.2
+
+### Fixes
+
+- Fix iOS retain cycle in `RNSentryOnDrawReporterView` leaking TTID/TTFD reporter views and their frame-tracker listeners ([#6449](https://github.com/getsentry/sentry-react-native/pull/6449))
+
 ## 8.14.1
 
 ### Fixes

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryOnDrawReporterTests.swift

@@ -145,4 +145,22 @@ final class RNSentryOnDrawReporterTests: XCTestCase {
 
         emitNewFrameCallback!(1)
     }
+
+    func testReporterViewIsDeallocatedAfterRelease() {
+        // Guards against the retain cycle described in
+        // https://github.com/getsentry/sentry-react-native/issues/6440 where the
+        // emit-new-frame block captured `self` strongly, keeping the view (and
+        // its frames-tracker listener) alive forever.
+        weak var weakReporter: RNSentryOnDrawReporterView?
+
+        autoreleasepool {
+            let reporter = RNSentryOnDrawReporterView.createWithMockedListener()
+            reporter!.initialDisplay = true
+            reporter!.parentSpanId = spanId
+            reporter!.didSetProps(["initialDisplay", "parentSpanId"])
+            weakReporter = reporter
+        }
+
+        XCTAssertNil(weakReporter, "RNSentryOnDrawReporterView leaked due to a retain cycle")
+    }
 }

packages/core/ios/RNSentryOnDrawReporter.m

@@ -40,23 +40,29 @@ - (instancetype)init
 
 - (RNSentryEmitNewFrameEvent)createEmitNewFrameEvent
 {
+    __weak __typeof__(self) weakSelf = self;
     return ^(NSNumber *newFrameTimestampInSeconds) {
-        self->isListening = NO;
+        __strong __typeof__(weakSelf) strongSelf = weakSelf;
+        if (strongSelf == nil) {
+            return;
+        }
+
+        strongSelf->isListening = NO;
 
-        if (![_parentSpanId isKindOfClass:[NSString class]]) {
+        if (![strongSelf->_parentSpanId isKindOfClass:[NSString class]]) {
             return;
         }
 
-        if (self->_fullDisplay) {
+        if (strongSelf->_fullDisplay) {
             [RNSentryTimeToDisplay
-                putTimeToDisplayFor:[@"ttfd-" stringByAppendingString:self->_parentSpanId]
+                putTimeToDisplayFor:[@"ttfd-" stringByAppendingString:strongSelf->_parentSpanId]
                               value:newFrameTimestampInSeconds];
             return;
         }
 
-        if (self->_initialDisplay) {
+        if (strongSelf->_initialDisplay) {
             [RNSentryTimeToDisplay
-                putTimeToDisplayFor:[@"ttid-" stringByAppendingString:self->_parentSpanId]
+                putTimeToDisplayFor:[@"ttid-" stringByAppendingString:strongSelf->_parentSpanId]
                               value:newFrameTimestampInSeconds];
             return;
         }