Merge e69797c into 5eaadc5

Author: brustolin

Samples/iOS-ObjectiveC/iOS-ObjectiveC/AppDelegate.m

@@ -1,7 +1,6 @@
 #import "AppDelegate.h"
 @import CoreData;
 @import Sentry;
-
 @interface
 AppDelegate ()
 

Sentry.xcodeproj/project.pbxproj

@@ -883,7 +883,6 @@
 		D8AFC03D2BDA79BF00118BE1 /* SentryReplayVideoMaker.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8AFC03C2BDA79BF00118BE1 /* SentryReplayVideoMaker.swift */; };
 		D8AFC0572BDA895400118BE1 /* UIRedactBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8AFC0562BDA895400118BE1 /* UIRedactBuilder.swift */; };
 		D8AFC05A2BDA89C100118BE1 /* RedactRegionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8AFC0582BDA899A00118BE1 /* RedactRegionTests.swift */; };
-		D8AFC0622BDBEE4200118BE1 /* SentrySessionReplayIntegration+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D8AFC0612BDBEDF100118BE1 /* SentrySessionReplayIntegration+Private.h */; };
 		D8B0542E2A7D2C720056BAF6 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = D8B0542D2A7D2C720056BAF6 /* PrivacyInfo.xcprivacy */; };
 		D8B088B629C9E3FF00213258 /* SentryTracerConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B088B429C9E3FF00213258 /* SentryTracerConfiguration.h */; };
 		D8B088B729C9E3FF00213258 /* SentryTracerConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = D8B088B529C9E3FF00213258 /* SentryTracerConfiguration.m */; };
@@ -1839,6 +1838,7 @@
 		D801990F286B089000C277F0 /* SentryCrashReportSinkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryCrashReportSinkTests.swift; sourceTree = "<group>"; };
 		D802994D2BA836EF000F0081 /* SentryOnDemandReplay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryOnDemandReplay.swift; sourceTree = "<group>"; };
 		D802994F2BA83A88000F0081 /* SentryPixelBuffer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryPixelBuffer.swift; sourceTree = "<group>"; };
+		D80382BE2C09C6FD0090E048 /* SentrySessionReplayIntegration-Hybrid.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentrySessionReplayIntegration-Hybrid.h"; path = "include/HybridPublic/SentrySessionReplayIntegration-Hybrid.h"; sourceTree = "<group>"; };
 		D80694C22B7CC86E00B820E6 /* SentryReplayEventTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryReplayEventTests.swift; sourceTree = "<group>"; };
 		D80694C52B7CCFA100B820E6 /* SentryReplayRecordingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryReplayRecordingTests.swift; sourceTree = "<group>"; };
 		D80694CB2B7E0A3E00B820E6 /* SentryReplayType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryReplayType.h; path = include/SentryReplayType.h; sourceTree = "<group>"; };
@@ -3625,6 +3625,7 @@
 				D820CDB52BB1895F00BA339D /* SentrySessionReplayIntegration.h */,
 				D8AFC0612BDBEDF100118BE1 /* SentrySessionReplayIntegration+Private.h */,
 				D820CDB62BB1895F00BA339D /* SentrySessionReplayIntegration.m */,
+				D80382BE2C09C6FD0090E048 /* SentrySessionReplayIntegration-Hybrid.h */,
 			);
 			name = SessionReplay;
 			sourceTree = "<group>";
@@ -4067,7 +4068,6 @@
 				6383953623ABA42C000C1594 /* SentryHttpTransport.h in Headers */,
 				84A8891C28DBD28900C51DFD /* SentryDevice.h in Headers */,
 				8E564AEF267AF24400FE117D /* SentryNetworkTracker.h in Headers */,
-				D8AFC0622BDBEE4200118BE1 /* SentrySessionReplayIntegration+Private.h in Headers */,
 				63FE715120DA4C1100CDBAE8 /* SentryCrashDebug.h in Headers */,
 				63FE70F520DA4C1000CDBAE8 /* SentryCrashMonitor_System.h in Headers */,
 				7B31C291277B04A000337126 /* SentryCrashPlatformSpecificDefines.h in Headers */,

Sources/Sentry/PrivateSentrySDKOnly.mm

