@crimson-education/browser-logger 5.0.1 → 5.0.3

package/lib/logger/index.js

@@ -1,52 +1,33 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = exports.createLogger = exports.setLogLevel = exports.globalLogLevel = exports.logTransports = exports.globalMetadata = void 0;
 /* eslint-disable prefer-rest-params */
-const types_1 = require("../types");
-const utils_1 = require("../utils");
-const consoleTransport_1 = require("./consoleTransport");
-const utils_2 = require("./utils");
-__exportStar(require("./consoleTransport"), exports);
-__exportStar(require("./datadogTransport"), exports);
-exports.globalMetadata = {};
-exports.logTransports = [(0, consoleTransport_1.consoleTransport)()];
+import { LogLevel } from '../types';
+import { filterReporterMetadata } from '../utils';
+import { consoleTransport } from './consoleTransport';
+import { getLogMessage, isAboveLevel } from './utils';
+export * from './consoleTransport';
+export * from './datadogTransport';
+export const globalMetadata = {};
+export const logTransports = [consoleTransport()];
+export let globalLogLevel;
 /**
  * Sets the global log level.
  */
-function setLogLevel(level) {
-    exports.globalLogLevel = level !== null && level !== void 0 ? level : undefined;
+export function setLogLevel(level) {
+    globalLogLevel = level ?? undefined;
 }
-exports.setLogLevel = setLogLevel;
 /**
  * Creates a Logger Instance.
  */
-function createLogger(options = {}) {
-    var _a;
-    const rootMetadata = (_a = options.metadata) !== null && _a !== void 0 ? _a : {};
+export function createLogger(options = {}) {
+    const rootMetadata = options.metadata ?? {};
     const logger = {
         // impl loosely based on Winston Logger's dynamic log function
         // https://github.com/winstonjs/winston/blob/master/lib/winston/logger.js
         log() {
-            var _a, _b;
             let logInfo;
             // Optimize for the hotpath of logging JSON literals
             if (arguments.length === 1) {
                 logInfo = {
-                    level: types_1.LogLevel.Info,
+                    level: LogLevel.Info,
                     ...arguments[0],
                 };
             }
@@ -56,7 +37,7 @@ function createLogger(options = {}) {
                 if (message && typeof message === 'object') {
                     logInfo = {
                         ...message,
-                        level: (_a = message.level) !== null && _a !== void 0 ? _a : level,
+                        level: message.level ?? level,
                     };
                 }
                 else {
@@ -77,7 +58,7 @@ function createLogger(options = {}) {
                         message,
                     };
                     if (meta.message) {
-                        logInfo.message = `${(0, utils_2.getLogMessage)(logInfo.message)} ${(0, utils_2.getLogMessage)(meta.message)}`;
+                        logInfo.message = `${getLogMessage(logInfo.message)} ${getLogMessage(meta.message)}`;
                     }
                     if (meta.stack) {
                         logInfo.stack = meta.stack;
@@ -92,27 +73,27 @@ function createLogger(options = {}) {
                 }
             }
             // Check if we should log this message
-            const minLevel = exports.globalLogLevel !== null && exports.globalLogLevel !== void 0 ? exports.globalLogLevel : options.logLevel;
-            if (minLevel && !(0, utils_2.isAboveLevel)(logInfo.level, minLevel)) {
+            const minLevel = globalLogLevel ?? options.logLevel;
+            if (minLevel && !isAboveLevel(logInfo.level, minLevel)) {
                 return logger;
             }
             // Add timestamp and root metadata.
             // Ensure there is a message property.
             logInfo = {
-                ...exports.globalMetadata,
+                ...globalMetadata,
                 ...rootMetadata,
                 timestamp: new Date().toISOString(),
                 ...logInfo,
-                message: (_b = logInfo.message) !== null && _b !== void 0 ? _b : '',
+                message: logInfo.message ?? '',
             };
-            for (const transport of exports.logTransports) {
+            for (const transport of logTransports) {
                 if (transport.logLevel) {
-                    if (!(0, utils_2.isAboveLevel)(logInfo.level, transport.logLevel)) {
+                    if (!isAboveLevel(logInfo.level, transport.logLevel)) {
                         continue;
                     }
                 }
                 transport.log({
-                    ...(0, utils_1.filterReporterMetadata)(logInfo, transport),
+                    ...filterReporterMetadata(logInfo, transport),
                     // These would break the transport if excluded.
                     level: logInfo.level,
                     message: logInfo.message,
@@ -130,19 +111,18 @@ function createLogger(options = {}) {
                 logger: this,
                 done: ({ message, level, metadata } = {}) => {
                     const duration = new Date().getTime() - start.getTime();
-                    logger.log(level !== null && level !== void 0 ? level : types_1.LogLevel.Info, message !== null && message !== void 0 ? message : 'Timer Completed', { duration, ...(metadata !== null && metadata !== void 0 ? metadata : {}) });
+                    logger.log(level ?? LogLevel.Info, message ?? 'Timer Completed', { duration, ...(metadata ?? {}) });
                     return true;
                 },
             };
         },
         // Forward the log levels into the log function, essentially shortcuts.
-        debug: (...args) => logger.log(types_1.LogLevel.Debug, ...args),
-        info: (...args) => logger.log(types_1.LogLevel.Info, ...args),
-        warn: (...args) => logger.log(types_1.LogLevel.Warn, ...args),
-        error: (...args) => logger.log(types_1.LogLevel.Error, ...args),
+        debug: (...args) => logger.log(LogLevel.Debug, ...args),
+        info: (...args) => logger.log(LogLevel.Info, ...args),
+        warn: (...args) => logger.log(LogLevel.Warn, ...args),
+        error: (...args) => logger.log(LogLevel.Error, ...args),
     };
     return logger;
 }
-exports.createLogger = createLogger;
-exports.logger = createLogger();
+export const logger = createLogger();
 //# sourceMappingURL=index.js.map

package/lib/logger/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logger/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logger/index.ts"],"names":[],"mappings":"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"}

package/lib/logger/index.test.js

@@ -1,33 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const _1 = require(".");
-const __1 = require("..");
-const reporters_1 = require("../reporters");
-const types_1 = require("../types");
+import { createLogger, setLogLevel as setGlobalLogLevel, logTransports, consoleTransport } from '.';
+import { init } from '..';
+import { addMetadata, setUser } from '../reporters';
+import { LogLevel } from '../types';
 // This isn't actually asserting anything.
 // But it ensures that the logs look correct, and no errors get thrown.
 describe('logger', () => {
-    const logger = (0, _1.createLogger)({
+    const logger = createLogger({
         metadata: {
             service: 'test',
         },
     });
     // Manually set the log transports.
-    _1.logTransports.length = 0;
-    const transport = (0, _1.consoleTransport)({
+    logTransports.length = 0;
+    const transport = consoleTransport({
         // So we can see everything.
         ignoreMetadataPatterns: [],
     });
-    _1.logTransports.push(transport);
+    logTransports.push(transport);
     it('should log', async () => {
         logger.log({
             level: 'info',
             message: 'data',
         });
         logger.log({ data: 'obj' });
-        logger.log(types_1.LogLevel.Debug, 'level, message', { data: 'obj' });
-        logger.log(types_1.LogLevel.Debug, 'level, message, metadata', { data: 'obj' });
-        (0, __1.init)({
+        logger.log(LogLevel.Debug, 'level, message', { data: 'obj' });
+        logger.log(LogLevel.Debug, 'level, message, metadata', { data: 'obj' });
+        init({
             service: 'test-service',
             environment: 'test',
             version: 'no-version',
@@ -41,17 +39,17 @@ describe('logger', () => {
         const timer = logger.startTimer();
         await new Promise((resolve) => setTimeout(resolve, 1000));
         timer.done({ message: 'timer done', metadata: { id: 1 } });
-        (0, _1.setLogLevel)(types_1.LogLevel.Info);
-        (0, reporters_1.addMetadata)({ global: 'metadata' });
+        setGlobalLogLevel(LogLevel.Info);
+        addMetadata({ global: 'metadata' });
         logger.debug('You should not see this');
         logger.info('You should see this with { global: "metadata" }');
-        (0, _1.setLogLevel)(null);
-        (0, reporters_1.setUser)({
+        setGlobalLogLevel(null);
+        setUser({
             id: '123',
             email: 'test@example.com',
         });
         logger.debug('debug call, user metadata');
-        transport.logLevel = types_1.LogLevel.Info;
+        transport.logLevel = LogLevel.Info;
         logger.debug('You should not see this');
         logger.info('You should see this');
         transport.logLevel = undefined;

package/lib/logger/index.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/logger/index.test.ts"],"names":[],"mappings":";;AAAA,wBAAoG;AACpG,0BAA0B;AAC1B,4CAAoD;AACpD,oCAAoC;AAEpC,0CAA0C;AAC1C,uEAAuE;AACvE,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,MAAM,MAAM,GAAG,IAAA,eAAY,EAAC;QAC1B,QAAQ,EAAE;YACR,OAAO,EAAE,MAAM;SAChB;KACF,CAAC,CAAC;IAEH,mCAAmC;IACnC,gBAAa,CAAC,MAAM,GAAG,CAAC,CAAC;IACzB,MAAM,SAAS,GAAG,IAAA,mBAAgB,EAAC;QACjC,4BAA4B;QAC5B,sBAAsB,EAAE,EAAE;KAC3B,CAAC,CAAC;IACH,gBAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAE9B,EAAE,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAC1B,MAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,MAAM;YACb,OAAO,EAAE,MAAM;SAChB,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9D,MAAM,CAAC,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,0BAA0B,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAExE,IAAA,QAAI,EAAC;YACH,OAAO,EAAE,cAAc;YACvB,WAAW,EAAE,MAAM;YACnB,OAAO,EAAE,YAAY;YACrB,eAAe,EAAE;gBACf,WAAW,EAAE,MAAM;aACpB;SACF,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACrD,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACtC,UAAU,CAAC,IAAI,CAAC,8BAA8B,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;QAEzE,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QAC1D,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAE3D,IAAA,cAAiB,EAAC,gBAAQ,CAAC,IAAI,CAAC,CAAC;QACjC,IAAA,uBAAW,EAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAEpC,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACxC,MAAM,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;QAE/D,IAAA,cAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,IAAA,mBAAO,EAAC;YACN,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,kBAAkB;SAC1B,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAE1C,SAAS,CAAC,QAAQ,GAAG,gBAAQ,CAAC,IAAI,CAAC;QACnC,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACxC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACnC,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/logger/index.test.ts"],"names":[],"mappings":"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"}

package/lib/logger/utils.js

@@ -1,24 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLogMessage = exports.isAboveLevel = void 0;
-const types_1 = require("../types");
+import { LogLevel } from '../types';
 /**
  * Checks if a log level is above the global log level.
  * @param level The log level to check
  * @param checkLevel THe log level to check against
  * @returns Is above the checkLevel?
  */
-function isAboveLevel(level, checkLevel) {
-    const levels = [types_1.LogLevel.Debug, types_1.LogLevel.Info, types_1.LogLevel.Warn, types_1.LogLevel.Error];
+export function isAboveLevel(level, checkLevel) {
+    const levels = [LogLevel.Debug, LogLevel.Info, LogLevel.Warn, LogLevel.Error];
     return levels.indexOf(level) >= levels.indexOf(checkLevel);
 }
-exports.isAboveLevel = isAboveLevel;
 /**
  * Ensures a message output is a string.
  * @param message The message to assert is/convert to a string
  * @returns The message as a string
  */
-function getLogMessage(message) {
+export function getLogMessage(message) {
     if (typeof message === 'string') {
         return message;
     }
@@ -28,5 +24,4 @@ function getLogMessage(message) {
     }
     return String(message);
 }
-exports.getLogMessage = getLogMessage;
 //# sourceMappingURL=utils.js.map

package/lib/logger/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/logger/utils.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AAEpC;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,KAAe,EAAE,UAAoB;IAChE,MAAM,MAAM,GAAG,CAAC,gBAAQ,CAAC,KAAK,EAAE,gBAAQ,CAAC,IAAI,EAAE,gBAAQ,CAAC,IAAI,EAAE,gBAAQ,CAAC,KAAK,CAAC,CAAC;IAC9E,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAC7D,CAAC;AAHD,oCAGC;AAED;;;;GAIG;AACH,SAAgB,aAAa,CAAC,OAAY;IACxC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,OAAO,OAAO,CAAC;KAChB;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,EAAE;QACnD,MAAM,IAAI,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;KAC7B;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC;AATD,sCASC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/logger/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,KAAe,EAAE,UAAoB;IAChE,MAAM,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9E,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAC7D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,OAAY;IACxC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,OAAO,OAAO,CAAC;KAChB;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,EAAE;QACnD,MAAM,IAAI,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;KAC7B;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC;AACzB,CAAC"}

package/lib/reporters/datadogReporter.d.ts

@@ -23,11 +23,14 @@ export interface DatadogReporterConfig extends ReporterConfigBase {
      * @deprecated Prefer using the dedicated `logSampleRate`, `rumSampleRate`, and `replaySampleRate` options.
      */
     sampleRate?: number;
+    sessionSampleRate?: number;
+    sessionReplaySampleRate?: number;
     /**
      * Sampling rate for browser log collection. Defaults to 100, meaning every log message is sent to Datadog.
      */
     logSampleRate?: number;
     /**
+     * @deprecated Prefer using `sessionSampleRate`.
      * Sampling rate for RUM session collection. Defaults to 100, meaning every browser session is tracked.
      *
      * RUM can be used to track things like core web vitals.
@@ -36,6 +39,7 @@ export interface DatadogReporterConfig extends ReporterConfigBase {
      */
     rumSampleRate?: number;
     /**
+     * @deprecated Prefer using `sessionReplaySampleRate`.
      * Applied after the RUM sample rate, and controls the percentage of sessions tracked as Browser RUM & Session Replay.
      * It defaults to 100, so every session is tracked as Browser RUM & Session Replay by default.
      *
@@ -47,10 +51,17 @@ export interface DatadogReporterConfig extends ReporterConfigBase {
      */
     useSecureSessionCookie?: boolean;
     /**
+     * @deprecated Prefer using `usePartitionedCrossSiteSessionCookie`.
      * Use a secure cross-site session cookie.
      * This allows the RUM Browser SDK to run when the site is loaded from another one (iframe). Implies `useSecureSessionCookie`
      */
     useCrossSiteSessionCookie?: boolean;
+    /**
+     * Use a partitioned secure cross-site session cookie. This allows the RUM Browser SDK to run when the site is loaded from another one (iframe). Implies `useSecureSessionCookie`.
+     * Important: If you are using the RUM and Logs Browser SDKs, this option must be configured with identical values
+     * @default false
+     */
+    usePartitionedCrossSiteSessionCookie?: boolean;
     /**
      * Preserve the session across subdomains for the same site.
      */
@@ -100,7 +111,8 @@ export interface DatadogReporterConfig extends ReporterConfigBase {
     /**
      * A list of request origins used to inject tracing headers, to be able to connect RUM and backend tracing.
      */
-    allowedTracingOrigins?: (string | RegExp)[];
+    allowedTrackingOrigins?: (string | RegExp)[];
+    allowedTracingUrls?: (string | RegExp)[];
     /**
      * Enables action tracking for user interactions. This enables the Heatmap tab within Datadog
      */

package/lib/reporters/datadogReporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"datadogReporter.d.ts","sourceRoot":"","sources":["../../src/reporters/datadogReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAMT,WAAW,EACX,kBAAkB,EAEnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAA4B,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACxF,OAAO,EAAc,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE7F,OAAO,EAAE,yBAAyB,EAAoB,MAAM,4BAA4B,CAAC;AAEzF,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,8BAA8B;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,yDAAyD;IACzD,WAAW,EAAE,MAAM,CAAC;IACpB,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,uEAAuE;IACvE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yBAAyB;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC;;;OAGG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC;;OAEG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAC;IAEvC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;OAEG;IACH,UAAU,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAEhD;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,GAAG,yBAAyB,CAAC;IACnD;;OAEG;IACH,cAAc,CAAC,EAAE,qBAAqB,CAAC,YAAY,CAAC,CAAC;IAErD;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C;;OAEG;IACH,qBAAqB,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC5C;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,WAAW,EAAE,CAAC;CACtC;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,qBAAqB,GAAG,SAAS,CAoI3F"}
+{"version":3,"file":"datadogReporter.d.ts","sourceRoot":"","sources":["../../src/reporters/datadogReporter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAMT,WAAW,EACX,kBAAkB,EAEnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAA4B,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACxF,OAAO,EAAc,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE7F,OAAO,EAAE,yBAAyB,EAAoB,MAAM,4BAA4B,CAAC;AA2FzF,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,8BAA8B;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,yDAAyD;IACzD,WAAW,EAAE,MAAM,CAAC;IACpB,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,uEAAuE;IACvE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yBAAyB;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAEjC;;;;OAIG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IAEpC;;;;OAIG;IACH,oCAAoC,CAAC,EAAE,OAAO,CAAC;IAE/C;;OAEG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAC;IAEvC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;OAEG;IACH,UAAU,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAEhD;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,GAAG,yBAAyB,CAAC;IACnD;;OAEG;IACH,cAAc,CAAC,EAAE,qBAAqB,CAAC,YAAY,CAAC,CAAC;IAErD;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C;;OAEG;IACH,sBAAsB,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC7C,kBAAkB,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACzC;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,WAAW,EAAE,CAAC;CACtC;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,qBAAqB,GAAG,SAAS,CAuI3F"}

package/lib/reporters/datadogReporter.js

@@ -1,66 +1,141 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.datadogReporter = void 0;
-const browser_logs_1 = require("@datadog/browser-logs");
-const browser_rum_1 = require("@datadog/browser-rum");
-const logger_1 = require("../logger");
-const datadogTransport_1 = require("../logger/datadogTransport");
-function datadogReporter(info, config) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+import { datadogLogs, HandlerType } from '@datadog/browser-logs';
+import { datadogRum } from '@datadog/browser-rum';
+import { logTransports } from '../logger';
+import { datadogTransport } from '../logger/datadogTransport';
+// User frustration detection for Datadog Gen2
+class DatadogFrustrationDetector {
+    config;
+    frustrationEvents = [];
+    FRUSTRATION_THRESHOLD = 3; // Number of events to trigger frustration
+    FRUSTRATION_WINDOW = 5000; // Time window in ms
+    constructor(config) {
+        this.config = config;
+        if (config.trackFrustrations) {
+            this.setupFrustrationDetection();
+        }
+    }
+    setupFrustrationDetection() {
+        // Track rapid clicks (potential frustration)
+        let clickCount = 0;
+        let lastClickTime = 0;
+        document.addEventListener('click', () => {
+            const now = Date.now();
+            if (now - lastClickTime < 1000) {
+                // Rapid clicks within 1 second
+                clickCount++;
+                if (clickCount >= 3) {
+                    this.recordFrustrationEvent('rapid_clicks');
+                    clickCount = 0;
+                }
+            }
+            else {
+                clickCount = 1;
+            }
+            lastClickTime = now;
+        });
+        // Track form errors (potential frustration)
+        document.addEventListener('invalid', () => {
+            this.recordFrustrationEvent('form_validation_error');
+        });
+        // Track 404 errors (potential frustration)
+        window.addEventListener('error', (event) => {
+            if (event.message.includes('404') || event.message.includes('Not Found')) {
+                this.recordFrustrationEvent('page_not_found');
+            }
+        });
+        // Track network errors (potential frustration)
+        window.addEventListener('unhandledrejection', (event) => {
+            if (event.reason && typeof event.reason === 'object' && 'status' in event.reason) {
+                const status = event.reason.status;
+                if (status >= 400) {
+                    this.recordFrustrationEvent('network_error');
+                }
+            }
+        });
+    }
+    recordFrustrationEvent(type) {
+        const now = Date.now();
+        this.frustrationEvents.push({ type, timestamp: now });
+        // Clean old events outside the window
+        this.frustrationEvents = this.frustrationEvents.filter((event) => now - event.timestamp < this.FRUSTRATION_WINDOW);
+        // Check if we have enough events to trigger frustration
+        if (this.frustrationEvents.length >= this.FRUSTRATION_THRESHOLD) {
+            this.triggerFrustrationDetection();
+        }
+    }
+    triggerFrustrationDetection() {
+        const frustrationData = {
+            frustrationType: 'user_frustration_detected',
+            frustrationEvents: this.frustrationEvents.map((e) => e.type),
+            frustrationCount: this.frustrationEvents.length,
+            pageUrl: window.location.href,
+            timestamp: new Date().toISOString(),
+        };
+        // Send frustration event to Datadog
+        if (typeof datadogRum !== 'undefined') {
+            datadogRum.addAction('User Frustration Detected', frustrationData);
+        }
+        // Clear events after reporting
+        this.frustrationEvents = [];
+    }
+}
+export function datadogReporter(info, config) {
     const isLocalhost = window.location.hostname === 'localhost';
     // Don't forward error logs by default, do enable the log transport by default
     // forwardErrorsToLogs incorrectly is called forwardConsoleLogs, this is for backwards compatibility
-    const forwardErrorsToLogs = (_a = config.forwardConsoleLogs) !== null && _a !== void 0 ? _a : false;
+    const forwardErrorsToLogs = config.forwardConsoleLogs ?? false;
     const enableLogTransport = config.logTransport !== false;
     // Only init datadog logs if something is using it.
-    if (forwardErrorsToLogs !== true && enableLogTransport !== true) {
-        browser_logs_1.datadogLogs.init({
+    if (forwardErrorsToLogs === true || enableLogTransport === true) {
+        datadogLogs.init({
             site: config.site,
-            proxyUrl: config.proxyUrl,
             clientToken: config.clientToken,
             service: info.service,
             env: info.environment,
-            version: (_b = config.version) !== null && _b !== void 0 ? _b : info.version,
-            sampleRate: (_d = (_c = config.logSampleRate) !== null && _c !== void 0 ? _c : config.sampleRate) !== null && _d !== void 0 ? _d : 100,
+            version: config.version ?? info.version,
             beforeSend: config.beforeLogsSend,
-            useSecureSessionCookie: (_e = config.useSecureSessionCookie) !== null && _e !== void 0 ? _e : !isLocalhost,
-            useCrossSiteSessionCookie: (_f = config.useCrossSiteSessionCookie) !== null && _f !== void 0 ? _f : false,
+            usePartitionedCrossSiteSessionCookie: config.usePartitionedCrossSiteSessionCookie,
+            useSecureSessionCookie: config.useSecureSessionCookie ?? !isLocalhost,
+            // Note: useCrossSiteSessionCookie is not available in newer Datadog versions
             trackSessionAcrossSubdomains: config.trackSessionAcrossSubdomains,
             forwardErrorsToLogs,
+            allowedTrackingOrigins: config.allowedTrackingOrigins,
         });
-        browser_logs_1.datadogLogs.logger.setHandler(browser_logs_1.HandlerType.http);
+        datadogLogs.logger.setHandler(HandlerType.http);
     }
     // Add the datadog log transport
     if (enableLogTransport) {
-        logger_1.logTransports.push((0, datadogTransport_1.datadogTransport)(typeof config.logTransport === 'boolean' ? {} : config.logTransport));
+        logTransports.push(datadogTransport(typeof config.logTransport === 'boolean' ? {} : config.logTransport));
     }
-    browser_rum_1.datadogRum.init({
+    datadogRum.init({
         enableExperimentalFeatures: ['feature_flags'],
         site: config.site,
-        proxyUrl: config.proxyUrl,
         clientToken: config.clientToken,
         applicationId: config.applicationId,
         service: info.service,
         env: info.environment,
-        version: (_g = config.version) !== null && _g !== void 0 ? _g : info.version,
-        sampleRate: (_j = (_h = config.rumSampleRate) !== null && _h !== void 0 ? _h : config.sampleRate) !== null && _j !== void 0 ? _j : 100,
-        replaySampleRate: (_k = config.replaySampleRate) !== null && _k !== void 0 ? _k : 100,
-        useSecureSessionCookie: (_l = config.useSecureSessionCookie) !== null && _l !== void 0 ? _l : !isLocalhost,
-        useCrossSiteSessionCookie: (_m = config.useCrossSiteSessionCookie) !== null && _m !== void 0 ? _m : false,
+        version: config.version ?? info.version,
+        usePartitionedCrossSiteSessionCookie: config.usePartitionedCrossSiteSessionCookie,
+        // Use correct Datadog v6 SDK options
+        sessionSampleRate: config.sessionSampleRate ?? config.rumSampleRate ?? config.sampleRate ?? 100,
+        sessionReplaySampleRate: config.sessionReplaySampleRate ?? config.replaySampleRate ?? 100,
+        // Track interactions (Note: trackFrustrations is not available in Datadog v6)
+        trackUserInteractions: config.trackUserInteractions ?? config.trackInteractions ?? false,
+        useSecureSessionCookie: config.useSecureSessionCookie ?? !isLocalhost,
+        // Note: useCrossSiteSessionCookie is not available in newer Datadog versions
         trackSessionAcrossSubdomains: config.trackSessionAcrossSubdomains,
-        trackInteractions: (_o = config.trackInteractions) !== null && _o !== void 0 ? _o : false,
-        trackFrustrations: (_p = config.trackFrustrations) !== null && _p !== void 0 ? _p : false,
-        trackViewsManually: (_q = config.trackViewsManually) !== null && _q !== void 0 ? _q : false,
-        actionNameAttribute: (_r = config.actionNameAttribute) !== null && _r !== void 0 ? _r : 'data-analytics-name',
+        trackViewsManually: config.trackViewsManually ?? false,
+        actionNameAttribute: config.actionNameAttribute ?? 'data-analytics-name',
         beforeSend: config.beforeSend,
-        defaultPrivacyLevel: (_s = config.defaultPrivacyLevel) !== null && _s !== void 0 ? _s : 'mask-user-input',
-        allowedTracingOrigins: config.allowedTracingOrigins,
-        trackUserInteractions: (_t = config.trackUserInteractions) !== null && _t !== void 0 ? _t : false,
+        defaultPrivacyLevel: config.defaultPrivacyLevel ?? 'mask-user-input',
+        allowedTracingUrls: config.allowedTracingUrls ?? config.allowedTrackingOrigins,
         excludedActivityUrls: config.excludedActivityUrls,
     });
+    // Initialize frustration detector
+    new DatadogFrustrationDetector(config);
     const reporter = {
         trackEvent: function (event) {
-            browser_rum_1.datadogRum.addAction(event.message, {
+            datadogRum.addAction(event.message, {
                 level: event.level,
                 ...event.metadata,
                 ...event.tags,
@@ -68,7 +143,7 @@ function datadogReporter(info, config) {
             });
         },
         addBreadcrumb: function (breadcrumb) {
-            browser_rum_1.datadogRum.addAction(breadcrumb.message, {
+            datadogRum.addAction(breadcrumb.message, {
                 ...breadcrumb.metadata,
                 category: breadcrumb.category,
             });
@@ -76,30 +151,29 @@ function datadogReporter(info, config) {
         addMetadata: function (metadata) {
             for (const [key, value] of Object.entries(metadata)) {
                 if (value !== null) {
-                    browser_rum_1.datadogRum.addRumGlobalContext(key, value);
+                    datadogRum.setGlobalContextProperty(key, value);
                     // Note, this will add duplicate context data in logs.
                     // But this is valuable for logs ingested outside of the browser logger.
-                    browser_logs_1.datadogLogs.addLoggerGlobalContext(key, value);
+                    datadogLogs.setGlobalContextProperty(key, value);
                 }
                 else {
-                    browser_rum_1.datadogRum.removeRumGlobalContext(key);
+                    datadogRum.removeGlobalContextProperty(key);
                     // But this is valuable for logs ingested outside of the browser logger.
-                    browser_logs_1.datadogLogs.removeLoggerGlobalContext(key);
+                    datadogLogs.removeGlobalContextProperty(key);
                 }
             }
         },
         setUser: function (user) {
-            var _a;
             if (user) {
-                browser_rum_1.datadogRum.setUser({
+                datadogRum.setUser({
                     ...user,
                     id: user.id,
                     email: user.email,
-                    name: (_a = user.name) !== null && _a !== void 0 ? _a : user.email,
+                    name: user.name ?? user.email,
                 });
             }
             else {
-                browser_rum_1.datadogRum.removeUser();
+                datadogRum.setUser({});
             }
         },
         setRouteName: function (routeName) {
@@ -107,26 +181,25 @@ function datadogReporter(info, config) {
         },
         setPageName: function (pageName) {
             if (config.trackViewsManually) {
-                browser_rum_1.datadogRum.startView(pageName);
+                datadogRum.startView(pageName);
             }
             else {
                 reporter.addMetadata({ pageName });
             }
         },
         reportError: function (error, metadata) {
-            browser_rum_1.datadogRum.addError(error, metadata);
+            datadogRum.addError(error, metadata);
         },
         reportFeatureFlag: function (flag) {
-            browser_rum_1.datadogRum.addFeatureFlagEvaluation(flag.name, flag.value);
+            datadogRum.addFeatureFlagEvaluation(flag.name, flag.value);
         },
         recordSession: function () {
-            browser_rum_1.datadogRum.startSessionReplayRecording();
+            datadogRum.startSessionReplayRecording();
         },
         recordSessionStop: function () {
-            browser_rum_1.datadogRum.stopSessionReplayRecording();
+            datadogRum.stopSessionReplayRecording();
         },
     };
     return reporter;
 }
-exports.datadogReporter = datadogReporter;
 //# sourceMappingURL=datadogReporter.js.map