@dynatrace/react-native-plugin 2.339.1 → 2.343.1

package/ios/DynatraceRNBridge.h

@@ -22,6 +22,12 @@
 + (void)startView:(NSDictionary<NSString*,id>* _Nullable)fields NS_SWIFT_NAME(startView(fields:));
 + (void)stopView;
 + (void)addConfigurationSubscriber:(id<ConfigurationSubscriber>)subscriber;
++ (void)trackCrossPlatformScreenshot;
++ (void)setAutomaticUserActionDetection:(BOOL)enabled NS_SWIFT_NAME(setAutomaticUserActionDetection(enabled:));
++ (void)createUserAction:(NSString *)actionId name:(NSString *)name completeAutomatically:(BOOL)completeAutomatically properties:(NSDictionary<NSString*,id>* _Nullable)properties NS_SWIFT_NAME(createUserAction(actionId:name:completeAutomatically:properties:));
++ (void)addEventPropertyToUserAction:(NSString *)actionId key:(NSString *)key value:(id _Nullable)value NS_SWIFT_NAME(addEventPropertyToUserAction(actionId:key:value:));
++ (void)completeUserAction:(NSString *)actionId NS_SWIFT_NAME(completeUserAction(actionId:));
++ (void)setCompleteUserActionAutomatically:(NSString *)actionId enabled:(BOOL)enabled NS_SWIFT_NAME(setCompleteUserActionAutomatically(actionId:enabled:));
 @end
 
 typedef enum : NSUInteger {

package/ios/DynatraceRNBridge.mm

@@ -3,6 +3,7 @@
 //
 
 #import "DynatraceRNBridge.h"
+#import "DTXScreenshotSelfMonitor.h"
 
 // For Turbo Module
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -111,6 +112,11 @@ static bool remoteConfigSubscribed;
 static NSDictionary<NSString*, id>* lastRuntimeConfiguration;
 static RNConfigurationSubscriber* configurationSubscriber;
 
+// Screenshot self-monitoring. Registered once per process; the configuration publisher retains it
+// as a subscriber and the remote `replay_metrics_enabled` flag toggles monitoring on/off.
+static bool screenshotMonitorSubscribed;
+static DTXScreenshotSelfMonitor* screenshotMonitor;
+
 RCT_EXPORT_MODULE(DynatraceBridge);
 
 - (instancetype) init
@@ -307,6 +313,18 @@ template<typename T = void> std::enable_if_t<(facebook::react::ReactNativeVersio
     }
     remoteConfigSubscribed = YES;
     [HybridBridge addConfigurationSubscriber:(id)configurationSubscriber];
+
+    // Start the screenshot self-monitor here — same proven-safe timing as the config subscriber
+    // above (post-startup). Started once; -start touches UIApplication and the layer swizzle, so it
+    // must run on the main thread.
+#if DTX_REPLAY_METRICS_ENABLED
+    if (!screenshotMonitorSubscribed) {
+        screenshotMonitorSubscribed = YES;
+        NSLog(@"[dtxScreenshotSelfMonitor] bridge: registering screenshot self-monitor as config subscriber");
+        screenshotMonitor = [[DTXScreenshotSelfMonitor alloc] init];
+        [HybridBridge addConfigurationSubscriber:(id)screenshotMonitor];
+    }
+#endif
 }
 
 - (void)emitToJS:(NSString*)event body:(id)body
@@ -627,6 +645,41 @@ RCT_EXPORT_METHOD(forwardAppStartEvent:(NSDictionary<NSString*, id>*) attributes
     [HybridBridge forwardAppStartEvent:attributes keys:appStartKeys];
 }
 
