@dynatrace/react-native-plugin 2.333.1 → 2.337.1

package/lib/core/configuration/ConfigurationHandler.js

@@ -5,6 +5,43 @@ const RuntimeConfigurationObserver_1 = require("../../next/configuration/Runtime
 const LogLevel_1 = require("../logging/LogLevel");
 let _configuration;
 let _uiiEnabledLastKnownGood = undefined;
+const getRuntimeConfiguration = () => RuntimeConfigurationObserver_1.RuntimeConfigurationObserver.getCurrentRuntimeConfiguration();
+const getBaseThirdGenDecision = () => {
+    if (!RuntimeConfigurationObserver_1.RuntimeConfigurationObserver.isInitiated()) {
+        return {
+            allowed: true,
+            reason: 'runtime_config_unavailable',
+        };
+    }
+    const runtimeConfiguration = getRuntimeConfiguration();
+    if (!runtimeConfiguration['3rd_gen_enabled']) {
+        return {
+            allowed: false,
+            reason: 'third_gen_disabled',
+        };
+    }
+    if (runtimeConfiguration.data_collection_level === 0) {
+        return {
+            allowed: false,
+            reason: 'data_collection_off',
+        };
+    }
+    if (!runtimeConfiguration.agent_status) {
+        return {
+            allowed: false,
+            reason: 'agent_inactive',
+        };
+    }
+    if (runtimeConfiguration.traffic_control) {
+        return {
+            allowed: false,
+            reason: 'traffic_control_active',
+        };
+    }
+    return {
+        allowed: true,
+    };
+};
 exports.ConfigurationHandler = {
     setConfiguration(configuration) {
         _configuration = configuration;
@@ -19,7 +56,34 @@ exports.ConfigurationHandler = {
         _configuration.logLevel === LogLevel_1.LogLevel.Debug,
     isLifecycleUpdateEnabled: () => _configuration.lifecycleUpdate,
     isActionNamePrivacyEnabled: () => _configuration.actionNamePrivacy,
+    getActionNamePreference: () => _configuration.actionNamePreference,
+    getActionNameAlgorithm: () => _configuration.actionNameAlgorithm,
     isGrailEnabled: () => RuntimeConfigurationObserver_1.RuntimeConfigurationObserver.getCurrentRuntimeConfiguration()['3rd_gen_enabled'],
+    getThirdGenDataReportingDecision: () => getBaseThirdGenDecision(),
+    getThirdGenHeaderPropagationDecision: () => getBaseThirdGenDecision(),
+    getThirdGenCrashReportingDecision: () => {
+        const decision = getBaseThirdGenDecision();
+        if (!decision.allowed) {
+            return decision;
+        }
+        if (decision.reason === 'runtime_config_unavailable') {
+            return decision;
+        }
+        if (!getRuntimeConfiguration().crash_reporting) {
+            return {
+                allowed: false,
+                reason: 'crash_reporting_disabled',
+            };
+        }
+        return {
+            allowed: true,
+        };
+    },
+    getInstanceId: () => RuntimeConfigurationObserver_1.RuntimeConfigurationObserver.getCurrentRuntimeConfiguration()['instance_id'],
+    getSessionId: () => RuntimeConfigurationObserver_1.RuntimeConfigurationObserver.getCurrentRuntimeConfiguration()['session_id'],
+    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) {

package/lib/core/configuration/ConfigurationPreset.js

@@ -21,6 +21,12 @@ class ConfigurationPreset {
     getActionNamePrivacy() {
         return ConfigurationDefaults_1.DEFAULT_ACTION_NAME_PRIVACY;
     }
+    getActionNamePreference() {
+        return ConfigurationDefaults_1.DEFAULT_ACTION_NAME_PREFERENCE;
+    }
+    getActionNameAlgorithm() {
+        return ConfigurationDefaults_1.DEFAULT_ACTION_NAME_ALGORITHM;
+    }
     getBundleName() {
         return undefined;
     }

package/lib/core/configuration/ManualStartupConfiguration.js

@@ -5,7 +5,7 @@ const LogLevelUtil_1 = require("../logging/LogLevelUtil");
 const ConfigurationDefaults_1 = require("./ConfigurationDefaults");
 const ConfigurationPreset_1 = require("./ConfigurationPreset");
 class ManualStartupConfiguration {
-    constructor(beaconUrl, applicationId, reportCrash, logLevel, lifecycleUpdate, userOptIn, actionNamePrivacy, bundleName, bundleVersion) {
+    constructor(beaconUrl, applicationId, reportCrash, logLevel, lifecycleUpdate, userOptIn, actionNamePrivacy, actionNamePreference, actionNameAlgorithm, bundleName, bundleVersion) {
         this.reportCrash = ConfigurationDefaults_1.DEFAULT_REPORT_CRASH;
         this.userOptIn = ConfigurationDefaults_1.DEFAULT_USER_OPT_IN;
         if (!applicationId || !beaconUrl) {
@@ -19,6 +19,8 @@ class ManualStartupConfiguration {
         this.reportFatalErrorAsCrash = preset.isReportFatalErrorAsCrash();
         this.lifecycleUpdate = preset.getLifecycleUpdate();
         this.actionNamePrivacy = preset.getActionNamePrivacy();
+        this.actionNamePreference = preset.getActionNamePreference();
+        this.actionNameAlgorithm = preset.getActionNameAlgorithm();
         this.bundleName = preset.getBundleName();
         if (reportCrash != null) {
             this.reportCrash = reportCrash;
@@ -35,6 +37,12 @@ class ManualStartupConfiguration {
         if (actionNamePrivacy != null) {
             this.actionNamePrivacy = actionNamePrivacy;
         }
+        if (actionNamePreference != null) {
+            this.actionNamePreference = actionNamePreference;
+        }
+        if (actionNameAlgorithm != null) {
+            this.actionNameAlgorithm = actionNameAlgorithm;
+        }
         if (bundleName != null) {
             this.bundleName = bundleName;
         }

package/lib/dynatrace-reporter.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
 const TerminalReporter = (() => {
     try {
         return require('metro/src/lib/TerminalReporter');
@@ -24,19 +23,6 @@ const paths = require('../scripts/PathsConstants');
 const reporter = new TerminalReporter(new Terminal(process.stdout));
 const updateOrig = TerminalReporter.prototype.update;
 TerminalReporter.prototype.update = function update(event) {
-    if ((event === null || event === void 0 ? void 0 : event.type) === 'bundle_build_done') {
-        (0, child_process_1.exec)('npx lineOffsetDynatrace env prod', (error, stdout, stderr) => {
-            if (error) {
-                console.error(`Error: ${error.message}`);
-                return;
-            }
-            if (stderr) {
-                console.error(`stderr: ${stderr}`);
-                return;
-            }
-            console.log(`${stdout}`);
-        });
-    }
     return updateOrig === null || updateOrig === void 0 ? void 0 : updateOrig.apply(this, arguments);
 };
 const update = (event) => __awaiter(void 0, void 0, void 0, function* () {

package/lib/dynatrace-transformer.js

@@ -1,24 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUpstreamTransformer = exports.transform = void 0;
-const nodePath = require("path");
-const PathsConstants_1 = require("../scripts/PathsConstants");
 const config = require("../scripts/Config");
 const Logger_1 = require("../scripts/Logger");
-const CustomArgumentUtil_1 = require("../scripts/util/CustomArgumentUtil");
+const BabelPluginDynatrace_1 = require("../instrumentation/BabelPluginDynatrace");
 const instrumentor = require("../instrumentation/DynatraceInstrumentation");
-const customArguments = (0, CustomArgumentUtil_1.readCustomArguments)();
-const transform = (src, filename, options) => {
-    if (typeof src === 'object') {
-        ({ src, filename, options } = src);
-    }
+const Config_1 = require("../scripts/Config");
+const transform = (args) => {
+    var _a;
+    let src = args.src;
+    const { filename, options } = args;
     let reactOptions;
     try {
-        if (customArguments.isCustomConfigurationPathSet()) {
-            reactOptions = config.readConfig(nodePath.join(PathsConstants_1.default.getApplicationPath(), customArguments.getCustomConfigurationPath()));
-        }
-        else {
-            reactOptions = config.readConfig(nodePath.join(PathsConstants_1.default.getConfigFilePath()));
+        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);
     }

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

@@ -7,12 +7,18 @@ exports.DEFAULT_DT_CONFIG = {
     artifactsDir: Types_1.Literals.DefaultArtifactsDir,
     runtimeImport: Types_1.Literals.DefaultRuntimeImport,
     componentNames: {
-        segment: Types_1.Literals.DefaultSegmentName,
-        tabButton: Types_1.Literals.DefaultTabButtonName,
         root: Types_1.Literals.DefaultRootName,
     },
     ui: {
         skipTags: ['NavigationContainer'],
+        pathId: {
+            enabled: true,
+            propName: 'dtPathID',
+            uiRootPropName: 'dtUIRoot',
+            injectUiRoot: false,
+            skipProviderTags: true,
+            blacklist: ['AnalyticsRoot', 'Stack', 'React.Fragment', 'Fragment'],
+        },
     },
 };
 const getDTConfig = () => exports.DEFAULT_DT_CONFIG;

package/lib/features/ui-interaction/Plugin.Fragment.Test.js

@@ -0,0 +1,170 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const jsc = require("jscodeshift");
+const Plugin_1 = require("./Plugin");
+const j = jsc.withParser('tsx');
+const runPlugin = (src, filename = 'FragmentCase.tsx') => {
+    const root = j(src);
+    const out = (0, Plugin_1.applyDTPathIdInstrumentation)(root, filename);
+    return out.root.toSource({ quote: 'single' });
+};
+describe('UI interaction Fragment blacklist', () => {
+    it('does not inject dtUIRoot by default', () => {
+        const code = runPlugin(`
+            import React from 'react';
+            import { View, Text } from 'react-native';
+
+            export default function Screen() {
+                return (
+                    <View>
+                        <Text>Hello</Text>
+                    </View>
+                );
+            }
+        `);
+        expect(code).toContain('<View dtPathID=');
+        expect(code).not.toContain('dtUIRoot');
+    });
+    it('does not instrument React.Fragment', () => {
+        const code = runPlugin(`
+            import React from 'react';
+            import { View, Text } from 'react-native';
+
+            export default function Screen() {
+                return (
+                    <View>
+                        <React.Fragment>
+                            <Text>Hello</Text>
+                        </React.Fragment>
+                    </View>
+                );
+            }
+        `);
+        expect(code).toContain('<React.Fragment>');
+        expect(code).not.toContain('<React.Fragment dtPathID=');
+        expect(code).toContain('<View dtPathID=');
+        expect(code).toContain('<Text dtPathID=');
+    });
+    it('does not instrument imported Fragment', () => {
+        const code = runPlugin(`
+            import React, { Fragment } from 'react';
+            import { View, Text } from 'react-native';
+
+            export default function Screen() {
+                return (
+                    <View>
+                        <Fragment>
+                            <Text>Hello</Text>
+                        </Fragment>
+                    </View>
+                );
+            }
+        `);
+        expect(code).toContain('<Fragment>');
+        expect(code).not.toContain('<Fragment dtPathID=');
+        expect(code).toContain('<View dtPathID=');
+        expect(code).toContain('<Text dtPathID=');
+    });
+    it('does not instrument aliased Fragment imports', () => {
+        const code = runPlugin(`
+            import React, { Fragment as F } from 'react';
+            import { View, Text } from 'react-native';
+
+            export default function Screen() {
+                return (
+                    <View>
+                        <F>
+                            <Text>Hello</Text>
+                        </F>
+                    </View>
+                );
+            }
+        `);
+        expect(code).toContain('<F>');
+        expect(code).not.toContain('<F dtPathID=');
+        expect(code).toContain('<View dtPathID=');
+        expect(code).toContain('<Text dtPathID=');
+    });
+    it('does not instrument empty fragment tags', () => {
+        const code = runPlugin(`
+            import React from 'react';
+            import { View, Text } from 'react-native';
+
+            export default function Screen() {
+                return (
+                    <>
+                        <View>
+                            <Text>Hello</Text>
+                        </View>
+                    </>
+                );
+            }
+        `);
+        expect(code).toContain('<>');
+        expect(code).toContain('<View dtPathID=');
+        expect(code).toContain('<Text dtPathID=');
+    });
+    it('removes existing dtPathID from React.Fragment JSX', () => {
+        const code = runPlugin(`
+            import React from 'react';
+            export default function Screen() {
+                return <React.Fragment dtPathID='bad'>Hello</React.Fragment>;
+            }
+        `);
+        expect(code).toContain('<React.Fragment>');
+        expect(code).not.toContain('dtPathID=');
+    });
+    it('removes dtPathID from transpiled jsx Fragment call', () => {
+        const code = runPlugin(`
+            import { Fragment as _Fragment, jsx as _jsx } from 'react/jsx-runtime';
+            export default function Screen() {
+                return _jsx(_Fragment, { dtPathID: 'bad', children: 'Hello' });
+            }
+        `);
+        expect(code).toContain('_jsx(_Fragment');
+        expect(code).not.toContain('dtPathID');
+    });
+    it('removes dtPathID from transpiled jsxDEV Fragment call', () => {
+        const code = runPlugin(`
+            import { Fragment as _Fragment, jsxDEV as _jsxDEV } from 'react/jsx-dev-runtime';
+            export default function Screen() {
+                return _jsxDEV(_Fragment, { dtPathID: 'bad', children: 'Hello' }, void 0, false, void 0, this);
+            }
+        `);
+        expect(code).toContain('_jsxDEV(_Fragment');
+        expect(code).not.toContain('dtPathID');
+    });
+    it('does not instrument Stack elements', () => {
+        const code = runPlugin(`
+            import React from 'react';
+            import { Stack } from 'expo-router';
+            import { View, Text } from 'react-native';
+
+            export default function Screen() {
+                return (
+                    <View>
+                        <Stack>
+                            <Text>Hello</Text>
+                        </Stack>
+                    </View>
+                );
+            }
+        `);
+        expect(code).toContain('<Stack>');
+        expect(code).not.toContain('<Stack dtPathID=');
+        expect(code).toContain('<View dtPathID=');
+        expect(code).toContain('<Text dtPathID=');
+    });
+    it('skips instrumentation for Expo package files', () => {
+        const src = `
+            import React from 'react';
+            import { View, Text } from 'react-native';
+            export default function Screen() {
+                return <View><Text>Hello</Text></View>;
+            }
+        `;
+        const code = runPlugin(src, 'node_modules/expo-router/build/qualified-entry.js');
+        expect(code).toEqual(j(src).toSource({ quote: 'single' }));
+        expect(code).not.toContain('dtPathID');
+    });
+});