@cloudcare/rum-uniapp 2.2.2 → 2.2.4

package/cjs/boot/buildEnv.js

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

package/cjs/core/baseInfo.js

@@ -8,6 +8,7 @@ var _sdk = require("../core/sdk");
 var _utils = require("../helper/utils");
 var _enums = require("../helper/enums");
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -23,28 +24,79 @@ var BaseInfo = /*#__PURE__*/function () {
     key: "getDeviceInfo",
     value: function getDeviceInfo() {
       try {
-        var deviceInfo = _sdk.sdk.getSystemInfoSync();
-        var osInfo = deviceInfo.system.split(' ');
-        var osVersion = '';
-        if (osInfo.length > 1) {
-          osVersion = osInfo[1];
+        // 设备信息
+        var deviceInfo = {};
+        if (_sdk.sdk.getDeviceInfo) {
+          deviceInfo = _sdk.sdk.getDeviceInfo();
+        } else {
+          var systemInfo = _sdk.sdk.getSystemInfoSync();
+          deviceInfo = _defineProperty({
+            deviceBrand: systemInfo.deviceBrand,
+            deviceId: systemInfo.deviceId,
+            deviceModel: systemInfo.deviceModel,
+            deviceType: systemInfo.deviceType,
+            deviceOrientation: systemInfo.deviceOrientation,
+            devicePixelRatio: systemInfo.devicePixelRatio,
+            system: systemInfo.system
+          }, "devicePixelRatio", systemInfo.devicePixelRatio);
+        }
+        var appBaseInfo = {};
+        if (_sdk.sdk.getAppBaseInfo) {
+          appBaseInfo = _sdk.sdk.getAppBaseInfo();
         } else {
-          osVersion = osInfo[0] || '';
+          var _systemInfo = _sdk.sdk.getSystemInfoSync();
+          appBaseInfo = {
+            appId: _systemInfo.appId,
+            appName: _systemInfo.appName,
+            appVersion: _systemInfo.appVersion,
+            appVersionCode: _systemInfo.appVersionCode,
+            appLanguage: _systemInfo.appLanguage,
+            appWgtVersion: _systemInfo.appWgtVersion,
+            hostName: _systemInfo.hostName,
+            hostVersion: _systemInfo.hostVersion,
+            hostLanguage: _systemInfo.hostLanguage
+          };
         }
+        var windowInfo = {};
+        if (_sdk.sdk.getWindowInfo) {
+          windowInfo = _sdk.sdk.getWindowInfo();
+        } else {
+          var _systemInfo2 = _sdk.sdk.getSystemInfoSync();
+          windowInfo = {
+            screenWidth: _systemInfo2.screenWidth,
+            screenHeight: _systemInfo2.screenHeight,
+            statusBarHeight: _systemInfo2.statusBarHeight,
+            windowWidth: _systemInfo2.windowWidth,
+            windowHeight: _systemInfo2.windowHeight,
+            windowTop: _systemInfo2.windowTop,
+            windowBottom: _systemInfo2.windowBottom,
+            screenTop: _systemInfo2.screenTop
+          };
+        }
+        var osInfo = deviceInfo.system.split(' ');
+        var osVersion = osInfo.length > 1 && osInfo[1];
         var osVersionMajor = osVersion && osVersion.split('.').length && osVersion.split('.')[0];
         this.deviceInfo = {
-          screenSize: "".concat(deviceInfo.screenWidth, "*").concat(deviceInfo.screenHeight, " "),
-          platform: deviceInfo.platform,
-          platformVersion: deviceInfo.version,
+          deviceUuid: deviceInfo.deviceId,
+          deviceId: deviceInfo.deviceId,
+          brand: deviceInfo.deviceBrand,
+          model: deviceInfo.deviceModel,
+          type: deviceInfo.deviceType,
+          pixelRatio: deviceInfo.devicePixelRatio,
+          orientation: deviceInfo.deviceOrientation,
+          os: osInfo.length > 0 && osInfo[0],
           osVersion: osVersion,
           osVersionMajor: osVersionMajor,
-          os: osInfo.length > 1 && osInfo[0],
-          app: deviceInfo.app,
-          brand: deviceInfo.brand,
-          model: deviceInfo.model,
-          frameworkVersion: deviceInfo.SDKVersion,
-          pixelRatio: deviceInfo.pixelRatio,
-          deviceUuid: deviceInfo.deviceId
+          appVersion: appBaseInfo.appVersion,
+          appId: appBaseInfo.appId,
+          appName: appBaseInfo.appName,
+          appVersionCode: appBaseInfo.appVersionCode,
+          appLanguage: appBaseInfo.appLanguage,
+          appWgtVersion: appBaseInfo.appWgtVersion,
+          platform: appBaseInfo.hostName,
+          platformVersion: appBaseInfo.hostVersion,
+          platformLanguage: appBaseInfo.hostLanguage,
+          screenSize: "".concat(windowInfo.screenWidth, "*").concat(windowInfo.screenHeight, " ")
         };
       } catch (e) {
         this.deviceInfo = {};

package/cjs/core/configuration.js

@@ -66,7 +66,8 @@ function commonInit(userConfiguration, buildEnv) {
     sdkName: buildEnv.sdkName,
     datakitUrl: getDatakitEndPoint(userConfiguration),
     tags: userConfiguration.tags || [],
-    injectTraceHeader: userConfiguration.injectTraceHeader && (0, _catchUserErrors.catchUserErrors)(userConfiguration.injectTraceHeader, 'injectTraceHeader threw an error:')
+    injectTraceHeader: userConfiguration.injectTraceHeader && (0, _catchUserErrors.catchUserErrors)(userConfiguration.injectTraceHeader, 'injectTraceHeader threw an error:'),
+    generateTraceId: userConfiguration.generateTraceId && (0, _catchUserErrors.catchUserErrors)(userConfiguration.generateTraceId, 'generateTraceId threw an error:')
   };
   if ('trackInteractions' in userConfiguration) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions;

package/cjs/core/dataMap.js

@@ -19,18 +19,27 @@ var commonTags = exports.commonTags = {
   session_id: 'session.id',
   session_type: 'session.type',
   is_signin: 'user.is_signin',
+  platform: 'device.platform',
+  platform_version: 'device.platform_version',
+  platform_language: 'device.platform_language',
+  device_uuid: 'device.device_uuid',
+  device_id: 'device.device_id',
   device: 'device.brand',
+  brand: 'device.brand',
   model: 'device.model',
-  device_uuid: 'device.device_uuid',
+  device_type: 'device.type',
+  pixel_ratio: 'device.pixel_ratio',
+  orientation: 'device.orientation',
   os: 'device.os',
-  app: 'device.app',
   os_version: 'device.os_version',
   os_version_major: 'device.os_version_major',
+  device_app_version: 'device.app_version',
+  device_app_id: 'device.app_id',
+  device_app_version_code: 'device.app_version_code',
+  device_app_language: 'device.app_language',
+  device_app_wgt_version: 'device.app_wgt_version',
   screen_size: 'device.screen_size',
   network_type: 'device.network_type',
-  platform: 'device.platform',
-  platform_version: 'device.platform_version',
-  app_framework_version: 'device.framework_version',
   view_id: 'page.id',
   view_name: 'page.route',
   view_referer: 'page.referer'

package/cjs/core/xhrProxy.js

@@ -49,19 +49,23 @@ function proxyXhr(userConfiguration) {
     };
     dataflux_xhr.startTime = (0, _utils.now)();
     var originalSuccess = arguments[0].success;
-    arguments[0].success = function () {
-      reportXhr(arguments[0]);
-      if (typeof originalSuccess === 'function') {
-        originalSuccess.apply(_this, arguments);
-      }
-    };
+    if (originalSuccess) {
+      arguments[0].success = function () {
+        reportXhr(arguments[0]);
+        if (typeof originalSuccess === 'function') {
+          originalSuccess.apply(_this, arguments);
+        }
+      };
+    }
     var originalFail = arguments[0].fail;
-    arguments[0].fail = function () {
-      reportXhr(arguments[0]);
-      if (typeof originalFail === 'function') {
-        originalFail.apply(_this, arguments);
-      }
-    };
+    if (originalFail) {
+      arguments[0].fail = function () {
+        reportXhr(arguments[0]);
+        if (typeof originalFail === 'function') {
+          originalFail.apply(_this, arguments);
+        }
+      };
+    }
     var hasBeenReported = false;
     var reportXhr = function reportXhr(res) {
       if (hasBeenReported) {
@@ -69,7 +73,7 @@ function proxyXhr(userConfiguration) {
       }
       hasBeenReported = true;
       dataflux_xhr.duration = (0, _utils.now)() - dataflux_xhr.startTime;
-      dataflux_xhr.response = JSON.stringify(res.data);
+      dataflux_xhr.response = res.data && JSON.stringify(res.data) || {};
       dataflux_xhr.header = res.header || {};
       dataflux_xhr.profile = res.profile;
       dataflux_xhr.status = res.statusCode || res.status || 0;

package/cjs/rumEventsCollection/action/trackActions.js

@@ -28,7 +28,9 @@ function trackActions(lifeCycle, Vue) {
   Page = function Page(page) {
     try {
       hookClick(page);
-    } catch (error) {}
+    } catch (error) {
+      console.error('error===', error);
+    }
     return originPage(page);
   };
   var originComponent = Component;
@@ -38,7 +40,9 @@ function trackActions(lifeCycle, Vue) {
       component.methods.onLoad = function () {
         try {
           hookClick(this);
-        } catch (error) {}
+        } catch (error) {
+          console.error('error===', error);
+        }
         return originOnLoad.apply(this, arguments);
       };
     }

package/cjs/rumEventsCollection/tracing/ddtraceTracer.js

@@ -15,12 +15,18 @@ function randomTraceId() {
   return n;
 }
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 function DDtraceTracer(configuration) {
   this._spanId = randomTraceId();
   this._traceId = randomTraceId();
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 DDtraceTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -30,6 +36,7 @@ DDtraceTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   makeTracingHeaders: function makeTracingHeaders() {

package/cjs/rumEventsCollection/tracing/jaegerTracer.js

@@ -16,7 +16,7 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 function JaegerTracer(configuration) {
@@ -29,6 +29,12 @@ function JaegerTracer(configuration) {
     this._traceId = rootSpanId;
   }
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 JaegerTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -38,11 +44,12 @@ JaegerTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getUberTraceId: function getUberTraceId() {
     //{trace-id}:{span-id}:{parent-span-id}:{flags}
-    return this._traceId + ':' + this._spanId + ':' + '0' + ':' + '1';
+    return this.getTraceId() + ':' + this.getSpanId() + ':' + '0' + ':' + '1';
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {

package/cjs/rumEventsCollection/tracing/skywalkingTracer.js

@@ -17,7 +17,7 @@ function uuid() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  * @param {*} requestUrl 请求的url
  */
@@ -28,6 +28,12 @@ function SkyWalkingTracer(configuration, requestUrl) {
   this._env = configuration.env;
   this._version = configuration.version;
   this._urlParse = (0, _utils.urlParse)(requestUrl).getParse();
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 SkyWalkingTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -38,12 +44,13 @@ SkyWalkingTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getSkyWalkingSw8: function getSkyWalkingSw8() {
     try {
-      var traceIdStr = String((0, _utils.base64Encode)(this._traceId));
-      var segmentId = String((0, _utils.base64Encode)(this._spanId));
+      var traceIdStr = String((0, _utils.base64Encode)(this.getTraceId()));
+      var segmentId = String((0, _utils.base64Encode)(this.getSpanId()));
       var service = String((0, _utils.base64Encode)(this._applicationId + '_rum_' + this.env));
       var instance = String((0, _utils.base64Encode)(this._version));
       var activePage = (0, _utils.getActivePage)();
@@ -62,7 +69,7 @@ SkyWalkingTracer.prototype = {
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {
-      'sw8': this.getSkyWalkingSw8()
+      sw8: this.getSkyWalkingSw8()
     };
   }
 };

package/cjs/rumEventsCollection/tracing/tracer.js

@@ -55,7 +55,7 @@ function injectHeadersIfTracingAllowed(configuration, context, inject) {
   var tracer;
   switch (configuration.traceType) {
     case _enums.TraceType.DDTRACE:
-      tracer = new _ddtraceTracer.DDtraceTracer();
+      tracer = new _ddtraceTracer.DDtraceTracer(configuration);
       break;
     case _enums.TraceType.SKYWALKING_V3:
       tracer = new _skywalkingTracer.SkyWalkingTracer(configuration, context.url);

package/cjs/rumEventsCollection/tracing/w3cTraceParentTracer.js

@@ -16,13 +16,19 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 function W3cTraceParentTracer(configuration) {
   var rootSpanId = randomTraceId();
   this._traceId = randomTraceId() + rootSpanId;
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 W3cTraceParentTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -32,15 +38,16 @@ W3cTraceParentTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getTraceParent: function getTraceParent() {
     // '{version}-{traceId}-{spanId}-{sampleDecision}'
-    return '00-' + this._traceId + '-' + this._spanId + '-01';
+    return '00-' + this.getTraceId() + '-' + this.getSpanId() + '-01';
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {
-      'traceparent': this.getTraceParent()
+      traceparent: this.getTraceParent()
     };
   }
 };

package/cjs/rumEventsCollection/tracing/zipkinMultiTracer.js

@@ -16,7 +16,7 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 function ZipkinMultiTracer(configuration) {
@@ -28,6 +28,12 @@ function ZipkinMultiTracer(configuration) {
     this._traceId = rootSpanId;
   }
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 ZipkinMultiTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -37,6 +43,7 @@ ZipkinMultiTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   makeTracingHeaders: function makeTracingHeaders() {

package/cjs/rumEventsCollection/tracing/zipkinSingleTracer.js

@@ -16,13 +16,19 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 function ZipkinSingleTracer(configuration) {
   var rootSpanId = randomTraceId();
   this._traceId = randomTraceId() + rootSpanId;
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 ZipkinSingleTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -32,15 +38,16 @@ ZipkinSingleTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getB3Str: function getB3Str() {
     //{TraceId}-{SpanId}-{SamplingState}-{ParentSpanId}
-    return this._traceId + '-' + this._spanId + '-1';
+    return this.getTraceId() + '-' + this.getSpanId() + '-1';
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {
-      'b3': this.getB3Str()
+      b3: this.getB3Str()
     };
   }
 };

package/esm/boot/buildEnv.js

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

package/esm/core/baseInfo.js

@@ -8,28 +8,80 @@ class BaseInfo {
   }
   getDeviceInfo() {
     try {
-      var deviceInfo = sdk.getSystemInfoSync();
-      var osInfo = deviceInfo.system.split(' ');
-      var osVersion = '';
-      if (osInfo.length > 1) {
-        osVersion = osInfo[1];
+      // 设备信息
+      var deviceInfo = {};
+      if (sdk.getDeviceInfo) {
+        deviceInfo = sdk.getDeviceInfo();
+      } else {
+        var systemInfo = sdk.getSystemInfoSync();
+        deviceInfo = {
+          deviceBrand: systemInfo.deviceBrand,
+          deviceId: systemInfo.deviceId,
+          deviceModel: systemInfo.deviceModel,
+          deviceType: systemInfo.deviceType,
+          deviceOrientation: systemInfo.deviceOrientation,
+          devicePixelRatio: systemInfo.devicePixelRatio,
+          system: systemInfo.system,
+          devicePixelRatio: systemInfo.devicePixelRatio
+        };
+      }
+      var appBaseInfo = {};
+      if (sdk.getAppBaseInfo) {
+        appBaseInfo = sdk.getAppBaseInfo();
       } else {
-        osVersion = osInfo[0] || '';
+        var _systemInfo = sdk.getSystemInfoSync();
+        appBaseInfo = {
+          appId: _systemInfo.appId,
+          appName: _systemInfo.appName,
+          appVersion: _systemInfo.appVersion,
+          appVersionCode: _systemInfo.appVersionCode,
+          appLanguage: _systemInfo.appLanguage,
+          appWgtVersion: _systemInfo.appWgtVersion,
+          hostName: _systemInfo.hostName,
+          hostVersion: _systemInfo.hostVersion,
+          hostLanguage: _systemInfo.hostLanguage
+        };
       }
+      var windowInfo = {};
+      if (sdk.getWindowInfo) {
+        windowInfo = sdk.getWindowInfo();
+      } else {
+        var _systemInfo2 = sdk.getSystemInfoSync();
+        windowInfo = {
+          screenWidth: _systemInfo2.screenWidth,
+          screenHeight: _systemInfo2.screenHeight,
+          statusBarHeight: _systemInfo2.statusBarHeight,
+          windowWidth: _systemInfo2.windowWidth,
+          windowHeight: _systemInfo2.windowHeight,
+          windowTop: _systemInfo2.windowTop,
+          windowBottom: _systemInfo2.windowBottom,
+          screenTop: _systemInfo2.screenTop
+        };
+      }
+      var osInfo = deviceInfo.system.split(' ');
+      var osVersion = osInfo.length > 1 && osInfo[1];
       var osVersionMajor = osVersion && osVersion.split('.').length && osVersion.split('.')[0];
       this.deviceInfo = {
-        screenSize: "".concat(deviceInfo.screenWidth, "*").concat(deviceInfo.screenHeight, " "),
-        platform: deviceInfo.platform,
-        platformVersion: deviceInfo.version,
+        deviceUuid: deviceInfo.deviceId,
+        deviceId: deviceInfo.deviceId,
+        brand: deviceInfo.deviceBrand,
+        model: deviceInfo.deviceModel,
+        type: deviceInfo.deviceType,
+        pixelRatio: deviceInfo.devicePixelRatio,
+        orientation: deviceInfo.deviceOrientation,
+        os: osInfo.length > 0 && osInfo[0],
         osVersion: osVersion,
         osVersionMajor: osVersionMajor,
-        os: osInfo.length > 1 && osInfo[0],
-        app: deviceInfo.app,
-        brand: deviceInfo.brand,
-        model: deviceInfo.model,
-        frameworkVersion: deviceInfo.SDKVersion,
-        pixelRatio: deviceInfo.pixelRatio,
-        deviceUuid: deviceInfo.deviceId
+        appVersion: appBaseInfo.appVersion,
+        appId: appBaseInfo.appId,
+        appName: appBaseInfo.appName,
+        appVersionCode: appBaseInfo.appVersionCode,
+        appLanguage: appBaseInfo.appLanguage,
+        appWgtVersion: appBaseInfo.appWgtVersion,
+        platform: appBaseInfo.hostName,
+        platformVersion: appBaseInfo.hostVersion,
+        platformLanguage: appBaseInfo.hostLanguage,
+        screenSize: "".concat(windowInfo.screenWidth, "*").concat(windowInfo.screenHeight, " ")
       };
     } catch (e) {
       this.deviceInfo = {};

package/esm/core/configuration.js

@@ -58,7 +58,8 @@ export function commonInit(userConfiguration, buildEnv) {
     sdkName: buildEnv.sdkName,
     datakitUrl: getDatakitEndPoint(userConfiguration),
     tags: userConfiguration.tags || [],
-    injectTraceHeader: userConfiguration.injectTraceHeader && catchUserErrors(userConfiguration.injectTraceHeader, 'injectTraceHeader threw an error:')
+    injectTraceHeader: userConfiguration.injectTraceHeader && catchUserErrors(userConfiguration.injectTraceHeader, 'injectTraceHeader threw an error:'),
+    generateTraceId: userConfiguration.generateTraceId && catchUserErrors(userConfiguration.generateTraceId, 'generateTraceId threw an error:')
   };
   if ('trackInteractions' in userConfiguration) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions;

package/esm/core/dataMap.js

@@ -13,18 +13,27 @@ export var commonTags = {
   session_id: 'session.id',
   session_type: 'session.type',
   is_signin: 'user.is_signin',
+  platform: 'device.platform',
+  platform_version: 'device.platform_version',
+  platform_language: 'device.platform_language',
+  device_uuid: 'device.device_uuid',
+  device_id: 'device.device_id',
   device: 'device.brand',
+  brand: 'device.brand',
   model: 'device.model',
-  device_uuid: 'device.device_uuid',
+  device_type: 'device.type',
+  pixel_ratio: 'device.pixel_ratio',
+  orientation: 'device.orientation',
   os: 'device.os',
-  app: 'device.app',
   os_version: 'device.os_version',
   os_version_major: 'device.os_version_major',
+  device_app_version: 'device.app_version',
+  device_app_id: 'device.app_id',
+  device_app_version_code: 'device.app_version_code',
+  device_app_language: 'device.app_language',
+  device_app_wgt_version: 'device.app_wgt_version',
   screen_size: 'device.screen_size',
   network_type: 'device.network_type',
-  platform: 'device.platform',
-  platform_version: 'device.platform_version',
-  app_framework_version: 'device.framework_version',
   view_id: 'page.id',
   view_name: 'page.route',
   view_referer: 'page.referer'

package/esm/core/xhrProxy.js

@@ -41,19 +41,23 @@ function proxyXhr(userConfiguration) {
     };
     dataflux_xhr.startTime = now();
     var originalSuccess = arguments[0].success;
-    arguments[0].success = function () {
-      reportXhr(arguments[0]);
-      if (typeof originalSuccess === 'function') {
-        originalSuccess.apply(_this, arguments);
-      }
-    };
+    if (originalSuccess) {
+      arguments[0].success = function () {
+        reportXhr(arguments[0]);
+        if (typeof originalSuccess === 'function') {
+          originalSuccess.apply(_this, arguments);
+        }
+      };
+    }
     var originalFail = arguments[0].fail;
-    arguments[0].fail = function () {
-      reportXhr(arguments[0]);
-      if (typeof originalFail === 'function') {
-        originalFail.apply(_this, arguments);
-      }
-    };
+    if (originalFail) {
+      arguments[0].fail = function () {
+        reportXhr(arguments[0]);
+        if (typeof originalFail === 'function') {
+          originalFail.apply(_this, arguments);
+        }
+      };
+    }
     var hasBeenReported = false;
     var reportXhr = function reportXhr(res) {
       if (hasBeenReported) {
@@ -61,7 +65,7 @@ function proxyXhr(userConfiguration) {
       }
       hasBeenReported = true;
       dataflux_xhr.duration = now() - dataflux_xhr.startTime;
-      dataflux_xhr.response = JSON.stringify(res.data);
+      dataflux_xhr.response = res.data && JSON.stringify(res.data) || {};
       dataflux_xhr.header = res.header || {};
       dataflux_xhr.profile = res.profile;
       dataflux_xhr.status = res.statusCode || res.status || 0;

package/esm/rumEventsCollection/action/trackActions.js

@@ -22,7 +22,9 @@ export function trackActions(lifeCycle, Vue) {
   Page = function Page(page) {
     try {
       hookClick(page);
-    } catch (error) {}
+    } catch (error) {
+      console.error('error===', error);
+    }
     return originPage(page);
   };
   var originComponent = Component;
@@ -32,7 +34,9 @@ export function trackActions(lifeCycle, Vue) {
       component.methods.onLoad = function () {
         try {
           hookClick(this);
-        } catch (error) {}
+        } catch (error) {
+          console.error('error===', error);
+        }
         return originOnLoad.apply(this, arguments);
       };
     }

package/esm/rumEventsCollection/tracing/ddtraceTracer.js

@@ -9,12 +9,18 @@ function randomTraceId() {
   return n;
 }
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 export function DDtraceTracer(configuration) {
   this._spanId = randomTraceId();
   this._traceId = randomTraceId();
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 DDtraceTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -24,6 +30,7 @@ DDtraceTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   makeTracingHeaders: function makeTracingHeaders() {

package/esm/rumEventsCollection/tracing/jaegerTracer.js

@@ -10,7 +10,7 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 export function JaegerTracer(configuration) {
@@ -23,6 +23,12 @@ export function JaegerTracer(configuration) {
     this._traceId = rootSpanId;
   }
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 JaegerTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -32,11 +38,12 @@ JaegerTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getUberTraceId: function getUberTraceId() {
     //{trace-id}:{span-id}:{parent-span-id}:{flags}
-    return this._traceId + ':' + this._spanId + ':' + '0' + ':' + '1';
+    return this.getTraceId() + ':' + this.getSpanId() + ':' + '0' + ':' + '1';
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {

package/esm/rumEventsCollection/tracing/skywalkingTracer.js

@@ -11,7 +11,7 @@ function uuid() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  * @param {*} requestUrl 请求的url
  */
@@ -22,6 +22,12 @@ export function SkyWalkingTracer(configuration, requestUrl) {
   this._env = configuration.env;
   this._version = configuration.version;
   this._urlParse = urlParse(requestUrl).getParse();
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 SkyWalkingTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -32,12 +38,13 @@ SkyWalkingTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getSkyWalkingSw8: function getSkyWalkingSw8() {
     try {
-      var traceIdStr = String(base64Encode(this._traceId));
-      var segmentId = String(base64Encode(this._spanId));
+      var traceIdStr = String(base64Encode(this.getTraceId()));
+      var segmentId = String(base64Encode(this.getSpanId()));
       var service = String(base64Encode(this._applicationId + '_rum_' + this.env));
       var instance = String(base64Encode(this._version));
       var activePage = getActivePage();
@@ -56,7 +63,7 @@ SkyWalkingTracer.prototype = {
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {
-      'sw8': this.getSkyWalkingSw8()
+      sw8: this.getSkyWalkingSw8()
     };
   }
 };

package/esm/rumEventsCollection/tracing/tracer.js

@@ -47,7 +47,7 @@ export function injectHeadersIfTracingAllowed(configuration, context, inject) {
   var tracer;
   switch (configuration.traceType) {
     case TraceType.DDTRACE:
-      tracer = new DDtraceTracer();
+      tracer = new DDtraceTracer(configuration);
       break;
     case TraceType.SKYWALKING_V3:
       tracer = new SkyWalkingTracer(configuration, context.url);

package/esm/rumEventsCollection/tracing/w3cTraceParentTracer.js

@@ -10,13 +10,19 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 export function W3cTraceParentTracer(configuration) {
   var rootSpanId = randomTraceId();
   this._traceId = randomTraceId() + rootSpanId;
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 W3cTraceParentTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -26,15 +32,16 @@ W3cTraceParentTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getTraceParent: function getTraceParent() {
     // '{version}-{traceId}-{spanId}-{sampleDecision}'
-    return '00-' + this._traceId + '-' + this._spanId + '-01';
+    return '00-' + this.getTraceId() + '-' + this.getSpanId() + '-01';
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {
-      'traceparent': this.getTraceParent()
+      traceparent: this.getTraceParent()
     };
   }
 };

package/esm/rumEventsCollection/tracing/zipkinMultiTracer.js

@@ -10,7 +10,7 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 export function ZipkinMultiTracer(configuration) {
@@ -22,6 +22,12 @@ export function ZipkinMultiTracer(configuration) {
     this._traceId = rootSpanId;
   }
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 ZipkinMultiTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -31,6 +37,7 @@ ZipkinMultiTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   makeTracingHeaders: function makeTracingHeaders() {

package/esm/rumEventsCollection/tracing/zipkinSingleTracer.js

@@ -10,13 +10,19 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 export function ZipkinSingleTracer(configuration) {
   var rootSpanId = randomTraceId();
   this._traceId = randomTraceId() + rootSpanId;
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 ZipkinSingleTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -26,15 +32,16 @@ ZipkinSingleTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getB3Str: function getB3Str() {
     //{TraceId}-{SpanId}-{SamplingState}-{ParentSpanId}
-    return this._traceId + '-' + this._spanId + '-1';
+    return this.getTraceId() + '-' + this.getSpanId() + '-1';
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {
-      'b3': this.getB3Str()
+      b3: this.getB3Str()
     };
   }
 };

package/package.json

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