@@ -11,6 +11,7 @@
 #import "SentryOptions.h"
 #import "SentrySDK+Private.h"
 #import "SentrySerialization.h"
+#import "SentrySessionReplayIntegration.h"
 #import "SentrySwift.h"
 #import "SentryThreadHandle.hpp"
 #import "SentryUser+Private.h"
@@ -306,4 +307,16 @@ + (void)addReplayRedactClasses:(NSArray<Class> *_Nonnull)classes
 #endif
 }
 
++ (SentrySessionReplayIntegration *)createReplayIntegration
+{
+#if SENTRY_HAS_UIKIT && !TARGET_OS_VISION
+    return [[SentrySessionReplayIntegration alloc] init];
+#else
+    SENTRY_LOG_DEBUG(
+        @"PrivateSentrySDKOnly.captureViewHierarchy only works with UIKit enabled. Ensure you're "
+        @"using the right configuration of Sentry that links UIKit.");
+    return nil;
+#endif // SENTRY_HAS_UIKIT
+}
+
 @end

Sources/Sentry/SentrySessionReplay.m

@@ -43,13 +43,14 @@ @implementation SentrySessionReplay {
     int _currentSegmentId;
     BOOL _processingScreenshot;
     BOOL _reachedMaximumDuration;
-    SentryReplayBreadcrumbConverter *_breadcrumbConverter;
+    id<SentryReplayBreadcrumbConverter> _breadcrumbConverter;
 }
 
 - (instancetype)initWithSettings:(SentryReplayOptions *)replayOptions
                 replayFolderPath:(NSURL *)folderPath
               screenshotProvider:(id<SentryViewScreenshotProvider>)screenshotProvider
                      replayMaker:(id<SentryReplayVideoMaker>)replayMaker
+             breadcrumbConverter:(id<SentryReplayBreadcrumbConverter>)breadcrumbConverter
                     dateProvider:(SentryCurrentDateProvider *)dateProvider
                           random:(id<SentryRandom>)random
               displayLinkWrapper:(SentryDisplayLinkWrapper *)displayLinkWrapper;
@@ -64,7 +65,7 @@ - (instancetype)initWithSettings:(SentryReplayOptions *)replayOptions
         _urlToCache = folderPath;
         _replayMaker = replayMaker;
         _reachedMaximumDuration = NO;
-        _breadcrumbConverter = [[SentryReplayBreadcrumbConverter alloc] init];
+        _breadcrumbConverter = breadcrumbConverter;
     }
     return self;
 }

Sources/Sentry/SentrySessionReplayIntegration.m

@@ -73,6 +73,17 @@ - (void)newSceneActivate
 
 - (void)startWithOptions:(SentryReplayOptions *)replayOptions
              fullSession:(BOOL)shouldReplayFullSession
