@cloudcare/rum-uniapp 2.1.23 → 2.1.24

package/cjs/boot/buildEnv.js

@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildEnv = void 0;
 var buildEnv = exports.buildEnv = {
-  sdkVersion: '2.1.23',
+  sdkVersion: '2.1.24',
   sdkName: 'df_uniapp_rum_sdk'
 };

package/cjs/core/configuration.js

@@ -8,6 +8,7 @@ exports.commonInit = commonInit;
 exports.isIntakeRequest = isIntakeRequest;
 var _utils = require("../helper/utils");
 var _enums = require("../helper/enums");
+var _catchUserErrors = require("../helper/catchUserErrors");
 var TRIM_REGIX = /^\s+|\s+$/g;
 var DEFAULT_CONFIGURATION = exports.DEFAULT_CONFIGURATION = {
   sampleRate: 100,
@@ -64,7 +65,8 @@ function commonInit(userConfiguration, buildEnv) {
     sdkVersion: buildEnv.sdkVersion,
     sdkName: buildEnv.sdkName,
     datakitUrl: getDatakitEndPoint(userConfiguration),
-    tags: userConfiguration.tags || []
+    tags: userConfiguration.tags || [],
+    injectTraceHeader: userConfiguration.injectTraceHeader && (0, _catchUserErrors.catchUserErrors)(userConfiguration.injectTraceHeader, 'injectTraceHeader threw an error:')
   };
   if ('trackInteractions' in userConfiguration) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions;

package/cjs/helper/catchUserErrors.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.catchUserErrors = catchUserErrors;
+function catchUserErrors(fn, errorMsg) {
+  return function () {
+    var args = [].slice.call(arguments);
+    try {
+      return fn.apply(this, args);
+    } catch (err) {
+      console.error(errorMsg, err);
+    }
+  };
+}

package/cjs/helper/utils.js

@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ONE_SECOND = exports.ONE_MINUTE = exports.ONE_HOUR = void 0;
 exports.UUID = UUID;
-exports.base64Encode = exports.areInOrder = void 0;
+exports.areInOrder = void 0;
+exports.assign = assign;
+exports.base64Encode = void 0;
 exports.deepClone = deepClone;
 exports.deepMixObject = void 0;
 exports.deepSnakeCase = deepSnakeCase;
@@ -36,7 +38,9 @@ exports.now = void 0;
 exports.performDraw = performDraw;
 exports.replaceNumberCharByPath = replaceNumberCharByPath;
 exports.round = round;
-exports.toArray = exports.throttle = exports.safeJSONParse = void 0;
+exports.safeJSONParse = void 0;
+exports.shallowClone = shallowClone;
+exports.toArray = exports.throttle = void 0;
 exports.toServerDuration = toServerDuration;
 exports.toSnakeCase = toSnakeCase;
 exports.values = exports.utf8Encode = exports.urlParse = exports.trim = void 0;
@@ -740,4 +744,17 @@ function getGlobalObject() {
     }
   }
   return globalObject;
+}
+function assign(target) {
+  each(slice.call(arguments, 1), function (source) {
+    for (var prop in source) {
+      if (Object.prototype.hasOwnProperty.call(source, prop)) {
+        target[prop] = source[prop];
+      }
+    }
+  });
+  return target;
+}
+function shallowClone(object) {
+  return assign({}, object);
 }

package/cjs/rumEventsCollection/tracing/tracer.js

@@ -80,5 +80,16 @@ function injectHeadersIfTracingAllowed(configuration, context, inject) {
   }
   context.traceId = tracer.getTraceId();
   context.spanId = tracer.getSpanId();
-  inject(tracer.makeTracingHeaders());
+  var headers = tracer.makeTracingHeaders();
+  if (configuration.injectTraceHeader) {
+    var result = configuration.injectTraceHeader((0, _utils.shallowClone)(context));
+    if ((0, _utils.getType)(result) === 'object') {
+      (0, _utils.each)(result, function (value, key) {
+        if ((0, _utils.getType)(value) === 'string') {
+          headers[key] = value;
+        }
+      });
+    }
+  }
+  inject(headers);
 }

package/esm/boot/buildEnv.js

@@ -1,4 +1,4 @@
 export var buildEnv = {
-  sdkVersion: '2.1.23',
+  sdkVersion: '2.1.24',
   sdkName: 'df_uniapp_rum_sdk'
 };

package/esm/core/configuration.js

@@ -1,5 +1,6 @@
 import { extend2Lev, urlParse, values, isFunction, isBoolean } from '../helper/utils';
 import { ONE_KILO_BYTE, ONE_SECOND, TraceType } from '../helper/enums';
+import { catchUserErrors } from '../helper/catchUserErrors';
 var TRIM_REGIX = /^\s+|\s+$/g;
 export var DEFAULT_CONFIGURATION = {
   sampleRate: 100,
@@ -56,7 +57,8 @@ export function commonInit(userConfiguration, buildEnv) {
     sdkVersion: buildEnv.sdkVersion,
     sdkName: buildEnv.sdkName,
     datakitUrl: getDatakitEndPoint(userConfiguration),
-    tags: userConfiguration.tags || []
+    tags: userConfiguration.tags || [],
+    injectTraceHeader: userConfiguration.injectTraceHeader && catchUserErrors(userConfiguration.injectTraceHeader, 'injectTraceHeader threw an error:')
   };
   if ('trackInteractions' in userConfiguration) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions;

package/esm/helper/catchUserErrors.js

@@ -0,0 +1,10 @@
+export function catchUserErrors(fn, errorMsg) {
+  return function () {
+    var args = [].slice.call(arguments);
+    try {
+      return fn.apply(this, args);
+    } catch (err) {
+      console.error(errorMsg, err);
+    }
+  };
+}

package/esm/helper/utils.js

@@ -694,4 +694,17 @@ export function getGlobalObject() {
     }
   }
   return globalObject;
+}
+export function assign(target) {
+  each(slice.call(arguments, 1), function (source) {
+    for (var prop in source) {
+      if (Object.prototype.hasOwnProperty.call(source, prop)) {
+        target[prop] = source[prop];
+      }
+    }
+  });
+  return target;
+}
+export function shallowClone(object) {
+  return assign({}, object);
 }

package/esm/rumEventsCollection/tracing/tracer.js

@@ -1,4 +1,4 @@
-import { each, extend, getOrigin } from '../../helper/utils';
+import { each, extend, getOrigin, getType, shallowClone } from '../../helper/utils';
 import { TraceType } from '../../helper/enums';
 import { DDtraceTracer } from './ddtraceTracer';
 import { SkyWalkingTracer } from './skywalkingTracer';
@@ -72,5 +72,16 @@ export function injectHeadersIfTracingAllowed(configuration, context, inject) {
   }
   context.traceId = tracer.getTraceId();
   context.spanId = tracer.getSpanId();
-  inject(tracer.makeTracingHeaders());
+  var headers = tracer.makeTracingHeaders();
+  if (configuration.injectTraceHeader) {
+    var result = configuration.injectTraceHeader(shallowClone(context));
+    if (getType(result) === 'object') {
+      each(result, function (value, key) {
+        if (getType(value) === 'string') {
+          headers[key] = value;
+        }
+      });
+    }
+  }
+  inject(headers);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudcare/rum-uniapp",
-    "version": "2.1.23",
+    "version": "2.1.24",
     "main": "cjs/index.js",
     "module": "esm/index.js",
     "miniprogram": "cjs",