@cloudcare/rum-uniapp 2.2.9 → 2.2.11

package/cjs/boot/buildEnv.js

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

package/cjs/core/configuration.js

@@ -87,10 +87,10 @@ function commonInit(userConfiguration, buildEnv) {
   if ('isVue2' in userConfiguration) {
     transportConfiguration.isVue2 = userConfiguration.isVue2;
   }
-  if ('isIntakeUrl' in userConfiguration && (0, _utils.isFunction)(userConfiguration.isIntakeUrl) && (0, _utils.isBoolean)(userConfiguration.isIntakeUrl())) {
+  if ('isIntakeUrl' in userConfiguration && (0, _utils.isFunction)(userConfiguration.isIntakeUrl)) {
     transportConfiguration.isIntakeUrl = userConfiguration.isIntakeUrl;
   }
-  return (0, _utils.extend2Lev)(DEFAULT_CONFIGURATION, transportConfiguration);
+  return (0, _utils.extend2Lev)({}, DEFAULT_CONFIGURATION, transportConfiguration);
 }
 function hasTraceType(traceType) {
   if (traceType && (0, _utils.values)(_enums.TraceType).indexOf(traceType) > -1) return true;

package/cjs/core/dataMap.js

@@ -72,6 +72,7 @@ var dataMap = exports.dataMap = {
   resource: {
     type: _enums.RumEventType.RESOURCE,
     tags: {
+      resource_id: 'resource.id',
       trace_id: '_dd.trace_id',
       span_id: '_dd.span_id',
       resource_type: 'resource.type',
@@ -99,6 +100,7 @@ var dataMap = exports.dataMap = {
   error: {
     type: _enums.RumEventType.ERROR,
     tags: {
+      error_id: 'error.id',
       trace_id: '_dd.trace_id',
       span_id: '_dd.span_id',
       error_source: 'error.source',

package/cjs/core/downloadProxy.js

@@ -48,23 +48,26 @@ function proxyDownload(userConfiguration) {
     };
     dataflux_xhr.startTime = (0, _utils.now)();
     var originalSuccess = arguments[0].success;
-    if (typeof originalSuccess === 'function') {
-      arguments[0].success = function () {
-        reportXhr(arguments[0]);
-        if (originalSuccess) {
-          originalSuccess.apply(_this, arguments);
-        }
-      };
-    }
+    arguments[0].success = function () {
+      reportXhr(arguments[0]);
+      if (typeof originalSuccess === 'function') {
+        originalSuccess.apply(_this, arguments);
+      }
+    };
     var originalFail = arguments[0].fail;
-    if (typeof originalFail === 'function') {
-      arguments[0].fail = function () {
-        reportXhr(arguments[0]);
-        if (originalFail) {
-          originalFail.apply(_this, arguments);
-        }
-      };
-    }
+    arguments[0].fail = function () {
+      reportXhr(arguments[0]);
+      if (typeof originalFail === 'function') {
+        originalFail.apply(_this, arguments);
+      }
+    };
+    var originalComplete = arguments[0].complete;
+    arguments[0].complete = function () {
+      reportXhr(arguments[0]);
+      if (typeof originalComplete === 'function') {
+        originalComplete.apply(_this, arguments);
+      }
+    };
     var hasBeenReported = false;
     var reportXhr = function reportXhr(res) {
       if (hasBeenReported) {

package/cjs/core/xhrProxy.js

@@ -49,32 +49,26 @@ function proxyXhr(userConfiguration) {
     };
     dataflux_xhr.startTime = (0, _utils.now)();
     var originalSuccess = arguments[0].success;
-    if (originalSuccess) {
-      arguments[0].success = function () {
-        reportXhr(arguments[0]);
-        if (typeof originalSuccess === "function") {
-          originalSuccess.apply(_this, arguments);
-        }
-      };
-    }
+    arguments[0].success = function () {
+      reportXhr(arguments[0]);
+      if (typeof originalSuccess === "function") {
+        originalSuccess.apply(_this, arguments);
+      }
+    };
     var originalFail = arguments[0].fail;
-    if (originalFail) {
-      arguments[0].fail = function () {
-        reportXhr(arguments[0]);
-        if (typeof originalFail === "function") {
-          originalFail.apply(_this, arguments);
-        }
-      };
-    }
+    arguments[0].fail = function () {
+      reportXhr(arguments[0]);
+      if (typeof originalFail === "function") {
+        originalFail.apply(_this, arguments);
+      }
+    };
     var originalComplete = arguments[0].complete;
-    if (originalComplete) {
-      arguments[0].complete = function () {
-        reportXhr(arguments[0]);
-        if (typeof originalComplete === "function") {
-          originalComplete.apply(_this, arguments);
-        }
-      };
-    }
+    arguments[0].complete = function () {
+      reportXhr(arguments[0]);
+      if (typeof originalComplete === "function") {
+        originalComplete.apply(_this, arguments);
+      }
+    };
     var hasBeenReported = false;
     var reportXhr = function reportXhr(res) {
       if (hasBeenReported) {

package/cjs/rumEventsCollection/app/index.js

@@ -59,7 +59,7 @@ function startPerformanceObservable(lifeCycle) {
     });
     if (typeof launchEntity !== 'undefined') {
       lifeCycle.notify(_lifeCycle.LifeCycleEventType.APP_UPDATE, {
-        startTime: launchEntity.startTime,
+        startTime: computeEntryStartTime(startTime, launchEntity),
         name: '启动',
         type: 'launch',
         id: (0, _utils.UUID)(),
@@ -71,7 +71,7 @@ function startPerformanceObservable(lifeCycle) {
     });
     if (typeof scriptentity !== 'undefined') {
       lifeCycle.notify(_lifeCycle.LifeCycleEventType.APP_UPDATE, {
-        startTime: scriptentity.startTime,
+        startTime: computeEntryStartTime(startTime, scriptentity),
         name: '脚本注入',
         type: 'script_insert',
         id: (0, _utils.UUID)(),
@@ -88,7 +88,7 @@ function startPerformanceObservable(lifeCycle) {
       codeDownloadDuration = launchEntity.duration - firstEntity.duration - scriptentity.duration;
       // 资源下载耗时
       lifeCycle.notify(_lifeCycle.LifeCycleEventType.APP_UPDATE, {
-        startTime: launchEntity.startTime,
+        startTime: computeEntryStartTime(startTime, launchEntity),
         name: '小程序包下载',
         type: 'package_download',
         id: (0, _utils.UUID)(),
@@ -101,4 +101,13 @@ function startPerformanceObservable(lifeCycle) {
   return {
     stop: subscribe.unsubscribe
   };
+}
+function computeEntryStartTime(appStartTime, entry) {
+  if (!(0, _utils.isNumber)(appStartTime)) {
+    return (0, _utils.now)();
+  }
+  if (!entry || !(0, _utils.isNumber)(entry.startTime)) {
+    return appStartTime;
+  }
+  return appStartTime + entry.startTime;
 }

package/cjs/rumEventsCollection/error/errorCollection.js

@@ -60,6 +60,7 @@ function processError(error) {
   var rawRumEvent = (0, _utils.extend2Lev)({
     date: error.startTime,
     error: {
+      id: (0, _utils.UUID)(),
       message: error.message,
       resource: resource,
       source: error.source,

package/cjs/rumEventsCollection/resource/resourceCollection.js

@@ -24,6 +24,7 @@ function processRequest(request) {
   var resourceEvent = (0, _utils.extend2Lev)({
     date: startTime,
     resource: {
+      id: (0, _utils.UUID)(),
       type: type,
       duration: (0, _utils.msToNs)(request.duration),
       method: request.method,
@@ -51,9 +52,6 @@ function computeRequestTracingInfo(request) {
     _dd: {
       spanId: request.spanId,
       traceId: request.traceId
-    },
-    resource: {
-      id: (0, _utils.UUID)()
     }
   };
 }

package/cjs/rumEventsCollection/tracing/ddtraceTracer.js

@@ -8,8 +8,13 @@ exports.DDtraceTracer = DDtraceTracer;
 function randomTraceId() {
   var digits = '0123456789abcdef';
   var n = '';
-  for (var i = 0; i < 19; i += 1) {
-    var rand = Math.floor(Math.random() * 10);
+  for (var i = 0; i < 32; i++) {
+    var rand = void 0;
+    if (i === 0) {
+      rand = Math.floor(Math.random() * 15) + 1;
+    } else {
+      rand = Math.floor(Math.random() * 16);
+    }
     n += digits[rand];
   }
   return n;

package/cjs/rumEventsCollection/tracing/jaegerTracer.js

@@ -9,7 +9,12 @@ function randomTraceId() {
   var digits = '0123456789abcdef';
   var n = '';
   for (var i = 0; i < 16; i += 1) {
-    var rand = Math.floor(Math.random() * 16);
+    var rand = void 0;
+    if (i === 0) {
+      rand = Math.floor(Math.random() * 15) + 1;
+    } else {
+      rand = Math.floor(Math.random() * 16);
+    }
     n += digits[rand];
   }
   return n;

package/cjs/rumEventsCollection/tracing/w3cTraceParentTracer.js

@@ -9,7 +9,12 @@ function randomTraceId() {
   var digits = '0123456789abcdef';
   var n = '';
   for (var i = 0; i < 16; i += 1) {
-    var rand = Math.floor(Math.random() * 16);
+    var rand = void 0;
+    if (i === 0) {
+      rand = Math.floor(Math.random() * 15) + 1;
+    } else {
+      rand = Math.floor(Math.random() * 16);
+    }
     n += digits[rand];
   }
   return n;

package/cjs/rumEventsCollection/tracing/zipkinMultiTracer.js

@@ -9,7 +9,12 @@ function randomTraceId() {
   var digits = '0123456789abcdef';
   var n = '';
   for (var i = 0; i < 16; i += 1) {
-    var rand = Math.floor(Math.random() * 16);
+    var rand = void 0;
+    if (i === 0) {
+      rand = Math.floor(Math.random() * 15) + 1;
+    } else {
+      rand = Math.floor(Math.random() * 16);
+    }
     n += digits[rand];
   }
   return n;

package/cjs/rumEventsCollection/tracing/zipkinSingleTracer.js

@@ -9,7 +9,12 @@ function randomTraceId() {
   var digits = '0123456789abcdef';
   var n = '';
   for (var i = 0; i < 16; i += 1) {
-    var rand = Math.floor(Math.random() * 16);
+    var rand = void 0;
+    if (i === 0) {
+      rand = Math.floor(Math.random() * 15) + 1;
+    } else {
+      rand = Math.floor(Math.random() * 16);
+    }
     n += digits[rand];
   }
   return n;

package/esm/boot/buildEnv.js

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

package/esm/core/configuration.js

@@ -1,4 +1,4 @@
-import { extend2Lev, urlParse, values, isFunction, isBoolean } from '../helper/utils';
+import { extend2Lev, urlParse, values, isFunction } from '../helper/utils';
 import { ONE_KILO_BYTE, ONE_SECOND, TraceType } from '../helper/enums';
 import { catchUserErrors } from '../helper/catchUserErrors';
 var TRIM_REGIX = /^\s+|\s+$/g;
@@ -79,10 +79,10 @@ export function commonInit(userConfiguration, buildEnv) {
   if ('isVue2' in userConfiguration) {
     transportConfiguration.isVue2 = userConfiguration.isVue2;
   }
-  if ('isIntakeUrl' in userConfiguration && isFunction(userConfiguration.isIntakeUrl) && isBoolean(userConfiguration.isIntakeUrl())) {
+  if ('isIntakeUrl' in userConfiguration && isFunction(userConfiguration.isIntakeUrl)) {
     transportConfiguration.isIntakeUrl = userConfiguration.isIntakeUrl;
   }
-  return extend2Lev(DEFAULT_CONFIGURATION, transportConfiguration);
+  return extend2Lev({}, DEFAULT_CONFIGURATION, transportConfiguration);
 }
 function hasTraceType(traceType) {
   if (traceType && values(TraceType).indexOf(traceType) > -1) return true;

package/esm/core/dataMap.js

@@ -66,6 +66,7 @@ export var dataMap = {
   resource: {
     type: RumEventType.RESOURCE,
     tags: {
+      resource_id: 'resource.id',
       trace_id: '_dd.trace_id',
       span_id: '_dd.span_id',
       resource_type: 'resource.type',
@@ -93,6 +94,7 @@ export var dataMap = {
   error: {
     type: RumEventType.ERROR,
     tags: {
+      error_id: 'error.id',
       trace_id: '_dd.trace_id',
       span_id: '_dd.span_id',
       error_source: 'error.source',

package/esm/core/downloadProxy.js

@@ -40,23 +40,26 @@ function proxyDownload(userConfiguration) {
     };
     dataflux_xhr.startTime = now();
     var originalSuccess = arguments[0].success;
-    if (typeof originalSuccess === 'function') {
-      arguments[0].success = function () {
-        reportXhr(arguments[0]);
-        if (originalSuccess) {
-          originalSuccess.apply(_this, arguments);
-        }
-      };
-    }
+    arguments[0].success = function () {
+      reportXhr(arguments[0]);
+      if (typeof originalSuccess === 'function') {
+        originalSuccess.apply(_this, arguments);
+      }
+    };
     var originalFail = arguments[0].fail;
-    if (typeof originalFail === 'function') {
-      arguments[0].fail = function () {
-        reportXhr(arguments[0]);
-        if (originalFail) {
-          originalFail.apply(_this, arguments);
-        }
-      };
-    }
+    arguments[0].fail = function () {
+      reportXhr(arguments[0]);
+      if (typeof originalFail === 'function') {
+        originalFail.apply(_this, arguments);
+      }
+    };
+    var originalComplete = arguments[0].complete;
+    arguments[0].complete = function () {
+      reportXhr(arguments[0]);
+      if (typeof originalComplete === 'function') {
+        originalComplete.apply(_this, arguments);
+      }
+    };
     var hasBeenReported = false;
     var reportXhr = function reportXhr(res) {
       if (hasBeenReported) {

package/esm/core/xhrProxy.js

@@ -41,32 +41,26 @@ function proxyXhr(userConfiguration) {
     };
     dataflux_xhr.startTime = now();
     var originalSuccess = arguments[0].success;
-    if (originalSuccess) {
-      arguments[0].success = function () {
-        reportXhr(arguments[0]);
-        if (typeof originalSuccess === "function") {
-          originalSuccess.apply(_this, arguments);
-        }
-      };
-    }
+    arguments[0].success = function () {
+      reportXhr(arguments[0]);
+      if (typeof originalSuccess === "function") {
+        originalSuccess.apply(_this, arguments);
+      }
+    };
     var originalFail = arguments[0].fail;
-    if (originalFail) {
-      arguments[0].fail = function () {
-        reportXhr(arguments[0]);
-        if (typeof originalFail === "function") {
-          originalFail.apply(_this, arguments);
-        }
-      };
-    }
+    arguments[0].fail = function () {
+      reportXhr(arguments[0]);
+      if (typeof originalFail === "function") {
+        originalFail.apply(_this, arguments);
+      }
+    };
     var originalComplete = arguments[0].complete;
-    if (originalComplete) {
-      arguments[0].complete = function () {
-        reportXhr(arguments[0]);
-        if (typeof originalComplete === "function") {
-          originalComplete.apply(_this, arguments);
-        }
-      };
-    }
+    arguments[0].complete = function () {
+      reportXhr(arguments[0]);
+      if (typeof originalComplete === "function") {
+        originalComplete.apply(_this, arguments);
+      }
+    };
     var hasBeenReported = false;
     var reportXhr = function reportXhr(res) {
       if (hasBeenReported) {

package/esm/rumEventsCollection/app/index.js

@@ -1,4 +1,4 @@
-import { now, areInOrder, UUID } from '../../helper/utils';
+import { now, areInOrder, UUID, isNumber } from '../../helper/utils';
 import { LifeCycleEventType } from '../../core/lifeCycle';
 
 // 劫持原小程序App方法
@@ -50,7 +50,7 @@ function startPerformanceObservable(lifeCycle) {
     var launchEntity = entitys.find(entity => entity.entryType === 'navigation' && entity.navigationType === 'appLaunch');
     if (typeof launchEntity !== 'undefined') {
       lifeCycle.notify(LifeCycleEventType.APP_UPDATE, {
-        startTime: launchEntity.startTime,
+        startTime: computeEntryStartTime(startTime, launchEntity),
         name: '启动',
         type: 'launch',
         id: UUID(),
@@ -60,7 +60,7 @@ function startPerformanceObservable(lifeCycle) {
     var scriptentity = entitys.find(entity => entity.entryType === 'script' && entity.name === 'evaluateScript');
     if (typeof scriptentity !== 'undefined') {
       lifeCycle.notify(LifeCycleEventType.APP_UPDATE, {
-        startTime: scriptentity.startTime,
+        startTime: computeEntryStartTime(startTime, scriptentity),
         name: '脚本注入',
         type: 'script_insert',
         id: UUID(),
@@ -75,7 +75,7 @@ function startPerformanceObservable(lifeCycle) {
       codeDownloadDuration = launchEntity.duration - firstEntity.duration - scriptentity.duration;
       // 资源下载耗时
       lifeCycle.notify(LifeCycleEventType.APP_UPDATE, {
-        startTime: launchEntity.startTime,
+        startTime: computeEntryStartTime(startTime, launchEntity),
         name: '小程序包下载',
         type: 'package_download',
         id: UUID(),
@@ -88,4 +88,13 @@ function startPerformanceObservable(lifeCycle) {
   return {
     stop: subscribe.unsubscribe
   };
+}
+function computeEntryStartTime(appStartTime, entry) {
+  if (!isNumber(appStartTime)) {
+    return now();
+  }
+  if (!entry || !isNumber(entry.startTime)) {
+    return appStartTime;
+  }
+  return appStartTime + entry.startTime;
 }

package/esm/rumEventsCollection/error/errorCollection.js

@@ -2,7 +2,7 @@ import { startAutomaticErrorCollection } from '../../core/errorCollection';
 import { RumEventType } from '../../helper/enums';
 import { LifeCycleEventType } from '../../core/lifeCycle';
 import { ErrorSource, formatUnknownError } from '../../core/errorTools';
-import { urlParse, replaceNumberCharByPath, getStatusGroup, extend2Lev, extend } from '../../helper/utils';
+import { urlParse, replaceNumberCharByPath, getStatusGroup, extend2Lev, extend, UUID } from '../../helper/utils';
 import { computeStackTrace } from '../../helper/tracekit';
 export function startErrorCollection(lifeCycle, configuration) {
   startAutomaticErrorCollection(configuration).subscribe(function (error) {
@@ -53,6 +53,7 @@ function processError(error) {
   var rawRumEvent = extend2Lev({
     date: error.startTime,
     error: {
+      id: UUID(),
       message: error.message,
       resource: resource,
       source: error.source,

package/esm/rumEventsCollection/resource/resourceCollection.js

@@ -18,6 +18,7 @@ function processRequest(request) {
   var resourceEvent = extend2Lev({
     date: startTime,
     resource: {
+      id: UUID(),
       type: type,
       duration: msToNs(request.duration),
       method: request.method,
@@ -45,9 +46,6 @@ function computeRequestTracingInfo(request) {
     _dd: {
       spanId: request.spanId,
       traceId: request.traceId
-    },
-    resource: {
-      id: UUID()
     }
   };
 }

package/esm/rumEventsCollection/tracing/ddtraceTracer.js

@@ -2,8 +2,13 @@
 function randomTraceId() {
   var digits = '0123456789abcdef';
   var n = '';
-  for (var i = 0; i < 19; i += 1) {
-    var rand = Math.floor(Math.random() * 10);
+  for (var i = 0; i < 32; i++) {
+    var rand = void 0;
+    if (i === 0) {
+      rand = Math.floor(Math.random() * 15) + 1;
+    } else {
+      rand = Math.floor(Math.random() * 16);
+    }
     n += digits[rand];
   }
   return n;

package/esm/rumEventsCollection/tracing/jaegerTracer.js

@@ -3,7 +3,12 @@ function randomTraceId() {
   var digits = '0123456789abcdef';
   var n = '';
   for (var i = 0; i < 16; i += 1) {
-    var rand = Math.floor(Math.random() * 16);
+    var rand = void 0;
+    if (i === 0) {
+      rand = Math.floor(Math.random() * 15) + 1;
+    } else {
+      rand = Math.floor(Math.random() * 16);
+    }
     n += digits[rand];
   }
   return n;

package/esm/rumEventsCollection/tracing/w3cTraceParentTracer.js

@@ -3,7 +3,12 @@ function randomTraceId() {
   var digits = '0123456789abcdef';
   var n = '';
   for (var i = 0; i < 16; i += 1) {
-    var rand = Math.floor(Math.random() * 16);
+    var rand = void 0;
+    if (i === 0) {
+      rand = Math.floor(Math.random() * 15) + 1;
+    } else {
+      rand = Math.floor(Math.random() * 16);
+    }
     n += digits[rand];
   }
   return n;

package/esm/rumEventsCollection/tracing/zipkinMultiTracer.js

@@ -3,7 +3,12 @@ function randomTraceId() {
   var digits = '0123456789abcdef';
   var n = '';
   for (var i = 0; i < 16; i += 1) {
-    var rand = Math.floor(Math.random() * 16);
+    var rand = void 0;
+    if (i === 0) {
+      rand = Math.floor(Math.random() * 15) + 1;
+    } else {
+      rand = Math.floor(Math.random() * 16);
+    }
     n += digits[rand];
   }
   return n;

package/esm/rumEventsCollection/tracing/zipkinSingleTracer.js

@@ -3,7 +3,12 @@ function randomTraceId() {
   var digits = '0123456789abcdef';
   var n = '';
   for (var i = 0; i < 16; i += 1) {
-    var rand = Math.floor(Math.random() * 16);
+    var rand = void 0;
+    if (i === 0) {
+      rand = Math.floor(Math.random() * 15) + 1;
+    } else {
+      rand = Math.floor(Math.random() * 16);
+    }
     n += digits[rand];
   }
   return n;

package/package.json

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