New Relic iOS agent Staging 7.6.2

.github/workflows/main.yml

@@ -31,6 +31,9 @@ jobs:
       #     curl https://raw.githubusercontent.com/Homebrew/homebrew-core/e92d2ae54954ebf485b484d8522104700b144fee/Formula/lcov.rb > lcov.rb
       #     brew install ./lcov.rb
 
+      - name: Install Bundler 2.7.2
+        run: gem install bundler:2.7.2
+
       - name: Update gem
         run: bundle update
 
@@ -57,6 +60,9 @@ jobs:
       # - name: Install lcov
       #   run: brew install lcov
 
+      - name: Install Bundler 2.7.2
+        run: gem install bundler:2.7.2
+
       - name: Update gem
         run: bundle update
 
@@ -83,6 +89,9 @@ jobs:
       # - name: Install lcov
       #   run: brew install lcov
 
+      - name: Install Bundler 2.7.2
+        run: gem install bundler:2.7.2
+
       - name: Update gem
         run: bundle update
 
@@ -139,6 +148,9 @@ jobs:
           # mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
           # cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
 
+      - name: Install Bundler 2.7.2
+        run: gem install bundler:2.7.2
+
       - name: Update gem
         run: bundle update
 
@@ -180,6 +192,9 @@ jobs:
         with:
           submodules: true
 
+      - name: Install Bundler 2.7.2
+        run: gem install bundler:2.7.2
+
       - name: Update gem
         run: bundle update
 

Agent/Analytics/Constants.h

@@ -45,6 +45,7 @@ extern NSString *const kNRMA_RET_mobileRequestError;
 extern NSString *const kNRMA_RET_mobileCrash;
 extern NSString *const kNRMA_RET_mobileBreadcrumb;
 extern NSString *const kNRMA_RET_mobileUserAction;
+extern NSString *const kNRMA_RET_userAction;
 
 extern NSString *const kNRMA_RA_methodExecuted;
 extern NSString *const kNRMA_RA_targetObject;

Agent/Analytics/Constants.m

@@ -47,6 +47,7 @@
 NSString * const kNRMA_RET_mobileCrash          = @"MobileCrash";
 NSString * const kNRMA_RET_mobileBreadcrumb     = @"MobileBreadcrumb";
 NSString * const kNRMA_RET_mobileUserAction     = @"MobileUserAction";
+NSString * const kNRMA_RET_userAction           = @"UserAction";
 
 //gesture attributes (not reserved)
 NSString * const kNRMA_RA_methodExecuted     = @"methodExecuted";

Agent/Analytics/Events/NRMAUserActionEvent.h

@@ -0,0 +1,26 @@
+//
+//  NRMAUserActionEvent.h
+//  Agent
+//
+//  Created by Mike Bruin on 1/29/26.
+//  Copyright © 2026 New Relic. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#import "NRMAMobileEvent.h"
+#import "AttributeValidatorProtocol.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NRMAUserActionEvent : NRMAMobileEvent
+@property (nonatomic, strong) NSString *category;
+
+- (nonnull instancetype) initWithTimestamp:(NSTimeInterval)timestamp
+               sessionElapsedTimeInSeconds:(NSTimeInterval)sessionElapsedTimeSeconds
+                                  category:(NSString *) category
+                    withAttributeValidator:(__nullable id<AttributeValidatorProtocol>)attributeValidator;
+
+@end
+
+NS_ASSUME_NONNULL_END

Agent/Analytics/Events/NRMAUserActionEvent.m

@@ -0,0 +1,57 @@
+//
+//  NRMAUserActionEvent.m
+//  Agent
+//
+//  Created by Mike Bruin on 1/29/26.
+//  Copyright © 2026 New Relic. All rights reserved.
+//
+
+#import "NRMAUserActionEvent.h"
+#import "Constants.h"
+
+static NSString* const kCategoryKey = @"Category";
+
+@implementation NRMAUserActionEvent
+
++ (BOOL) supportsSecureCoding {
+    return YES;
+}
+
+- (nonnull instancetype) initWithTimestamp:(NSTimeInterval)timestamp
+               sessionElapsedTimeInSeconds:(NSTimeInterval)sessionElapsedTimeSeconds
+                                  category:(NSString *) category
+                    withAttributeValidator:(__nullable id<AttributeValidatorProtocol>)attributeValidator
+{
+    self = [super initWithTimestamp:timestamp sessionElapsedTimeInSeconds:sessionElapsedTimeSeconds withAttributeValidator:attributeValidator];
+    if (self) {
+        self.eventType = kNRMA_RET_mobileUserAction;
+        self.category = category;
+    }
+
+    return self;
+}
+
+- (id)JSONObject {
+    NSDictionary *event = [super JSONObject];
+
+    NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:event];
+    dict[kNRMA_RA_category] = self.category;
+
+    return [NSDictionary dictionaryWithDictionary:dict];
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [super encodeWithCoder:coder];
+
+    [coder encodeObject:self.category forKey:kCategoryKey];
+}
+
+- (nullable instancetype)initWithCoder:(nonnull NSCoder *)coder {
+    self = [super initWithCoder:coder];
+    if(self) {
+        self.category = [coder decodeObjectOfClass:[NSString class] forKey:kCategoryKey];
+    }
+
+    return self;
+}
+@end

