@dynatrace/react-native-plugin 2.311.1 → 2.313.1

package/README.md

@@ -32,8 +32,8 @@ If you want to start using this plugin and are not a Dynatrace customer yet, hea
 ## Agent Versions
 This agent versions are configured in this plugin:
 
-* Android Agent: 8.311.1.1007
-* iOS Agent: 8.311.1.1013
+* Android Agent: 8.313.1.1004
+* iOS Agent: 8.313.1.1016
 
 ## Quick Setup
 
@@ -177,8 +177,6 @@ Define a mobile app in Dynatrace and open the Mobile app instrumentation setting
 
 > **Note**: Define the components that you want to see lifecycle instrumented ([example](#lifecycle)). This is important as you will only see Application startup and Touches out of the box.
 
-> **Note for Expo**: If you are using expo make sure to use the upstreamTransformer property in the `dynatrace.config.js` file: `upstreamTransformer: require.resolve('@expo/metro-config/babel-transformer')`
-
 For more details about the configuration, see [Advanced topics](#structure-of-the-dynatracejs-file).
 
 ## 4. Update Babel Configuration
@@ -1463,7 +1461,12 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
-2.311.1
+2.313.1
+* Updated Android (8.313.1.1004) & iOS Agent (8.313.1.1016)
+* Expo transformer is now automatically used, if available.
+* LogLevel was broken for manual startup
+
+2.311.2
 * Updated Android (8.311.1.1007) & iOS Agent (8.311.1.1013)
 * Configuration copied to android folder which supports cloud builds
 * Removed dynamic import for jsx runtime as it was causing issue

package/android/build.gradle

@@ -72,7 +72,7 @@ repositories {
 }
 
 dependencies {
-	implementation 'com.dynatrace.agent:agent-android:8.311.1.1007'
+	implementation 'com.dynatrace.agent:agent-android:8.313.1.1004'
     implementation "com.facebook.react:react-native:${safeExtGet('reactNative', '+')}"
 }
   

package/android/src/main/java/com/dynatrace/android/agent/DynatraceUtils.kt

@@ -25,16 +25,15 @@ internal object DynatraceUtils {
                         ) {
                             // This is a int
                             arrayList.add(array.getDouble(i).toInt())
-                        }
-                        if (value >= Long.MIN_VALUE && value <= Long.MAX_VALUE && value == value.toLong()
+                        } else if (value >= Long.MIN_VALUE && value <= Long.MAX_VALUE && value == value.toLong()
                                 .toDouble()
                         ) {
                             // This is a long
                             arrayList.add(array.getDouble(i).toLong())
                         }
-                        break
+                    } else {
+                        arrayList.add(array.getDouble(i))
                     }
-                    arrayList.add(array.getDouble(i))
                 }
 
                 ReadableType.String -> arrayList.add(array.getString(i))
@@ -63,16 +62,15 @@ internal object DynatraceUtils {
                         ) {
                             // This is a int
                             hashMap[key] = map.getDouble(key).toInt()
-                        }
-                        if (value >= Long.MIN_VALUE && value <= Long.MAX_VALUE && value == value.toLong()
+                        } else if (value >= Long.MIN_VALUE && value <= Long.MAX_VALUE && value == value.toLong()
                                 .toDouble()
                         ) {
                             // This is a long
                             hashMap[key] = map.getDouble(key).toLong()
                         }
-                        break
+                    } else {
+                        hashMap[key] = map.getDouble(key)
                     }
-                    hashMap[key] = map.getDouble(key)
                 }
 
                 ReadableType.String -> hashMap[key] = map.getString(key)

package/files/plugin.gradle

@@ -1,3 +1,3 @@
 dependencies {
-	classpath 'com.dynatrace.tools.android:gradle-plugin:8.311.1.1007'
+	classpath 'com.dynatrace.tools.android:gradle-plugin:8.313.1.1004'
 }

package/lib/core/Dynatrace.js

@@ -350,4 +350,7 @@ exports.Dynatrace = {
     sendSessionPropertyEvent: (properties) => {
         Dynatrace_1.Dynatrace.sendSessionPropertyEvent(properties);
     },
+    sendExceptionEvent: (error, fields) => {
+        Dynatrace_1.Dynatrace.sendExceptionEvent(error, fields);
+    },
 };