+RCT_EXPORT_METHOD(setAutomaticUserActionDetection:(BOOL)enabled)
+{
+    [HybridBridge setAutomaticUserActionDetection:enabled];
+}
+
+RCT_EXPORT_METHOD(createUserAction:(NSString *)actionId name:(NSString *)name completeAutomatically:(BOOL)completeAutomatically properties:(NSDictionary<NSString*, id>* _Nullable)properties)
+{
+    [HybridBridge createUserAction:actionId name:name completeAutomatically:completeAutomatically properties:properties];
+}
+
+RCT_EXPORT_METHOD(addEventStringPropertyToUserAction:(NSString *)actionId key:(NSString *)key value:(NSString *)value)
+{
+    [HybridBridge addEventPropertyToUserAction:actionId key:key value:value];
+}
+
+RCT_EXPORT_METHOD(addEventDoublePropertyToUserAction:(NSString *)actionId key:(NSString *)key value:(double)value)
+{
+    [HybridBridge addEventPropertyToUserAction:actionId key:key value:@(value)];
+}
+
+RCT_EXPORT_METHOD(addEventBooleanPropertyToUserAction:(NSString *)actionId key:(NSString *)key value:(BOOL)value)
+{
+    [HybridBridge addEventPropertyToUserAction:actionId key:key value:@(value)];
+}
+
+RCT_EXPORT_METHOD(completeUserAction:(NSString *)actionId)
+{
+    [HybridBridge completeUserAction:actionId];
+}
+
+RCT_EXPORT_METHOD(setCompleteUserActionAutomatically:(NSString *)actionId enabled:(BOOL)enabled)
+{
+    [HybridBridge setCompleteUserActionAutomatically:actionId enabled:enabled];
+}
+
 RCT_EXPORT_METHOD(setGPSLocation:(double)latitude andLongitude: (double)longitude platform: (NSString *) platform)
 {
     if ([self shouldWorkOnIosWithPlatform: platform])

package/lib/core/Dynatrace.js

@@ -426,4 +426,6 @@ exports.Dynatrace = {
     generateTraceContext(traceparent, tracestate) {
         return Dynatrace_1.Dynatrace.generateTraceContext(traceparent, tracestate);
     },
+    createUserAction: (configuration) => Dynatrace_1.Dynatrace.createUserAction(configuration),
+    setAutomaticUserActionDetection: (enabled) => Dynatrace_1.Dynatrace.setAutomaticUserActionDetection(enabled),
 };

package/lib/core/DynatraceAction.js

@@ -153,9 +153,7 @@ class DynatraceAction {
             this.logger.debug(LogMessages_1.LogMessage.ACTION_GET_REQUEST_TAG_CLOSED, {
                 url,
             });
-            return new Promise((resolve) => {
-                resolve('');
-            });
+            return Promise.resolve('');
         }
         this.logger.debug(LogMessages_1.LogMessage.ACTION_GET_REQUEST_TAG, {
             url,

package/lib/core/DynatraceInternal.js

@@ -10,52 +10,50 @@ const LogMessages_1 = require("./logging/LogMessages");
 let counter = 0;
 const logger = new ConsoleLogger_1.ConsoleLogger('DyntraceInt');
 exports.DynatraceInternal = {
-    reportErrorFromHandler: (isFatal, errorName, reason, stacktrace, isReportFatalErrorAsCrash, platform) => {
-        if (isFatal && isReportFatalErrorAsCrash) {
-            if (react_native_1.Platform.OS === 'ios') {
-                logger.debug(LogMessages_1.LogMessage.STORE_CRASH, {
-                    errorName,
-                    reason,
-                    stacktrace,
-                });
-                DynatraceBridge_1.DynatraceNative.storeCrash(errorName, reason, stacktrace);
-            }
-            else {
-                logger.debug(LogMessages_1.LogMessage.REPORT_CRASH, {
-                    crashName: errorName,
-                    reason,
-                    stacktrace,
-                });
-                DynatraceBridge_1.DynatraceNative.reportCrash(errorName, reason, stacktrace, true, platform === null || platform === void 0 ? void 0 : platform.toString());
-            }
-            Dynatrace_1.Dynatrace.reportCrash({
+    reportErrorFromHandler: (_isFatal, errorName, reason, stacktrace, isLegacyApiReported = false, platform) => {
+        if (StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(stacktrace)) {
+            logger.debug(LogMessages_1.LogMessage.INTERNAL_REPORT_ERROR_SIMPLE, {
+                errorName,
+            });
+            DynatraceBridge_1.DynatraceNative.reportErrorWithoutStacktrace(errorName, -1);
+            Dynatrace_1.Dynatrace.reportErrorCode(errorName, -1, isLegacyApiReported);
+        }
+        else {
+            logger.debug(LogMessages_1.LogMessage.INTERNAL_REPORT_ERROR, {
+                errorName,
+                reason,
+                stacktrace,
+            });
+            DynatraceBridge_1.DynatraceNative.reportError(errorName, '-', reason, stacktrace, platform === null || platform === void 0 ? void 0 : platform.toString());
+            Dynatrace_1.Dynatrace.reportError({
                 name: errorName,
                 message: reason,
                 stack: stacktrace,
-            }, false, isFatal);
+            }, isLegacyApiReported);
+        }
+    },
+    reportFatalErrorAsCrashFromHandler: (isFatal, errorName, reason, stacktrace, platform) => {
+        if (react_native_1.Platform.OS === 'ios') {
+            logger.debug(LogMessages_1.LogMessage.STORE_CRASH, {
+                errorName,
+                reason,
+                stacktrace,
+            });
+            DynatraceBridge_1.DynatraceNative.storeCrash(errorName, reason, stacktrace);
         }
         else {
-            if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(stacktrace)) {
-                logger.debug(LogMessages_1.LogMessage.INTERNAL_REPORT_ERROR, {
-                    errorName,
-                    reason,
-                    stacktrace,
-                });
-                DynatraceBridge_1.DynatraceNative.reportError(errorName, '-', reason, stacktrace, platform === null || platform === void 0 ? void 0 : platform.toString());
-                Dynatrace_1.Dynatrace.reportError({
-                    name: errorName,
-                    message: reason,
-                    stack: stacktrace,
-                }, false);
-            }
-            else {
-                logger.debug(LogMessages_1.LogMessage.INTERNAL_REPORT_ERROR_SIMPLE, {
-                    errorName,
-                });
-                DynatraceBridge_1.DynatraceNative.reportErrorWithoutStacktrace(errorName, -1);
-                Dynatrace_1.Dynatrace.reportErrorCode(errorName, -1, false);
-            }
+            logger.debug(LogMessages_1.LogMessage.REPORT_CRASH, {
+                crashName: errorName,
+                reason,
+                stacktrace,
+            });
+            DynatraceBridge_1.DynatraceNative.reportCrash(errorName, reason, stacktrace, true, platform === null || platform === void 0 ? void 0 : platform.toString());
         }
+        Dynatrace_1.Dynatrace.reportCrash({
+            name: errorName,
+            message: reason,
+            stack: stacktrace,
+        }, false, isFatal);
     },
     getCounter: () => counter++,
 };

package/lib/core/ErrorHandler.js

@@ -1,49 +1,69 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reportErrorToDynatrace = exports.startErrorHandler = void 0;
+const react_native_1 = require("react-native");
 const DynatraceInternal_1 = require("./DynatraceInternal");
-const Dynatrace_1 = require("./Dynatrace");
 const StringUtils_1 = require("./util/StringUtils");
 const ConsoleLogger_1 = require("./logging/ConsoleLogger");
 const LogMessages_1 = require("./logging/LogMessages");
-const react_native_1 = require("react-native");
 const logger = new ConsoleLogger_1.ConsoleLogger('ErrorHandler');
 let manualStart = { enabled: false };
 const startErrorHandler = (reportFatalErrorAsCrash) => {
     manualStart = {
         enabled: true,
-        reportFatalErrorAsCrash: reportFatalErrorAsCrash,
+        reportFatalErrorAsCrash,
     };
 };
 exports.startErrorHandler = startErrorHandler;
 const reportErrorToDynatrace = (exception, isFatal, reportFatalErrorAsCrashFromConfig, autoStart) => {
-    if (!autoStart && !manualStart)
+    if (!isErrorHandlingEnabled(autoStart)) {
         return 0;
-    const reportFatalErrorAsCrash = manualStart.enabled
-        ? manualStart.reportFatalErrorAsCrash
-        : reportFatalErrorAsCrashFromConfig;
-    if (exception != null && isExceptionAnError(exception)) {
-        if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(exception.name)) {
-            if (isFatal === undefined) {
-                isFatal = false;
-            }
-            DynatraceInternal_1.DynatraceInternal.reportErrorFromHandler(isFatal, String(exception.name), adjustedReason(exception.message), exception.stack != null ? exception.stack : '', reportFatalErrorAsCrash);
-            logger.debug(LogMessages_1.LogMessage.REPORT_ERROR_TO_DYNATRACE, {
-                exception: String(exception),
-                isFatal: String(isFatal),
-            });
-        }
     }
-    else {
-        Dynatrace_1.Dynatrace.reportError(String(exception), -1);
+    if (!isExceptionAnErrorWithName(exception)) {
+        DynatraceInternal_1.DynatraceInternal.reportErrorFromHandler(false, String(exception), '', '', true);
         logger.debug(LogMessages_1.LogMessage.REPORT_ERROR_TO_DYNATRACE, {
             exception: String(exception),
             isFatal: '-1',
         });
+        return getCrashDelay();
     }
-    return react_native_1.Platform.OS === 'ios' ? 200 : 0;
+    const resolvedIsFatal = isFatal !== null && isFatal !== void 0 ? isFatal : false;
+    const reportFatalErrorAsCrash = resolveReportFatalErrorAsCrash(reportFatalErrorAsCrashFromConfig);
+    const { errorName, errorReason, errorStack } = buildErrorDetails(exception);
+    reportErrorFromException(resolvedIsFatal, reportFatalErrorAsCrash, errorName, errorReason, errorStack);
+    logger.debug(LogMessages_1.LogMessage.REPORT_ERROR_TO_DYNATRACE, {
+        exception: String(exception),
+        isFatal: String(resolvedIsFatal),
+    });
+    return getCrashDelay();
 };
 exports.reportErrorToDynatrace = reportErrorToDynatrace;
+const isErrorHandlingEnabled = (autoStart) => autoStart || manualStart.enabled;
+const resolveReportFatalErrorAsCrash = (reportFatalErrorAsCrashFromConfig) => manualStart.enabled
+    ? manualStart.reportFatalErrorAsCrash
+    : reportFatalErrorAsCrashFromConfig;
+const isExceptionAnErrorWithName = (exception) => {
+    if (exception == null || !isExceptionAnError(exception)) {
+        return false;
+    }
+    return !StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(exception.name);
+};
+const buildErrorDetails = (exception) => {
+    var _a;
+    return ({
+        errorName: String(exception.name),
+        errorReason: adjustedReason(exception.message),
+        errorStack: (_a = exception.stack) !== null && _a !== void 0 ? _a : '',
+    });
+};
+const reportErrorFromException = (isFatal, reportFatalErrorAsCrash, errorName, errorReason, errorStack) => {
+    if (isFatal && reportFatalErrorAsCrash) {
+        DynatraceInternal_1.DynatraceInternal.reportFatalErrorAsCrashFromHandler(isFatal, errorName, errorReason, errorStack);
+        return;
+    }
+    DynatraceInternal_1.DynatraceInternal.reportErrorFromHandler(isFatal, errorName, errorReason, errorStack);
+};
+const getCrashDelay = () => (react_native_1.Platform.OS === 'ios' ? 200 : 0);
 const adjustedReason = (reason) => {
     if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(reason)) {
         const reasonNewLineIndex = reason.indexOf('\n');

package/lib/core/NullAction.js

@@ -24,9 +24,7 @@ class NullAction {
         return;
     }
     getRequestTag(url) {
-        return new Promise((resolve) => {
-            resolve('');
-        });
+        return Promise.resolve('');
     }
     getRequestTagHeader() {
         return '';

package/lib/core/logging/LogMessages.js

@@ -36,6 +36,8 @@ var LogMessage;
     LogMessage["COMPONENT_NOT_STARTED"] = "COMPONENT_NOT_STARTED";
     LogMessage["CONFIGURATION_DUPLICATE_STARTUP"] = "CONFIGURATION_DUPLICATE_STARTUP";
     LogMessage["CONFIGURATION_SET"] = "CONFIGURATION_SET";
+    LogMessage["CREATE_USER_ACTION"] = "CREATE_USER_ACTION";
+    LogMessage["CREATE_USER_ACTION_NOT_STARTED"] = "CREATE_USER_ACTION_NOT_STARTED";
     LogMessage["END_SESSION"] = "END_SESSION";
     LogMessage["END_SESSION_NOT_STARTED"] = "END_SESSION_NOT_STARTED";
     LogMessage["ENTER_AUTO_ACTION"] = "ENTER_AUTO_ACTION";
@@ -115,6 +117,8 @@ var LogMessage;
     LogMessage["SEND_SESSION_PROPERTY_EVENT"] = "SEND_SESSION_PROPERTY_EVENT";
     LogMessage["SEND_SESSION_PROPERTY_EVENT_INVALID_TYPE"] = "SEND_SESSION_PROPERTY_EVENT_INVALID_TYPE";
     LogMessage["SESSION_PROPERTIES_FILTERED"] = "SESSION_PROPERTIES_FILTERED";
+    LogMessage["SET_AUTOMATIC_USER_ACTION_DETECTION"] = "SET_AUTOMATIC_USER_ACTION_DETECTION";
+    LogMessage["SET_AUTOMATIC_USER_ACTION_DETECTION_NOT_STARTED"] = "SET_AUTOMATIC_USER_ACTION_DETECTION_NOT_STARTED";
     LogMessage["SET_BEACON_HEADERS"] = "SET_BEACON_HEADERS";
     LogMessage["SET_BEACON_HEADERS_NOT_STARTED"] = "SET_BEACON_HEADERS_NOT_STARTED";
     LogMessage["SET_CRASH_REPORTING_OPTED_IN"] = "SET_CRASH_REPORTING_OPTED_IN";
@@ -137,6 +141,10 @@ var LogMessage;
     LogMessage["TRACE_CONTEXT_NOT_STARTED"] = "TRACE_CONTEXT_NOT_STARTED";
     LogMessage["TRIM_STRING_VALUE_LIMITED"] = "TRIM_STRING_VALUE_LIMITED";
     LogMessage["UI_INTERACTION_DEBUG"] = "UI_INTERACTION_DEBUG";
+    LogMessage["USER_ACTION_ADD_EVENT_PROPERTY"] = "USER_ACTION_ADD_EVENT_PROPERTY";
+    LogMessage["USER_ACTION_COMPLETE"] = "USER_ACTION_COMPLETE";
+    LogMessage["USER_ACTION_CREATED"] = "USER_ACTION_CREATED";
+    LogMessage["USER_ACTION_SET_COMPLETE_AUTOMATICALLY"] = "USER_ACTION_SET_COMPLETE_AUTOMATICALLY";
     LogMessage["VALUE_SIZE_LIMITED"] = "VALUE_SIZE_LIMITED";
     LogMessage["WEB_REQUEST_TIMING_START"] = "WEB_REQUEST_TIMING_START";
     LogMessage["WEB_REQUEST_TIMING_START_FAILED"] = "WEB_REQUEST_TIMING_START_FAILED";
@@ -281,6 +289,15 @@ exports.LOG_MESSAGES = {
         template: ({ config }) => `Configuration set: ${config}`,
         logType: LogType_1.LogType.Info,
     },
+    [LogMessage.CREATE_USER_ACTION]: {
+        template: ({ customName, completeAutomatically, }) => `createUserAction(${customName}, ${completeAutomatically})`,
+        logType: LogType_1.LogType.Info,
+    },
+    [LogMessage.CREATE_USER_ACTION_NOT_STARTED]: {
+        template: 'createUserAction(): React Native plugin has not been started yet! User action will not be created!',
+        logType: LogType_1.LogType.Warning,
+        documentationUri: 'https://dt-url.net/r2g3975',
+    },
     [LogMessage.END_SESSION]: {
         template: 'Dynatrace endSession()',
         logType: LogType_1.LogType.Info,
@@ -640,6 +657,15 @@ exports.LOG_MESSAGES = {
         logType: LogType_1.LogType.Warning,
         documentationUri: 'https://dt-url.net/lsk39cn',
     },
+    [LogMessage.SET_AUTOMATIC_USER_ACTION_DETECTION]: {
+        template: ({ enabled }) => `setAutomaticUserActionDetection(${enabled})`,
+        logType: LogType_1.LogType.Info,
+    },
+    [LogMessage.SET_AUTOMATIC_USER_ACTION_DETECTION_NOT_STARTED]: {
+        template: 'setAutomaticUserActionDetection(): React Native plugin has not been started yet! Setting will not be applied!',
+        logType: LogType_1.LogType.Warning,
+        documentationUri: 'https://dt-url.net/r2g3975',
+    },
     [LogMessage.SET_BEACON_HEADERS]: {
         template: 'setBeaconHeaders(headers)',
         logType: LogType_1.LogType.Info,
@@ -738,6 +764,22 @@ exports.LOG_MESSAGES = {
         template: ({ event }) => `[DT UI]${event}`,
         logType: LogType_1.LogType.Info,
     },
+    [LogMessage.USER_ACTION_ADD_EVENT_PROPERTY]: {
+        template: ({ key, value, customName, }) => `addEventProperty(${key}, ${value}): in UserAction - ${customName}`,
+        logType: LogType_1.LogType.Info,
+    },
+    [LogMessage.USER_ACTION_COMPLETE]: {
+        template: ({ customName }) => `complete(): ${customName}`,
+        logType: LogType_1.LogType.Info,
+    },
+    [LogMessage.USER_ACTION_CREATED]: {
+        template: ({ customName, completeAutomatically, actionId, }) => `UserAction created: ${customName} (actionId: ${actionId}, completeAutomatically: ${completeAutomatically})`,
+        logType: LogType_1.LogType.Info,
+    },
+    [LogMessage.USER_ACTION_SET_COMPLETE_AUTOMATICALLY]: {
+        template: ({ enabled, customName, }) => `setCompleteAutomatically(${enabled}): ${customName}`,
+        logType: LogType_1.LogType.Info,
+    },
     [LogMessage.VALUE_SIZE_LIMITED]: {
         template: ({ key, maxLength }) => `restrictingValueSize(): Limiting value of ${key} as maximum value length (${maxLength}) is reached!`,
         logType: LogType_1.LogType.Warning,

package/lib/core/util/JsonUtils.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonUtils = void 0;
+exports.JsonUtils = {
+    stringify: (value) => typeof value === 'string' ? value : JSON.stringify(value),
+};

package/lib/features/ui-interaction/IUserInteractionEvent.js

@@ -8,7 +8,7 @@ var UserInteractionEventKey;
     UserInteractionEventKey["UiElementComponents"] = "ui_element.components";
     UserInteractionEventKey["UiElementId"] = "ui_element.id";
     UserInteractionEventKey["UiElementNameOrigin"] = "ui_element.name_origin";
-    UserInteractionEventKey["InteractionName"] = "interaction.name";
+    UserInteractionEventKey["InteractionType"] = "interaction.type";
     UserInteractionEventKey["UiElementResponderDetectedName"] = "ui_element.responder.detected_name";
     UserInteractionEventKey["UiElementResponderComponents"] = "ui_element.responder.components";
     UserInteractionEventKey["UiElementResponderOriginName"] = "ui_element.responder.name_origin";

package/lib/features/ui-interaction/Runtime.js

@@ -330,7 +330,7 @@ function _an_flat(e) {
         [IUserInteractionEvent_1.UserInteractionEventKey.UiElementDetectedName]: (_c = (_b = e === null || e === void 0 ? void 0 : e.ui_element) === null || _b === void 0 ? void 0 : _b.detected_name) !== null && _c !== void 0 ? _c : null,
         [IUserInteractionEvent_1.UserInteractionEventKey.UiElementComponents]: normalizedUiComponents,
         [IUserInteractionEvent_1.UserInteractionEventKey.UiElementId]: (_e = (_d = e === null || e === void 0 ? void 0 : e.ui_element) === null || _d === void 0 ? void 0 : _d.id) !== null && _e !== void 0 ? _e : null,
-        [IUserInteractionEvent_1.UserInteractionEventKey.InteractionName]: _an_interaction_type(e),
+        [IUserInteractionEvent_1.UserInteractionEventKey.InteractionType]: _an_interaction_type(e),
         positions: Array.isArray(e === null || e === void 0 ? void 0 : e.positions)
             ? e.positions.map((pos) => ({
                 x: Math.trunc(pos.x),

package/lib/features/ui-interaction/TouchMetaResolver.js

@@ -148,9 +148,10 @@ class TouchMetaResolver {
             return null;
         }
         const props = (_a = node.memoizedProps) !== null && _a !== void 0 ? _a : {};
-        const dtName = props.dtName;
-        if (typeof dtName === 'string' && dtName.trim().length > 0) {
-            return dtName.trim();
+        const dtActionName = props.dtActionName;
+        if (typeof dtActionName === 'string' &&
+            dtActionName.trim().length > 0) {
+            return dtActionName.trim();
         }
         const testId = props.testID;
         if (typeof testId === 'string' && testId.trim().length > 0) {

package/lib/next/Dynatrace.js

@@ -14,6 +14,8 @@ const EventData_1 = require("./events/EventData");
 const SessionPropertyEventData_1 = require("./events/SessionPropertyEventData");
 const ExceptionEventData_1 = require("./events/ExceptionEventData");
 const HttpRequestEventData_1 = require("./events/HttpRequestEventData");
+const NullUserAction_1 = require("./userAction/NullUserAction");
+const UserActionImpl_1 = require("./userAction/UserActionImpl");
 const DynatraceArgValidators_1 = require("./DynatraceArgValidators");
 const TraceContextUtils_1 = require("./util/TraceContextUtils");
 const DECISION_REASON_TEXT = {
@@ -169,12 +171,14 @@ class DynatraceImpl {
         let parsedTraceparent = traceparent === undefined
             ? undefined
             : (0, TraceContextUtils_1.parseTraceparent)(traceparent);
+        let traceparentFromDynatrace = false;
         if (parsedTraceparent === undefined) {
             traceparent = (0, TraceContextUtils_1.generateTraceparentHeader)();
             parsedTraceparent = (0, TraceContextUtils_1.parseTraceparent)(traceparent);
             tracestate = undefined;
+            traceparentFromDynatrace = true;
         }
-        tracestate = (0, TraceContextUtils_1.generateTracestate)(parsedTraceparent.parentId, tracestate);
+        tracestate = (0, TraceContextUtils_1.generateTracestate)(parsedTraceparent.parentId, traceparentFromDynatrace, tracestate);
         if (tracestate === undefined) {
             this.logger.info(LogMessages_1.LogMessage.TRACE_CONTEXT_DISABLED_OR_INVALID, {
                 existingTraceparent: existingTraceparent !== null && existingTraceparent !== void 0 ? existingTraceparent : 'undefined',
@@ -187,5 +191,26 @@ class DynatraceImpl {
             tracestate,
         };
     }
+    createUserAction(configuration) {
+        if (!ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable()) {
+            this.logger.info(LogMessages_1.LogMessage.CREATE_USER_ACTION_NOT_STARTED);
+            return new NullUserAction_1.NullUserAction();
+        }
+        this.logger.debug(LogMessages_1.LogMessage.CREATE_USER_ACTION, {
+            customName: configuration.customName,
+            completeAutomatically: configuration.completeAutomatically,
+        });
+        return new UserActionImpl_1.UserActionImpl(configuration);
+    }
+    setAutomaticUserActionDetection(enabled) {
+        if (!ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable()) {
+            this.logger.info(LogMessages_1.LogMessage.SET_AUTOMATIC_USER_ACTION_DETECTION_NOT_STARTED);
+            return;
+        }
+        this.logger.debug(LogMessages_1.LogMessage.SET_AUTOMATIC_USER_ACTION_DETECTION, {
+            enabled,
+        });
+        DynatraceBridge_1.DynatraceNative.setAutomaticUserActionDetection(enabled);
+    }
 }
 exports.Dynatrace = new DynatraceImpl(TimestampProvider_1.defaultTimestampProvider);

package/lib/next/events/EventPipeline.js

@@ -34,30 +34,53 @@ class EventPipelineImpl {
         ];
     }
     insertEvent(event) {
+        if (this.isSuppressed(event)) {
+            return;
+        }
+        this.logger.debug(LogMessages_1.LogMessage.EVENT_PIPELINE_INSERT_EVENT, {
+            event: JSON.stringify(event),
+        });
+        const processed = this.applyModifiers(event);
+        if (processed != null) {
+            this.dispatchEvent(processed);
+        }
+    }
+    addEventModifier(eventModifier) {
+        this.logger.debug(LogMessages_1.LogMessage.ADD_EVENT_MODIFIER);
+        return this.customEventModifierChain.addEventModifier(eventModifier);
+    }
+    removeEventModifier(eventModifier) {
+        this.logger.debug(LogMessages_1.LogMessage.REMOVE_EVENT_MODIFIER);
+        return this.customEventModifierChain.removeEventModifier(eventModifier);
+    }
+    isSuppressed(event) {
         const decision = ConfigurationHandler_1.ConfigurationHandler.getThirdGenDataReportingDecision();
-        if (!decision.allowed) {
+        if (decision.allowed) {
+            return false;
+        }
+        const isAppStart = event["characteristics.has_app_start"] ===
+            true;
+        const suppressed = !isAppStart ||
+            decision.reason === 'data_collection_off' ||
+            decision.reason === 'agent_inactive';
+        if (suppressed) {
             const reasonText = decision.reason
                 ? DECISION_REASON_TEXT[decision.reason]
                 : 'Unknown reason';
             this.logger.debug(LogMessages_1.LogMessage.THIRD_GEN_EVENT_SUPPRESSED, {
                 reason: reasonText,
             });
-            return;
         }
-        this.logger.debug(LogMessages_1.LogMessage.EVENT_PIPELINE_INSERT_EVENT, {
-            event: JSON.stringify(event),
-        });
-        let isDiscarded = false;
+        return suppressed;
+    }
+    applyModifiers(event) {
         for (const modifier of this.getEventModifierChain()) {
             try {
-                const eventRv = modifier.modifyEvent(event);
-                if (eventRv == null) {
-                    isDiscarded = true;
-                    break;
-                }
-                else {
-                    event = eventRv;
+                const result = modifier.modifyEvent(event);
+                if (result == null) {
+                    return null;
                 }
+                event = result;
             }
             catch (_a) {
                 if (event != null) {
@@ -65,25 +88,19 @@ class EventPipelineImpl {
                 }
             }
         }
-        if (event != null && !isDiscarded) {
-            this.logger.debug(LogMessages_1.LogMessage.EVENT_PIPELINE_FORWARD_EVENT, {
-                event: JSON.stringify(event),
-            });
-            if (event["characteristics.has_app_start"] === true) {
-                DynatraceBridge_1.DynatraceNative.forwardAppStartEvent(event, EventSpecContstants_1.ALL_APP_START_KEYS);
-            }
-            else {
-                DynatraceBridge_1.DynatraceNative.forwardEvent(event);
-            }
-        }
-    }
-    addEventModifier(eventModifier) {
-        this.logger.debug(LogMessages_1.LogMessage.ADD_EVENT_MODIFIER);
-        return this.customEventModifierChain.addEventModifier(eventModifier);
+        return event;
     }
-    removeEventModifier(eventModifier) {
-        this.logger.debug(LogMessages_1.LogMessage.REMOVE_EVENT_MODIFIER);
-        return this.customEventModifierChain.removeEventModifier(eventModifier);
+    dispatchEvent(event) {
+        this.logger.debug(LogMessages_1.LogMessage.EVENT_PIPELINE_FORWARD_EVENT, {
+            event: JSON.stringify(event),
+        });
+        if (event["characteristics.has_app_start"] ===
+            true) {
+            DynatraceBridge_1.DynatraceNative.forwardAppStartEvent(event, EventSpecContstants_1.ALL_APP_START_KEYS);
+        }
+        else {
+            DynatraceBridge_1.DynatraceNative.forwardEvent(event);
+        }
     }
 }
 exports.EventPipeline = new EventPipelineImpl();

package/lib/next/events/HttpRequestEventData.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ConsoleLogger_1 = require("../../core/logging/ConsoleLogger");
 const LogMessages_1 = require("../../core/logging/LogMessages");
 const TimestampProvider_1 = require("../provider/TimestampProvider");
+const TraceContextUtils_1 = require("../util/TraceContextUtils");
+const ConfigurationHandler_1 = require("../../core/configuration/ConfigurationHandler");
 const SendEventValidation_1 = require("./modifier/SendEventValidation");
 const EventModifierUtil_1 = require("./modifier/EventModifierUtil");
 const EventBuilderUtil_1 = require("./EventBuilderUtil");
-const TraceContextUtils_1 = require("../util/TraceContextUtils");
-const ConfigurationHandler_1 = require("../../core/configuration/ConfigurationHandler");
 const logger = new ConsoleLogger_1.ConsoleLogger('HttpRequestEventData');
 class HttpRequestEventData {
     constructor(url, requestMethod) {
@@ -94,7 +94,7 @@ class HttpRequestEventData {
             return "api_set";
         }
         else {
-            return "invalid";
+            return "invalid_set";
         }
     }
     hasValidMandatoryAttributes() {

package/lib/next/events/interface/HttpRequestEventDataTypes.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });