@dynatrace/react-native-plugin 2.337.3 → 2.341.1

package/lib/core/DynatraceRootAction.js

@@ -8,6 +8,7 @@ const NullAction_1 = require("./NullAction");
 const DynatraceInternal_1 = require("./DynatraceInternal");
 const ConfigurationHandler_1 = require("./configuration/ConfigurationHandler");
 const ConsoleLogger_1 = require("./logging/ConsoleLogger");
+const LogMessages_1 = require("./logging/LogMessages");
 class DynatraceRootAction extends DynatraceAction_1.DynatraceAction {
     constructor(key, name) {
         super(key, name, true);
@@ -15,7 +16,7 @@ class DynatraceRootAction extends DynatraceAction_1.DynatraceAction {
     }
     enterAction(name, platform) {
         if (this.closed) {
-            this.logger.debug(`enterAction(${name}): Action was closed already!`);
+            this.logger.debug(LogMessages_1.LogMessage.ROOT_ACTION_ENTER_CLOSED, { name });
             return new NullAction_1.NullAction();
         }
         let childKey;
@@ -29,12 +30,14 @@ class DynatraceRootAction extends DynatraceAction_1.DynatraceAction {
             childKey = 'DEFAULT_' + DynatraceInternal_1.DynatraceInternal.getCounter();
         }
         if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(name)) {
-            this.logger.debug(`enterAction(${name})`);
+            this.logger.debug(LogMessages_1.LogMessage.ROOT_ACTION_ENTER, { name });
             DynatraceBridge_1.DynatraceNative.enterManualActionWithParent(name, childKey, this.key, platform === null || platform === void 0 ? void 0 : platform.toString());
             return new DynatraceAction_1.DynatraceAction(childKey, name, true);
         }
         else {
-            this.logger.debug(`enterAction(${name}): Action Name was empty or null! Action will have no effect.`);
+            this.logger.debug(LogMessages_1.LogMessage.ROOT_ACTION_ENTER_NAME_EMPTY, {
+                name,
+            });
             return new NullAction_1.NullAction();
         }
     }

package/lib/core/DynatraceWebRequestTiming.js

@@ -4,6 +4,7 @@ exports.DynatraceWebRequestTiming = void 0;
 const DynatraceBridge_1 = require("./DynatraceBridge");
 const ConsoleLogger_1 = require("./logging/ConsoleLogger");
 const StringUtils_1 = require("./util/StringUtils");
+const LogMessages_1 = require("./logging/LogMessages");
 const logger = new ConsoleLogger_1.ConsoleLogger('DynatraceWebRequestTiming');
 class DynatraceWebRequestTiming {
     constructor(requestTag, url) {
@@ -13,11 +14,17 @@ class DynatraceWebRequestTiming {
     startWebRequestTiming() {
         if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.requestTag) &&
             !StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.url)) {
-            logger.debug(`startWebRequestTiming() - (${this.url}/${this.requestTag})`);
+            logger.debug(LogMessages_1.LogMessage.WEB_REQUEST_TIMING_START, {
+                url: this.url,
+                requestTag: this.requestTag,
+            });
             DynatraceBridge_1.DynatraceNative.startWebRequestTiming(this.requestTag, this.url);
         }
         else {
-            logger.debug(`startWebRequestTiming(): Web Request Timing could not be created! - (${this.url}/${this.requestTag})`);
+            logger.debug(LogMessages_1.LogMessage.WEB_REQUEST_TIMING_START_FAILED, {
+                url: this.url,
+                requestTag: this.requestTag,
+            });
         }
     }
     stopWebRequestTiming(responseCode, responseMessage) {
@@ -28,11 +35,25 @@ class DynatraceWebRequestTiming {
             !StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(this.url) &&
             responseCode != null &&
             !StringUtils_1.StringUtils.isStringNullOrUndefined(responseMessage)) {
-            logger.debug(`stopWebRequestTiming(${responseCode}, ${responseMessage}, ${requestSize}, ${responseSize}) - (${this.url}/${this.requestTag})`);
+            logger.debug(LogMessages_1.LogMessage.WEB_REQUEST_TIMING_STOP, {
+                responseCode,
+                responseMessage,
+                requestSize,
+                responseSize,
+                url: this.url,
+                requestTag: this.requestTag,
+            });
             DynatraceBridge_1.DynatraceNative.stopWebRequestTimingWithSize(this.requestTag, this.url, responseCode, responseMessage, requestSize, responseSize);
         }
         else {
-            logger.debug(`stopWebRequestTiming(${responseCode}, ${responseMessage}, ${requestSize}, ${responseSize}): Web Request Timing could not be stopped! - (${this.url}/${this.requestTag})`);
+            logger.debug(LogMessages_1.LogMessage.WEB_REQUEST_TIMING_STOP_FAILED, {
+                responseCode,
+                responseMessage,
+                requestSize,
+                responseSize,
+                url: this.url,
+                requestTag: this.requestTag,
+            });
         }
     }
     getRequestTag() {

package/lib/core/ErrorHandler.js

@@ -1,42 +1,69 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reportErrorToDynatrace = exports.startErrorHandler = void 0;
+const react_native_1 = require("react-native");
 const DynatraceInternal_1 = require("./DynatraceInternal");
-const Dynatrace_1 = require("./Dynatrace");
 const StringUtils_1 = require("./util/StringUtils");
 const ConsoleLogger_1 = require("./logging/ConsoleLogger");
-const react_native_1 = require("react-native");
+const LogMessages_1 = require("./logging/LogMessages");
 const logger = new ConsoleLogger_1.ConsoleLogger('ErrorHandler');
 let manualStart = { enabled: false };
 const startErrorHandler = (reportFatalErrorAsCrash) => {
     manualStart = {
         enabled: true,
-        reportFatalErrorAsCrash: reportFatalErrorAsCrash,
+        reportFatalErrorAsCrash,
     };
 };
 exports.startErrorHandler = startErrorHandler;
 const reportErrorToDynatrace = (exception, isFatal, reportFatalErrorAsCrashFromConfig, autoStart) => {
-    if (!autoStart && !manualStart)
+    if (!isErrorHandlingEnabled(autoStart)) {
         return 0;
-    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 : '', reportFatalErrorAsCrash);
-            logger.debug(`reportErrorToDynatrace(${exception}, ${isFatal})`);
-        }
     }
-    else {
-        Dynatrace_1.Dynatrace.reportError(String(exception), -1);
-        logger.debug(`reportErrorToDynatrace(${exception}, -1)`);
+    if (!isExceptionAnErrorWithName(exception)) {
+        DynatraceInternal_1.DynatraceInternal.reportErrorFromHandler(false, String(exception), '', '', true);
+        logger.debug(LogMessages_1.LogMessage.REPORT_ERROR_TO_DYNATRACE, {
+            exception: String(exception),
+            isFatal: '-1',
+        });
+        return getCrashDelay();
     }
-    return react_native_1.Platform.OS === 'ios' ? 200 : 0;
+    const resolvedIsFatal = isFatal !== null && isFatal !== void 0 ? isFatal : false;
+    const reportFatalErrorAsCrash = resolveReportFatalErrorAsCrash(reportFatalErrorAsCrashFromConfig);
+    const { errorName, errorReason, errorStack } = buildErrorDetails(exception);
+    reportErrorFromException(resolvedIsFatal, reportFatalErrorAsCrash, errorName, errorReason, errorStack);
+    logger.debug(LogMessages_1.LogMessage.REPORT_ERROR_TO_DYNATRACE, {
+        exception: String(exception),
+        isFatal: String(resolvedIsFatal),
+    });
+    return getCrashDelay();
 };
 exports.reportErrorToDynatrace = reportErrorToDynatrace;
+const isErrorHandlingEnabled = (autoStart) => autoStart || manualStart.enabled;
+const resolveReportFatalErrorAsCrash = (reportFatalErrorAsCrashFromConfig) => manualStart.enabled
+    ? manualStart.reportFatalErrorAsCrash
+    : reportFatalErrorAsCrashFromConfig;
+const isExceptionAnErrorWithName = (exception) => {
+    if (exception == null || !isExceptionAnError(exception)) {
+        return false;
+    }
+    return !StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(exception.name);
+};
+const buildErrorDetails = (exception) => {
+    var _a;
+    return ({
+        errorName: String(exception.name),
+        errorReason: adjustedReason(exception.message),
+        errorStack: (_a = exception.stack) !== null && _a !== void 0 ? _a : '',
+    });
+};
+const reportErrorFromException = (isFatal, reportFatalErrorAsCrash, errorName, errorReason, errorStack) => {
+    if (isFatal && reportFatalErrorAsCrash) {
+        DynatraceInternal_1.DynatraceInternal.reportFatalErrorAsCrashFromHandler(isFatal, errorName, errorReason, errorStack);
+        return;
+    }
+    DynatraceInternal_1.DynatraceInternal.reportErrorFromHandler(isFatal, errorName, errorReason, errorStack);
+};
+const getCrashDelay = () => (react_native_1.Platform.OS === 'ios' ? 200 : 0);
 const adjustedReason = (reason) => {
     if (!StringUtils_1.StringUtils.isStringNullEmptyOrUndefined(reason)) {
         const reasonNewLineIndex = reason.indexOf('\n');

package/lib/core/NullAction.js

@@ -24,9 +24,7 @@ class NullAction {
         return;
     }
     getRequestTag(url) {
-        return new Promise((resolve) => {
-            resolve('');
-        });
+        return Promise.resolve('');
     }
     getRequestTagHeader() {
         return '';

package/lib/core/logging/ConsoleLogger.js

@@ -3,21 +3,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsoleLogger = void 0;
 const ConfigurationHandler_1 = require("../configuration/ConfigurationHandler");
 const LogLevel_1 = require("./LogLevel");
+const LogMessages_1 = require("./LogMessages");
+const LogType_1 = require("./LogType");
 class ConsoleLogger {
     constructor(name, logLevel) {
         this.name = name;
         this.level = logLevel;
     }
-    debug(msg) {
+    debug(key, ...args) {
         if (this.isDebugEnabled()) {
-            this.logMessage(msg);
+            this.logMessage(key, args[0]);
         }
     }
-    info(msg) {
-        this.logMessage(msg);
+    info(key, ...args) {
+        this.logMessage(key, args[0]);
     }
-    logMessage(msg) {
-        console.log(`[${this.name}]: ${msg}`);
+    logMessage(key, params) {
+        var _a;
+        const entry = LogMessages_1.LOG_MESSAGES[key];
+        let message = typeof entry.template === 'function'
+            ? entry.template(params)
+            : entry.template;
+        if ('documentationUri' in entry && entry.documentationUri) {
+            message += `\nFor more information, see: ${entry.documentationUri}`;
+        }
+        const logType = 'logType' in entry ? (_a = entry.logType) !== null && _a !== void 0 ? _a : LogType_1.LogType.Info : LogType_1.LogType.Info;
+        console.log(`[${logType}][${this.name}]: ${message}`);
     }
     isDebugEnabled() {
         return (this.level === LogLevel_1.LogLevel.Debug ||