+{
+    [self startWithOptions:replayOptions
+         screenshotProvider:SentryViewPhotographer.shared
+        breadcrumbConverter:[[SentryReplayBreadcrumbConverter alloc] init]
+                fullSession:shouldReplayFullSession];
+}
+
+- (void)startWithOptions:(SentryReplayOptions *)replayOptions
+      screenshotProvider:(id<SentryViewScreenshotProvider>)screenshotProvider
+     breadcrumbConverter:(id<SentryReplayBreadcrumbConverter>)breadcrumbConverter
+             fullSession:(BOOL)shouldReplayFullSession
 {
     if (@available(iOS 16.0, tvOS 16.0, *)) {
         NSURL *docs = [NSURL
@@ -96,14 +107,14 @@ - (void)startWithOptions:(SentryReplayOptions *)replayOptions
                                                   : replayOptions.errorReplayDuration);
 
         self.sessionReplay = [[SentrySessionReplay alloc]
-              initWithSettings:replayOptions
-              replayFolderPath:docs
-            screenshotProvider:SentryViewPhotographer.shared
-                   replayMaker:replayMaker
-                  dateProvider:SentryDependencyContainer.sharedInstance.dateProvider
-                        random:SentryDependencyContainer.sharedInstance.random
-
-            displayLinkWrapper:[[SentryDisplayLinkWrapper alloc] init]];
+               initWithSettings:replayOptions
+               replayFolderPath:docs
+             screenshotProvider:screenshotProvider
+                    replayMaker:replayMaker
+            breadcrumbConverter:breadcrumbConverter
+                   dateProvider:SentryDependencyContainer.sharedInstance.dateProvider
+                         random:SentryDependencyContainer.sharedInstance.random
+             displayLinkWrapper:[[SentryDisplayLinkWrapper alloc] init]];
 
         [self.sessionReplay
                   start:SentryDependencyContainer.sharedInstance.application.windows.firstObject

Sources/Sentry/include/HybridPublic/PrivateSentrySDKOnly.h

@@ -9,6 +9,7 @@
 @class SentryUser;
 @class SentryEnvelope;
 @class SentryId;
+@class SentrySessionReplayIntegration;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -156,8 +157,16 @@ typedef void (^SentryOnAppStartMeasurementAvailable)(
  * configurations even when targeting iOS or tvOS platforms.
  */
 + (NSData *)captureViewHierarchy;
+
 #endif // SENTRY_UIKIT_AVAILABLE
 
+#if SENTRY_HAS_UIKIT && !TARGET_OS_VISION
+/**
+ * This is how hybrid SDKs can control session replay.
+ */
++ (nullable SentrySessionReplayIntegration *)createReplayIntegration;
+#endif
+
 + (SentryUser *)userWithDictionary:(NSDictionary *)dictionary;
 
 + (SentryBreadcrumb *)breadcrumbWithDictionary:(NSDictionary *)dictionary;

Sources/Sentry/include/HybridPublic/SentrySessionReplayIntegration-Hybrid.h

@@ -0,0 +1,18 @@
+#import <Foundation/Foundation.h>
+#import <Sentry/SentryDefines.h>
+
+#if SENTRY_UIKIT_AVAILABLE
+@class SentryReplayOptions;
+
+@protocol SentryViewScreenshotProvider;
+@protocol SentryReplayBreadcrumbConverter;
+
+@interface SentrySessionReplayIntegration : NSObject
+
+- (void)startWithOptions:(SentryReplayOptions *)replayOptions
+      screenshotProvider:(id<SentryViewScreenshotProvider>)screenshotProvider
+     breadcrumbConverter:(id<SentryReplayBreadcrumbConverter>)breadcrumbConverter
+             fullSession:(BOOL)shouldReplayFullSession;
+
+@end
+#endif

Sources/Sentry/include/SentrySessionReplay.h

@@ -15,6 +15,7 @@
 @protocol SentryRedactOptions;
 @protocol SentryViewScreenshotProvider;
 @protocol SentryReplayVideoMaker;
+@protocol SentryReplayBreadcrumbConverter;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -26,6 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
                 replayFolderPath:(NSURL *)folderPath
               screenshotProvider:(id<SentryViewScreenshotProvider>)photographer
                      replayMaker:(id<SentryReplayVideoMaker>)replayMaker
+             breadcrumbConverter:(id<SentryReplayBreadcrumbConverter>)breadcrumbConverter
                     dateProvider:(SentryCurrentDateProvider *)dateProvider
                           random:(id<SentryRandom>)random
               displayLinkWrapper:(SentryDisplayLinkWrapper *)displayLinkWrapper;

Sources/Swift/Helper/SentryCurrentDateProvider.swift

@@ -1,7 +1,8 @@
 @_implementationOnly import _SentryPrivate
 
-@objcMembers class SentryCurrentDateProvider: NSObject {
-
+@objcMembers 
+class SentryCurrentDateProvider: NSObject {
+    
     func date() -> Date {
         return Date()
     }

Sources/Swift/Integrations/SessionReplay/SentryReplayBreadcrumbConverter.swift

@@ -1,8 +1,13 @@
 @_implementationOnly import _SentryPrivate
 import Foundation
 
+@objc(SentryReplayBreadcrumbConverter)
+protocol SentryReplayBreadcrumbConverterProtocol: NSObjectProtocol {
+    func convert(breadcrumbs: [Breadcrumb], from: Date, until: Date) -> [SentryRRWebEvent]
+}
+
 @objcMembers
-class SentryReplayBreadcrumbConverter: NSObject {
+class SentryReplayBreadcrumbConverter: NSObject, SentryReplayBreadcrumbConverterProtocol {
 
     private let supportedNetworkData = Set<String>([
         "status_code",