@dynatrace/react-native-plugin 2.335.1 → 2.337.2

package/lib/next/events/EventPipeline.js

@@ -9,6 +9,14 @@ const ValueRestrictionModifier_1 = require("./modifier/ValueRestrictionModifier"
 const ModifyEventValidation_1 = require("./modifier/ModifyEventValidation");
 const EventSpecContstants_1 = require("./spec/EventSpecContstants");
 const StringLengthEventModifier_1 = require("./modifier/StringLengthEventModifier");
+const DECISION_REASON_TEXT = {
+    third_gen_disabled: '3rd generation RUM is disabled',
+    runtime_config_unavailable: 'Runtime configuration is not yet available',
+    data_collection_off: 'Data collection is disabled',
+    agent_inactive: 'Agent is inactive',
+    traffic_control_active: 'Traffic control is limiting data transmission',
+    crash_reporting_disabled: 'Crash reporting is disabled',
+};
 class EventPipelineImpl {
     constructor() {
         this.customEventModifierChain = new ModifyEventValidation_1.ModifyEventValidation();
@@ -25,12 +33,12 @@ class EventPipelineImpl {
         ];
     }
     insertEvent(event) {
-        if (!ConfigurationHandler_1.ConfigurationHandler.isRuntimeConfigurationInitiated()) {
-            this.logger.debug('isRuntimeConfigurationInitiated is not enabled! App start event will be discarded!');
-            return;
-        }
-        if (!ConfigurationHandler_1.ConfigurationHandler.isGrailEnabled()) {
-            this.logger.debug('RUM on Grail is not enabled! App start event will be discarded!');
+        const decision = ConfigurationHandler_1.ConfigurationHandler.getThirdGenDataReportingDecision();
+        if (!decision.allowed) {
+            const reasonText = decision.reason
+                ? DECISION_REASON_TEXT[decision.reason]
+                : 'Unknown reason';
+            this.logger.debug(`3rd gen event suppressed: ${reasonText}`);
             return;
         }
         this.logger.debug(`insertEvent(${JSON.stringify(event)})`);

package/lib/next/events/HttpRequestEventData.js

@@ -5,6 +5,8 @@ const TimestampProvider_1 = require("../provider/TimestampProvider");
 const SendEventValidation_1 = require("./modifier/SendEventValidation");
 const EventModifierUtil_1 = require("./modifier/EventModifierUtil");
 const EventBuilderUtil_1 = require("./EventBuilderUtil");
+const TraceContextUtils_1 = require("../util/TraceContextUtils");
+const ConfigurationHandler_1 = require("../../core/configuration/ConfigurationHandler");
 const logger = new ConsoleLogger_1.ConsoleLogger('HttpRequestEventData');
 class HttpRequestEventData {
     constructor(url, requestMethod) {
@@ -43,7 +45,9 @@ class HttpRequestEventData {
         return this;
     }
     withTraceparentHeader(traceparentHeader) {
-        this.traceparentHeader = traceparentHeader;
+        if (traceparentHeader !== undefined) {
+            this.traceparentHeader = traceparentHeader;
+        }
         return this;
     }
     addEventProperty(key, value) {
@@ -59,13 +63,8 @@ class HttpRequestEventData {
         const sanitizedStatusCode = this.sanitizeStatusCode();
         const sanitizedBytesReceived = this.sanitizeBytesReceived();
         const sanitizedBytesSent = this.sanitizeBytesSent();
-        const parsedTraceparentHeader = this.traceparentHeader &&
-            this.parseTraceparent(this.traceparentHeader);
-        const traceContextHint = !this.traceparentHeader
-            ? "api_unused"
-            : parsedTraceparentHeader
-                ? "api_set"
-                : "invalid";
+        const parsedTraceparentHeader = this.traceparentHeader && (0, TraceContextUtils_1.parseTraceparent)(this.traceparentHeader);
+        const traceContextHint = this.getTraceContextHint(parsedTraceparentHeader);
         const hasFailedRequest = this.isStatusCodeError() || !!this.error;
         const sanitizedEventProperties = SendEventValidation_1.SendEventValidation.modifyEvent(this.rawEventProperties);
         (0, EventModifierUtil_1.flagEventProperties)(sanitizedEventProperties);
@@ -76,9 +75,27 @@ class HttpRequestEventData {
             ],
         })), (0, EventBuilderUtil_1.includeIfDefined)("http.response.status_code", sanitizedStatusCode)), (0, EventBuilderUtil_1.includeIfDefined)("http.response.reason_phrase", this.reasonPhrase)), (0, EventBuilderUtil_1.includeIfDefined)("request.bytes_sent", sanitizedBytesSent)), (0, EventBuilderUtil_1.includeIfDefined)("request.bytes_received", sanitizedBytesReceived)), { ["characteristics.has_request"]: true, ["characteristics.is_api_reported"]: true }), (0, EventBuilderUtil_1.includeIfTrue)("characteristics.has_failed_request", hasFailedRequest)), (0, EventBuilderUtil_1.includeIfTrue)("characteristics.has_error", hasFailedRequest)), (this.error !== undefined && Object.assign({ ["characteristics.has_exception"]: true, ["exception.type"]: this.error.name, ["exception.message"]: this.error.message }, (0, EventBuilderUtil_1.includeIfDefined)("exception.stack_trace", this.error.stack)))), (parsedTraceparentHeader && {
             ["trace.id"]: parsedTraceparentHeader.traceId,
-            ["span.id"]: parsedTraceparentHeader.spanId,
+            ["span.id"]: parsedTraceparentHeader.parentId,
         })), (0, EventBuilderUtil_1.includeIfTrue)("dt.support.api.has_dropped_properties", this.hasDroppedProperties));
     }