package/lib/core/configuration/ConfigurationDefaults.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_ACTION_NAME_PRIVACY = exports.DEFAULT_USER_OPT_IN = exports.DEFAULT_LOGLEVEL = exports.DEFAULT_FATAL_AS_CRASH = exports.DEFAULT_ERROR_HANDLER = exports.DEFAULT_REPORT_CRASH = exports.DEFAULT_LIFECYCLE_UPDATE = void 0;
+const LogLevel_1 = require("../logging/LogLevel");
 exports.DEFAULT_LIFECYCLE_UPDATE = false;
 exports.DEFAULT_REPORT_CRASH = true;
 exports.DEFAULT_ERROR_HANDLER = true;
 exports.DEFAULT_FATAL_AS_CRASH = true;
-exports.DEFAULT_LOGLEVEL = 1;
+exports.DEFAULT_LOGLEVEL = LogLevel_1.LogLevel.Info;
 exports.DEFAULT_USER_OPT_IN = false;
 exports.DEFAULT_ACTION_NAME_PRIVACY = false;

package/lib/core/configuration/ConfigurationHandler.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigurationHandler = void 0;
+const LogLevel_1 = require("../logging/LogLevel");
 let _configuration;
 exports.ConfigurationHandler = {
     setConfiguration(configuration) {
@@ -10,7 +11,7 @@ exports.ConfigurationHandler = {
     isErrorHandlerEnabled: () => _configuration.errorHandler,
     isReportFatalErrorAsCrash: () => _configuration.reportFatalErrorAsCrash,
     isDebugEnabled: () => exports.ConfigurationHandler.isConfigurationAvailable() &&
-        _configuration.logLevel === 0,
+        _configuration.logLevel === LogLevel_1.LogLevel.Debug,
     isLifecycleUpdateEnabled: () => _configuration.lifecycleUpdate,
     isActionNamePrivacyEnabled: () => _configuration.actionNamePrivacy,
     getBundleName: () => _configuration.bundleName,

package/lib/core/logging/ConsoleLogger.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsoleLogger = void 0;
 const ConfigurationHandler_1 = require("../configuration/ConfigurationHandler");
+const LogLevel_1 = require("./LogLevel");
 class ConsoleLogger {
     constructor(name, logLevel) {
         this.name = name;
@@ -19,7 +20,7 @@ class ConsoleLogger {
         console.log(`[${this.name}]: ${msg}`);
     }
     isDebugEnabled() {
-        return (this.level === 0 ||
+        return (this.level === LogLevel_1.LogLevel.Debug ||
             (ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable() &&
                 ConfigurationHandler_1.ConfigurationHandler.isDebugEnabled()));
     }

package/lib/core/logging/LogLevel.js

@@ -1,8 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogLevelToString = void 0;
+exports.LogLevelToString = exports.LogLevel = void 0;
+var LogLevel;
+(function (LogLevel) {
+    LogLevel[LogLevel["Debug"] = 0] = "Debug";
+    LogLevel[LogLevel["Info"] = 1] = "Info";
+})(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
 const LogLevelToString = (level) => {
-    if (level === 0) {
+    if (level === LogLevel.Debug) {
         return 'Debug';
     }
     else {

package/lib/dynatrace-transformer.js

@@ -40,18 +40,24 @@ const transform = (src, filename, options) => {
     });
 };
 exports.transform = transform;
+const safeRequire = (modulePath) => {
+    try {
+        return require(modulePath);
+    }
+    catch (_a) {
+        return null;
+    }
+};
 const getUpstreamTransformer = (reactOptions) => {
     if (reactOptions !== undefined &&
         reactOptions.upstreamTransformer !== undefined) {
         return require(reactOptions.upstreamTransformer);
     }
     else {
-        try {
-            return require('metro-react-native-babel-transformer/src/index');
-        }
-        catch (e) {
-            return require('@react-native/metro-babel-transformer');
-        }
+        const transformer = safeRequire('@expo/metro-config/babel-transformer') ||
+            safeRequire('metro-react-native-babel-transformer/src/index') ||
+            safeRequire('@react-native/metro-babel-transformer');
+        return transformer;
     }
 };
 exports.getUpstreamTransformer = getUpstreamTransformer;

package/lib/next/Dynatrace.js

@@ -67,6 +67,15 @@ class DynatraceImpl {
         }
         EventPipeline_1.EventPipeline.insertEvent(event);
     }
+    sendExceptionEvent(error, fields) {
+        const fieldsCheck = !fields ? null : fields;
+        this.logger.debug(`sendExceptionEvent(${JSON.stringify(error)}, ${JSON.stringify(fieldsCheck)})`);
+        const event = Object.assign({}, (0, EventCreator_1.createErrorEvent)(error.name, error.message, error.stack));
+        let eventValidated = SendEventValidation_1.SendEventValidation.modifyEvent(fieldsCheck);
+        eventValidated = Object.assign(Object.assign({}, event), eventValidated);
+        eventValidated["characteristics.is_api_reported"] = true;
+        EventPipeline_1.EventPipeline.insertEvent(eventValidated);
+    }
     sendEvent(properties, context) {
         this.logger.debug(`sendEvent(${JSON.stringify(properties, context)})`);
         const eventValidated = SendEventValidation_1.SendEventValidation.modifyEvent(properties);

package/lib/next/appstart/AppStartType.js

@@ -13,26 +13,26 @@ var AppStartType;
 exports.AppStartTypeKeyMapping = [
     {
         type: AppStartType.RELOAD,
-        key: "app_start.react_native.application.reload",
+        key: "app_start.react_native.run_js_bundle.load_time",
     },
     {
         type: AppStartType.DOWNLOAD_START,
-        key: "app_start.react_native.application.download_start",
+        key: "app_start.react_native.download.start_time",
     },
     {
         type: AppStartType.RUN_JS_BUNDLE_START,
-        key: "app_start.react_native.application.run_js_bundle_start",
+        key: "app_start.react_native.run_js_bundle.start_time",
     },
     {
         type: AppStartType.DOWNLOAD_END,
-        key: "app_start.react_native.application.download_end",
+        key: "app_start.react_native.download.end_time",
     },
     {
         type: AppStartType.RUN_JS_BUNDLE_END,
-        key: "app_start.react_native.application.run_js_bundle_end",
+        key: "app_start.react_native.run_js_bundle.end_time",
     },
     {
         type: AppStartType.CONTENT_APPEARED,
-        key: "app_start.react_native.application.content_appeared",
+        key: "app_start.react_native.content_appeared",
     },
 ];

package/lib/next/events/modifier/BaseDataEventModifier.js

@@ -17,12 +17,12 @@ class BaseDataEventModifier {
         event["dt.rum.event.source.type"] = 'react_native';
         const bundleName = ConfigurationHandler_1.ConfigurationHandler.getBundleName();
         if (bundleName !== undefined) {
-            event["app.react_native.bundle.name"] =
+            event["react_native.bundle.name"] =
                 bundleName;
         }
         const bundleVersion = ConfigurationHandler_1.ConfigurationHandler.getBundleVersion();
         if (bundleVersion !== undefined) {
-            event["app.react_native.bundle.version"] =
+            event["react_native.bundle.version"] =
                 bundleVersion;
         }
         return event;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace/react-native-plugin",
-  "version": "2.311.1",
+  "version": "2.313.1",
   "description": "This plugin gives you the ability to use the Dynatrace Mobile agent in your react native application.",
   "main": "index.js",
   "types": "typings/react-native-dynatrace.d.ts",
@@ -24,6 +24,8 @@
     "uninstall": "node ./scripts/Uninstall.js",
     "test": "jest --runInBand",
     "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand",
+    "test:local": "npm run lint && node runner.js test",
+    "tsc:local": "tsc -p tsconfig.local.json",
     "tsc": "tsc",
     "tsc:prod": "tsc -p tsconfig.release.json",
     "lint": "eslint --cache src/**/*.ts --ignore-pattern .gitignore",
@@ -35,6 +37,11 @@
   "jest": {
     "displayName": "@dynatrace/react-native-plugin",
     "preset": "react-native",
+    "moduleNameMapper": {
+      "@expo/metro-config/babel-transformer": "<rootDir>/__mocks__/@expo/metro-config/babel-transformer.js",
+      "metro-react-native-babel-transformer/src/index": "<rootDir>/__mocks__/metro-react-native-babel-transformer.js",
+      "@react-native/metro-babel-transformer": "<rootDir>/__mocks__/@react-native/metro-babel-transformer.js"
+    },
     "moduleDirectories": [
       "node_modules"
     ],
@@ -66,7 +73,7 @@
   },
   "jest-junit": {
     "suiteName": "jest tests",
-    "outputDirectory": ".",
+    "outputDirectory": "test_report",
     "outputName": "junit.xml",
     "uniqueOutputName": "true",
     "ancestorSeparator": " › ",
@@ -75,11 +82,11 @@
   "author": "Dynatrace",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@babel/runtime": "^7.27.0",
+    "@babel/runtime": "^7.27.1",
     "jscodeshift": "^17.3.0",
     "plist": "^3.1.0",
     "proxy-polyfill": "^0.3.2",
-    "semver": "^7.7.1"
+    "semver": "^7.7.2"
   },
   "homepage": "https://www.dynatrace.com/",
   "peerDependencies": {

package/react-native-dynatrace.podspec

@@ -111,7 +111,7 @@ Pod::Spec.new do |s|
   #
   
   s.dependency "React"
-  s.dependency 'Dynatrace', '~> 8.311.1.1013'
+  s.dependency 'Dynatrace', '~> 8.313.1.1016'
 
   # Allows for better compatibility for older and newer versions
   if defined?(install_modules_dependencies)

package/scripts/Android.js

@@ -2,10 +2,10 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyGradleConfigFile = exports.writeGradleConfig = exports.instrumentAndroidPlatform = exports.GRADLE_APPLY_BUILDSCRIPT = exports.GRADLE_DYNATRACE_FILE = void 0;
+const path_1 = require("path");
 const Logger_1 = require("./Logger");
 const FileOperationHelper_1 = require("./FileOperationHelper");
 const PathsConstants_1 = require("./PathsConstants");
-const path_1 = require("path");
 const GRADLE_CONFIG_IDENTIFIER = '// AUTO - INSERTED';
 exports.GRADLE_DYNATRACE_FILE = `apply from: "./${PathsConstants_1.DYNATRACE_CONFIG_GRADLE_FILE}"`;
 const GRADLE_BUILDSCRIPT_IDENTIFIER = 'buildscript';

package/scripts/Config.js

@@ -21,7 +21,7 @@ exports.defaultConfig = {
         debug: false,
         errorHandler: {
             enabled: true,
-            reportFatalErrorAsCrash: true
+            reportFatalErrorAsCrash: true,
         },
         lifecycle: {
             includeUpdate: false,

package/scripts/Ios.js

@@ -130,7 +130,9 @@ const updatedExcludedStr = (config) => {
         const controlsArr = Object.keys(PlistConstants_1.CONTROLS_PROP_OPTIONS);
         let updatedStr = `${PlistConstants_1.START_CONTROLS_PROP}${PlistConstants_1.CONTROLS_PROP_OPTIONS.PickerView}${PlistConstants_1.CONTROLS_PROP_OPTIONS.Switch}`;
         for (let index = 0; index < controlsArr.length; index++) {
-            if (controlsArr[index] !== 'PickerView' && controlsArr[index] !== 'Switch' && config.indexOf(PlistConstants_1.CONTROLS_PROP_OPTIONS[controlsArr[index]].trim()) >= 0) {
+            if (controlsArr[index] !== 'PickerView'
+                && controlsArr[index] !== 'Switch'
+                && config.indexOf(PlistConstants_1.CONTROLS_PROP_OPTIONS[controlsArr[index]].trim()) >= 0) {
                 updatedStr = updatedStr + PlistConstants_1.CONTROLS_PROP_OPTIONS[controlsArr[index]];
             }
         }