@dynatrace/react-native-plugin 2.313.1 → 2.317.1

package/README.md

@@ -27,13 +27,13 @@ If you want to start using this plugin and are not a Dynatrace customer yet, hea
   * Android Gradle plugin version 7.0+
   * Java 11
 * For iOS users: Minimum iOS 12
-* NodeJS 18+
+* NodeJS 18.18+
 
 ## Agent Versions
 This agent versions are configured in this plugin:
 
-* Android Agent: 8.313.1.1004
-* iOS Agent: 8.313.1.1016
+* Android Agent: 8.317.1.1007
+* iOS Agent: 8.317.1.1003
 
 ## Quick Setup
 
@@ -1461,6 +1461,9 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
+2.317.1
+* Updated Android (8.317.1.1007) & iOS Agent (8.317.1.1003)
+
 2.313.1
 * Updated Android (8.313.1.1004) & iOS Agent (8.313.1.1016)
 * Expo transformer is now automatically used, if available.

package/android/build.gradle

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

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

@@ -31,6 +31,7 @@ private val buffer: Queue<AppStartMeasurement> = ConcurrentLinkedQueue()
  * Setup to register all time points which we want to use to report correct app startup time.
  */
 fun setupAppStartListener() {
+    val initTimestamp = System.currentTimeMillis() - SystemClock.elapsedRealtime();
     ReactMarker.addListener { name: ReactMarkerConstants?, _: String?, _: Int ->
         when (name) {
             ReactMarkerConstants.RELOAD -> {
@@ -38,7 +39,7 @@ fun setupAppStartListener() {
                 buffer.add(
                     AppStartMeasurement(
                         AppStartMeasurementType.RELOAD.value,
-                        SystemClock.uptimeMillis()
+                        initTimestamp + SystemClock.elapsedRealtime()
                     )
                 )
             }
@@ -46,35 +47,35 @@ fun setupAppStartListener() {
             ReactMarkerConstants.CONTENT_APPEARED -> buffer.add(
                 AppStartMeasurement(
                     AppStartMeasurementType.CONTENT_APPEARED.value,
-                    SystemClock.uptimeMillis()
+                    initTimestamp + SystemClock.elapsedRealtime()
                 )
             )
 
             ReactMarkerConstants.DOWNLOAD_END -> buffer.add(
                 AppStartMeasurement(
                     AppStartMeasurementType.DOWNLOAD_END.value,
-                    SystemClock.uptimeMillis()
+                    initTimestamp + SystemClock.elapsedRealtime()
                 )
             )
 
             ReactMarkerConstants.DOWNLOAD_START -> buffer.add(
                 AppStartMeasurement(
                     AppStartMeasurementType.DOWNLOAD_START.value,
-                    SystemClock.uptimeMillis()
+                    initTimestamp + SystemClock.elapsedRealtime()
                 )
             )
 
             ReactMarkerConstants.RUN_JS_BUNDLE_END -> buffer.add(
                 AppStartMeasurement(
                     AppStartMeasurementType.RUN_JS_BUNDLE_END.value,
-                    SystemClock.uptimeMillis()
+                    initTimestamp + SystemClock.elapsedRealtime()
                 )
             )
 
             ReactMarkerConstants.RUN_JS_BUNDLE_START -> buffer.add(
                 AppStartMeasurement(
                     AppStartMeasurementType.RUN_JS_BUNDLE_START.value,
-                    SystemClock.uptimeMillis()
+                    initTimestamp + SystemClock.elapsedRealtime()
                 )
             )
 

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

@@ -9,6 +9,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableArray
 import org.json.JSONObject
 import java.net.URI
 import java.net.URISyntaxException
@@ -291,6 +292,10 @@ class DynatraceRNBridgeImpl(
         HybridBridge.forwardEvent(JSONObject(DynatraceUtils.toHashMap(attributes)))
     }
 
+    fun forwardAppStartEvent(attributes: ReadableMap, appStartKeys: ReadableArray) {
+        HybridBridge.forwardAppStartEvent(JSONObject(DynatraceUtils.toHashMap(attributes)), appStartKeys.toArrayList() as ArrayList<String>)
+    }
+
     fun startView(name: String) {
         Dynatrace.startView(name)
     }

package/android/src/new/java/com/dynatrace/android/agent/DynatraceRNBridge.kt

@@ -3,6 +3,7 @@ package com.dynatrace.android.agent
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableArray
 
 class DynatraceRNBridge(
     reactContext: ReactApplicationContext,
@@ -174,6 +175,10 @@ class DynatraceRNBridge(
         impl.forwardEvent(attributes)
     }
 
+    override fun forwardAppStartEvent(attributes: ReadableMap, appStartKeys: ReadableArray) {
+        impl.forwardAppStartEvent(attributes, appStartKeys)
+    }
+
     override fun startView(name: String) {
         impl.startView(name)
     }

package/android/src/old/java/com/dynatrace/android/agent/DynatraceRNBridge.kt

@@ -5,6 +5,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableArray
 
 class DynatraceRNBridge(
     reactContext: ReactApplicationContext,
@@ -191,6 +192,11 @@ class DynatraceRNBridge(
         impl.forwardEvent(attributes)
     }
 
+    @ReactMethod
+    fun forwardAppStartEvent(attributes: ReadableMap, appStartKeys: ReadableArray) {
+        impl.forwardAppStartEvent(attributes, appStartKeys)
+    }
+
     @ReactMethod
     fun startView(name: String) {
         impl.startView(name)

package/files/plugin.gradle

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

package/instrumentation/DynatraceInstrumentation.js

@@ -1 +1 @@
-"use strict";var u,n=require("@babel/runtime/helpers/interopRequireDefault"),r=n(require("@babel/runtime/helpers/toConsumableArray")),a=(Object.defineProperty(exports,"t",{value:!0}),exports.instrument=void 0,require("path")),c=require("jscodeshift"),i=require("jscodeshift/src/Collection"),e=require("../scripts/FileOperationHelper"),t=require("../scripts/PathsConstants"),o=require("./libs/react-native/Touchables.InstrInfo"),l=require("./libs/react-native/RefreshControl.InstrInfo"),f=require("./libs/react-native/Switch.InstrInfo"),s=require("./libs/community/gesture-handler/Touchables.InstrInfo"),d=require("./libs/community/Picker.InstrInfo"),v=require("./parser/Babel"),p=require("./model/Types"),m=(!function(n){n[n.i=-1]="Filtered",n[n.o=0]="Normal",n[n.u=1]="ReactNative",n[n.l=2]="React"}(u=u||{}),[]),y=(m.push.apply(m,(0,r.default)(o.instrumentationInfo)),m.push.apply(m,(0,r.default)(l.instrumentationInfo)),m.push.apply(m,(0,r.default)(f.instrumentationInfo)),m.push.apply(m,(0,r.default)(s.instrumentationInfo)),m.push.apply(m,(0,r.default)(d.instrumentationInfo)),["AppRegistry","renderApplication","setUpErrorHandling"]),g="@dynatrace/react-native-plugin/instrumentation/libs",instrument=function(n,r,e){r=w(r);var t=V(r);if(t!==u.i){var i=!1,o=N(r,n);if(t===u.l)T(o),i=!0;else if(t===u.u)r.endsWith("AppRegistry.js")?void 0!==e&&e.autoStart&&(U(o),i=!0):r.endsWith("renderApplication.js")?(q(o),i=!0):r.endsWith("setUpErrorHandling.js")&&void 0!==e&&e.autoStart&&e.errorHandler.enabled&&(J(o,e.autoStart,e.errorHandler.reportFatalErrorAsCrash),i=!0);else{var t=B(r,e);if(e.custom.reactnavigation&&b(r,o))i=!0;else{if(!t.input&&!t.lifecycle)return null!=e&&e.debug&&console.log("Dynatrace - Filtered All: ".concat(r)),E(r),n;t.lifecycle&&q(o)&&(i=!0),t.input&&m.forEach(function(n){n=K(o,n);o=n.root,i=i||n.v})}}i?(n=o.toSource({quote:"single"}),H(n,r)):E(r),null!=e&&e.debug&&i&&console.log("Dynatrace - Modified Filename: "+r)}else r.includes(a.join("@dynatrace","react-native-plugin"))&&r.endsWith(a.join("lib","core","configuration","ConfigurationPreset.js"))&&void 0!==e&&(t=N(r,n),void 0!==e.lifecycle&&h(t,"getLifecycleUpdate",e.lifecycle.includeUpdate),void 0!==e.debug&&h(t,"getLogLevel",e.debug?0:1),void 0!==e.bundleName&&h(t,"getBundleName",e.bundleName),void 0!==e.bundleVersion&&h(t,"getBundleVersion",e.bundleVersion),void 0!==e.input&&void 0!==e.input.actionNamePrivacy&&h(t,"getActionNamePrivacy",e.input.actionNamePrivacy),void 0!==e.errorHandler&&(h(t,"isErrorHandlerEnabled",e.errorHandler.enabled),h(t,"isReportFatalErrorAsCrash",e.errorHandler.reportFatalErrorAsCrash)),e.autoStart&&h(t,"isAutoStartupEnabled",e.autoStart),n=t.toSource({quote:"single"}),H(n,r));return n},b=(exports.instrument=instrument,function(n,r){return!!O(n,r)&&(n="import { registerListener } from '".concat(g,"/react-navigation/ReactNavigation';"),r.find(c.ImportDeclaration).at(0).insertBefore(n),!0)}),O=function(n,r){var e=!1;return n.includes("react-navigation")&&n.includes("NavigationContainer.tsx")&&r.find(c.VariableDeclarator).forEach(function(n){e||null==n.value||null==n.value.id||"refContainer"!==n.value.id.name||null!=n.parent&&null!=n.parent.value&&null!=n.parent.value.type&&"VariableDeclaration"===n.parent.value.type&&(n.parent.insertAfter("registerListener(refContainer);"),e=!0)}),e},q=function(n){var r=n.findJSXElements(),t=!1;return 0<r.length&&(n.find(c.FunctionDeclaration).forEach(function(n){var r,e=(0,i.fromPaths)([n]);0<e.findJSXElements().length&&null!=n&&null!=n.value&&null!=n.value.id&&n.value.id.name&&(r=e.find(c.ClassDeclaration),e=e.find(c.ClassExpression),0===r.length)&&0===e.length&&(A(n,p.Types.FunctionalComponent,n.value.id.name),t=!0)}),n.find(c.ClassDeclaration).forEach(function(n){0<(0,i.fromPaths)([n]).findJSXElements().length&&null!=n&&null!=n.value&&n.value.id&&n.value.id.name&&(A(n,p.Types.ClassComponent,n.value.id.name),t=!0)}),n.find(c.ArrowFunctionExpression).forEach(function(n){0<(0,i.fromPaths)([n]).findJSXElements().length&&null!=n.parent&&null!=n.parent.value&&null!=n.parent.value.id&&null!=n.parent.value.id.name&&(A(n,p.Types.FunctionalComponent,n.parent.value.id.name),t=!0)})),t},A=function(n,r,e){for(r=c.expressionStatement(c.assignmentExpression("=",c.memberExpression(c.identifier(e),c.identifier("_dtInfo")),P(r,e)));void 0!==n.parentPath&&"body"!==n.parentPath.name;)n=n.parentPath;void 0!==n.parentPath&&n.insertAfter(r)},P=function(n,r){return c.objectExpression([c.objectProperty(c.identifier("type"),c.numericLiteral(n)),c.objectProperty(c.identifier("name"),c.stringLiteral(r))])},h=function(n,r,e){var n=n.find(c.Identifier).filter(function(n){return n.node.name===r});1===n.length&&"ReturnStatement"===(n=n.paths()[0].parent.value.body.body[0]).type&&("boolean"==typeof e&&(n.argument=c.booleanLiteral(e)),"string"==typeof e&&(n.argument=c.stringLiteral(e)),"number"==typeof e)&&(n.argument=c.numericLiteral(e))},N=function(n,r){return c.withParser((0,v.babelParser)(a.extname(n)))(r)},w=function(n){return a.isAbsolute(n)?n.replace(t.default.getApplicationPath()+a.sep,""):n},E=function(n){try{var r=a.join(t.default.getBuildPath(),n+".dtx");e.default.checkIfFileExistsSync(r),e.default.deleteFileSync(r)}catch(n){}},H=function(n,r){r=a.join(t.default.getBuildPath(),r);try{e.default.checkIfFileExistsSync(a.dirname(r))}catch(n){e.default.createDirectorySync(a.dirname(r))}e.default.writeTextToFileSync(r+".dtx",n)},B=function(n,r){var e={input:!1,lifecycle:!1};return void 0!==r&&(void 0!==r.lifecycle&&void 0!==r.lifecycle.instrument&&r.lifecycle.instrument(n)&&(e.lifecycle=!0),void 0!==r.input)&&void 0!==r.input.instrument&&r.input.instrument(n)&&(e.input=!0),e},T=function(n){var r,n=n.find(c.Program);1===n.length&&(r=c.expressionStatement(c.callExpression(c.memberExpression(c.callExpression(c.identifier("require"),[c.stringLiteral("@dynatrace/react-native-plugin/instrumentation/jsx/ElementHelper")]),c.identifier("instrumentCreateElement")),[c.memberExpression(c.identifier("module"),c.identifier("exports"))])),n.paths()[0].node.body.push(r))},U=function(n){var r=M(n,"runApplication",!0);1===r.length&&(en(n,{p:"_DynatraceApplicationHandler",module:"@dynatrace/react-native-plugin",reference:"ApplicationHandler"}),I(r.paths()[0].parent.value.body.body,0,D("_DynatraceApplicationHandler","startup",[])))},J=function(n,r,e){n=n.paths()[0].value.program.body;null!=n&&(I(n,n.length,_({p:"_DynatraceErrorHandler",module:"@dynatrace/react-native-plugin/lib/core/ErrorHandler",reference:""})),I(n,n.length,D("_DynatraceErrorHandler","registerErrorHandler",[c.literal(e)])))},I=function(n,r){for(var e=arguments.length,t=new Array(2<e?e-2:0),i=2;i<e;i++)t[i-2]=arguments[i];return n.splice.apply(n,[r,0].concat(t))},M=function(n,r,t){for(var e=arguments.length,i=new Array(3<e?e-3:0),o=3;o<e;o++)i[o-3]=arguments[o];return n.find(c.Identifier).filter(function(n){return n.node.name===r}).filter(function(n){return void 0!==n.parent&&void 0!==n.parent.value&&void 0!==n.parent.value.params}).filter(function(n){var r=void 0!==n.parent&&void 0!==n.parent.value;t||(r=r&&n.parent.value.params.length===i.length);for(var e=0;e<0;e++)r=r&&n.parent.value.params[e].name===i[e];return r})},V=function(n){if(n.includes("@dynatrace"))return u.i;var r=a.extname(n);if(".js"!==r&&".ts"!==r&&".tsx"!==r&&".jsx"!==r)return u.i;for(var e=a.parse(n),t=e.dir.split(a.sep),i=0;i<t.length;i++)if("node_modules"===t[i]){if("react-native"===t[i+1]||"create-react-class"===t[i+1]||"react-clone-referenced-element"===t[i+1])return y.includes(e.name)?u.u:u.i;if("react"===t[i+1]&&"index"===e.name)return u.l}return u.o},k=function(n,r,e){var t=z(n,r,e);return G(n,r,e)||t},z=function(n,r,e){var t=Q(n,r);return 0<t.length&&(void 0!==(t=C(t,r.reference,!1))&&(e.p=t.localName),nn(n,e),!0)},G=function(n,r,e){var t=j(n,r.module);if(1===t.length){t=C(t,r.reference,!0);if(void 0!==t)return rn(n,e.defaultImport,t.localName,"ImportNamespaceSpecifier"===t.type),!0}return!1},K=function(n,r){var e=JSON.parse(JSON.stringify(r.new));return{root:n,v:k(n,r.old,e)||W(n,r.old,r.new.defaultImport)}},Q=function(n,r){return n.find(c.ImportDeclaration).filter(function(n){return n.node.source.value===r.module&&null!=n.node.specifiers&&n.node.specifiers.some(function(n){return x(n)&&n.imported.name===r.reference||n.local&&n.local.name===r.reference})})},x=function(n){return void 0!==n.imported},W=function(n,r,e){var t=!1;return n.find(c.CallExpression).filter(function(n){return X(n.node.callee)&&Y(n.node.arguments[0])&&n.node.arguments[0].value===r.module&&void 0!==n.parent}).forEach(function(n){(void 0===n.parent.value.property||void 0!==n.parent.value.property&&void 0!==n.parent.value.property.name&&n.parent.value.property.name===r.reference)&&(n.node.arguments[0].value=e,t=t||!0)}),t},X=function(n){return"require"===n.name},Y=function(n){return"StringLiteral"===n.type||"Literal"===n.type},j=function(n,r){return n.find(c.ImportDeclaration).filter(function(n){return n.node.source.value===r})},C=function(n,e,t){var i;return n.forEach(function(n){void 0!==n.node.specifiers&&(n.node.specifiers=n.node.specifiers.filter(function(n){var r;return x(n)&&!t?((r=n.imported.name!==e)||null==n.local||n.imported.name===n.local.name||(i={localName:n.local.name,type:n.type}),r):!(!x(n)&&t&&(null!=n.local&&(i={localName:n.local.name,type:n.type}),1))}),0===n.node.specifiers.length)&&n.prune()}),i},Z=function(n,r){n.find(c.ImportDeclaration).filter(function(n){return n.node.source.value===r.module}).forEach(function(n){null!=n.node.specifiers&&n.node.specifiers.push(F(r))})},$=function(n,r,e){n.find(c.ImportDeclaration).filter(function(n){return n.node.source.value===r}).forEach(function(n){null!=n.node.specifiers&&n.node.specifiers.push(e)})},R=function(n,r,e){var t=n.find(c.ImportDeclaration);0<t.length?c(t.paths()[0]).insertAfter(S(r,e)):1===(t=n.find(c.Program)).length&&t.paths()[0].node.body.unshift(S(r,e))},nn=function(n,r){0<j(n,r.module).length?Z(n,r):R(n,r.module,[F(r)])},rn=function(n,r,e,t){var i=j(n,r),t=(t?ln:cn)(e);0<i.length?$(n,r,t):R(n,r,[t])},en=function(n,r){n=n.find(c.VariableDeclaration);0<n.length&&c(n.paths()[0]).insertAfter(_(r))},D=function(n,r,e){return c.expressionStatement(tn(n,r,e))},tn=function(n,r,e){return c.callExpression(an(n,r),e)},_=function(n){return c.variableDeclaration("var",[on(n)])},on=function(n){return c.variableDeclarator(void 0!==n.p?c.identifier(n.p):c.identifier(n.reference),(0<n.reference.length?un:L)(n))},un=function(n){return c.memberExpression(L(n),c.identifier(n.reference))},an=function(n,r){return c.memberExpression(c.identifier(n),c.identifier(r))},L=function(n){return c.callExpression(c.identifier("require"),[c.literal(n.module)])},S=function(n,r){return c.importDeclaration(r,c.literal(n))},F=function(n){return void 0!==n.p?c.importSpecifier(c.identifier(n.reference),c.identifier(n.p)):c.importSpecifier(c.identifier(n.reference))},cn=function(n){return c.importDefaultSpecifier(c.identifier(n))},ln=function(n){return c.importNamespaceSpecifier(c.identifier(n))};
+"use strict";var a,n=require("@babel/runtime/helpers/interopRequireDefault"),r=n(require("@babel/runtime/helpers/toConsumableArray")),l=(Object.defineProperty(exports,"t",{value:!0}),exports.instrument=void 0,require("path")),o=require("jscodeshift"),i=require("jscodeshift/src/Collection"),e=require("../scripts/FileOperationHelper"),c=require("../scripts/PathsConstants"),f=require("../lib/core/util/GetValuesFromPackage"),t=require("../scripts/util/InstrumentUtil"),u=require("./libs/react-native/Touchables.InstrInfo"),s=require("./libs/react-native/RefreshControl.InstrInfo"),d=require("./libs/react-native/Switch.InstrInfo"),v=require("./libs/community/gesture-handler/Touchables.InstrInfo"),p=require("./libs/community/Picker.InstrInfo"),m=require("./parser/Babel"),g=require("./model/Types"),y=(!function(n){n[n.i=-1]="Filtered",n[n.u=0]="Normal",n[n.o=1]="ReactNative",n[n.l=2]="React"}(a=a||{}),[]),b=(y.push.apply(y,(0,r.default)(u.instrumentationInfo)),y.push.apply(y,(0,r.default)(s.instrumentationInfo)),y.push.apply(y,(0,r.default)(d.instrumentationInfo)),y.push.apply(y,(0,r.default)(v.instrumentationInfo)),y.push.apply(y,(0,r.default)(p.instrumentationInfo)),["AppRegistry","renderApplication","setUpErrorHandling"]),q="@dynatrace/react-native-plugin/instrumentation/libs",instrument=function(n,r,e){r=V(r);var t,i=G(r);if(i!==a.i){var u=!1,o=I(r,n);if(i===a.l)T(o),u=!0;else if(i===a.o)r.endsWith("AppRegistry.js")?void 0!==e&&e.autoStart&&(k(o),u=!0):r.endsWith("renderApplication.js")?(A(o),u=!0):r.endsWith("setUpErrorHandling.js")&&void 0!==e&&e.autoStart&&e.errorHandler.enabled&&(J(o,e.autoStart,e.errorHandler.reportFatalErrorAsCrash),u=!0);else{var i=w(r,e);if(e.custom.reactnavigation&&P(r,o))u=!0;else{if(!i.input&&!i.lifecycle)return null!=e&&e.debug&&console.log("Dynatrace - Filtered All: ".concat(r)),E(r),n;i.lifecycle&&A(o)&&(u=!0),i.input&&y.forEach(function(n){n=W(o,n);o=n.root,u=u||n.v})}}u?(n=o.toSource({quote:"single"}),H(n,r)):E(r),null!=e&&e.debug&&u&&console.log("Dynatrace - Modified Filename: "+r)}else r.includes(l.join("@dynatrace","react-native-plugin"))&&r.endsWith(l.join("lib","core","configuration","ConfigurationPreset.js"))&&void 0!==e&&(i=(0,f.getHostAppBundleInfo)(c.default.getPackageJsonFile()),t=I(r,n),void 0!==e.lifecycle&&N(t,"getLifecycleUpdate",e.lifecycle.includeUpdate),void 0!==e.debug&&N(t,"getLogLevel",e.debug?0:1),void 0!==e.bundleName?N(t,"getBundleName",e.bundleName):null!==i&&N(t,"getBundleName",null==i?void 0:i.name),void 0!==e.bundleVersion?N(t,"getBundleVersion",e.bundleVersion):null!==i&&N(t,"getBundleVersion",null==i?void 0:i.version),void 0!==e.input&&void 0!==e.input.actionNamePrivacy&&N(t,"getActionNamePrivacy",e.input.actionNamePrivacy),void 0!==e.errorHandler&&(N(t,"isErrorHandlerEnabled",e.errorHandler.enabled),N(t,"isReportFatalErrorAsCrash",e.errorHandler.reportFatalErrorAsCrash)),e.autoStart&&N(t,"isAutoStartupEnabled",e.autoStart),n=t.toSource({quote:"single"}),H(n,r));return n},P=(exports.instrument=instrument,function(n,r){return!!O(n,r)&&(n="import { registerListener } from '".concat(q,"/react-navigation/ReactNavigation';"),r.find(o.ImportDeclaration).at(0).insertBefore(n),!0)}),O=function(n,r){var e=!1;return n.includes("react-navigation")&&n.includes("NavigationContainer.tsx")&&r.find(o.VariableDeclarator).forEach(function(n){e||null==n.value||null==n.value.id||"refContainer"!==n.value.id.name||null!=n.parent&&null!=n.parent.value&&null!=n.parent.value.type&&"VariableDeclaration"===n.parent.value.type&&(n.parent.insertAfter("registerListener(refContainer);"),e=!0)}),e},A=function(n){var r=n.findJSXElements(),t=!1;return 0<r.length&&(n.find(o.FunctionDeclaration).forEach(function(n){var r,e=(0,i.fromPaths)([n]);0<e.findJSXElements().length&&null!=n&&null!=n.value&&null!=n.value.id&&n.value.id.name&&(r=e.find(o.ClassDeclaration),e=e.find(o.ClassExpression),0===r.length)&&0===e.length&&(h(n,g.Types.FunctionalComponent,n.value.id.name),t=!0)}),n.find(o.ClassDeclaration).forEach(function(n){0<(0,i.fromPaths)([n]).findJSXElements().length&&null!=n&&null!=n.value&&n.value.id&&n.value.id.name&&(h(n,g.Types.ClassComponent,n.value.id.name),t=!0)}),n.find(o.ArrowFunctionExpression).forEach(function(n){0<(0,i.fromPaths)([n]).findJSXElements().length&&null!=n.parent&&null!=n.parent.value&&null!=n.parent.value.id&&null!=n.parent.value.id.name&&(h(n,g.Types.FunctionalComponent,n.parent.value.id.name),t=!0)})),t},h=function(n,r,e){for(r=o.expressionStatement(o.assignmentExpression("=",o.memberExpression(o.identifier(e),o.identifier("_dtInfo")),U(r,e)));void 0!==n.parentPath&&"body"!==n.parentPath.name;)n=n.parentPath;void 0!==n.parentPath&&n.insertAfter(r)},U=function(n,r){return o.objectExpression([o.objectProperty(o.identifier("type"),o.numericLiteral(n)),o.objectProperty(o.identifier("name"),o.stringLiteral(r))])},N=function(n,r,e){var n=n.find(o.Identifier).filter(function(n){return n.node.name===r});1===n.length&&"ReturnStatement"===(n=n.paths()[0].parent.value.body.body[0]).type&&("boolean"==typeof e&&(n.argument=o.booleanLiteral(e)),"string"==typeof e&&(n.argument=o.stringLiteral(e)),"number"==typeof e)&&(n.argument=o.numericLiteral(e))},I=function(n,r){return o.withParser((0,m.babelParser)(l.extname(n)))(r)},V=function(n){return l.isAbsolute(n)?n.replace(c.default.getApplicationPath()+l.sep,""):n},E=function(n){try{var r=l.join(c.default.getBuildPath(),n+t.INSTRUMENTED_FILE_EXTENSION);e.default.checkIfFileExistsSync(r),e.default.deleteFileSync(r)}catch(n){}},H=function(n,r){r=l.join(c.default.getBuildPath(),r);try{e.default.checkIfFileExistsSync(l.dirname(r))}catch(n){e.default.createDirectorySync(l.dirname(r))}e.default.writeTextToFileSync(r+t.INSTRUMENTED_FILE_EXTENSION,n)},w=function(n,r){var e={input:!1,lifecycle:!1};return void 0!==r&&(void 0!==r.lifecycle&&void 0!==r.lifecycle.instrument&&r.lifecycle.instrument(n)&&(e.lifecycle=!0),void 0!==r.input)&&void 0!==r.input.instrument&&r.input.instrument(n)&&(e.input=!0),e},T=function(n){var r,n=n.find(o.Program);1===n.length&&(r=o.expressionStatement(o.callExpression(o.memberExpression(o.callExpression(o.identifier("require"),[o.stringLiteral("@dynatrace/react-native-plugin/instrumentation/jsx/ElementHelper")]),o.identifier("instrumentCreateElement")),[o.memberExpression(o.identifier("module"),o.identifier("exports"))])),n.paths()[0].node.body.push(r))},k=function(n){var r=M(n,"runApplication",!0);1===r.length&&(un(n,{p:"_DynatraceApplicationHandler",module:"@dynatrace/react-native-plugin",reference:"ApplicationHandler"}),j(r.paths()[0].parent.value.body.body,0,_("_DynatraceApplicationHandler","startup",[])))},J=function(n,r,e){n=n.paths()[0].value.program.body;null!=n&&(j(n,n.length,L({p:"_DynatraceErrorHandler",module:"@dynatrace/react-native-plugin/lib/core/ErrorHandler",reference:""})),j(n,n.length,_("_DynatraceErrorHandler","registerErrorHandler",[o.literal(e)])))},j=function(n,r){for(var e=arguments.length,t=new Array(2<e?e-2:0),i=2;i<e;i++)t[i-2]=arguments[i];return n.splice.apply(n,[r,0].concat(t))},M=function(n,r,t){for(var e=arguments.length,i=new Array(3<e?e-3:0),u=3;u<e;u++)i[u-3]=arguments[u];return n.find(o.Identifier).filter(function(n){return n.node.name===r}).filter(function(n){return void 0!==n.parent&&void 0!==n.parent.value&&void 0!==n.parent.value.params}).filter(function(n){var r=void 0!==n.parent&&void 0!==n.parent.value;t||(r=r&&n.parent.value.params.length===i.length);for(var e=0;e<0;e++)r=r&&n.parent.value.params[e].name===i[e];return r})},G=function(n){if(n.includes("@dynatrace"))return a.i;var r=l.extname(n);if(".js"!==r&&".ts"!==r&&".tsx"!==r&&".jsx"!==r)return a.i;for(var e=l.parse(n),t=e.dir.split(l.sep),i=0;i<t.length;i++)if("node_modules"===t[i]){if("react-native"===t[i+1]||"create-react-class"===t[i+1]||"react-clone-referenced-element"===t[i+1])return b.includes(e.name)?a.o:a.i;if("react"===t[i+1]&&"index"===e.name)return a.l}return a.u},z=function(n,r,e){var t=K(n,r,e);return Q(n,r,e)||t},K=function(n,r,e){var t=X(n,r);return 0<t.length&&(void 0!==(t=R(t,r.reference,!1))&&(e.p=t.localName),en(n,e),!0)},Q=function(n,r,e){var t=x(n,r.module);if(1===t.length){t=R(t,r.reference,!0);if(void 0!==t)return tn(n,e.defaultImport,t.localName,"ImportNamespaceSpecifier"===t.type),!0}return!1},W=function(n,r){var e=JSON.parse(JSON.stringify(r.new));return{root:n,v:z(n,r.old,e)||Y(n,r.old,r.new.defaultImport)}},X=function(n,r){return n.find(o.ImportDeclaration).filter(function(n){return n.node.source.value===r.module&&null!=n.node.specifiers&&n.node.specifiers.some(function(n){return C(n)&&n.imported.name===r.reference||n.local&&n.local.name===r.reference})})},C=function(n){return void 0!==n.imported},Y=function(n,r,e){var t=!1;return n.find(o.CallExpression).filter(function(n){return Z(n.node.callee)&&$(n.node.arguments[0])&&n.node.arguments[0].value===r.module&&void 0!==n.parent}).forEach(function(n){(void 0===n.parent.value.property||void 0!==n.parent.value.property&&void 0!==n.parent.value.property.name&&n.parent.value.property.name===r.reference)&&(n.node.arguments[0].value=e,t=t||!0)}),t},Z=function(n){return"require"===n.name},$=function(n){return"StringLiteral"===n.type||"Literal"===n.type},x=function(n,r){return n.find(o.ImportDeclaration).filter(function(n){return n.node.source.value===r})},R=function(n,e,t){var i;return n.forEach(function(n){void 0!==n.node.specifiers&&(n.node.specifiers=n.node.specifiers.filter(function(n){var r;return C(n)&&!t?((r=n.imported.name!==e)||null==n.local||n.imported.name===n.local.name||(i={localName:n.local.name,type:n.type}),r):!(!C(n)&&t&&(null!=n.local&&(i={localName:n.local.name,type:n.type}),1))}),0===n.node.specifiers.length)&&n.prune()}),i},nn=function(n,r){n.find(o.ImportDeclaration).filter(function(n){return n.node.source.value===r.module}).forEach(function(n){null!=n.node.specifiers&&n.node.specifiers.push(B(r))})},rn=function(n,r,e){n.find(o.ImportDeclaration).filter(function(n){return n.node.source.value===r}).forEach(function(n){null!=n.node.specifiers&&n.node.specifiers.push(e)})},D=function(n,r,e){var t=n.find(o.ImportDeclaration);0<t.length?o(t.paths()[0]).insertAfter(F(r,e)):1===(t=n.find(o.Program)).length&&t.paths()[0].node.body.unshift(F(r,e))},en=function(n,r){0<x(n,r.module).length?nn(n,r):D(n,r.module,[B(r)])},tn=function(n,r,e,t){var i=x(n,r),t=(t?sn:fn)(e);0<i.length?rn(n,r,t):D(n,r,[t])},un=function(n,r){n=n.find(o.VariableDeclaration);0<n.length&&o(n.paths()[0]).insertAfter(L(r))},_=function(n,r,e){return o.expressionStatement(on(n,r,e))},on=function(n,r,e){return o.callExpression(cn(n,r),e)},L=function(n){return o.variableDeclaration("var",[an(n)])},an=function(n){return o.variableDeclarator(void 0!==n.p?o.identifier(n.p):o.identifier(n.reference),(0<n.reference.length?ln:S)(n))},ln=function(n){return o.memberExpression(S(n),o.identifier(n.reference))},cn=function(n,r){return o.memberExpression(o.identifier(n),o.identifier(r))},S=function(n){return o.callExpression(o.identifier("require"),[o.literal(n.module)])},F=function(n,r){return o.importDeclaration(r,o.literal(n))},B=function(n){return void 0!==n.p?o.importSpecifier(o.identifier(n.reference),o.identifier(n.p)):o.importSpecifier(o.identifier(n.reference))},fn=function(n){return o.importDefaultSpecifier(o.identifier(n))},sn=function(n){return o.importNamespaceSpecifier(o.identifier(n))};

package/ios/DynatraceRNBridge.h

@@ -17,6 +17,7 @@
 
 @interface HybridBridge : NSObject
 + (void)forwardEvent:(NSDictionary<NSString*,id>* _Nullable)fields NS_SWIFT_NAME(forwardEvent(fields:));
++ (void)forwardAppStartEvent:(NSDictionary<NSString*,id>* _Nullable)fields keys:(NSArray<NSString*>* _Nullable)keys NS_SWIFT_NAME(forwardEvent(fields:keys:));
 @end
 
 typedef enum : NSUInteger {

package/ios/DynatraceRNBridge.mm

@@ -13,6 +13,9 @@
 #import <CoreLocation/CoreLocation.h>
 #import <React/RCTPerformanceLogger.h>
 #import <React/RCTRootView.h>
+#import <cxxreact/ReactMarker.h>
+
+#include <chrono>
 
 @implementation DynatraceRNBridge
 
@@ -44,21 +47,28 @@ NSString *const ContentAppeared = @"contentAppeared";
 /**
 * Telling us if we can actually emit events
 */
-bool hasListeners = NO;
+bool hasListeners;
 
 /**
 * When events have been emitted this value will be true, so we don't emit again
 */
-bool didEmit = NO;
+bool didEmit;
+
+/**
+* When content finally appeared
+*/
+int64_t contentAppeared;
 
 RCT_EXPORT_MODULE(DynatraceBridge);
 
-- (id) init
+- (instancetype) init
 {
-  self = [super init];
-  if (self) {
+  if (self = [super init]) {
     actionDict = [[NSMutableDictionary alloc] init];
     webTimingsDict = [[NSMutableDictionary alloc] init];
+    hasListeners = NO;
+    didEmit = NO;
+    contentAppeared = -1;
   }
   return self;
 }
@@ -67,6 +77,12 @@ RCT_EXPORT_MODULE(DynatraceBridge);
     return @[EmitAppMeasurementsIdentifier];
 }
 
+int64_t GetTimestampUnix()
+{
+    auto millisecondsUTC = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
+    return millisecondsUTC;
+}
+
 /**
 * When bridge is starting we will add an observer for content did appear so we can emit our app start measurements
 */
@@ -74,72 +90,45 @@ RCT_EXPORT_MODULE(DynatraceBridge);
 {
     [super setBridge:bridge];
     [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(emitMeasurements)
+                                             selector:@selector(contentAppeared)
                                                  name:RCTContentDidAppearNotification
                                                object:nil];
 }
 
+- (BOOL)isReady
+{
+    return contentAppeared != -1 && !std::isnan(facebook::react::ReactMarker::StartupLogger::getInstance().getRunJSBundleEndTime());
+}
+
+- (void) contentAppeared
+{
+    contentAppeared = GetTimestampUnix();
+    [self emitMeasurements];
+}
+
 /**
 * Emitting all events which are available and important for our app start measurements
 */
 - (void)emitMeasurements
 {
-    if (!didEmit && hasListeners && [self.bridge.performanceLogger valueForTag:RCTPLTTI] != 0) {
+    if (!didEmit && hasListeners && [self isReady]) {
         didEmit = YES;
-
+        
         NSMutableDictionary<NSString*, NSNumber*> *appStartMeasurements = [[NSMutableDictionary alloc] init];
-
-        [self addStartMeasurement:RCTPLScriptDownload withName:DownloadStart intoDict:appStartMeasurements];
-        [self addEndMeasurement:RCTPLScriptDownload withName:DownloadEnd intoDict:appStartMeasurements];
-        [self addStartMeasurement:RCTPLScriptExecution withName:RunJSBundleStart intoDict:appStartMeasurements];
-        [self addEndMeasurement:RCTPLScriptExecution withName:RunJSBundleEnd intoDict:appStartMeasurements];
-        [self addStartMeasurement:RCTPLBridgeStartup withName:Reload intoDict:appStartMeasurements];
-        [self addStartMeasurement:RCTPLTTI withName:ContentAppeared intoDict:appStartMeasurements];
-
+        
+        [appStartMeasurements setObject:[self correctionOfTimestamp:facebook::react::ReactMarker::StartupLogger::getInstance().getRunJSBundleStartTime()] forKey:RunJSBundleStart];
+        [appStartMeasurements setObject:[self correctionOfTimestamp:facebook::react::ReactMarker::StartupLogger::getInstance().getRunJSBundleEndTime()] forKey:RunJSBundleEnd];
+        [appStartMeasurements setObject:[NSNumber numberWithLongLong:contentAppeared] forKey:ContentAppeared];
+        
         if (hasListeners) {
             [self sendEventWithName:EmitAppMeasurementsIdentifier body:appStartMeasurements];
         }
     }
 }
 
-/**
-* Adding a start measurement
-*
-* @param type Tag which is used for the internal react native performance logger
-* @param name Name which should be used for inserting a specific timestamp into the dict
-* @param measurements Dictionary which is used to insert the timing
-*/
-- (void)addStartMeasurement:(RCTPLTag)type withName:(NSString *)name intoDict:(NSMutableDictionary *) measurements {
-    int64_t duration = [self.bridge.performanceLogger durationForTag:type];
-    int64_t end = [self.bridge.performanceLogger valueForTag:type];
-
-    if (duration == 0 || end == 0) {
-        return;
-    }
-
-    [measurements setObject:[self correctionOfTimestamp:end-duration] forKey:name];
-}
-
-/**
-* Adding a end measurement
-*
-* @param type Tag which is used for the internal react native performance logger
-* @param name Name which should be used for inserting a specific timestamp into the dict
-* @param measurements Dictionary which is used to insert the timing
-*/
-- (void)addEndMeasurement:(RCTPLTag)type withName:(NSString *)name intoDict:(NSMutableDictionary *) measurements {
-    int64_t end = [self.bridge.performanceLogger valueForTag:type];
-    
-    if (end == 0) {
-        return;
-    }
-    
-    [measurements setObject:[self correctionOfTimestamp:end] forKey:name];
-}
-
 - (NSNumber* )correctionOfTimestamp:(int64_t) timestamp
 {
-    return [NSNumber numberWithLongLong:timestamp + [[NSDate date] timeIntervalSince1970] - (CACurrentMediaTime() * 1000)];
+    return [NSNumber numberWithLongLong:timestamp + GetTimestampUnix() - (CACurrentMediaTime() * 1000)];
 }
 
 /**
@@ -209,7 +198,10 @@ RCT_EXPORT_METHOD(start:(NSDictionary *) options)
     }
 
     if (properties[@"DTXBeaconURL"] != NULL && properties[@"DTXApplicationID"] != NULL) {
-        [Dynatrace startupWithConfig:properties];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            NSLog(@"Dynatrace Agent runs on the main thread.");
+            [Dynatrace startupWithConfig:properties];
+        });
     }
 }
 
@@ -460,6 +452,11 @@ RCT_EXPORT_METHOD(forwardEvent:(NSDictionary<NSString*, id>*) attributes)
     [HybridBridge forwardEvent:attributes];
 }
 
+RCT_EXPORT_METHOD(forwardAppStartEvent:(NSDictionary<NSString*, id>*) attributes withAppStartKeys:(NSArray<NSString*>* _Nullable) appStartKeys)
+{
+    [HybridBridge forwardAppStartEvent:attributes keys:appStartKeys];
+}
+
 RCT_EXPORT_METHOD(setGPSLocation:(double)latitude andLongitude: (double)longitude platform: (NSString *) platform)
 {
     if ([self shouldWorkOnIosWithPlatform: platform])

package/lib/core/Application.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplicationHandler = void 0;
+const AppStartObserver_1 = require("../next/appstart/AppStartObserver");
 const ConfigurationBuilder_1 = require("./configuration/ConfigurationBuilder");
 const ConfigurationHandler_1 = require("./configuration/ConfigurationHandler");
 const ConsoleLogger_1 = require("./logging/ConsoleLogger");
+AppStartObserver_1.AppStartObserver.call();
 const logger = new ConsoleLogger_1.ConsoleLogger('ApplicationHandler');
 exports.ApplicationHandler = {
     startup: (configuration) => {

package/lib/core/util/GetValuesFromPackage.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getHostAppBundleInfo = void 0;
+const fs_1 = require("fs");
+const pluginName = '@dynatrace/react-native-plugin';
+const getHostAppBundleInfo = (path, allowInternal = false) => {
+    try {
+        const pkg = JSON.parse((0, fs_1.readFileSync)(path, 'utf8'));
+        if (pkg.name === pluginName && !allowInternal) {
+            return null;
+        }
+        return { name: pkg.name, version: pkg.version };
+    }
+    catch (_a) {
+        return null;
+    }
+};
+exports.getHostAppBundleInfo = getHostAppBundleInfo;

package/lib/metro/getSourceMapInfo.js

@@ -2,13 +2,14 @@
 const pathNode = require('path');
 const pathsConstants = require('@dynatrace/react-native-plugin/scripts/PathsConstants').default;
 const fileOperation = require('@dynatrace/react-native-plugin/scripts/FileOperationHelper').default;
+const INSTRUMENTED_FILE_EXTENSION = require('@dynatrace/react-native-plugin/scripts/util/InstrumentUtil').INSTRUMENTED_FILE_EXTENSION;
 const originalSourceMapInfo = require('./getSourceMapInfoOrig');
 const getSourceMapInfo = (module, options) => {
     const dataOrig = originalSourceMapInfo(module, options);
     try {
-        if (!Boolean(options.excludeSource)) {
+        if (!options.excludeSource) {
             const correctPath = module.path.replace(pathsConstants.getApplicationPath(), '') +
-                '.dtx';
+                INSTRUMENTED_FILE_EXTENSION;
             dataOrig.source = fileOperation.readTextFromFileSync(pathNode.join(pathsConstants.getBuildPath(), correctPath));
         }
     }

package/lib/next/events/EventCreator.js

@@ -54,20 +54,26 @@ const createErrorEvent = (type, message, stacktrace) => {
 exports.createErrorEvent = createErrorEvent;
 const createAppStartEvent = (appStartMeasurements) => {
     const event = {
-        'characteristics.is_app_start': true,
+        'characteristics.has_app_start': true,
     };
-    let timings = [];
+    let timingsApp = [];
     for (const { type, key } of AppStartType_1.AppStartTypeKeyMapping) {
         if (appStartMeasurements[type] !== undefined) {
-            event[key] = appStartMeasurements[type];
-            timings.push(appStartMeasurements[type]);
+            timingsApp.push({
+                name: key,
+                timestamp: appStartMeasurements[type],
+            });
         }
     }
-    timings = timings.sort((a, b) => a - b);
-    if (timings.length > 0) {
-        event["start_time"] = timings[0];
+    timingsApp = timingsApp.sort((a, b) => a.timestamp - b.timestamp);
+    if (timingsApp.length > 0) {
+        event["start_time"] = timingsApp[0].timestamp;
         event["duration"] =
-            timings[timings.length - 1] - timings[0];
+            timingsApp[timingsApp.length - 1].timestamp -
+                timingsApp[0].timestamp;
+        for (const timing of timingsApp) {
+            event[timing.name] = timing.timestamp - timingsApp[0].timestamp;
+        }
     }
     else {
         return null;

package/lib/next/events/EventPipeline.js

@@ -7,6 +7,7 @@ const BaseDataEventModifier_1 = require("./modifier/BaseDataEventModifier");
 const ValueRestrictionModifier_1 = require("./modifier/ValueRestrictionModifier");
 const ModifyEventValidation_1 = require("./modifier/ModifyEventValidation");
 const ViewInfoCreator_1 = require("./ViewInfoCreator");
+const EventSpecContstants_1 = require("./spec/EventSpecContstants");
 class EventPipelineImpl {
     constructor() {
         this.customEventModifierChain = new ModifyEventValidation_1.ModifyEventValidation();
@@ -27,14 +28,18 @@ class EventPipelineImpl {
             }
             catch (error) {
                 if (event != null) {
-                    event["dt.rum.api.has_enrich_exception"] =
-                        true;
+                    event["dt.internal.api.has_enrich_exception"] = true;
                 }
             }
         });
         if (event != null) {
             this.logger.debug(`forwardEvent(${JSON.stringify(event)})`);
-            DynatraceBridge_1.DynatraceNative.forwardEvent(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) {

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

@@ -76,7 +76,7 @@ class ModifyEventValidation {
             this.logger.debug(`sanitizeUserEnrichedEvent(${originalEvent}, ${userEnrichedEvent}): Event has not been changed`);
             return originalEvent;
         }
-        let overriddenKeys = originalEvent["dt.rum.overridden_keys"];
+        let overriddenKeys = originalEvent["dt.internal.api.overridden_keys"];
         if (overriddenKeys == null) {
             overriddenKeys = [];
         }
@@ -97,19 +97,19 @@ class ModifyEventValidation {
         const sizedEntries = new EventLimitation_1.EventLimitation().limitEventProperties(finalEntries);
         if (sizedEntries.length < userEnrichedEventEntries.length) {
             sizedEntries.push([
-                "dt.rum.api.has_dropped_fields",
+                "dt.internal.api.has_dropped_custom_properties",
                 true,
             ]);
         }
         if (Array.isArray(overriddenKeys) && overriddenKeys.length > 0) {
             sizedEntries.push([
-                "dt.rum.overridden_keys",
+                "dt.internal.api.overridden_keys",
                 overriddenKeys,
             ]);
         }
         if (externalException) {
             sizedEntries.push([
-                "dt.rum.api.has_enrich_exception",
+                "dt.internal.api.has_enrich_exception",
                 true,
             ]);
         }

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

@@ -31,7 +31,7 @@ class SendEventValidationImpl {
         this.applyOverriddenKeys(sizedEntries);
         if (sizedEntries.length < eventCopy.length) {
             sizedEntries.push([
-                "dt.rum.api.has_dropped_fields",
+                "dt.internal.api.has_dropped_custom_properties",
                 true,
             ]);
         }
@@ -55,7 +55,7 @@ class SendEventValidationImpl {
         }
         if (overriddenKeys.length > 0) {
             eventEntries.push([
-                "dt.rum.overridden_keys",
+                "dt.internal.api.overridden_keys",
                 overriddenKeys,
             ]);
         }

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

@@ -9,7 +9,7 @@ class ValueRestrictionModifierImpl {
     }
     modifyEvent(event) {
         if (event != null && this.eventHasRestrictedValues(event)) {
-            event["dt.rum.has_nfn_values"] = true;
+            event["dt.internal.has_nfn_values"] = true;
         }
         return JSON.parse(JSON.stringify(event, (_key, value) => {
             if (value === undefined) {

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

@@ -1,33 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MODIFY_EVENT_WHITELIST_NAMESPACE = exports.MODIFY_EVENT_WHITELIST_FIELDS = exports.SEND_SESSION_PROPERTY_EVENT_WHITELIST_FIELDS = exports.SEND_EVENT_WHITELIST_FIELDS = exports.SEND_SESSION_PROPERTY_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 = void 0;
-const SPECIFICATION_VERSION = '0.18';
+exports.ALL_APP_START_KEYS = exports.MODIFY_EVENT_WHITELIST_NAMESPACE = exports.MODIFY_EVENT_WHITELIST_FIELDS = exports.SEND_SESSION_PROPERTY_EVENT_WHITELIST_FIELDS = exports.SEND_EVENT_WHITELIST_FIELDS = exports.SEND_SESSION_PROPERTY_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 = void 0;
+const SPECIFICATION_VERSION = '0.19';
 exports.MAX_CUSTOM_EVENT_FIELDS = 50;
 exports.MAX_CUSTOM_EVENT_KEY_LENGTH = 100;
 exports.MAX_CUSTOM_EVENT_VALUE_LENGTH = 5000;
 exports.KEY_NAME_REGEX = RegExp('^[a-z0-9]+(?:\\.[a-z][a-z0-9]*|_[a-z0-9]+)*$');
-exports.AllCharacteristicsKeys = [
-    "characteristics.has_anr",
-    "characteristics.has_crash",
-    "characteristics.has_csp_violation",
-    "characteristics.has_error",
-    "characteristics.has_exception",
-    "characteristics.has_failed_request",
-    "characteristics.has_request",
-    "characteristics.has_w3c_navigation_timings",
-    "characteristics.has_w3c_resource_timings",
-    "characteristics.has_navigation",
-    "characteristics.has_page_summary",
-    "characteristics.has_user_interaction",
-    "characteristics.has_view_summary",
-    "characteristics.is_api_reported",
-    "characteristics.is_app_start",
-    "characteristics.is_internal",
-    "characteristics.is_self_monitoring",
-    "characteristics.is_visibility_change",
-    "characteristics.has_event_properties",
-    "characteristics.has_session_properties",
-];
+const characteristicsKeyMap = {
+    ["characteristics.has_anr"]: null,
+    ["characteristics.has_crash"]: null,
+    ["characteristics.has_csp_violation"]: null,
+    ["characteristics.has_error"]: null,
+    ["characteristics.has_exception"]: null,
+    ["characteristics.has_failed_request"]: null,
+    ["characteristics.has_request"]: null,
+    ["characteristics.has_w3c_navigation_timings"]: null,
+    ["characteristics.has_w3c_resource_timings"]: null,
+    ["characteristics.has_navigation"]: null,
+    ["characteristics.has_page_summary"]: null,
+    ["characteristics.has_user_interaction"]: null,
+    ["characteristics.has_view_summary"]: null,
+    ["characteristics.is_api_reported"]: null,
+    ["characteristics.has_app_start"]: null,
+    ["characteristics.is_internal"]: null,
+    ["characteristics.is_self_monitoring"]: null,
+    ["characteristics.has_visibility_change"]: null,
+    ["characteristics.has_event_properties"]: null,
+    ["characteristics.has_session_properties"]: null,
+};
+exports.AllCharacteristicsKeys = Object.keys(characteristicsKeyMap);
 exports.SEND_EVENT_WHITELIST_NAMESPACES = [
     "event_properties",
 ];
@@ -45,3 +46,12 @@ exports.MODIFY_EVENT_WHITELIST_NAMESPACE = [
     "session_properties",
     "event_properties",
 ];
+const appStartKeyMap = {
+    ["app_start.react_native.content_appeared"]: null,
+    ["app_start.react_native.download.end_time"]: null,
+    ["app_start.react_native.download.start_time"]: null,
+    ["app_start.react_native.run_js_bundle.load_time"]: null,
+    ["app_start.react_native.run_js_bundle.end_time"]: null,
+    ["app_start.react_native.run_js_bundle.start_time"]: null,
+};
+exports.ALL_APP_START_KEYS = Object.keys(appStartKeyMap);

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@dynatrace/react-native-plugin",
-  "version": "2.313.1",
+  "version": "2.317.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",
   "bin": {
     "instrumentDynatrace": "scripts/Instrument.js",
-    "configDynatrace": "scripts/CheckConfig.js"
+    "configDynatrace": "scripts/CheckConfig.js",
+    "lineOffsetDynatrace": "scripts/LineOffsetAnalyze.js"
   },
   "keywords": [
     "react-native",
@@ -82,7 +83,7 @@
   "author": "Dynatrace",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@babel/runtime": "^7.27.1",
+    "@babel/runtime": "^7.27.6",
     "jscodeshift": "^17.3.0",
     "plist": "^3.1.0",
     "proxy-polyfill": "^0.3.2",
@@ -96,7 +97,7 @@
     "react-native": ">=0.62.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.25.7",
+    "@babel/cli": "^7.27.2",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
     "@babel/plugin-proposal-optional-chaining": "^7.8.3",
@@ -108,6 +109,7 @@
     "@types/jest": "^29.5.1",
     "@types/jscodeshift": "^0.11.6",
     "@types/libxmljs": "^0.18.3",
+    "@types/mock-fs": "^4.13.4",
     "@types/node": "^18.19.71",
     "@types/plist": "^3.0.2",
     "@types/react-native": "^0.63.32",
@@ -117,7 +119,8 @@
     "@typescript-eslint/eslint-plugin": "^8.22.0",
     "@typescript-eslint/parser": "^8.22.0",
     "compressing": "^1.5.1",
-    "eslint": "^9.19.0",
+    "diff": "^8.0.2",
+    "eslint": "^9.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jsdoc": "^50.6.3",
@@ -128,7 +131,8 @@
     "jest-each": "^28.1.3",
     "jest-junit": "^14.0.0",
     "jest-mock": "^28.1.3",
-    "npm-check-updates": "^16.10.12",
+    "mock-fs": "^5.5.0",
+    "npm-check-updates": "^18.0.1",
     "prettier": "^2.6.1",
     "shelljs": "^0.8.5",
     "ts-jest": "^28.0.7",

package/react-native-dynatrace.podspec

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

package/scripts/FileOperationHelper.js

@@ -1,7 +1,17 @@
 #!/usr/bin/env node
 '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 fs = require("fs");
+const fsPromise = require("fs/promises");
 const path = require("path");
 const checkIfFileExists = (_file) => new Promise((resolve, reject) => {
     fs.stat(_file, (err) => {
@@ -147,9 +157,32 @@ const copyDirectory = (from, to) => {
         }
     });
 };
+const allowedRootFolders = ['src', 'node_modules'];
+const getAllFiles = (log, dir, base = '', isRoot = false) => __awaiter(void 0, void 0, void 0, function* () {
+    const entries = yield fsPromise.readdir(dir);
+    let files = [];
+    for (const entry of entries) {
+        const fullPath = path.join(dir, entry);
+        const relPath = path.join(base, entry);
+        const stat = yield fsPromise.stat(fullPath);
+        if (stat.isDirectory()) {
+            if (isRoot && !allowedRootFolders.includes(entry)) {
+                yield log(`🔸 Skipping folder: ${entry}`);
+                continue;
+            }
+            const subFiles = yield getAllFiles(log, fullPath, relPath);
+            files = files.concat(subFiles);
+        }
+        else {
+            files.push(relPath);
+        }
+    }
+    return files;
+});
 exports.default = {
     checkIfFileExists,
     checkIfFileExistsSync,
+    getAllFiles,
     readTextFromFile,
     readTextFromFileSync,
     writeTextToFile,

package/scripts/LineOffsetAnalyze.js

@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const GetValuesFromPackage_1 = require("../lib/core/util/GetValuesFromPackage");
+const PathsConstants_1 = require("../scripts/PathsConstants");
+const LineOffsetAnalyzeCall_1 = require("./core/LineOffsetAnalyzeCall");
+module.exports = (() => {
+    const args = process.argv.slice(2);
+    const appBundleInfo = Object.assign({}, (0, GetValuesFromPackage_1.getHostAppBundleInfo)(PathsConstants_1.default.getPackageJsonFile()));
+    const pluginInfo = Object.assign({}, (0, GetValuesFromPackage_1.getHostAppBundleInfo)(PathsConstants_1.default.getInternalPackageJsonFile(), true));
+    appBundleInfo.pluginVersion = ((pluginInfo === null || pluginInfo === void 0 ? void 0 : pluginInfo.version) != null) ? pluginInfo === null || pluginInfo === void 0 ? void 0 : pluginInfo.version : '0';
+    const projectRoot = args[0] || PathsConstants_1.default.getApplicationPath();
+    const buildPath = args[1] || PathsConstants_1.default.getBuildPath();
+    const analyzer = new LineOffsetAnalyzeCall_1.LineOffsetAnalyzer(projectRoot, buildPath, appBundleInfo);
+    analyzer.run();
+})();

package/scripts/core/LineOffsetAnalyzeCall.js

@@ -0,0 +1,123 @@
+"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 });
+exports.LineOffsetAnalyzer = void 0;
+const fs = require("fs/promises");
+const path_1 = require("path");
+const diff_1 = require("diff");
+const Logger_1 = require("../Logger");
+const InstrumentUtil_1 = require("../util/InstrumentUtil");
+const FileOperationHelper_1 = require("../../scripts/FileOperationHelper");
+class LineOffsetAnalyzer {
+    constructor(rootPath, instrumentedPath, appBundleInfo) {
+        this.rootDir = (0, path_1.resolve)(rootPath);
+        this.instrumentedDir = (0, path_1.resolve)(instrumentedPath);
+        this.outputFile = (0, path_1.resolve)(this.instrumentedDir, 'line-offsets.json');
+        this.logFile = (0, path_1.resolve)(this.instrumentedDir, 'debug.log');
+        this.appBundleInfo = appBundleInfo;
+    }
+    run() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield fs.writeFile(this.logFile, '');
+                const buildExists = yield FileOperationHelper_1.default.checkIfFileExists(this.instrumentedDir);
+                if (!buildExists) {
+                    yield this.log(`❌ Build directory not found at: ${this.instrumentedDir}`);
+                    yield this.log('🛠️ Please run the instrumentation step first!');
+                    console.error('🚫 Build directory missing. Make and instrument the project first.');
+                    process.exit(1);
+                }
+                const instrumentedFiles = (yield FileOperationHelper_1.default.getAllFiles(this.log, this.instrumentedDir))
+                    .filter((filePath) => filePath.endsWith(InstrumentUtil_1.INSTRUMENTED_FILE_EXTENSION));
+                const mappings = {};
+                yield this.log(`🔍 Found ${instrumentedFiles.length} instrumented files`);
+                for (const instrRelPath of instrumentedFiles) {
+                    const baseRelPath = instrRelPath.slice(0, -InstrumentUtil_1.INSTRUMENTED_FILE_EXTENSION.length);
+                    const origPath = (0, path_1.join)(this.rootDir, baseRelPath);
+                    const instrPath = (0, path_1.join)(this.instrumentedDir, instrRelPath);
+                    const origExists = yield FileOperationHelper_1.default.checkIfFileExists(origPath);
+                    if (!origExists) {
+                        yield this.log(`⚠️ Original file not found for: ${baseRelPath}`);
+                        continue;
+                    }
+                    yield this.log(`📄 Comparing: ${baseRelPath}`);
+                    const [originalContent, instrumentedContent] = yield Promise.all([
+                        FileOperationHelper_1.default.readTextFromFile(origPath),
+                        FileOperationHelper_1.default.readTextFromFile(instrPath),
+                    ]);
+                    const offsets = this.computeLineOffsets(originalContent, instrumentedContent);
+                    if (offsets.length > 0) {
+                        mappings[baseRelPath] = offsets;
+                        yield this.log(`✅ Offsets found for ${baseRelPath}: ${offsets.length} entries`);
+                    }
+                    else {
+                        yield this.log(`ℹ️ No offsets needed for ${baseRelPath}`);
+                    }
+                }
+                const finalOutput = {
+                    generationTime: new Date().toISOString(),
+                    appVersion: this.appBundleInfo ? this.appBundleInfo.version : 'application version not defined',
+                    pluginVersion: this.appBundleInfo ? this.appBundleInfo.pluginVersion : 'plugin version not defined',
+                    mappings: {
+                        [this.appBundleInfo ? this.appBundleInfo.name : 'app name not defined']: mappings,
+                    },
+                };
+                yield fs.writeFile(this.outputFile, JSON.stringify(finalOutput, null, 2));
+                yield this.log(`✅ Line offsets written to ${this.outputFile}`);
+            }
+            catch (err) {
+                console.error('❌ Unexpected error:', err);
+            }
+        });
+    }
+    log(msg) {
+        return __awaiter(this, void 0, void 0, function* () {
+            Logger_1.default.logMessageSync(msg, Logger_1.default.INFO);
+            yield fs.appendFile(this.logFile, msg + '\n');
+        });
+    }
+    computeLineOffsets(originalContent, instrumentedContent) {
+        const diffs = (0, diff_1.diffLines)(originalContent, instrumentedContent);
+        let origLine = 0;
+        let instrLine = 0;
+        let offset = 0;
+        let lastRecordedOffset = null;
+        const offsets = [];
+        this.log('🔍 Diff result:');
+        for (const part of diffs) {
+            const lines = part.value.split('\n').slice(0, -1);
+            if (part.added) {
+                this.log(`➕ Added ${lines.length} lines at instrumented line ${instrLine + 1}`);
+                lines.forEach((line, i) => this.log(`    + ${instrLine + 1 + i}: ${line}`));
+                instrLine += lines.length;
+                offset -= lines.length;
+            }
+            else if (part.removed) {
+                this.log(`➖ Removed ${lines.length} lines at original line ${origLine + 1}`);
+                lines.forEach((line, i) => this.log(`    - ${origLine + 1 + i}: ${line}`));
+                origLine += lines.length;
+                offset += lines.length;
+            }
+            else {
+                for (let i = 0; i < lines.length; i++) {
+                    instrLine++;
+                    origLine++;
+                    if (offset !== 0 && offset !== lastRecordedOffset) {
+                        offsets.push({ [instrLine]: offset });
+                        lastRecordedOffset = offset;
+                    }
+                }
+            }
+        }
+        return offsets;
+    }
+}
+exports.LineOffsetAnalyzer = LineOffsetAnalyzer;

package/scripts/util/InstrumentUtil.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.showVersionOfPlugin = exports.isPlatformAvailable = void 0;
+exports.showVersionOfPlugin = exports.isPlatformAvailable = exports.INSTRUMENTED_FILE_EXTENSION = void 0;
 const Logger_1 = require("../Logger");
 const FileOperationHelper_1 = require("../FileOperationHelper");
 const PathsConstants_1 = require("../PathsConstants");
+exports.INSTRUMENTED_FILE_EXTENSION = '.dtx';
 const isPlatformAvailable = (path, platform) => {
     try {
         FileOperationHelper_1.default.checkIfFileExistsSync(path);

package/src/lib/core/interface/NativeDynatraceBridge.ts

@@ -115,6 +115,11 @@ export interface Spec extends TurboModule {
 
     forwardEvent(attributes: UnsafeObject): void;
 
+    forwardAppStartEvent(
+        attributes: UnsafeObject,
+        appStartKeys: string[],
+    ): void;
+
     setGPSLocation(
         latitude: number,
         longitude: number,

package/typings/react-native-dynatrace.d.ts

@@ -1395,6 +1395,11 @@ export declare interface IConfiguration {
      * Will define the bundle name which will prefix internal action ids.
      */
     readonly bundleName?: string;
+
+	/**
+     * Will define the bundle version which will extend bundleName signature.
+     */
+    readonly bundleVersion?: string;
 }
 
 /**
@@ -1413,12 +1418,13 @@ export declare class ManualStartupConfiguration implements IConfiguration {
 	 * @param {boolean} userOptIn Activates the privacy mode when set to `true`. User consent must be queried and set.
 	 * @param {boolean} actionNamePrivacy Activates a privacy mode especially for Touchables and Buttons. Setting this option to true means that a name for the control will no longer be shown, e.g. "Touch on Button". When setting a dtActionName onto the component this setting will be ignored.
 	 * @param {string} bundleName Will define the bundle name which will prefix internal action ids.
+	 * @param {string} bundleVersion Will define the bundle version which will extend bundleName signature.
 	 * 
 	 * @deprecated Use ConfigurationBuilder and IConfiguration instead
 	 */
 	constructor(beaconUrl: string, applicationId: string, reportCrash?: boolean,
 		logLevel?: LogLevel, lifecycleUpdate?: boolean, userOptIn?: boolean, 
-		actionNamePrivacy?: boolean, bundleName?: string);
+		actionNamePrivacy?: boolean, bundleName?: string, bundleVersion?: string);
 
 	/**
      * Beacon url which is used for communicate with the beacon endpoint. This value is mandatory.
@@ -1495,6 +1501,11 @@ export declare class ManualStartupConfiguration implements IConfiguration {
      * Will define the bundle name which will prefix internal action ids.
      */
     readonly bundleName?: string;
+
+	/**
+     * Will define the bundle version which will extend bundleName signature.
+     */
+    readonly bundleVersion?: string;
 }
 
 /**
@@ -1672,6 +1683,25 @@ export declare class ConfigurationBuilder {
      */
 	public withBundleName(bundleName: string): ConfigurationBuilder;
 
+
+	/**
+	 * Builder function to handle bundle name property
+	 *
+	 * @param {string} bundleName Will define the bundle name which will prefix internal action ids.
+	 *
+	 * Usage:
+     *
+     * ```ts
+     * import { ConfigurationBuilder, Dynatrace } from '@dynatrace/react-native-plugin';
+     *
+     * const configurationBuilder = new ConfigurationBuilder("beaconUrl", "applicationId");
+     * Dynatrace.start(configurationBuilder.withBundleName("bundleName").buildConfiguration());
+     * ```
+     *
+     * @see https://www.npmjs.com/package/@dynatrace/react-native-plugin#plugin-startup
+     */
+	public withBundleVersion(bundleName: string): ConfigurationBuilder;
+
 	/**
 	 * Build configuration which is used for startup
 	 *