@cloudcare/rum-uniapp 2.1.23 → 2.2.0

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.2.0',
   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/enums.js

@@ -43,7 +43,8 @@ var MpHook = exports.MpHook = {
   onPageScroll: 1,
   onResize: 1,
   onHide: 1,
-  onUnload: 1
+  onUnload: 1,
+  onRouteDone: 1
 };
 var TraceType = exports.TraceType = {
   DDTRACE: 'ddtrace',

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/action/trackActions.js

@@ -9,8 +9,6 @@ var _lifeCycle = require("../../core/lifeCycle");
 var _trackEventCounts = require("../trackEventCounts");
 var _trackPageActiveites = require("../trackPageActiveites");
 var _enums = require("../../helper/enums");
-var _sdk = require("../../core/sdk");
-var WHITE_METHOD = ['setup'];
 function trackActions(lifeCycle, Vue) {
   var action = startActionManagement(lifeCycle);
 
@@ -18,57 +16,34 @@ function trackActions(lifeCycle, Vue) {
   lifeCycle.subscribe(_lifeCycle.LifeCycleEventType.VIEW_CREATED, function () {
     action.discardCurrent();
   });
-  if (Vue && Vue.extend) {
-    var originVueExtend = Vue.extend;
-    Vue.extend = function (vueOptions) {
-      proxyInstance(vueOptions, action, lifeCycle);
-      return originVueExtend.call(this, vueOptions);
-    };
-  } else {
-    if (!_sdk.tracker) return;
-    var hasComponent = false;
-    if (Page) {
-      hasComponent = true;
-      var originPage = Page;
-      Page = function Page(page) {
-        var methods = (0, _utils.getMethods)(page);
-        methods.forEach(function (methodName) {
-          clickProxy(page, methodName, function (_action) {
-            action.create(_action.type, _action.name);
-          }, lifeCycle);
-        });
-        return originPage(page);
-      };
-    }
-    if (Component) {
-      hasComponent = true;
-      var originComponent = Component;
-      Component = function Component(component) {
-        var methods = (0, _utils.getMethods)(component.methods);
-        methods.forEach(function (methodName) {
-          clickProxy(component, methodName, function (_action) {
-            action.create(_action.type, _action.name);
-          });
-        });
-        return originComponent(component);
-      };
-    }
-    if (!hasComponent) {
-      var originCreatePage = _sdk.tracker.createPage;
-      _sdk.tracker.createPage = function (page) {
-        // methods 方法
-        proxyInstance(page, action, lifeCycle);
-        return originCreatePage.call(this, page);
-      };
-      var originCreateComponent = _sdk.tracker.createComponent;
-      _sdk.tracker.createComponent = function (component) {
-        proxyInstance(component, action, lifeCycle);
-        return originCreateComponent.call(this, component);
+  var hookClick = function hookClick(instance) {
+    var methods = (0, _utils.getMethods)(instance);
+    methods.forEach(function (methodName) {
+      clickProxy(instance, methodName, function (_action) {
+        action.create(_action.type, _action.name);
+      }, lifeCycle);
+    });
+  };
+  var originPage = Page;
+  Page = function Page(page) {
+    try {
+      hookClick(page);
+    } catch (error) {}
+    return originPage(page);
+  };
+  var originComponent = Component;
+  Component = function Component(component) {
+    if (component.methods && component.methods.onLoad) {
+      var originOnLoad = component.methods.onLoad;
+      component.methods.onLoad = function () {
+        try {
+          hookClick(this);
+        } catch (error) {}
+        return originOnLoad.apply(this, arguments);
       };
     }
-  }
-  // var originVueExtend = Vue.extend
-
+    return originComponent(component);
+  };
   return {
     stop: function stop() {
       action.discardCurrent();
@@ -77,28 +52,10 @@ function trackActions(lifeCycle, Vue) {
   };
 }
 
-function proxyInstance(options, action, lifeCycle) {
-  // methods 方法
-  if (options.methods) {
-    var vueMethods = Object.keys(options.methods);
-    vueMethods.forEach(function (methodName) {
-      clickProxy(options.methods, methodName, function (_action) {
-        action.create(_action.type, _action.name);
-      }, lifeCycle);
-    });
-  }
-  var originMethods = (0, _utils.getMethods)(options);
-  originMethods.forEach(function (methodName) {
-    clickProxy(options, methodName, function (_action) {
-      action.create(_action.type, _action.name);
-    }, lifeCycle);
-  });
-}
 function clickProxy(origin, methodName, callback, lifeCycle) {
-  if (WHITE_METHOD.indexOf(methodName) > -1) return;
   var originMethod = origin[methodName];
   origin[methodName] = function () {
-    var result = originMethod.apply(this, arguments);
+    var result = originMethod.apply(this, arguments) || {};
     var action = {};
     if ((0, _utils.isObject)(arguments[0])) {
       var currentTarget = arguments[0].currentTarget || {};
@@ -111,17 +68,17 @@ function clickProxy(origin, methodName, callback, lifeCycle) {
         lifeCycle.notify(_lifeCycle.LifeCycleEventType.PAGE_ALIAS_ACTION, true);
       } else if (methodName === 'onAddToFavorites') {
         action.type = 'click';
-        action.name = '收藏 ' + '标题: ' + result.title + (result.query ? ' query: ' + result.query : '');
+        action.name = '收藏 ' + '标题: ' + result.title || '' + (result.query ? ' query: ' + result.query : '');
         callback(action);
         lifeCycle.notify(_lifeCycle.LifeCycleEventType.PAGE_ALIAS_ACTION, true);
       } else if (methodName === 'onShareAppMessage') {
         action.type = 'click';
-        action.name = '转发 ' + '标题: ' + result.title + (result.path ? ' path: ' + result.path : '');
+        action.name = '转发 ' + '标题: ' + result.title || '' + (result.path ? ' path: ' + result.path : '');
         callback(action);
         lifeCycle.notify(_lifeCycle.LifeCycleEventType.PAGE_ALIAS_ACTION, true);
       } else if (methodName === 'onShareTimeline') {
         action.type = 'click';
-        action.name = '分享到朋友圈 ' + '标题: ' + result.title + (result.query ? ' query: ' + result.query : '');
+        action.name = '分享到朋友圈 ' + '标题: ' + result.title || '' + (result.query ? ' query: ' + result.query : '');
         callback(action);
         lifeCycle.notify(_lifeCycle.LifeCycleEventType.PAGE_ALIAS_ACTION, true);
       } else if (methodName === 'onTabItemTap') {

package/cjs/rumEventsCollection/page/index.js

@@ -10,58 +10,46 @@ var _trackEventCounts2 = require("../trackEventCounts");
 var _lifeCycle = require("../../core/lifeCycle");
 // 劫持原小程序App方法
 var THROTTLE_VIEW_UPDATE_PERIOD = exports.THROTTLE_VIEW_UPDATE_PERIOD = 3000;
-function proxyPage(pageOptions, lifeCycle) {
-  // 合并方法，插入记录脚本
-  var currentView,
-    startTime = (0, _utils.now)();
-  ['onReady', 'onShow', 'onLoad', 'onUnload', 'onHide'].forEach(function (methodName) {
-    var userDefinedMethod = pageOptions[methodName];
-    pageOptions[methodName] = function () {
-      var mpType = this.mpType || this.$vm && this.$vm.mpType;
-      if (mpType !== 'page') {
-        return userDefinedMethod && userDefinedMethod.apply(this, arguments);
-      }
-      // 只处理page类型
-      if (methodName === 'onShow' || methodName === 'onLoad') {
-        if (typeof currentView === 'undefined') {
-          var activePage = (0, _utils.getActivePage)();
-          currentView = newView(lifeCycle, activePage && activePage.route, startTime);
+function rewritePage(configuration, lifeCycle, Vue) {
+  var originPage = Page;
+  var originComponent = Component;
+  var hookPage = function hookPage(pageInstance) {
+    var currentView,
+      startTime = (0, _utils.now)();
+    ['onReady', 'onShow', 'onLoad', 'onUnload', 'onHide'].forEach(function (methodName) {
+      var userDefinedMethod = pageInstance[methodName];
+      pageInstance[methodName] = function () {
+        if (methodName === 'onShow' || methodName === 'onLoad') {
+          if (typeof currentView === 'undefined') {
+            var activePage = (0, _utils.getActivePage)();
+            currentView = newView(lifeCycle, activePage && activePage.route, startTime);
+          }
         }
-      }
-      currentView && currentView.setLoadEventEnd(methodName);
-      if ((methodName === 'onUnload' || methodName === 'onHide' || methodName === 'onShow') && currentView) {
-        currentView.triggerUpdate();
-        if (methodName === 'onUnload' || methodName === 'onHide') {
-          currentView.end();
-          currentView = undefined;
+        currentView && currentView.setLoadEventEnd(methodName);
+        if ((methodName === 'onUnload' || methodName === 'onHide' || methodName === 'onShow') && currentView) {
+          currentView.triggerUpdate();
+          if (methodName === 'onUnload' || methodName === 'onHide') {
+            currentView.end();
+            currentView = undefined;
+          }
         }
-      }
-      return userDefinedMethod && userDefinedMethod.apply(this, arguments);
-    };
-  });
-}
-function rewritePage(configuration, lifeCycle, Vue) {
-  if (Vue && Vue.extend) {
-    var originVueExtend = Vue.extend;
-    Vue.extend = function (vueOptions) {
-      proxyPage(vueOptions, lifeCycle);
-      return originVueExtend.call(this, vueOptions);
-    };
-  } else {
-    if (Page) {
-      var originPage = Page;
-      Page = function Page(pageOptions) {
-        proxyPage(pageOptions, lifeCycle);
-        return originPage.call(this, pageOptions);
-      };
-    } else {
-      var originComponent = Component;
-      Component = function Component(pageOptions) {
-        proxyPage(pageOptions.methods, lifeCycle);
-        return originComponent.call(this, pageOptions);
+        return userDefinedMethod && userDefinedMethod.apply(this, arguments);
       };
-    }
-  }
+    });
+  };
+  Component = function Component(component) {
+    try {
+      hookPage(component.methods);
+    } catch (error) {}
+    return originComponent(component);
+  };
+  Page = function Page(page) {
+    // 合并方法，插入记录脚本
+    try {
+      hookPage(page);
+    } catch (error) {}
+    return originPage(page);
+  };
 }
 function newView(lifeCycle, route, startTime) {
   if (typeof startTime === 'undefined' || Number(startTime) === 0) {

package/cjs/rumEventsCollection/setDataCollection.js

@@ -5,63 +5,32 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.startSetDataColloction = startSetDataColloction;
 var _lifeCycle = require("../core/lifeCycle");
-var _utils = require("../helper/utils");
-var _sdk = require("../core/sdk");
-function resetSetData(data, callback, lifeCycle, mpInstance) {
-  var pendingStartTimestamp = (0, _utils.now)();
-  var _callback = function _callback() {
-    lifeCycle.notify(_lifeCycle.LifeCycleEventType.PAGE_SET_DATA_UPDATE, {
-      pendingStartTimestamp: pendingStartTimestamp,
-      updateEndTimestamp: (0, _utils.now)()
-    });
-    if (typeof callback === 'function') {
-      callback.call(mpInstance);
+function startSetDataColloction(lifeCycle, Vue) {
+  var originComponent = Component;
+  Component = function Component(component) {
+    var originComponentAttached;
+    function handlerOrigin() {
+      this.setUpdatePerformanceListener && this.setUpdatePerformanceListener({
+        withDataPaths: true
+      }, function (res) {
+        lifeCycle.notify(_lifeCycle.LifeCycleEventType.PAGE_SET_DATA_UPDATE, res);
+      });
+      return originComponentAttached && originComponentAttached.apply(this, arguments);
     }
-  };
-  return _callback;
-}
-function proxyPage(pageOptions, lifeCycle) {
-  var userDefinedMethod = pageOptions['onLoad'];
-  pageOptions['onLoad'] = function () {
-    var mpInstance = this.$scope;
-    var setData = mpInstance.setData;
-    if (typeof setData === 'function') {
-      try {
-        // 这里暂时这么处理 只读属性 会抛出错误
-        mpInstance.setData = function (data, callback) {
-          return setData.call(mpInstance, data, resetSetData(data, callback, lifeCycle, mpInstance));
-        };
-      } catch (err) {
-        Object.defineProperty(mpInstance.__proto__, 'setData', {
-          configurable: false,
-          enumerable: false,
-          value: function value(data, callback) {
-            return setData.call(mpInstance, data, resetSetData(data, callback, lifeCycle, mpInstance));
-          }
-        });
+    try {
+      if (component.lifetimes && component.lifetimes['attached']) {
+        originComponentAttached = component.lifetimes['attached'];
+        component.lifetimes['attached'] = handlerOrigin;
+      } else if (component['attached']) {
+        // 兼容老版本
+        originComponentAttached = component['attached'];
+        component['attached'] = handlerOrigin;
       }
-    }
-    return userDefinedMethod && userDefinedMethod.apply(this, arguments);
+      if (component.onLoad) {
+        originComponentAttached = component.onLoad;
+        component.onLoad = handlerOrigin;
+      }
+    } catch (err) {}
+    return originComponent(component);
   };
-}
-function startSetDataColloction(lifeCycle, Vue) {
-  if (Vue && Vue.extend) {
-    var originVueExtend = Vue.extend;
-    Vue.extend = function (vueOptions) {
-      proxyPage(vueOptions, lifeCycle);
-      return originVueExtend.call(this, vueOptions);
-    };
-  } else {
-    if (!_sdk.tracker) return;
-    var originCreatePage = _sdk.tracker.createPage;
-    _sdk.tracker.createPage = function (pageOptions) {
-      proxyPage(pageOptions, lifeCycle);
-      return originCreatePage.call(this, pageOptions);
-    };
-    var originCreateComponent = _sdk.tracker.createComponent;
-    _sdk.tracker.createComponent = function (component) {
-      proxyPage(component, lifeCycle);
-      return originCreateComponent.call(this, component);
-    };
-  }
 }

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.2.0',
   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/enums.js

@@ -34,7 +34,8 @@ export var MpHook = {
   onPageScroll: 1,
   onResize: 1,
   onHide: 1,
-  onUnload: 1
+  onUnload: 1,
+  onRouteDone: 1
 };
 export var TraceType = {
   DDTRACE: 'ddtrace',

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/action/trackActions.js

@@ -3,8 +3,6 @@ import { LifeCycleEventType } from '../../core/lifeCycle';
 import { trackEventCounts } from '../trackEventCounts';
 import { waitIdlePageActivity } from '../trackPageActiveites';
 import { ActionType } from '../../helper/enums';
-import { tracker } from '../../core/sdk';
-var WHITE_METHOD = ['setup'];
 export function trackActions(lifeCycle, Vue) {
   var action = startActionManagement(lifeCycle);
 
@@ -12,57 +10,34 @@ export function trackActions(lifeCycle, Vue) {
   lifeCycle.subscribe(LifeCycleEventType.VIEW_CREATED, function () {
     action.discardCurrent();
   });
-  if (Vue && Vue.extend) {
-    var originVueExtend = Vue.extend;
-    Vue.extend = function (vueOptions) {
-      proxyInstance(vueOptions, action, lifeCycle);
-      return originVueExtend.call(this, vueOptions);
-    };
-  } else {
-    if (!tracker) return;
-    var hasComponent = false;
-    if (Page) {
-      hasComponent = true;
-      var originPage = Page;
-      Page = function Page(page) {
-        var methods = getMethods(page);
-        methods.forEach(methodName => {
-          clickProxy(page, methodName, function (_action) {
-            action.create(_action.type, _action.name);
-          }, lifeCycle);
-        });
-        return originPage(page);
-      };
-    }
-    if (Component) {
-      hasComponent = true;
-      var originComponent = Component;
-      Component = function Component(component) {
-        var methods = getMethods(component.methods);
-        methods.forEach(methodName => {
-          clickProxy(component, methodName, function (_action) {
-            action.create(_action.type, _action.name);
-          });
-        });
-        return originComponent(component);
-      };
-    }
-    if (!hasComponent) {
-      var originCreatePage = tracker.createPage;
-      tracker.createPage = function (page) {
-        // methods 方法
-        proxyInstance(page, action, lifeCycle);
-        return originCreatePage.call(this, page);
-      };
-      var originCreateComponent = tracker.createComponent;
-      tracker.createComponent = function (component) {
-        proxyInstance(component, action, lifeCycle);
-        return originCreateComponent.call(this, component);
+  var hookClick = function hookClick(instance) {
+    var methods = getMethods(instance);
+    methods.forEach(methodName => {
+      clickProxy(instance, methodName, function (_action) {
+        action.create(_action.type, _action.name);
+      }, lifeCycle);
+    });
+  };
+  var originPage = Page;
+  Page = function Page(page) {
+    try {
+      hookClick(page);
+    } catch (error) {}
+    return originPage(page);
+  };
+  var originComponent = Component;
+  Component = function Component(component) {
+    if (component.methods && component.methods.onLoad) {
+      var originOnLoad = component.methods.onLoad;
+      component.methods.onLoad = function () {
+        try {
+          hookClick(this);
+        } catch (error) {}
+        return originOnLoad.apply(this, arguments);
       };
     }
-  }
-  // var originVueExtend = Vue.extend
-
+    return originComponent(component);
+  };
   return {
     stop: function stop() {
       action.discardCurrent();
@@ -71,28 +46,10 @@ export function trackActions(lifeCycle, Vue) {
   };
 }
 
-function proxyInstance(options, action, lifeCycle) {
-  // methods 方法
-  if (options.methods) {
-    var vueMethods = Object.keys(options.methods);
-    vueMethods.forEach(methodName => {
-      clickProxy(options.methods, methodName, function (_action) {
-        action.create(_action.type, _action.name);
-      }, lifeCycle);
-    });
-  }
-  var originMethods = getMethods(options);
-  originMethods.forEach(methodName => {
-    clickProxy(options, methodName, function (_action) {
-      action.create(_action.type, _action.name);
-    }, lifeCycle);
-  });
-}
 function clickProxy(origin, methodName, callback, lifeCycle) {
-  if (WHITE_METHOD.indexOf(methodName) > -1) return;
   var originMethod = origin[methodName];
   origin[methodName] = function () {
-    var result = originMethod.apply(this, arguments);
+    var result = originMethod.apply(this, arguments) || {};
     var action = {};
     if (isObject(arguments[0])) {
       var currentTarget = arguments[0].currentTarget || {};
@@ -105,17 +62,17 @@ function clickProxy(origin, methodName, callback, lifeCycle) {
         lifeCycle.notify(LifeCycleEventType.PAGE_ALIAS_ACTION, true);
       } else if (methodName === 'onAddToFavorites') {
         action.type = 'click';
-        action.name = '收藏 ' + '标题: ' + result.title + (result.query ? ' query: ' + result.query : '');
+        action.name = '收藏 ' + '标题: ' + result.title || '' + (result.query ? ' query: ' + result.query : '');
         callback(action);
         lifeCycle.notify(LifeCycleEventType.PAGE_ALIAS_ACTION, true);
       } else if (methodName === 'onShareAppMessage') {
         action.type = 'click';
-        action.name = '转发 ' + '标题: ' + result.title + (result.path ? ' path: ' + result.path : '');
+        action.name = '转发 ' + '标题: ' + result.title || '' + (result.path ? ' path: ' + result.path : '');
         callback(action);
         lifeCycle.notify(LifeCycleEventType.PAGE_ALIAS_ACTION, true);
       } else if (methodName === 'onShareTimeline') {
         action.type = 'click';
-        action.name = '分享到朋友圈 ' + '标题: ' + result.title + (result.query ? ' query: ' + result.query : '');
+        action.name = '分享到朋友圈 ' + '标题: ' + result.title || '' + (result.query ? ' query: ' + result.query : '');
         callback(action);
         lifeCycle.notify(LifeCycleEventType.PAGE_ALIAS_ACTION, true);
       } else if (methodName === 'onTabItemTap') {

package/esm/rumEventsCollection/page/index.js

@@ -4,58 +4,46 @@ import { LifeCycleEventType } from '../../core/lifeCycle';
 
 // 劫持原小程序App方法
 export var THROTTLE_VIEW_UPDATE_PERIOD = 3000;
-function proxyPage(pageOptions, lifeCycle) {
-  // 合并方法，插入记录脚本
-  var currentView,
-    startTime = now();
-  ['onReady', 'onShow', 'onLoad', 'onUnload', 'onHide'].forEach(methodName => {
-    var userDefinedMethod = pageOptions[methodName];
-    pageOptions[methodName] = function () {
-      var mpType = this.mpType || this.$vm && this.$vm.mpType;
-      if (mpType !== 'page') {
-        return userDefinedMethod && userDefinedMethod.apply(this, arguments);
-      }
-      // 只处理page类型
-      if (methodName === 'onShow' || methodName === 'onLoad') {
-        if (typeof currentView === 'undefined') {
-          var activePage = getActivePage();
-          currentView = newView(lifeCycle, activePage && activePage.route, startTime);
+export function rewritePage(configuration, lifeCycle, Vue) {
+  var originPage = Page;
+  var originComponent = Component;
+  var hookPage = function hookPage(pageInstance) {
+    var currentView,
+      startTime = now();
+    ['onReady', 'onShow', 'onLoad', 'onUnload', 'onHide'].forEach(methodName => {
+      var userDefinedMethod = pageInstance[methodName];
+      pageInstance[methodName] = function () {
+        if (methodName === 'onShow' || methodName === 'onLoad') {
+          if (typeof currentView === 'undefined') {
+            var activePage = getActivePage();
+            currentView = newView(lifeCycle, activePage && activePage.route, startTime);
+          }
         }
-      }
-      currentView && currentView.setLoadEventEnd(methodName);
-      if ((methodName === 'onUnload' || methodName === 'onHide' || methodName === 'onShow') && currentView) {
-        currentView.triggerUpdate();
-        if (methodName === 'onUnload' || methodName === 'onHide') {
-          currentView.end();
-          currentView = undefined;
+        currentView && currentView.setLoadEventEnd(methodName);
+        if ((methodName === 'onUnload' || methodName === 'onHide' || methodName === 'onShow') && currentView) {
+          currentView.triggerUpdate();
+          if (methodName === 'onUnload' || methodName === 'onHide') {
+            currentView.end();
+            currentView = undefined;
+          }
         }
-      }
-      return userDefinedMethod && userDefinedMethod.apply(this, arguments);
-    };
-  });
-}
-export function rewritePage(configuration, lifeCycle, Vue) {
-  if (Vue && Vue.extend) {
-    var originVueExtend = Vue.extend;
-    Vue.extend = function (vueOptions) {
-      proxyPage(vueOptions, lifeCycle);
-      return originVueExtend.call(this, vueOptions);
-    };
-  } else {
-    if (Page) {
-      var originPage = Page;
-      Page = function Page(pageOptions) {
-        proxyPage(pageOptions, lifeCycle);
-        return originPage.call(this, pageOptions);
-      };
-    } else {
-      var originComponent = Component;
-      Component = function Component(pageOptions) {
-        proxyPage(pageOptions.methods, lifeCycle);
-        return originComponent.call(this, pageOptions);
+        return userDefinedMethod && userDefinedMethod.apply(this, arguments);
       };
-    }
-  }
+    });
+  };
+  Component = function Component(component) {
+    try {
+      hookPage(component.methods);
+    } catch (error) {}
+    return originComponent(component);
+  };
+  Page = function Page(page) {
+    // 合并方法，插入记录脚本
+    try {
+      hookPage(page);
+    } catch (error) {}
+    return originPage(page);
+  };
 }
 function newView(lifeCycle, route, startTime) {
   if (typeof startTime === 'undefined' || Number(startTime) === 0) {

package/esm/rumEventsCollection/setDataCollection.js

@@ -1,61 +1,30 @@
 import { LifeCycleEventType } from '../core/lifeCycle';
-import { now } from '../helper/utils';
-import { tracker } from '../core/sdk';
-function resetSetData(data, callback, lifeCycle, mpInstance) {
-  var pendingStartTimestamp = now();
-  var _callback = function _callback() {
-    lifeCycle.notify(LifeCycleEventType.PAGE_SET_DATA_UPDATE, {
-      pendingStartTimestamp: pendingStartTimestamp,
-      updateEndTimestamp: now()
-    });
-    if (typeof callback === 'function') {
-      callback.call(mpInstance);
+export function startSetDataColloction(lifeCycle, Vue) {
+  var originComponent = Component;
+  Component = function Component(component) {
+    var originComponentAttached;
+    function handlerOrigin() {
+      this.setUpdatePerformanceListener && this.setUpdatePerformanceListener({
+        withDataPaths: true
+      }, res => {
+        lifeCycle.notify(LifeCycleEventType.PAGE_SET_DATA_UPDATE, res);
+      });
+      return originComponentAttached && originComponentAttached.apply(this, arguments);
     }
-  };
-  return _callback;
-}
-function proxyPage(pageOptions, lifeCycle) {
-  var userDefinedMethod = pageOptions['onLoad'];
-  pageOptions['onLoad'] = function () {
-    var mpInstance = this.$scope;
-    var setData = mpInstance.setData;
-    if (typeof setData === 'function') {
-      try {
-        // 这里暂时这么处理 只读属性 会抛出错误
-        mpInstance.setData = function (data, callback) {
-          return setData.call(mpInstance, data, resetSetData(data, callback, lifeCycle, mpInstance));
-        };
-      } catch (err) {
-        Object.defineProperty(mpInstance.__proto__, 'setData', {
-          configurable: false,
-          enumerable: false,
-          value: function value(data, callback) {
-            return setData.call(mpInstance, data, resetSetData(data, callback, lifeCycle, mpInstance));
-          }
-        });
+    try {
+      if (component.lifetimes && component.lifetimes['attached']) {
+        originComponentAttached = component.lifetimes['attached'];
+        component.lifetimes['attached'] = handlerOrigin;
+      } else if (component['attached']) {
+        // 兼容老版本
+        originComponentAttached = component['attached'];
+        component['attached'] = handlerOrigin;
       }
-    }
-    return userDefinedMethod && userDefinedMethod.apply(this, arguments);
+      if (component.onLoad) {
+        originComponentAttached = component.onLoad;
+        component.onLoad = handlerOrigin;
+      }
+    } catch (err) {}
+    return originComponent(component);
   };
-}
-export function startSetDataColloction(lifeCycle, Vue) {
-  if (Vue && Vue.extend) {
-    var originVueExtend = Vue.extend;
-    Vue.extend = function (vueOptions) {
-      proxyPage(vueOptions, lifeCycle);
-      return originVueExtend.call(this, vueOptions);
-    };
-  } else {
-    if (!tracker) return;
-    var originCreatePage = tracker.createPage;
-    tracker.createPage = function (pageOptions) {
-      proxyPage(pageOptions, lifeCycle);
-      return originCreatePage.call(this, pageOptions);
-    };
-    var originCreateComponent = tracker.createComponent;
-    tracker.createComponent = function (component) {
-      proxyPage(component, lifeCycle);
-      return originCreateComponent.call(this, component);
-    };
-  }
 }

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.2.0",
     "main": "cjs/index.js",
     "module": "esm/index.js",
     "miniprogram": "cjs",