@dynatrace/react-native-plugin 2.323.1 → 2.323.2

package/README.md

@@ -21,13 +21,14 @@ If you want to start using this plugin and are not a Dynatrace customer yet, hea
 ## Requirements
 * React v16.8 or newer
 * React Native v0.60 or newer
-* For Android users:
+* For Android users: 
   * SDK version 21+
   * Gradle version 7.0+ ([How to update?](#updating-to-gradle-7))
   * Android Gradle plugin version 7.0+
   * Java 11
+  * Kotlin 2.0.21 — see [Kotlin Compatibility Note](#⚠️-kotlin-compatibility-note)
 * For iOS users: Minimum iOS 12
-* NodeJS 18.18+
+* NodeJS 16.0.0+ since our dependencies require NodeJS 16.0.0
 
 ## Agent Versions
 This agent versions are configured in this plugin:
@@ -80,6 +81,7 @@ This agent versions are configured in this plugin:
 * [React Automatic Runtime](#react-automatic-runtime)
 * [Using a second transformer besides the dynatrace transformer](#using-a-second-transformer-besides-the-dynatrace-transformer)
 * [Upgrading project to Gradle 7](#updating-to-gradle-7)
+* [Kotlin Compatibility Note](#⚠️-kotlin-compatibility-note)
 * [Maven Central in top-level gradle file](#maven-central-in-top-level-gradle-file)
 * [Configuration of standalone React Native project](#configuration-of-standalone-react-native-project)
 * [Instrumentation Overhead](#instrumentation-overhead)
@@ -1378,6 +1380,18 @@ dependencies {
 
 ```
 
+## ⚠️ Kotlin Compatibility Note
+
+Our Android Agent currently (2025-09-15) requires **Kotlin 2.0.21**. However, it should be noted that using this version may cause compatibility issues with older versions of React Native and the corresponding `react-native-gradle-plugin` due to, for instance, differences in Kotlin metadata:
+
+Kotlin embeds language-specific features that Java doesn't natively support (like nullability and extension functions) into bytecode using `@Metadata` annotations. These annotations include a `metadataVersion`.
+
+- **React Native 0.66**, for instance, works with Kotlin 2.0.21 because its `react-native-gradle-plugin` does **not use Kotlin**, avoiding metadata conflicts.
+- **React Native 0.71**, for instance, uses a `react-native-gradle-plugin` compiled with Kotlin **1.7.22**, which expects `metadataVersion 1.6.0`. Using Kotlin 2.0.21 (which produces `metadataVersion 1.9.0`) can lead to build failures.
+- **React Native 0.72**, for instance, again is compatible with Kotlin 2.0.21, as its `react-native-gradle-plugin` expects a metadata version that is compatible with `1.9.0`.
+
+In summary, ensure your build fulfills our Kotlin 2.0.21 requirement while simultaneously fulfilling the requirements of your React Native version and its `react-native-gradle-plugin`.
+
 ## Configuration of standalone React Native project
 
 This section explains the configuration of a standalone React Native project. This means you have a React Native project, but don't use the typicial `iOS` and `android` folders. Instead you have a seperate native `iOS` or `android` project which is embedding your React Native project.
@@ -1477,6 +1491,11 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
+2.323.2
+* Fixed error "Execution failed for task ':app:mergeReleaseAssets'. A problem occured starting process 'command 'npx''" when building for release on Windows.
+* Downgraded required NodeJS version to 16.0.0+
+* Fixing Switch instrumentation for React Native 0.81+
+
 2.323.1
 * Updated Android (8.323.1.1002) & iOS Agent (8.323.1.1009)
 * Fixing Touchable/Text instrumentation for React Native 0.81+

package/android/build.gradle

@@ -11,7 +11,7 @@ def isNewArchitectureEnabled() {
 buildscript {
     repositories {
 		google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
@@ -68,7 +68,7 @@ android {
 
 repositories {
     google()
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {

package/files/plugin-runtime.gradle

@@ -1,3 +1,5 @@
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+
 android.applicationVariants.all { variant ->
     if (variant.buildType.name == "release") {
         variant.mergeAssetsProvider.configure { task ->
@@ -10,7 +12,12 @@ android.applicationVariants.all { variant ->
 
                     exec {
                         workingDir rootDir
-                        commandLine 'npx', 'lineOffsetDynatrace', 'env=prod'
+                        if (DefaultNativePlatform.currentOperatingSystem.isWindows()) {
+                            // On windows, npx.cmd may not be a true binary executable and may need to be interpreted by a shell instead of executed direclty
+                            commandLine 'cmd', '/c', 'npx', 'lineOffsetDynatrace', 'env=prod'
+                        } else {
+                            commandLine 'npx', 'lineOffsetDynatrace', 'env=prod'
+                        }
                     }
 
                 } else {

package/index.js

@@ -8,3 +8,4 @@ export { ApplicationHandler } from './lib/core/Application';
 export { UserPrivacyOptions } from './lib/core/UserPrivacyOptions';
 export { DynatraceWebRequestTiming } from './lib/core/DynatraceWebRequestTiming';
 export { createElement } from './instrumentation/jsx/CreateElement';
+export { default as HttpRequestEventBuilder } from './lib/next/events/HttpRequestEventBuilder'

package/instrumentation/DynatraceInstrumentation.js

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

package/instrumentation/jsx/ElementHelper.js

@@ -5,7 +5,6 @@ const Types_1 = require("../model/Types");
 const Dynatrace_1 = require("../../lib/core/Dynatrace");
 const Picker_1 = require("./components/Picker");
 const RefreshControl_1 = require("./components/RefreshControl");
-const Switch_1 = require("./components/Switch");
 const FunctionalComponent_1 = require("./components/FunctionalComponent");
 const ClassComponent_1 = require("./components/ClassComponent");
 const instrumentCreateElement = (reactModule) => {
@@ -38,10 +37,6 @@ const modifyElement = (type, props) => {
             props.onRefresh != null) {
             (0, RefreshControl_1.RefreshControlHelper)(Dynatrace_1.Dynatrace).attachOnRefresh(props);
         }
-        else if (type._dtInfo.type === Types_1.Types.Switch &&
-            props.onValueChange != null) {
-            (0, Switch_1.SwitchHelper)(Dynatrace_1.Dynatrace).attachOnValueChange(props);
-        }
         else if (props.onValueChange != null &&
             type._dtInfo.type === Types_1.Types.Picker) {
             (0, Picker_1.PickerHelper)(Dynatrace_1.Dynatrace).attachOnValueChange(props);

package/instrumentation/libs/react-native/Switch.js

@@ -1,15 +1,58 @@
 "use strict";
-var _a;
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Switch = void 0;
+exports.wrapOnValueChange = exports.Switch = void 0;
 const react_native_1 = require("react-native");
-const Types_1 = require("../../model/Types");
-if (typeof react_native_1.Switch === 'object') {
-    exports.Switch = Object.assign({ _dtInfo: { type: Types_1.Types.Switch } }, react_native_1.Switch);
-}
-else {
-    exports.Switch = (_a = class Switch extends react_native_1.Switch {
-        },
-        _a._dtInfo = { type: Types_1.Types.Switch },
-        _a);
-}
+const React = require("react");
+const ConfigurationHandler_1 = require("../../../lib/core/configuration/ConfigurationHandler");
+const Dynatrace_1 = require("../../../lib/core/Dynatrace");
+const ComponentUtil_1 = require("../../jsx/components/ComponentUtil");
+exports.Switch = React.forwardRef((_a, ref) => {
+    var { onValueChange } = _a, rest = __rest(_a, ["onValueChange"]);
+    const shouldWrap = (0, ComponentUtil_1.isDynatraceIgnored)(rest) || !onValueChange;
+    const wrappedOnValueChange = shouldWrap
+        ? onValueChange
+        : (0, exports.wrapOnValueChange)(onValueChange, rest);
+    return (React.createElement(react_native_1.Switch, Object.assign({ ref: ref, onValueChange: wrappedOnValueChange }, rest)));
+});
+const wrapOnValueChange = (onValueChange, switchProps) => (value) => {
+    const switchName = findSwitchName(switchProps);
+    const action = Dynatrace_1.Dynatrace.enterAutoAction(`Touch on ${switchName} to ${value}`);
+    let isSync = true;
+    try {
+        const returnValue = onValueChange(value);
+        if (returnValue instanceof Promise) {
+            isSync = false;
+            return Promise.resolve(returnValue).finally(() => {
+                action.leaveAction();
+            });
+        }
+    }
+    finally {
+        if (isSync) {
+            action.leaveAction();
+        }
+    }
+};
+exports.wrapOnValueChange = wrapOnValueChange;
+const findSwitchName = (switchProps) => {
+    var _a;
+    if (switchProps.dtActionName) {
+        return switchProps.dtActionName;
+    }
+    if (ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable() &&
+        ConfigurationHandler_1.ConfigurationHandler.isActionNamePrivacyEnabled()) {
+        return 'Switch';
+    }
+    return (_a = switchProps.accessibilityLabel) !== null && _a !== void 0 ? _a : 'Switch';
+};

package/instrumentation/libs/withOnPressMonitoring.js

@@ -71,7 +71,7 @@ const findTouchableName = (props) => {
         return props.accessibilityLabel;
     }
     if (typeof props.children === 'function') {
-        return findTouchableNameRecursive(props.children({ pressed: false }));
+        return null;
     }
     return findTouchableNameRecursive(props.children);
 };

package/lib/core/Dynatrace.js

@@ -33,7 +33,7 @@ exports.Dynatrace = {
             if (configuration !== undefined) {
                 yield DynatraceBridge_1.DynatraceNative.start(configuration);
                 if (configuration.errorHandler) {
-                    (0, ErrorHandler_1.registerErrorHandler)(configuration.reportFatalErrorAsCrash);
+                    (0, ErrorHandler_1.startErrorHandler)(configuration.reportFatalErrorAsCrash);
                 }
                 else {
                     logger.debug('Dynatrace error handler will not be enabled as errorHandler was set to false!');
@@ -353,4 +353,7 @@ exports.Dynatrace = {
     sendExceptionEvent: (error, fields) => {
         Dynatrace_1.Dynatrace.sendExceptionEvent(error, fields);
     },
+    sendHttpRequestEvent(httpRequestEventBuilder) {
+        Dynatrace_1.Dynatrace.sendHttpRequestEvent(httpRequestEventBuilder);
+    },
 };

package/lib/core/ErrorHandler.js

@@ -1,56 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._reportErrorToDynatrace = exports.registerErrorHandler = void 0;
-const react_native_1 = require("react-native");
+exports.reportErrorToDynatrace = exports.startErrorHandler = void 0;
 const DynatraceInternal_1 = require("./DynatraceInternal");
 const Dynatrace_1 = require("./Dynatrace");
 const StringUtils_1 = require("./util/StringUtils");
 const ConsoleLogger_1 = require("./logging/ConsoleLogger");
-let _isReportFatalErrorAsCrash = true;
-const _isReactNativeGlobal = (globalScope) => globalScope.ErrorUtils !== undefined;
 const logger = new ConsoleLogger_1.ConsoleLogger('ErrorHandler');
-const registerErrorHandler = (reportFatalErrorAsCrash) => {
-    if (global !== undefined && _isReactNativeGlobal(global)) {
-        _isReportFatalErrorAsCrash = reportFatalErrorAsCrash;
-        const oldHandler = global.ErrorUtils.getGlobalHandler();
-        global.ErrorUtils.setGlobalHandler((error, isFatal) => {
-            (0, exports._reportErrorToDynatrace)(error, isFatal, oldHandler);
-        });
-        const setter = global.ErrorUtils.setGlobalHandler;
-        global.ErrorUtils.setGlobalHandler = (errorHandler) => {
-            setter((error, isFatal) => {
-                (0, exports._reportErrorToDynatrace)(error, isFatal, errorHandler);
-            });
-        };
-    }
+let manualStart = { enabled: false };
+const startErrorHandler = (reportFatalErrorAsCrash) => {
+    manualStart = {
+        enabled: true,
+        reportFatalErrorAsCrash: reportFatalErrorAsCrash,
+    };
 };
-exports.registerErrorHandler = registerErrorHandler;
-const _reportErrorToDynatrace = (exception, isFatal, oldHandler) => {
+exports.startErrorHandler = startErrorHandler;
+const reportErrorToDynatrace = (exception, isFatal, reportFatalErrorAsCrashFromConfig, autoStart) => {
+    if (!autoStart && !manualStart)
+        return;
+    const reportFatalErrorAsCrash = manualStart.enabled
+        ? manualStart.reportFatalErrorAsCrash
+        : reportFatalErrorAsCrashFromConfig;
     if (exception != null && isExceptionAnError(exception)) {
         if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(exception.name)) {
             if (isFatal === undefined) {
                 isFatal = false;
             }
-            DynatraceInternal_1.DynatraceInternal.reportErrorFromHandler(isFatal, String(exception.name), adjustedReason(exception.message), exception.stack != null ? exception.stack : '', _isReportFatalErrorAsCrash);
-            logger.debug(`_reportErrorToDynatrace(${exception}, ${isFatal})`);
+            DynatraceInternal_1.DynatraceInternal.reportErrorFromHandler(isFatal, String(exception.name), adjustedReason(exception.message), exception.stack != null ? exception.stack : '', reportFatalErrorAsCrash);
+            logger.debug(`reportErrorToDynatrace(${exception}, ${isFatal})`);
         }
     }
     else {
         Dynatrace_1.Dynatrace.reportError(String(exception), -1);
-        logger.debug(`_reportErrorToDynatrace(${exception}, -1)`);
-    }
-    if (oldHandler !== undefined) {
-        if (react_native_1.Platform.OS === 'ios') {
-            setTimeout(() => {
-                oldHandler(exception, isFatal);
-            }, 200);
-        }
-        else {
-            oldHandler(exception, isFatal);
-        }
+        logger.debug(`reportErrorToDynatrace(${exception}, -1)`);
     }
 };
-exports._reportErrorToDynatrace = _reportErrorToDynatrace;
+exports.reportErrorToDynatrace = reportErrorToDynatrace;
 const adjustedReason = (reason) => {
     if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(reason)) {
         const reasonNewLineIndex = reason.indexOf('\n');

package/lib/next/Dynatrace.js

@@ -42,8 +42,7 @@ class DynatraceImpl {
         const eventTimestamp = new EventTimestamp_1.EventTimestamp(this.timestampProvider);
         const event = Object.assign(Object.assign({}, (0, EventCreator_1.createCrashEvent)(crash.name, crash.message, crash.stack, isFatal)), eventTimestamp.getEventTimeInfo());
         if (isApiReported) {
-            event["characteristics.is_api_reported"] =
-                true;
+            (0, EventModifierUtil_1.addIsApiReported)(event);
             event["dt.support.is_legacy_api_reported"] = true;
         }
         EventPipeline_1.EventPipeline.insertEvent(event);
@@ -53,8 +52,7 @@ class DynatraceImpl {
         const eventTimestamp = new EventTimestamp_1.EventTimestamp(this.timestampProvider);
         const event = Object.assign(Object.assign({}, (0, EventCreator_1.createErrorCodeEvent)(errorName, errorCode)), eventTimestamp.getEventTimeInfo());
         if (isApiReported) {
-            event["characteristics.is_api_reported"] =
-                true;
+            (0, EventModifierUtil_1.addIsApiReported)(event);
             event["dt.support.is_legacy_api_reported"] = true;
         }
         EventPipeline_1.EventPipeline.insertEvent(event);
@@ -64,8 +62,7 @@ class DynatraceImpl {
         const eventTimestamp = new EventTimestamp_1.EventTimestamp(this.timestampProvider);
         const event = Object.assign(Object.assign({}, (0, EventCreator_1.createErrorEvent)(error.name, error.message, error.stack)), eventTimestamp.getEventTimeInfo());
         if (isApiReported) {
-            event["characteristics.is_api_reported"] =
-                true;
+            (0, EventModifierUtil_1.addIsApiReported)(event);
             event["dt.support.is_legacy_api_reported"] = true;
         }
         EventPipeline_1.EventPipeline.insertEvent(event);
@@ -76,15 +73,14 @@ class DynatraceImpl {
         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;
+        (0, EventModifierUtil_1.addIsApiReported)(eventValidated);
         EventPipeline_1.EventPipeline.insertEvent(eventValidated);
     }
     sendEvent(properties, context) {
         this.logger.debug(`sendEvent(${JSON.stringify(properties, context)})`);
         const eventValidated = SendEventValidation_1.SendEventValidation.modifyEvent(properties);
-        if (eventValidated != null && (0, EventModifierUtil_1.containEventProperties)(eventValidated)) {
-            eventValidated["characteristics.has_event_properties"] = true;
-        }
+        (0, EventModifierUtil_1.flagEventProperties)(eventValidated);
+        (0, EventModifierUtil_1.addIsApiReported)(eventValidated);
         EventPipeline_1.EventPipeline.insertEvent(eventValidated, context);
     }
     sendSessionPropertyEvent(properties) {
@@ -94,7 +90,14 @@ class DynatraceImpl {
             (0, EventModifierUtil_1.containSessionProperties)(eventValidated)) {
             eventValidated["characteristics.has_session_properties"] = true;
         }
+        (0, EventModifierUtil_1.addIsApiReported)(eventValidated);
         EventPipeline_1.EventPipeline.insertEvent(eventValidated);
     }
+    sendHttpRequestEvent(httpRequestEventBuilder) {
+        const sanitizedEvent = httpRequestEventBuilder.build();
+        this.logger.debug(`sendHttpRequestEvent(${JSON.stringify(sanitizedEvent)})`);
+        (0, EventModifierUtil_1.flagEventProperties)(sanitizedEvent);
+        EventPipeline_1.EventPipeline.insertEvent(sanitizedEvent);
+    }
 }
 exports.Dynatrace = new DynatraceImpl(TimestampProvider_1.defaultTimestampProvider);

package/lib/next/events/EventCreator.js

@@ -26,7 +26,8 @@ const createErrorCodeEvent = (errorName, errorCode) => {
         'error.is_fatal': false,
     };
     if (errorName != null) {
-        event["name"] = errorName;
+        event["error.name"] = errorName;
+        event["error.has_custom_name"] = true;
     }
     if (errorCode != null) {
         event["error.code"] = errorCode;

package/lib/next/events/HttpRequestEventBuilder.js

@@ -0,0 +1,196 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ConsoleLogger_1 = require("../../core/logging/ConsoleLogger");
+const SendEventValidation_1 = require("./modifier/SendEventValidation");
+const TimestampProvider_1 = require("../provider/TimestampProvider");
+const logger = new ConsoleLogger_1.ConsoleLogger('Dynatrace');
+class HttpRequestEventBuilder {
+    constructor(url, requestMethod) {
+        this.url = url;
+        this.requestMethod = requestMethod;
+        this.duration = 0;
+        this.rawEventProperties = {};
+        this.hasDroppedTraceparent = false;
+        this.hasDroppedCustomProperties = false;
+        this.hasNfnValues = false;
+        this.triedToOverwriteDuration = false;
+        this.requestMethod =
+            requestMethod.toUpperCase();
+    }
+    withDuration(duration) {
+        this.duration = duration;
+        this.triedToOverwriteDuration = true;
+        return this;
+    }
+    withStatusCode(statusCode) {
+        this.statusCode = statusCode;
+        return this;
+    }
+    withReasonPhrase(reasonPhrase) {
+        this.reasonPhrase = reasonPhrase;
+        return this;
+    }
+    withError(error) {
+        this.error = error;
+        return this;
+    }
+    withBytesSent(bytesSent) {
+        this.bytesSent = bytesSent;
+        return this;
+    }
+    withBytesReceived(bytesReceived) {
+        this.bytesReceived = bytesReceived;
+        return this;
+    }
+    withTraceparentHeader(traceparentHeader) {
+        this.traceparentHeader = traceparentHeader;
+        return this;
+    }
+    addEventProperty(key, value) {
+        this.rawEventProperties[key] = value;
+        return this;
+    }
+    build() {
+        if (!this.hasValidMandatoryAttriutes()) {
+            logger.debug('HttpRequestEventBuilder dropped invalid event');
+            return null;
+        }
+        this.sanitizeDuration();
+        this.sanitizeStatusCode();
+        this.sanitizeReasonPhrase();
+        this.sanitizeBytesReceived();
+        this.sanitizeBytesSent();
+        const parsedTraceparentHeader = this.traceparentHeader &&
+            this.parseTraceparent(this.traceparentHeader);
+        this.hasDroppedTraceparent =
+            !!this.traceparentHeader && !parsedTraceparentHeader;
+        const hasFailedRequest = this.isStatusCodeError() || !!this.error;
+        const filteredEventProperties = Object.fromEntries(Object.entries(this.rawEventProperties).filter(this.isEventPropertyKey, this));
+        const sanitizedEventProperties = SendEventValidation_1.SendEventValidation.modifyEvent(filteredEventProperties);
+        return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, sanitizedEventProperties), { ["url.full"]: this.url, ["network.protocol.name"]: 'http', ["http.request.method"]: this.requestMethod, ["duration"]: this.duration, ["start_time"]: TimestampProvider_1.defaultTimestampProvider.getCurrentTimestamp() - this.duration }), (this.triedToOverwriteDuration && {
+            ["dt.support.api.overridden_fields"]: [
+                'duration',
+            ],
+        })), this.includeIfDefined("http.response.status_code", this.statusCode)), this.includeIfDefined("http.response.reason_phrase", this.reasonPhrase)), this.includeIfDefined("request.bytes_sent", this.bytesSent)), this.includeIfDefined("request.bytes_received", this.bytesReceived)), { ["characteristics.has_request"]: true, ["characteristics.is_api_reported"]: true }), this.includeIfTrue("characteristics.has_failed_request", hasFailedRequest)), this.includeIfTrue("characteristics.has_error", hasFailedRequest)), (this.error !== undefined && Object.assign({ ["characteristics.has_exception"]: true, ["exception.type"]: this.error.name, ["exception.message"]: this.error.message }, this.includeIfDefined("exception.stack_trace", this.error.stack)))), (parsedTraceparentHeader && {
+            ["trace.id"]: parsedTraceparentHeader.traceId,
+            ["span.id"]: parsedTraceparentHeader.spanId,
+        })), (this.hasDroppedTraceparent && {
+            ["request.trace_context_hint"]: 'invalid_header',
+        })), this.includeIfTrue("dt.support.api.has_dropped_custom_properties", this.hasDroppedCustomProperties)), this.includeIfTrue("dt.support.has_nfn_values", this.hasNfnValues));
+    }
+    hasValidMandatoryAttriutes() {
+        let isValid = true;
+        if (this.isInvalidUrl(this.url)) {
+            logger.debug(`HttpRequestEventBuilder: dropped event since given URL is malformed: ${this.url}`);
+            isValid = false;
+        }
+        if (!HttpRequestEventBuilder.allowedRequestMethods.includes(this.requestMethod)) {
+            logger.debug(`HttpRequestEventBuilder: dropped event since given Request Method is invalid: ${this.requestMethod}`);
+            isValid = false;
+        }
+        return isValid;
+    }
+    isInvalidUrl(url) {
+        try {
+            if (!url.match(/^(https?):\/\/[^\s/$.?#-][^\s]*$/i)) {
+                return true;
+            }
+            new URL(url);
+            return false;
+        }
+        catch (_a) {
+            return true;
+        }
+    }
+    sanitizeStatusCode() {
+        if (this.statusCode == undefined && this.error === undefined) {
+            this.statusCode = 0;
+        }
+        if (this.statusCode && this.statusCode < 0) {
+            logger.debug('HttpRequestEventBuilder: overriding invalid Status Code with 0');
+            this.statusCode = 0;
+            this.hasDroppedCustomProperties = true;
+        }
+    }
+    sanitizeReasonPhrase() {
+        if (this.reasonPhrase &&
+            this.reasonPhrase.length >
+                HttpRequestEventBuilder.maxReasonPhraseLength) {
+            logger.debug(`HttpRequestEventBuilder: trimming too long Reason Phrase to a length of ${HttpRequestEventBuilder.maxReasonPhraseLength}`);
+            this.reasonPhrase = this.reasonPhrase.slice(0, HttpRequestEventBuilder.maxReasonPhraseLength);
+        }
+    }
+    sanitizeDuration() {
+        this.hasNfnValues || (this.hasNfnValues = !Number.isFinite(this.duration));
+        if (!Number.isFinite(this.duration) || this.duration < 0) {
+            logger.debug('HttpRequestEventBuilder: overriding invalid Duration with 0');
+            this.duration = 0;
+            this.hasDroppedCustomProperties = true;
+        }
+    }
+    sanitizeBytesSent() {
+        if (this.bytesSent && this.bytesSent < 0) {
+            logger.debug(`HttpRequestEventBuilder: dropping invalid value for Bytes Sent: ${this.bytesSent}`);
+            this.bytesSent = undefined;
+            this.hasDroppedCustomProperties = true;
+        }
+    }
+    sanitizeBytesReceived() {
+        if (this.bytesReceived && this.bytesReceived < 0) {
+            logger.debug(`HttpRequestEventBuilder: dropping invalid value for Bytes Received: ${this.bytesReceived}`);
+            this.bytesReceived = undefined;
+            this.hasDroppedCustomProperties = true;
+        }
+    }
+    isStatusCodeError() {
+        return (this.statusCode && 400 <= this.statusCode && this.statusCode <= 599);
+    }
+    isEventPropertyKey([key, _]) {
+        if (key.startsWith("event_properties")) {
+            return true;
+        }
+        logger.debug(`HttpRequestEventBuilder: dropped event property '$key' as it did not start with prefix ${"event_properties"}`);
+        this.hasDroppedCustomProperties = true;
+        return false;
+    }
+    includeIfDefined(key, value) {
+        return value !== undefined ? { [key]: value } : {};
+    }
+    includeIfTrue(key, value) {
+        return value === true ? { [key]: value } : {};
+    }
+    parseTraceparent(header) {
+        const traceparentRegex = /^00-([0-9a-f]{32})-([0-9a-f]{16})-0[01]$/;
+        const match = header.match(traceparentRegex);
+        if (!match) {
+            logger.debug("The provided traceparent header does not match the format: '00-<trace-id-32-HEXDIG>-<parent-id-16-HEXDIG>-<trace-flags-2-HEXDIG>'");
+            return null;
+        }
+        const [, traceId, spanId] = match;
+        if (this.allZeros(traceId)) {
+            logger.debug('Trace ID in traceparent header must not be all zeros');
+            return null;
+        }
+        if (this.allZeros(spanId)) {
+            logger.debug('Parent ID in traceparent header must not be all zeros');
+            return null;
+        }
+        return { traceId, spanId };
+    }
+    allZeros(str) {
+        return /^0*$/.test(str);
+    }
+}
+exports.default = HttpRequestEventBuilder;
+HttpRequestEventBuilder.allowedRequestMethods = [
+    'GET',
+    'HEAD',
+    'POST',
+    'PUT',
+    'DELETE',
+    'CONNECT',
+    'OPTIONS',
+    'TRACE',
+    'PATCH',
+];
+HttpRequestEventBuilder.maxReasonPhraseLength = 5000;

package/lib/next/events/ViewInfoCreator.js

@@ -8,7 +8,7 @@ const ASCII_CODE_A = 65;
 const NUMERICAL_CHARACTER_COUNT = 10;
 const OFFSET_A = ASCII_CODE_A - NUMERICAL_CHARACTER_COUNT;
 const createViewInfo = (name) => ({
-    ["view.id"]: createRandomHexString(VIEW_ID_LENGTH),
+    ["view.instance_id"]: createRandomHexString(VIEW_ID_LENGTH),
     ["view.name"]: name,
 });
 exports.createViewInfo = createViewInfo;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.containEventPropertiesInArray = exports.containEventProperties = exports.containSessionProperties = exports.trimStringValuesInObject = exports.trimString = exports.isObject = exports.flattenAdditionalData = void 0;
+exports.containEventPropertiesInArray = exports.addIsApiReported = exports.flagEventProperties = exports.containEventProperties = exports.containSessionProperties = exports.trimStringValuesInObject = exports.trimString = exports.isObject = exports.flattenAdditionalData = void 0;
 const MAX_STRING_LENGTH_FOR_VALUES = 5000;
 const flattenAdditionalData = (obj, parent, res = {}) => {
     for (const key in obj) {
@@ -60,6 +60,19 @@ const containEventProperties = (jsonData) => {
     return false;
 };
 exports.containEventProperties = containEventProperties;
+const flagEventProperties = (event) => {
+    if (event !== null && (0, exports.containEventProperties)(event)) {
+        event["characteristics.has_event_properties"] =
+            true;
+    }
+};
+exports.flagEventProperties = flagEventProperties;
+const addIsApiReported = (event) => {
+    if (event !== null) {
+        event["characteristics.is_api_reported"] = true;
+    }
+};
+exports.addIsApiReported = addIsApiReported;
 const containEventPropertiesInArray = (eventEntries) => {
     for (const [key, value] of eventEntries) {
         if (key.startsWith(`${"event_properties"}.`)) {

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

@@ -23,18 +23,17 @@ class SendEventValidationImpl {
         }
         const timeNow = this.timestampProvider.getCurrentTimestamp();
         const eventCopy = Object.entries(event).slice();
-        const filteredEvent = eventCopy
-            .filter(this.isKeyNameAllowed, this)
-            .filter(this.isFieldTypeAllowed, this);
+        const filteredEvent = eventCopy.filter(this.isKeyNameAllowed, this);
         const limitedEntries = new EventLimitation_1.EventLimitation().limitEventEntries(filteredEvent);
         const sizedEntries = new EventLimitation_1.EventLimitation().limitEventProperties(limitedEntries);
-        this.applyOverriddenKeys(sizedEntries);
         if (sizedEntries.length < eventCopy.length) {
             sizedEntries.push([
                 "dt.support.api.has_dropped_custom_properties",
                 true,
             ]);
         }
+        this.sanitizeDuration(sizedEntries);
+        this.applyOverriddenKeys(sizedEntries);
         const jsonObject = Object.fromEntries(sizedEntries);
         if (jsonObject["duration"] !== undefined) {
             jsonObject["start_time"] =
@@ -60,13 +59,27 @@ class SendEventValidationImpl {
             ]);
         }
     }
-    isFieldTypeAllowed(entry) {
-        const [key, value] = entry;
-        if (key === "duration" ||
-            key === "start_time") {
-            return typeof value === 'number' && isFinite(value) && value >= 0;
+    sanitizeDuration(event) {
+        for (const entry of event) {
+            const [key, value] = entry;
+            if (key === "duration") {
+                if (typeof value !== 'number' ||
+                    !isFinite(value) ||
+                    value < 0) {
+                    entry[1] = 0;
+                    event.push([
+                        "dt.support.api.has_dropped_custom_properties",
+                        true,
+                    ]);
+                }
+                if (typeof value === 'number' && !isFinite(value)) {
+                    event.push([
+                        "dt.support.has_nfn_values",
+                        true,
+                    ]);
+                }
+            }
         }
-        return true;
     }
     isKeyNameAllowed(entry) {
         const [key] = entry;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ALL_APP_START_KEYS = exports.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.21';
+const SPECIFICATION_VERSION = '0.22';
 exports.MAX_CUSTOM_EVENT_FIELDS = 50;
 exports.MAX_CUSTOM_EVENT_KEY_LENGTH = 100;
 exports.MAX_CUSTOM_EVENT_VALUE_LENGTH = 5000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace/react-native-plugin",
-  "version": "2.323.1",
+  "version": "2.323.2",
   "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",
@@ -167,6 +167,6 @@
     }
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=16"
   }
-}
+}

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

@@ -529,7 +529,7 @@ export declare const Dynatrace: {
 	 *
 	 * @see https://www.npmjs.com/package/@dynatrace/react-native-plugin#manually-report-a-crash
 	 */
-	reportCrashWithException(crashName: string, crash: Error, platform?: Platform);
+	reportCrashWithException(crashName: string, crash: Error, platform?: Platform): void;
 
 	/**
 	 * Puts a set of http headers on every agent http request (eg. the Authorization header). It also triggers the agent to
@@ -640,6 +640,35 @@ export declare const Dynatrace: {
 	  * @param properties any attributes that should be reported for every event in the session.
 	  */
 	 sendSessionPropertyEvent(properties: JSONObject): void;
+
+	 /**
+	 * 
+	 * Send an HttpRequestEvent by passing in an instance of HttpRequestEventBuilder.
+	 * The Builder allows you to configure common properties of an HttpRequest like url, requestMethod and duration.
+	 * Additionally, it allows you to set custom event properties.
+	 * 
+	 * @param httpRequestEventBuilder Mandatory Builder which allows you to configure common properties of an HttpRequest
+	 * 
+	 * Usage:
+	 * 
+	 * ```ts
+	 * import { Dynatrace, HttpRequestEventBuilder } from '@dynatrace/react-native-plugin';
+	 *
+	 * Dynatrace.sendHttpRequestEvent(
+	 *   new HttpRequestEventBuilder("http://www.dynatrace.com", "POST")
+	 *     .withDuration(100)
+	 *     .withStatusCode(404)
+	 *     .withReasonPhrase("HTTP/1.1 404 Not Found")
+	 *     .withError(new Error())
+	 *     .withBytesSent(100)
+	 *     .withBytesReceived(100)
+	 *     .withTraceparentHeader("traceparent: 00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01")
+	 *     .addEventProperty("event_properties.userid", 12345)
+	 *     .addEventProperty("event_properties.response", "example body")
+	 * );
+	 * ```
+	 */
+	sendHttpRequestEvent(httpRequestEventBuilder: HttpRequestEventBuilder): void
 }
 
 /**
@@ -1722,6 +1751,97 @@ export declare class ConfigurationBuilder {
 	public buildConfiguration(): IConfiguration;
 }
 
+type EventProperty = string | number | boolean;
+type TraceparentHeader = `00-${string}-${string}-0${'0' | '1'}`;
+type AllowedRequestMethods =
+    | 'GET'
+    | 'HEAD'
+    | 'POST'
+    | 'PUT'
+    | 'DELETE'
+    | 'CONNECT'
+    | 'OPTIONS'
+    | 'TRACE'
+    | 'PATCH'
+    | 'get'
+    | 'head'
+    | 'post'
+    | 'put'
+    | 'delete'
+    | 'connect'
+    | 'options'
+    | 'trace'
+    | 'patch';
+
+export declare class HttpRequestEventBuilder {
+	/**
+	 * 
+	 * @param url Accepts only URLs that are valid according to the WHATWG URL Standard. Mandatory.
+	 * @param requestMethod Accepts GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE and PATCH. Mandatory
+	 */
+	constructor(
+    	url: `http://${string}` | `https://${string}`,
+    	requestMethod: AllowedRequestMethods
+  	);
+
+	/**
+	 * 
+	 * @param duration Only positive numbers are valid.
+	 * @returns the HttpRequestEventBuilder
+	 */
+ 	withDuration(duration: number): this;
+
+	/**
+	 * 
+	 * @param statusCode Only positive numbers are valid.
+	 * @returns the HttpRequestEventBuilder
+	 */
+  	withStatusCode(statusCode: number): this;
+
+	/**
+	 * 
+	 * @param reasonPhrase Max. 5000 characters.
+	 * @returns the HttpRequestEventBuilder
+	 */
+  	withReasonPhrase(reasonPhrase: string): this;
+
+	/**
+	 * 
+	 * @param error A standard Javascript Error Object.
+	 * @returns the HttpRequestEventBuilder
+	 */
+  	withError(error: Error): this;
+
+	/**
+	 * 
+	 * @param bytesSent Only positive numbers are valid.
+	 * @returns the HttpRequestEventBuilder
+	 */
+  	withBytesSent(bytesSent: number): this;
+
+	/**
+	 * 
+	 * @param bytesReceived Only positive numbers are valid.
+	 * @returns the HttpRequestEventBuilder
+	 */
+  	withBytesReceived(bytesReceived: number): this;
+
+	/**
+	 * 
+	 * @param traceparentHeader Accepts Traceparent Headers that are valid according to the W3C Trace Context Specification.
+	 * @returns the HttpRequestEventBuilder
+	 */
+  	withTraceparentHeader(traceparentHeader: TraceparentHeader): this;
+
+	/**
+	 * 
+	 * @param key Accepts any string that starts with 'event_properties.'.
+	 * @param value Accepts any string (max. 5000 characters), number or boolean.
+	 * @returns the HttpRequestEventBuilder
+	 */
+  	addEventProperty(key: `event_properties.${string}`, value: EventProperty): this;
+}
+
 declare module 'react' {
     namespace JSX {
 		interface IntrinsicAttributes extends IDynatraceProperties {}

package/instrumentation/jsx/components/Switch.js

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SwitchHelper = void 0;
-const ComponentUtil_1 = require("./ComponentUtil");
-const ConfigurationHandler_1 = require("../../../lib/core/configuration/ConfigurationHandler");
-const SwitchHelper = (Dynatrace) => ({
-    attachOnValueChange: (switchProps) => {
-        if ((0, ComponentUtil_1.isDynatraceIgnored)(switchProps)) {
-            return;
-        }
-        const origOnValueChange = switchProps.onValueChange;
-        const nameOfAction = _findActionName(switchProps);
-        if (origOnValueChange != null) {
-            switchProps.onValueChange = (value) => {
-                const useGenericName = nameOfAction == null ||
-                    (!(0, ComponentUtil_1.isDynatraceNaming)(switchProps) &&
-                        ConfigurationHandler_1.ConfigurationHandler.isActionNamePrivacyEnabled());
-                const finalNameOfAction = useGenericName
-                    ? `Touch on Switch to ${value}`
-                    : `Touch on ${nameOfAction} to ${value}`;
-                const action = Dynatrace.enterAutoAction(finalNameOfAction);
-                let isSyncError = true;
-                try {
-                    const returnValue = origOnValueChange(value);
-                    if (_isPromise(returnValue)) {
-                        isSyncError = false;
-                        return returnValue.finally(() => {
-                            action.leaveAction();
-                        });
-                    }
-                    else {
-                        action.leaveAction();
-                    }
-                    isSyncError = false;
-                }
-                finally {
-                    if (isSyncError) {
-                        action.leaveAction();
-                    }
-                }
-            };
-        }
-    },
-});
-exports.SwitchHelper = SwitchHelper;
-const _findActionName = (switchProps) => {
-    if ((0, ComponentUtil_1.isDynatraceNaming)(switchProps)) {
-        return switchProps.dtActionName;
-    }
-    else if (switchProps.accessibilityLabel != null) {
-        return switchProps.accessibilityLabel;
-    }
-    return null;
-};
-const _isPromise = (object) => object != null &&
-    typeof object.then === 'function' &&
-    typeof object.catch === 'function';