@dynatrace/react-native-plugin 2.341.1 → 2.345.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
@@ -219,11 +225,13 @@ template<typename T = void> std::enable_if_t<(facebook::react::ReactNativeVersio
 /**
 * When bridge is starting we will add an observer for content did appear so we can emit our app start measurements
 */
+#if !RCT_NEW_ARCH_ENABLED
 - (void)setBridge:(RCTBridge *)bridge
 {
     [super setBridge:bridge];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(contentAppeared) name:RCTContentDidAppearNotification object:nil];
 }
+#endif
 
 - (BOOL)isReady
 {
@@ -283,6 +291,13 @@ template<typename T = void> std::enable_if_t<(facebook::react::ReactNativeVersio
 - (void)startObserving
 {
     hasListeners = YES;
+#if RCT_NEW_ARCH_ENABLED
+    // On new arch setBridge: is not called, so RCTContentDidAppearNotification is never observed.
+    // JS adding a listener is the earliest signal we have that content is visible.
+    if (contentAppeared == -1) {
+        contentAppeared = GetTimestampUnix();
+    }
+#endif
     [self emitMeasurements];
 
     [self setupRuntimeConfigurationListenerIfNeeded];
@@ -307,6 +322,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 +654,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/configuration/ConfigurationHandler.js

@@ -4,7 +4,6 @@ exports.ConfigurationHandler = void 0;
 const RuntimeConfigurationObserver_1 = require("../../next/configuration/RuntimeConfigurationObserver");
 const LogLevel_1 = require("../logging/LogLevel");
 let _configuration;
-let _uiiEnabledLastKnownGood = undefined;
 const getRuntimeConfiguration = () => RuntimeConfigurationObserver_1.RuntimeConfigurationObserver.getCurrentRuntimeConfiguration();
 const getBaseThirdGenDecision = () => {
     if (!RuntimeConfigurationObserver_1.RuntimeConfigurationObserver.isInitiated()) {
@@ -46,9 +45,6 @@ exports.ConfigurationHandler = {
     setConfiguration(configuration) {
         _configuration = configuration;
     },
-    setUserInteractionEnabledLastKnownGood(value) {
-        _uiiEnabledLastKnownGood = value;
-    },
     isConfigurationAvailable: () => _configuration !== undefined,
     isErrorHandlerEnabled: () => _configuration.errorHandler,
     isReportFatalErrorAsCrash: () => _configuration.reportFatalErrorAsCrash,
@@ -84,23 +80,6 @@ exports.ConfigurationHandler = {
     getApplicationId: () => RuntimeConfigurationObserver_1.RuntimeConfigurationObserver.getCurrentRuntimeConfiguration()['application_id'],
     getTracestateKeyPrefix: () => RuntimeConfigurationObserver_1.RuntimeConfigurationObserver.getCurrentRuntimeConfiguration()['tracestate_key_prefix'],
     getTraceContextEnabled: () => RuntimeConfigurationObserver_1.RuntimeConfigurationObserver.getCurrentRuntimeConfiguration()['trace_context_enabled'],
-    isUserInteractionEnabled: () => {
-        const isRuntimeConfigInitiated = RuntimeConfigurationObserver_1.RuntimeConfigurationObserver.isInitiated();
-        if (isRuntimeConfigInitiated) {
-            const realTimeconfiguration = RuntimeConfigurationObserver_1.RuntimeConfigurationObserver.getCurrentRuntimeConfiguration();
-            const remoteUIConfiguration = realTimeconfiguration
-                ? realTimeconfiguration.touch_interaction_enabled
-                : undefined;
-            if (typeof remoteUIConfiguration === 'boolean') {
-                _uiiEnabledLastKnownGood = remoteUIConfiguration;
-                return remoteUIConfiguration;
-            }
-        }
-        if (typeof _uiiEnabledLastKnownGood === 'boolean') {
-            return _uiiEnabledLastKnownGood;
-        }
-        return false;
-    },
     isRuntimeConfigurationInitiated: () => RuntimeConfigurationObserver_1.RuntimeConfigurationObserver.isInitiated(),
     getBundleName: () => _configuration.bundleName,
     getBundleVersion: () => _configuration.bundleVersion,

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/dynatrace-reporter.js

@@ -1,14 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
 const TerminalReporter = (() => {
     try {
         return require('metro/src/lib/TerminalReporter');
@@ -18,23 +8,4 @@ const TerminalReporter = (() => {
     }
 })();
 const { Terminal } = require('metro-core');
-const files = require('../scripts/FileOperationHelper');
-const paths = require('../scripts/PathsConstants');
-const reporter = new TerminalReporter(new Terminal(process.stdout));
-const updateOrig = TerminalReporter.prototype.update;
-TerminalReporter.prototype.update = function update(event) {
-    return updateOrig === null || updateOrig === void 0 ? void 0 : updateOrig.apply(this, arguments);
-};
-const update = (event) => __awaiter(void 0, void 0, void 0, function* () {
-    if (event != null) {
-        if (event.type === 'transform_cache_reset') {
-            try {
-                yield files.default.deleteDirectory(paths.default.getBuildPath());
-            }
-            catch (e) {
-            }
-        }
-    }
-    reporter.update(event);
-});
-module.exports.update = update;
+module.exports = new TerminalReporter(new Terminal(process.stdout));

package/lib/dynatrace-transformer.js

@@ -1,40 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUpstreamTransformer = exports.transform = void 0;
-const config = require("../scripts/Config");
-const Logger_1 = require("../scripts/Logger");
 const BabelPluginDynatrace_1 = require("../instrumentation/BabelPluginDynatrace");
-const instrumentor = require("../instrumentation/DynatraceInstrumentation");
 const Config_1 = require("../scripts/Config");
 const transform = (args) => {
     var _a;
-    let src = args.src;
-    const { filename, options } = args;
-    let reactOptions;
-    try {
-        reactOptions = (0, Config_1.readConfigDefault)();
-        if (!reactOptions.react.useLegacyJscodeshift) {
-            args.plugins = [BabelPluginDynatrace_1.default, ...((_a = args.plugins) !== null && _a !== void 0 ? _a : [])];
-            return (0, exports.getUpstreamTransformer)(reactOptions === null || reactOptions === void 0 ? void 0 : reactOptions.react).transform(args);
-        }
-        src = instrumentor.instrument(src, filename, reactOptions.react);
-    }
-    catch (e) {
-        if (e instanceof Error) {
-            if (e.message === config.ERROR_CONFIG_NOT_AVAILABLE) {
-                console.log('dynatrace.config.js not found!');
-            }
-            else {
-                console.log("Couldn't instrument file: " + filename);
-                Logger_1.default.logErrorSync(e.message);
-            }
-        }
-    }
-    return (0, exports.getUpstreamTransformer)(reactOptions === null || reactOptions === void 0 ? void 0 : reactOptions.react).transform({
-        src,
-        filename,
-        options,
-    });
+    args.plugins = [BabelPluginDynatrace_1.default, ...((_a = args.plugins) !== null && _a !== void 0 ? _a : [])];
+    return (0, exports.getUpstreamTransformer)((0, Config_1.readConfigDefault)().react).transform(args);
 };
 exports.transform = transform;
 const safeRequire = (modulePath) => {
@@ -45,10 +17,10 @@ const safeRequire = (modulePath) => {
         return null;
     }
 };
-const getUpstreamTransformer = (reactOptions) => {
-    if (reactOptions !== undefined &&
-        reactOptions.upstreamTransformer !== undefined) {
-        return require(reactOptions.upstreamTransformer);
+const getUpstreamTransformer = (transformerReactConfig) => {
+    const upstreamTransformer = transformerReactConfig === null || transformerReactConfig === void 0 ? void 0 : transformerReactConfig.upstreamTransformer;
+    if (upstreamTransformer !== undefined) {
+        return require(upstreamTransformer);
     }
     else {
         const transformer = safeRequire('@expo/metro-config/babel-transformer') ||

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/configuration/INativeRuntimeConfiguration.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateDefaultConfiguration = void 0;
 const generateDefaultConfiguration = () => ({
     '3rd_gen_enabled': true,
-    touch_interaction_enabled: false,
     instance_id: '',
     session_id: '',
     application_id: '',

package/lib/next/configuration/RuntimeConfigurationObserver.js

@@ -28,9 +28,6 @@ class RuntimeConfigurationObserverImpl {
         const thirdGenEnabled = typeof payload['3rd_gen_enabled'] === 'boolean'
             ? payload['3rd_gen_enabled']
             : undefined;
-        const touchInteractionEnabled = typeof payload.touch_interaction_enabled === 'boolean'
-            ? payload.touch_interaction_enabled
-            : undefined;
         const traceContextEnabled = typeof payload.trace_context_enabled === 'boolean'
             ? payload.trace_context_enabled
             : undefined;
@@ -60,10 +57,8 @@ class RuntimeConfigurationObserverImpl {
         const tracestateKeyPrefix = typeof payload.tracestate_key_prefix === 'string'
             ? payload.tracestate_key_prefix
             : undefined;
-        const normalized = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof thirdGenEnabled === 'boolean'
+        const normalized = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof thirdGenEnabled === 'boolean'
             ? { '3rd_gen_enabled': thirdGenEnabled }
-            : {})), (typeof touchInteractionEnabled === 'boolean'
-            ? { touch_interaction_enabled: touchInteractionEnabled }
             : {})), (typeof traceContextEnabled === 'boolean'
             ? { trace_context_enabled: traceContextEnabled }
             : {})), (typeof dataCollectionLevel === 'number'

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

@@ -94,7 +94,7 @@ class HttpRequestEventData {
             return "api_set";
         }
         else {
-            return "invalid";
+            return "invalid_set";
         }
     }
     hasValidMandatoryAttributes() {

package/lib/next/events/spec/EventSpecContstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ALL_APP_START_KEYS = exports.EVENT_WHITELIST_SIZE = exports.MODIFY_EVENT_WHITELIST_NAMESPACE = exports.MODIFY_EVENT_WHITELIST_STRING_FIELDS = exports.MODIFY_EVENT_WHITELIST_FIELDS = exports.SEND_SESSION_PROPERTY_EVENT_WHITELIST_FIELDS = exports.SEND_EXCEPTION_EVENT_WHITELIST_FIELDS = exports.SEND_EVENT_WHITELIST_FIELDS = exports.SEND_SESSION_PROPERTY_EVENT_WHITELIST_NAMESPACES = exports.SEND_EXCEPTION_EVENT_WHITELIST_NAMESPACES = exports.SEND_EVENT_WHITELIST_NAMESPACES = exports.AllCharacteristicsKeys = exports.KEY_NAME_REGEX = exports.MAX_CUSTOM_EVENT_VALUE_LENGTH = exports.MAX_CUSTOM_EVENT_KEY_LENGTH = exports.MAX_CUSTOM_EVENT_FIELDS = exports.SPECIFICATION_VERSION = void 0;
-exports.SPECIFICATION_VERSION = '0.23.0';
+exports.SPECIFICATION_VERSION = '0.24.0';
 exports.MAX_CUSTOM_EVENT_FIELDS = 50;
 exports.MAX_CUSTOM_EVENT_KEY_LENGTH = 100;
 exports.MAX_CUSTOM_EVENT_VALUE_LENGTH = 5000;

package/lib/next/navigation/NavigationTracker.js

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._resetForTest = exports.getActivePath = exports.reportScreenResume = exports.reportScreenBackground = exports.reportScreenChange = exports.buildPathFromState = exports.registerEventTrigger = void 0;
+const ConsoleLogger_1 = require("../../core/logging/ConsoleLogger");
+const LogMessages_1 = require("../../core/logging/LogMessages");
+const ConfigurationHandler_1 = require("../../core/configuration/ConfigurationHandler");
+const DynatraceBridge_1 = require("../../core/DynatraceBridge");
+const BaseDataEventModifier_1 = require("../events/modifier/BaseDataEventModifier");
+const logger = new ConsoleLogger_1.ConsoleLogger('NavigationTracker');
+let eventTrigger = null;
+const registerEventTrigger = (fn) => {
+    eventTrigger = fn;
+};
+exports.registerEventTrigger = registerEventTrigger;
+let activePath = '';
+let isBackgrounded = false;
+const buildPathFromState = (state) => {
+    var _a, _b;
+    let currentState = state;
+    const parts = [];
+    while (currentState === null || currentState === void 0 ? void 0 : currentState.routes[(_a = currentState.index) !== null && _a !== void 0 ? _a : 0]) {
+        const currentRoute = currentState.routes[(_b = currentState.index) !== null && _b !== void 0 ? _b : 0];
+        parts.push(currentRoute.name);
+        currentState = currentRoute.state;
+    }
+    return parts.join('/');
+};
+exports.buildPathFromState = buildPathFromState;
+const startView = (newPath) => {
+    if (!ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable()) {
+        logger.info(LogMessages_1.LogMessage.NAVIGATION_NOT_STARTED);
+        return;
+    }
+    const startViewInternalEvent = new BaseDataEventModifier_1.BaseDataEventModifier().modifyEvent(Object.assign({ 'view.detected_name': newPath }, (activePath && {
+        'view.source.detected_name': activePath,
+    })));
+    const fn = DynatraceBridge_1.DynatraceNative === null || DynatraceBridge_1.DynatraceNative === void 0 ? void 0 : DynatraceBridge_1.DynatraceNative.startViewInternal;
+    if (typeof fn === 'function') {
+        fn(startViewInternalEvent);
+    }
+    logger.debug(LogMessages_1.LogMessage.START_VIEW_INTERNAL, {
+        event: JSON.stringify(startViewInternalEvent),
+    });
+};
+const stopView = () => {
+    if (!ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable()) {
+        logger.info(LogMessages_1.LogMessage.NAVIGATION_NOT_STARTED);
+        return;
+    }
+    const fn = DynatraceBridge_1.DynatraceNative === null || DynatraceBridge_1.DynatraceNative === void 0 ? void 0 : DynatraceBridge_1.DynatraceNative.stopViewInternal;
+    if (typeof fn === 'function') {
+        fn();
+    }
+    logger.debug(LogMessages_1.LogMessage.STOP_VIEW_INTERNAL);
+};
+const reportScreenChange = (newPath) => {
+    if (newPath === activePath) {
+        return;
+    }
+    if (activePath !== '') {
+        stopView();
+    }
+    startView(newPath);
+    activePath = newPath;
+    if (newPath) {
+        eventTrigger === null || eventTrigger === void 0 ? void 0 : eventTrigger(newPath, Date.now());
+    }
+};
+exports.reportScreenChange = reportScreenChange;
+const reportScreenBackground = () => {
+    isBackgrounded = true;
+    stopView();
+};
+exports.reportScreenBackground = reportScreenBackground;
+const reportScreenResume = () => {
+    if (!isBackgrounded) {
+        return;
+    }
+    isBackgrounded = false;
+    startView(activePath);
+    if (activePath) {
+        eventTrigger === null || eventTrigger === void 0 ? void 0 : eventTrigger(activePath, Date.now());
+    }
+};
+exports.reportScreenResume = reportScreenResume;
+const getActivePath = () => activePath;
+exports.getActivePath = getActivePath;
+const _resetForTest = () => {
+    activePath = '';
+    isBackgrounded = false;
+    eventTrigger = null;
+};
+exports._resetForTest = _resetForTest;