+    getTraceContextHint(parsedTraceparentHeader) {
+        if (!ConfigurationHandler_1.ConfigurationHandler.isConfigurationAvailable() ||
+            !ConfigurationHandler_1.ConfigurationHandler.getTracestateKeyPrefix()) {
+            return "not_initialized";
+        }
+        if (!ConfigurationHandler_1.ConfigurationHandler.getTraceContextEnabled()) {
+            return "disabled";
+        }
+        if (!this.traceparentHeader) {
+            return "api_unused";
+        }
+        if (parsedTraceparentHeader) {
+            return "api_set";
+        }
+        else {
+            return "invalid";
+        }
+    }
     hasValidMandatoryAttributes() {
         let isValid = true;
         if (this.isInvalidUrl(this.url)) {
@@ -138,27 +155,6 @@ class HttpRequestEventData {
     isStatusCodeError() {
         return (this.statusCode && 400 <= this.statusCode && this.statusCode <= 599);
     }
-    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 = HttpRequestEventData;
 HttpRequestEventData.allowedRequestMethods = [

package/lib/next/provider/TimestampProvider.js

@@ -1,10 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultTimestampProvider = exports.TimestampProvider = void 0;
-class TimestampProvider {
-    getCurrentTimestamp() {
-        return new Date().getTime();
+exports.defaultTimestampProvider = void 0;
+let baseRealtimeMs = null;
+let baseMonotonicMs = null;
+const getMonotonicNow = () => {
+    var _a;
+    if (typeof ((_a = globalThis.performance) === null || _a === void 0 ? void 0 : _a.now) === 'function') {
+        return globalThis.performance.now();
     }
-}
-exports.TimestampProvider = TimestampProvider;
-exports.defaultTimestampProvider = new TimestampProvider();
+    return Date.now();
+};
+exports.defaultTimestampProvider = {
+    getCurrentTimestamp: () => {
+        const currentMonotonicMs = getMonotonicNow();
+        if (baseRealtimeMs == null || baseMonotonicMs == null) {
+            baseRealtimeMs = Date.now();
+            baseMonotonicMs = currentMonotonicMs;
+            return baseRealtimeMs;
+        }
+        return baseRealtimeMs + (currentMonotonicMs - baseMonotonicMs);
+    },
+};

package/lib/next/util/TraceContextUtils.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.trimTraceState = exports.generateTracestate = exports.generateTraceparentHeader = exports.parseTraceparent = void 0;
+const ConsoleLogger_1 = require("../../core/logging/ConsoleLogger");
+const ConfigurationHandler_1 = require("../../core/configuration/ConfigurationHandler");
+const logger = new ConsoleLogger_1.ConsoleLogger('TraceContextUtils');
+const parseTraceparent = (traceparent) => {
+    const traceparentRegex = /^[0-9a-f]{2}-([0-9a-f]{32})-([0-9a-f]{16})-([0-9a-f]{2})$/i;
+    const match = traceparentRegex.exec(traceparent);
+    if (!match) {
+        logger.debug("The traceparent header doesn't match the format: '<version-2-hex>-<trace-id-32-hex>-<parent-id-16-hex>-<flags-2-hex>'");
+        return undefined;
+    }
+    const [, traceId, parentId] = match;
+    if (allZeros(traceId)) {
+        logger.debug('Trace ID in traceparent header must not be all zeros');
+        return undefined;
+    }
+    if (allZeros(parentId)) {
+        logger.debug('Parent ID in traceparent header must not be all zeros');
+        return undefined;
+    }
+    return { traceId, parentId };
+};
+exports.parseTraceparent = parseTraceparent;
+const allZeros = (str) => /^0*$/.test(str);
+const generateTraceparentHeader = () => {
+    let traceId = randomHex(32);
+    if (/^0+$/.test(traceId)) {
+        traceId = '1' + traceId.slice(1);
+    }
+    let spanId = randomHex(16);
+    if (/^0+$/.test(spanId)) {
+        spanId = '1' + spanId.slice(1);
+    }
+    return `00-${traceId}-${spanId}-01`;
+};
+exports.generateTraceparentHeader = generateTraceparentHeader;
+const randomHex = (length) => {
+    let hex = '';
+    while (hex.length < length) {
+        hex += Math.floor(Math.random() * 0xffffffff)
+            .toString(16)
+            .padStart(8, '0');
+    }
+    return hex.slice(0, length);
+};
+const generateTracestate = (parentId, existingTracestate) => {
+    const instanceId = ConfigurationHandler_1.ConfigurationHandler.getInstanceId();
+    const sessionId = ConfigurationHandler_1.ConfigurationHandler.getSessionId();
+    const applicationId = ConfigurationHandler_1.ConfigurationHandler.getApplicationId();
+    const tracestateKeyPrefix = ConfigurationHandler_1.ConfigurationHandler.getTracestateKeyPrefix();
+    if (!ConfigurationHandler_1.ConfigurationHandler.getTraceContextEnabled() ||
+        !(instanceId && sessionId && applicationId && tracestateKeyPrefix)) {
+        return undefined;
+    }
+    const version = 1;
+    const originMarker = 'dtr';
+    const capture = 0;
+    let tracestate = `${tracestateKeyPrefix}@${originMarker}=${version};${parentId};${capture};${formatApplicationId(applicationId)};${instanceId};${sessionId}`;
+    if (typeof existingTracestate === 'string' && existingTracestate.trim()) {
+        tracestate += `,${existingTracestate}`;
+    }
+    return (0, exports.trimTraceState)(tracestate);
+};
+exports.generateTracestate = generateTracestate;
+const formatApplicationId = (applicationId) => applicationId.split('-').slice(0, 3).join('');
+const findLastLongSegmentIndex = (segments, longSegmentLength) => {
+    for (let i = segments.length - 1; i > 0; i--) {
+        if (segments[i].length > longSegmentLength) {
+            return i;
+        }
+    }
+    return -1;
+};
+const trimTraceState = (tracestate, maxLength = 512, longSegmentLength = 128, maxSegments = 32) => {
+    let segments = tracestate.split(',');
+    let length = tracestate.length;
+    if (length <= maxLength && segments.length <= maxSegments) {
+        return tracestate;
+    }
+    if (segments.length > maxSegments) {
+        segments = segments.slice(0, maxSegments);
+        length =
+            segments.reduce((sum, s) => sum + s.length, 0) +
+                (segments.length - 1);
+    }
+    let hasLongSegments = true;
+    while (length > maxLength && segments.length > 1) {
+        let removed = '';
+        if (hasLongSegments) {
+            const idx = findLastLongSegmentIndex(segments, longSegmentLength);
+            if (idx > 0) {
+                removed = segments.splice(idx, 1)[0];
+            }
+            else {
+                hasLongSegments = false;
+                continue;
+            }
+        }
+        else {
+            removed = segments.pop();
+        }
+        length -= removed.length + 1;
+    }
+    return segments.join(',');
+};
+exports.trimTraceState = trimTraceState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace/react-native-plugin",
-  "version": "2.335.1",
+  "version": "2.337.2",
   "description": "This plugin gives you the ability to use the Dynatrace Mobile agent in your react native application.",
   "main": "index.js",
   "types": "types.d.ts",
@@ -53,12 +53,11 @@
     "jscodeshift": "^17.3.0",
     "plist": "^3.1.0",
     "proxy-polyfill": "^0.3.2",
-    "semver": "^7.7.4"
+    "semver": "^7.8.0"
   },
   "homepage": "https://www.dynatrace.com/",
   "peerDependencies": {
     "@babel/core": ">=7.4.4",
-    "@react-native-picker/picker": ">=1.0.0",
     "diff": "^8.0.2",
     "react": ">=16.11.0",
     "react-native": ">=0.62.0"
@@ -77,6 +76,7 @@
     "@babel/plugin-transform-optional-chaining": "^7.27.1",
     "@babel/preset-env": "^7.27.2",
     "@babel/preset-react": "^7.27.1",
+    "@react-native-picker/picker": "^2.11.4",
     "@react-native/babel-preset": "^0.80.1",
     "@react-navigation/core": "^7.13.0",
     "@react-navigation/drawer": "^7.7.2",
@@ -171,6 +171,7 @@
     "lib/next/events/interface/*.js",
     "lib/next/events/modifier/*.js",
     "lib/next/events/spec/*.js",
+    "lib/next/util/*.js",
     "lib/next/provider/*.js",
     "lib/features/ui-interaction/*.js",
     "src/lib/core/interface/NativeDynatraceBridge.ts",

package/react-native-dynatrace.podspec

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

package/scripts/Android.js

@@ -1,22 +1,37 @@
 #!/usr/bin/env node
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureRuntimeScriptApplied = exports.writeGradleConfig = exports.instrumentAndroidPlatform = exports.GRADLE_APPLY_RUNTIME_SCRIPT = exports.GRADLE_APPLY_BUILDSCRIPT = exports.GRADLE_DYNATRACE_FILE = void 0;
+exports.ensureRuntimeScriptApplied = exports.writeGradleConfig = exports.instrumentAndroidPlatform = exports.GRADLE_APPLY_RUNTIME_SCRIPT_KTS = exports.GRADLE_APPLY_RUNTIME_SCRIPT = exports.GRADLE_APPLY_BUILDSCRIPT_KTS = exports.GRADLE_APPLY_BUILDSCRIPT = exports.GRADLE_DYNATRACE_FILE_KTS = exports.GRADLE_DYNATRACE_FILE = void 0;
 const path_1 = require("path");
 const Logger_1 = require("./Logger");
 const FileOperationHelper_1 = require("./FileOperationHelper");
 const PathsConstants_1 = require("./PathsConstants");
 const GRADLE_CONFIG_IDENTIFIER = '// AUTO - INSERTED';
 exports.GRADLE_DYNATRACE_FILE = `apply from: "./${PathsConstants_1.DYNATRACE_CONFIG_GRADLE_FILE}"`;
+exports.GRADLE_DYNATRACE_FILE_KTS = `apply(from = "./${PathsConstants_1.DYNATRACE_CONFIG_GRADLE_FILE}")`;
 const LEGACY_GRADLE_DYNATRACE_NODE_MODULES = 'node_modules/@dynatrace/react-native-plugin/files/dynatrace.gradle';
 const GRADLE_BUILDSCRIPT_IDENTIFIER = 'buildscript';
 exports.GRADLE_APPLY_BUILDSCRIPT = 'apply from: "../node_modules/@dynatrace/react-native-plugin/files/plugin.gradle", to: buildscript';
+exports.GRADLE_APPLY_BUILDSCRIPT_KTS = 'apply(from = "../node_modules/@dynatrace/react-native-plugin/files/plugin.gradle", to = buildscript)';
 const GRADLE_REACT_NATIVE_PLUGIN = 'apply plugin: "com.facebook.react.rootproject"';
 exports.GRADLE_APPLY_RUNTIME_SCRIPT = 'apply from: "../../node_modules/@dynatrace/react-native-plugin/files/plugin-runtime.gradle"';
+exports.GRADLE_APPLY_RUNTIME_SCRIPT_KTS = 'apply(from = "../../node_modules/@dynatrace/react-native-plugin/files/plugin-runtime.gradle")';
+const isKotlinDslGradleFile = (pathToGradle) => pathToGradle.endsWith('.gradle.kts');
+const getGradleStatements = (pathToGradle) => isKotlinDslGradleFile(pathToGradle)
+    ? {
+        applyBuildscript: exports.GRADLE_APPLY_BUILDSCRIPT_KTS,
+        dynatraceFile: exports.GRADLE_DYNATRACE_FILE_KTS,
+        runtimeScript: exports.GRADLE_APPLY_RUNTIME_SCRIPT_KTS,
+    }
+    : {
+        applyBuildscript: exports.GRADLE_APPLY_BUILDSCRIPT,
+        dynatraceFile: exports.GRADLE_DYNATRACE_FILE,
+        runtimeScript: exports.GRADLE_APPLY_RUNTIME_SCRIPT,
+    };
 const instrumentAndroidPlatform = (pathToGradle, remove) => {
     const path = FileOperationHelper_1.default.checkIfFileExistsSync(pathToGradle);
-    if (!path.endsWith('.gradle')) {
-        throw new Error("Can't find .gradle file. gradle path must also include the gradle file!");
+    if (!path.endsWith('.gradle') && !path.endsWith('.gradle.kts')) {
+        throw new Error("Can't find .gradle(.kts) file. gradle path must include build.gradle or build.gradle.kts!");
     }
     changeReactNativeBuildGradleFile(path, remove);
 };
@@ -60,11 +75,11 @@ const removeDynatraceFromGradle = (lines, indices, pathToGradle) => {
     }
     return modified;
 };
-const addDynatraceToGradle = (lines, indices, pathToGradle) => {
+const addDynatraceToGradle = (lines, indices, pathToGradle, statements) => {
     let modified = false;
     if (indices.dynatraceFileIndex !== -1 &&
         lines[indices.dynatraceFileIndex].includes(LEGACY_GRADLE_DYNATRACE_NODE_MODULES)) {
-        lines[indices.dynatraceFileIndex] = exports.GRADLE_DYNATRACE_FILE;
+        lines[indices.dynatraceFileIndex] = statements.dynatraceFile;
         Logger_1.default.logMessageSync('Migrated old node_modules dynatrace.gradle path to local path in build.gradle', Logger_1.default.INFO);
         modified = true;
     }
@@ -73,12 +88,12 @@ const addDynatraceToGradle = (lines, indices, pathToGradle) => {
         if (buildscriptIndex === -1) {
             throw new Error('Could not find Buildscript block in build.gradle.');
         }
-        lines.splice(buildscriptIndex + 1, 0, exports.GRADLE_APPLY_BUILDSCRIPT);
+        lines.splice(buildscriptIndex + 1, 0, statements.applyBuildscript);
         modified = true;
     }
     if (indices.dynatraceFileIndex === -1) {
         const pluginLineIndex = lines.findIndex((line) => line.includes(GRADLE_REACT_NATIVE_PLUGIN));
-        lines.splice(pluginLineIndex !== -1 ? pluginLineIndex : lines.length, 0, exports.GRADLE_DYNATRACE_FILE);
+        lines.splice(pluginLineIndex !== -1 ? pluginLineIndex : lines.length, 0, statements.dynatraceFile);
         modified = true;
     }
     if (modified) {
@@ -93,10 +108,11 @@ const changeReactNativeBuildGradleFile = (pathToGradle, remove) => {
     const gradleFileContent = FileOperationHelper_1.default.readTextFromFileSync(pathToGradle);
     const modifiedFileContent = removeOldDynatraceClasspath(gradleFileContent);
     const gradleFileContentLines = modifiedFileContent.split('\n');
+    const statements = getGradleStatements(pathToGradle);
     const indices = findGradleLineIndices(gradleFileContentLines);
     const modified = remove
         ? removeDynatraceFromGradle(gradleFileContentLines, indices, pathToGradle)
-        : addDynatraceToGradle(gradleFileContentLines, indices, pathToGradle);
+        : addDynatraceToGradle(gradleFileContentLines, indices, pathToGradle, statements);
     if (modified) {
         const fullGradleFile = gradleFileContentLines.join('\n');
         FileOperationHelper_1.default.writeTextToFileSync(pathToGradle, fullGradleFile);
@@ -152,9 +168,10 @@ const removeOldGradleConfig = (gradleFileContent) => {
 const ensureRuntimeScriptApplied = (pathToGradle) => {
     const gradleContent = FileOperationHelper_1.default.readTextFromFileSync(pathToGradle);
     const gradleLines = gradleContent.split('\n');
-    const alreadyApplied = gradleLines.some((line) => line.includes(exports.GRADLE_APPLY_RUNTIME_SCRIPT));
+    const { runtimeScript } = getGradleStatements(pathToGradle);
+    const alreadyApplied = gradleLines.some((line) => line.includes('plugin-runtime.gradle'));
     if (!alreadyApplied) {
-        gradleLines.push(exports.GRADLE_APPLY_RUNTIME_SCRIPT);
+        gradleLines.push(runtimeScript);
         FileOperationHelper_1.default.writeTextToFileSync(pathToGradle, gradleLines.join('\n'));
         Logger_1.default.logMessageSync(`Added runtime script to ${pathToGradle}`, Logger_1.default.INFO);
     }

package/scripts/Config.js

@@ -11,11 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkConfiguration = exports.addDefaultConfigs = exports.readConfig = exports.readConfigDefault = exports.defaultConfig = exports.ERROR_CONFIG_NOT_AVAILABLE = void 0;
+const path = require("node:path");
 const FileOperationHelper_1 = require("./FileOperationHelper");
 const Logger_1 = require("./Logger");
 const PathsConstants_1 = require("./PathsConstants");
 const CustomArgumentUtil_1 = require("./util/CustomArgumentUtil");
-const path = require("path");
 exports.ERROR_CONFIG_NOT_AVAILABLE = '-1';
 exports.defaultConfig = {
     react: {