Merge branch 'develop' into NR-502468

Author: mbruin-NR

Agent.xcodeproj/project.pbxproj

@@ -6714,7 +6714,7 @@
 					"$(SRCROOT)/modular-crash-reporter-ios/Source/Tests/**",
 				);
 				INFOPLIST_FILE = "Tests/Unit-Tests/Shared/tests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -6763,7 +6763,7 @@
 					"$(SRCROOT)/modular-crash-reporter-ios/Source/Tests/**",
 				);
 				INFOPLIST_FILE = "Tests/Unit-Tests/Shared/tests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -6977,7 +6977,7 @@
 				);
 				INFOPLIST_FILE = Agent/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -6995,7 +6995,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TVOS_DEPLOYMENT_TARGET = 16.6;
+				TVOS_DEPLOYMENT_TARGET = 15.0;
 				WATCHOS_DEPLOYMENT_TARGET = 8.7;
 			};
 			name = Debug;
@@ -7034,7 +7034,7 @@
 				);
 				INFOPLIST_FILE = Agent/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -7051,7 +7051,7 @@
 				STRIP_STYLE = "non-global";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TVOS_DEPLOYMENT_TARGET = 16.6;
+				TVOS_DEPLOYMENT_TARGET = 15.0;
 				WATCHOS_DEPLOYMENT_TARGET = 8.7;
 			};
 			name = Release;
@@ -7299,7 +7299,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 16.6;
+				TVOS_DEPLOYMENT_TARGET = 15.0;
 				WATCHOS_DEPLOYMENT_TARGET = 8.7;
 			};
 			name = Debug;
@@ -7350,7 +7350,7 @@
 				SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 16.6;
+				TVOS_DEPLOYMENT_TARGET = 15.0;
 				WATCHOS_DEPLOYMENT_TARGET = 8.7;
 			};
 			name = Release;

Agent/Network/NRMAHTTPUtilities.mm

@@ -54,11 +54,14 @@ + (NSArray*) trackedHeaderFields
 }
 
 + (NSMutableURLRequest*) addCrossProcessIdentifier:(NSURLRequest*)request {
-
     NSMutableURLRequest* mutableRequest = [self makeMutable:request];
-
-    NSString* xprocess = [NRMAHarvestController configuration].cross_process_id;
-
+    NRMAHarvesterConfiguration *config = [NRMAHarvestController configuration];
+    
+    if (!config) {
+        return mutableRequest;
+    }
+    
+    NSString* xprocess = config.cross_process_id;
     if (xprocess.length) {
         [mutableRequest setValue:xprocess
               forHTTPHeaderField:NEW_RELIC_CROSS_PROCESS_ID_HEADER_KEY];

Agent/SessionReplay/NRMASessionReplay.swift

@@ -79,9 +79,23 @@ class SessionReplayCapture {
 
             let context = SwiftUIContext(frame: parentThingy.viewDetails.frame, clip: parentThingy.viewDetails.clip)
             let thingys = UIHostingViewRecordOrchestrator.swiftUIViewThingys(currentView, context: context, viewAttributes: viewAttributes, parentId: parentThingy.viewDetails.viewId)
-            
+
             if !thingys.isEmpty {
-                parentThingy.subviews.append(contentsOf: thingys)
+                // Separate color views (backgrounds) from other views
+                var colorViews: [any SessionReplayViewThingy] = []
+                var otherViews: [any SessionReplayViewThingy] = []
+
+                for thingy in thingys {
+                    if thingy.viewDetails.viewName == "SwiftUIColorView" {
+                        colorViews.append(thingy)
+                    } else {
+                        otherViews.append(thingy)
+                    }
+                }
+
+                // Insert color views first (they go to the back) then other views
+                parentThingy.subviews.insert(contentsOf: colorViews, at: 0)
+                parentThingy.subviews.append(contentsOf: otherViews)
             }
         }
 

Agent/SessionReplay/SessionReplayCapture.swift

@@ -15,7 +15,7 @@ class SessionReplayFrameProcessor {
     var takeFullSnapshotNext = true
 
 
-    func processFrame(_ frame: SessionReplayFrame) -> RRWebEventCommon {
+    func processFrame(_ frame: SessionReplayFrame) -> RRWebEventCommon? {
         guard useIncrementalDiffs else { // If useIncrementalDiffs is false, we only take full snapshots
             self.lastFullFrame = frame
             return processFullSnapshot(frame)
@@ -28,7 +28,7 @@ class SessionReplayFrameProcessor {
             return processFullSnapshot(frame)
         }
 
-        var rrwebCommon: any RRWebEventCommon
+        var rrwebCommon: (any RRWebEventCommon)?
         // If a full snapshot is needed, frame size changed, or UILayoutContainerView count increased
         if takeFullSnapshotNext || frame.size != lastFullFrame.size || (frame.layoutContainerViewCount > 1 && frame.layoutContainerViewCount > lastFullFrame.layoutContainerViewCount) {
             rrwebCommon = processFullSnapshot(frame)
@@ -117,7 +117,7 @@ class SessionReplayFrameProcessor {
     }
 
 
-    private func processIncrementalSnapshot(newFrame: SessionReplayFrame, oldFrame: SessionReplayFrame) -> any RRWebEventCommon {
+    private func processIncrementalSnapshot(newFrame: SessionReplayFrame, oldFrame: SessionReplayFrame) -> (any RRWebEventCommon)? {
         // Validate input parameters
         guard newFrame.date >= oldFrame.date else {
             // If frames are out of order, fall back to full snapshot
@@ -157,6 +157,11 @@ class SessionReplayFrameProcessor {
         }
 
         let incrementalUpdate: RRWebIncrementalData = .mutation(RRWebMutationData(adds: adds, removes: removes, texts: texts, attributes: attributes))
+        
+        if adds.isEmpty && removes.isEmpty && texts.isEmpty && attributes.isEmpty {
+            return nil
+        }
+        
         let incrementalEvent = IncrementalEvent(timestamp: (newFrame.date.timeIntervalSince1970 * 1000).rounded(), data: incrementalUpdate)
         return incrementalEvent