Agent/Analytics/NRMAAnalytics.mm

@@ -26,6 +26,7 @@
 #import "NRMACustomEvent.h"
 #import "NRMARequestEvent.h"
 #import "NRMAInteractionEvent.h"
+#import "NRMAUserActionEvent.h"
 #import "NRMAPayload.h"
 #import "NRMANetworkErrorEvent.h"
 #import "NRMASAM.h"
@@ -932,45 +933,64 @@ - (BOOL) checkBackgroundStatus {
 
 - (BOOL)recordUserAction:(NRMAUserAction *)userAction {
     if (userAction == nil) { return NO; };
-
-    NRMACustomEvent* event = [[NRMACustomEvent alloc] initWithEventType:kNRMA_RET_mobileUserAction
-                                                              timestamp:[NRMAAnalytics currentTimeMillis]
-                                            sessionElapsedTimeInSeconds:[[NSDate date] timeIntervalSinceDate:_sessionStartTime] withAttributeValidator:_attributeValidator];
+    if([NRMAFlags shouldEnableNewEventSystem]){
+        NRMAUserActionEvent* event = [[NRMAUserActionEvent alloc] initWithTimestamp:[NRMAAnalytics currentTimeMillis]
+                                                        sessionElapsedTimeInSeconds:[[NSDate date] timeIntervalSinceDate:_sessionStartTime]
+                                                                           category:kNRMA_RET_userAction withAttributeValidator:_attributeValidator];
 
-    if (userAction.associatedMethod.length > 0) {
-        [event addAttribute:kNRMA_RA_methodExecuted value:userAction.associatedMethod];
-    }
+        if (userAction.associatedMethod.length > 0) {
+            [event addAttribute:kNRMA_RA_methodExecuted value:userAction.associatedMethod];
+        }
 
-    if (userAction.associatedClass.length > 0) {
-        [event addAttribute:kNRMA_RA_targetObject value:userAction.associatedClass];
-    }
+        if (userAction.associatedClass.length > 0) {
+            [event addAttribute:kNRMA_RA_targetObject value:userAction.associatedClass];
+        }
 
-    if (userAction.elementLabel.length > 0) {
-        [event addAttribute:kNRMA_RA_label value:userAction.elementLabel];
-    }
+        if (userAction.elementLabel.length > 0) {
+            [event addAttribute:kNRMA_RA_label value:userAction.elementLabel];
+        }
 
-    if ((userAction.accessibilityId.length > 0)) {
-        [event addAttribute:kNRMA_RA_accessibility value:userAction.accessibilityId];
-    }
+        if ((userAction.accessibilityId.length > 0)) {
+            [event addAttribute:kNRMA_RA_accessibility value:userAction.accessibilityId];
+        }
 
-    if ((userAction.interactionCoordinates.length > 0)) {
-        [event addAttribute:kNRMA_RA_touchCoordinates value:userAction.interactionCoordinates];
-    }
+        if ((userAction.interactionCoordinates.length > 0)) {
+            [event addAttribute:kNRMA_RA_touchCoordinates value:userAction.interactionCoordinates];
+        }
 
-    if ((userAction.actionType.length > 0)) {
-        [event addAttribute:kNMRA_RA_actionType value:userAction.actionType];
-    }
+        if ((userAction.actionType.length > 0)) {
+            [event addAttribute:kNMRA_RA_actionType value:userAction.actionType];
+        }
 
-    if ((userAction.elementFrame.length > 0)) {
-        [event addAttribute:kNRMA_RA_frame value:userAction.elementFrame];
-    }
+        if ((userAction.elementFrame.length > 0)) {
+            [event addAttribute:kNRMA_RA_frame value:userAction.elementFrame];
+        }
 
-    NSString* deviceOrientation = [NewRelicInternalUtils deviceOrientation];
-    if (deviceOrientation.length > 0) {
-        [event addAttribute:kNRMA_RA_orientation value:deviceOrientation];
-    }
+        NSString* deviceOrientation = [NewRelicInternalUtils deviceOrientation];
+        if (deviceOrientation.length > 0) {
+            [event addAttribute:kNRMA_RA_orientation value:deviceOrientation];
+        }
 
-    return [_eventManager addEvent:[event autorelease]];
+        return [_eventManager addEvent:[event autorelease]];
+    } else {
+        try {
+           return _analyticsController->addUserActionEvent(userAction.associatedMethod.UTF8String,
+                                                     userAction.associatedClass.UTF8String,
+                                                     userAction.elementLabel.UTF8String,
+                                                     userAction.accessibilityId.UTF8String,
+                                                     userAction.interactionCoordinates.UTF8String,
+                                                     userAction.actionType.UTF8String,
+                                                     userAction.elementFrame.UTF8String,
+                                                     [NewRelicInternalUtils deviceOrientation].UTF8String,
+                                                     [self checkOfflineStatus],
+                                                     [self checkBackgroundStatus]);
+        } catch (std::exception &error) {
+            NRLOG_AGENT_VERBOSE(@"Failed to add TrackedGesture: %s.", error.what());
+        } catch (...) {
+            NRLOG_AGENT_VERBOSE(@"Failed to add TrackedGesture: unknown error.");
+        }
+    }
+    return false;
 }
 
 - (BOOL) incrementSessionAttribute:(NSString*)name value:(NSNumber*)number
@@ -1123,14 +1143,6 @@ - (void) clearLastSessionsAnalytics {
 
 - (void) sessionWillEnd {
     _sessionWillEnd = YES;
-
-    if([NRMAFlags shouldEnableGestureInstrumentation])
-    {
-        NRMAUserAction* backgroundGesture = [NRMAUserActionBuilder buildWithBlock:^(NRMAUserActionBuilder *builder) {
-            [builder withActionType:kNRMAUserActionAppBackground];
-        }];
-        [[NewRelicAgentInternal sharedInstance].gestureFacade recordUserAction:backgroundGesture];
-    }
 
     [self endSessionReusable];
 }

Agent/Analytics/PersistentEventStore.m

@@ -14,6 +14,7 @@
 #import "NRMACustomEvent.h"
 #import "NRMARequestEvent.h"
 #import "NRMANetworkErrorEvent.h"
+#import "NRMAUserActionEvent.h"
 
 @interface PersistentEventStore ()
 @property (nonatomic, strong) dispatch_queue_t writeQueue;
@@ -216,7 +217,7 @@ + (NSDictionary *)getLastSessionEventsFromFilename:(NSString *)filename {
 
 + (NSSet*) classList {
     NSSet *classList = [[NSSet alloc] initWithArray:@[ [NRMAPayload class],
-        [NRMAInteractionEvent class],[NRMAMobileEvent class], [NRMASessionEvent class],[NRMACustomEvent class],[NRMARequestEvent class],[NRMANetworkErrorEvent class],
+        [NRMAInteractionEvent class],[NRMAMobileEvent class], [NRMASessionEvent class],[NRMACustomEvent class],[NRMARequestEvent class],[NRMANetworkErrorEvent class], [NRMAUserActionEvent class],
         [NSMutableDictionary class],[NSDictionary class],[NSString class],[NSNumber class]]];
     return classList;
 }

Agent/General/NewRelicAgentInternal.m

@@ -617,16 +617,6 @@ - (void) onSessionStart {
         }
     }
 
-    if([NRMAFlags shouldEnableGestureInstrumentation])
-    {
-        self.gestureFacade = [[NRMAUserActionFacade alloc] initWithAnalyticsController:self.analyticsController];
-
-        NRMAUserAction* foregroundGesture = [NRMAUserActionBuilder buildWithBlock:^(NRMAUserActionBuilder *builder) {
-            [builder withActionType:kNRMAUserActionAppLaunch];
-        }];
-        [self.gestureFacade recordUserAction:foregroundGesture];
-    }
-
     // appInstallMetricGenerator will receive the 'new install' notification
     // before the harvester is setup and before the task queue is set up.
     // by adding the appInstallMetricGenerator to the harvestAwareListener
@@ -792,6 +782,11 @@ - (void)applicationWillEnterForeground {
                  */
                 [self sessionStartInitialization];
                 didFireEnterBackground = NO;
+
+                NRMAUserActionBuilder* builder = [[NRMAUserActionBuilder alloc] init];
+                [builder withActionType:kNRMAUserActionAppLaunch];
+                NRMAUserAction* backgroundGesture = [builder build];
+                [self.analyticsController recordUserAction:backgroundGesture];
             }
         }
     });
@@ -972,6 +967,11 @@ - (void) applicationDidEnterBackground {
                     NSTimeInterval sessionLength = [[NSDate date] timeIntervalSinceDate:self.appSessionStartDate];
 #ifndef  DISABLE_NRMA_EXCEPTION_WRAPPER
                     @try {
+
+                        NRMAUserActionBuilder* builder = [[NRMAUserActionBuilder alloc] init];
+                        [builder withActionType:kNRMAUserActionAppBackground];
+                        NRMAUserAction* backgroundGesture = [builder build];
+                        [self.analyticsController recordUserAction:backgroundGesture];
 #endif
                         self.gestureFacade = nil;
                         [self.analyticsController sessionWillEnd];

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];