@cloudcare/rum-uniapp 2.1.5 → 2.1.8

package/README.md

@@ -42,6 +42,7 @@ datafluxRum.init({
 | `applicationId`                                 | String  | 是       |           | 从 dataflux 创建的应用 ID                                                                                                                                                                                                               |
 | `datakitOrigin`                                 | String  | 是       |           | datakit 数据上报 Origin;`注意：需要在小程序管理后台加上request白名单`                                                                                                                                                                   |
 | `env`                                           | String  | 否       |           | 小程序 应用当前环境， 如 prod：线上环境；gray：灰度环境；pre：预发布环境 common：日常环境；local：本地环境；                                                                                                                            |
+| `service`                                       | String  | 否       |           | 小程序应用 服务名称，可 用于 apm 关联 tag                                                                                                                                                                                               |
 | `version`                                       | String  | 否       |           | 小程序 应用的版本号                                                                                                                                                                                                                     |
 | `sampleRate`                                    | Number  | 否       | `100`     | 指标数据收集百分比: `100`表示全收集，`0`表示不收集                                                                                                                                                                                      |
 | `traceType` $\color{#FF0000}{新增}$             | Enum    | 否       | `ddtrace` | 与 APM 采集工具连接的请求header类型，目前兼容的类型包括：`ddtrace`、`zipkin`、`skywalking_v3`、`jaeger`、`zipkin_single_header`、`w3c_traceparent`。*注： opentelemetry 支持 `zipkin_single_header`,`w3c_traceparent`,`zipkin`三种类型* |

package/cjs/boot/buildEnv.js

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

package/cjs/boot/rum.entry.js

@@ -46,7 +46,9 @@ var makeRum = function makeRum(startRumImpl) {
       isAlreadyInitialized = true;
     },
     initVue3: function initVue3(userConfiguration) {
-      this.init({}, userConfiguration);
+      this.init({}, (0, _utils.extend)({
+        isVue2: false
+      }, userConfiguration));
     },
     getInternalContext: function getInternalContext(startTime) {
       return _getInternalContext(startTime);

package/cjs/core/configuration.js

@@ -37,8 +37,9 @@ var DEFAULT_CONFIGURATION = {
   trackInteractions: false,
   traceType: _enums.TraceType.DDTRACE,
   traceId128Bit: false,
-  allowedTracingOrigins: [] // 新增
-
+  allowedTracingOrigins: [],
+  // 新增
+  isVue2: true
 };
 exports.DEFAULT_CONFIGURATION = DEFAULT_CONFIGURATION;
 
@@ -56,6 +57,7 @@ function commonInit(userConfiguration, buildEnv) {
     applicationId: userConfiguration.applicationId,
     env: userConfiguration.env || '',
     version: userConfiguration.version || '',
+    service: userConfiguration.service || '',
     sdkVersion: buildEnv.sdkVersion,
     sdkName: buildEnv.sdkName,
     datakitUrl: getDatakitUrlUrl(userConfiguration.datakitUrl || userConfiguration.datakitOrigin),
@@ -82,6 +84,10 @@ function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.sampleRate = userConfiguration.sampleRate;
   }
 
+  if ('isVue2' in userConfiguration) {
+    transportConfiguration.isVue2 = userConfiguration.isVue2;
+  }
+
   return (0, _utils.extend2Lev)(DEFAULT_CONFIGURATION, transportConfiguration);
 }
 

package/cjs/core/dataMap.js

@@ -14,6 +14,7 @@ var commonTags = {
   app_id: 'application.id',
   env: '_dd.env',
   version: '_dd.version',
+  service: '_dd.service',
   userid: 'user.id',
   user_email: 'user.email',
   user_name: 'user.name',

package/cjs/core/downloadProxy.js

@@ -12,14 +12,16 @@ var _utils = require("../helper/utils");
 
 var _enums = require("../helper/enums");
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 var downloadProxySingleton;
 var beforeSendCallbacks = [];
 var onRequestCompleteCallbacks = [];
 var originalDownloadRequest;
 
-function startDownloadProxy() {
+function startDownloadProxy(userConfiguration) {
   if (!downloadProxySingleton) {
-    proxyDownload();
+    proxyDownload(userConfiguration);
     downloadProxySingleton = {
       beforeSend: function beforeSend(callback) {
         beforeSendCallbacks.push(callback);
@@ -42,7 +44,7 @@ function resetDownloadProxy() {
   }
 }
 
-function proxyDownload() {
+function proxyDownload(userConfiguration) {
   originalDownloadRequest = _sdk.sdk.downloadFile;
 
   _sdk.sdk.downloadFile = function () {
@@ -58,23 +60,27 @@ function proxyDownload() {
     dataflux_xhr.startTime = (0, _utils.now)();
     var originalSuccess = arguments[0].success;
 
-    arguments[0].success = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalSuccess === 'function') {
+      arguments[0].success = function () {
+        reportXhr(arguments[0]);
 
-      if (originalSuccess) {
-        originalSuccess.apply(_this, arguments);
-      }
-    };
+        if (originalSuccess) {
+          originalSuccess.apply(_this, arguments);
+        }
+      };
+    }
 
     var originalFail = arguments[0].fail;
 
-    arguments[0].fail = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalFail === 'function') {
+      arguments[0].fail = function () {
+        reportXhr(arguments[0]);
 
-      if (originalFail) {
-        originalFail.apply(_this, arguments);
-      }
-    };
+        if (originalFail) {
+          originalFail.apply(_this, arguments);
+        }
+      };
+    }
 
     var hasBeenReported = false;
 
@@ -100,6 +106,35 @@ function proxyDownload() {
     beforeSendCallbacks.forEach(function (callback) {
       callback(dataflux_xhr);
     });
-    return originalDownloadRequest.apply(this, arguments);
+    var result = originalDownloadRequest.apply(this, arguments); // 判断结果是否为promise
+
+    var isPromise = function isPromise(obj) {
+      return !!obj && (_typeof(obj) === "object" || typeof obj === "function") && typeof obj.then === "function";
+    };
+
+    if (isPromise(result) && userConfiguration.isVue2) {
+      // vue2 版本，success, fail 都在then返回
+      return result.then(function (res) {
+        if (res[0]) {
+          reportXhr(res[0]);
+        } else {
+          reportXhr(res[1]);
+        }
+
+        return res;
+      });
+    } else if (isPromise(result) && !userConfiguration.isVue2) {
+      return new Promise(function (resolve, reject) {
+        result.then(function (res) {
+          reportXhr(res);
+          resolve(res);
+        })["catch"](function (err) {
+          reportXhr(err);
+          reject(err);
+        });
+      });
+    } else {
+      return result;
+    }
   };
 }

package/cjs/core/errorCollection.js

@@ -120,10 +120,10 @@ function startAutomaticErrorCollection(configuration) {
 }
 
 function trackNetworkError(configuration, errorObservable) {
-  (0, _xhrProxy.startXhrProxy)().onRequestComplete(function (context) {
+  (0, _xhrProxy.startXhrProxy)(configuration).onRequestComplete(function (context) {
     return handleCompleteRequest(context.type, context);
   });
-  (0, _downloadProxy.startDownloadProxy)().onRequestComplete(function (context) {
+  (0, _downloadProxy.startDownloadProxy)(configuration).onRequestComplete(function (context) {
     return handleCompleteRequest(context.type, context);
   });
 

package/cjs/core/xhrProxy.js

@@ -12,14 +12,16 @@ var _utils = require("../helper/utils");
 
 var _enums = require("../helper/enums");
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 var xhrProxySingleton;
 var beforeSendCallbacks = [];
 var onRequestCompleteCallbacks = [];
 var originalXhrRequest;
 
-function startXhrProxy() {
+function startXhrProxy(userConfiguration) {
   if (!xhrProxySingleton) {
-    proxyXhr();
+    proxyXhr(userConfiguration);
     xhrProxySingleton = {
       beforeSend: function beforeSend(callback) {
         beforeSendCallbacks.push(callback);
@@ -42,7 +44,7 @@ function resetXhrProxy() {
   }
 }
 
-function proxyXhr() {
+function proxyXhr(userConfiguration) {
   originalXhrRequest = _sdk.sdk.request;
 
   _sdk.sdk.request = function () {
@@ -59,23 +61,27 @@ function proxyXhr() {
     dataflux_xhr.startTime = (0, _utils.now)();
     var originalSuccess = arguments[0].success;
 
-    arguments[0].success = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalSuccess === 'function') {
+      arguments[0].success = function () {
+        reportXhr(arguments[0]);
 
-      if (originalSuccess) {
-        originalSuccess.apply(_this, arguments);
-      }
-    };
+        if (originalSuccess) {
+          originalSuccess.apply(_this, arguments);
+        }
+      };
+    }
 
     var originalFail = arguments[0].fail;
 
-    arguments[0].fail = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalFail === 'function') {
+      arguments[0].fail = function () {
+        reportXhr(arguments[0]);
 
-      if (originalFail) {
-        originalFail.apply(_this, arguments);
-      }
-    };
+        if (originalFail) {
+          originalFail.apply(_this, arguments);
+        }
+      };
+    }
 
     var hasBeenReported = false;
 
@@ -98,6 +104,35 @@ function proxyXhr() {
     beforeSendCallbacks.forEach(function (callback) {
       callback(dataflux_xhr);
     });
-    return originalXhrRequest.call(this, dataflux_xhr.option);
+    var result = originalXhrRequest.call(this, dataflux_xhr.option); // 判断结果是否为promise
+
+    var isPromise = function isPromise(obj) {
+      return !!obj && (_typeof(obj) === "object" || typeof obj === "function") && typeof obj.then === "function";
+    };
+
+    if (isPromise(result) && userConfiguration.isVue2) {
+      // vue2 版本，success, fail 都在then返回
+      return result.then(function (res) {
+        if (res[0]) {
+          reportXhr(res[0]);
+        } else {
+          reportXhr(res[1]);
+        }
+
+        return res;
+      });
+    } else if (isPromise(result) && !userConfiguration.isVue2) {
+      return new Promise(function (resolve, reject) {
+        result.then(function (res) {
+          reportXhr(res);
+          resolve(res);
+        })["catch"](function (err) {
+          reportXhr(err);
+          reject(err);
+        });
+      });
+    } else {
+      return result;
+    }
   };
 }

package/cjs/rumEventsCollection/assembly.js

@@ -43,7 +43,8 @@ function startRumAssembly(applicationId, configuration, session, lifeCycle, pare
           sdkName: configuration.sdkName,
           sdkVersion: configuration.sdkVersion,
           env: configuration.env,
-          version: configuration.version
+          version: configuration.version,
+          service: configuration.service
         },
         tags: configuration.tags,
         application: {

package/cjs/rumEventsCollection/page/index.js

@@ -22,7 +22,6 @@ function proxyPage(pageOptions, lifeCycle) {
       startTime = (0, _utils.now)();
   ['onReady', 'onShow', 'onLoad', 'onUnload', 'onHide'].forEach(function (methodName) {
     var userDefinedMethod = pageOptions[methodName];
-    if (typeof userDefinedMethod !== 'function') return;
 
     pageOptions[methodName] = function () {
       var mpType = this.mpType || this.$vm.mpType;

package/cjs/rumEventsCollection/requestCollection.js

@@ -47,7 +47,7 @@ function getHeaderString(header) {
 }
 
 function trackXhr(lifeCycle, configuration, tracer) {
-  var xhrProxy = (0, _xhrProxy.startXhrProxy)();
+  var xhrProxy = (0, _xhrProxy.startXhrProxy)(configuration);
   xhrProxy.beforeSend(function (context) {
     if ((0, _resourceUtils.isAllowedRequestUrl)(configuration, context.url)) {
       tracer.traceXhr(context);
@@ -79,7 +79,7 @@ function trackXhr(lifeCycle, configuration, tracer) {
 }
 
 function trackDownload(lifeCycle, configuration) {
-  var dwonloadProxy = (0, _downloadProxy.startDownloadProxy)();
+  var dwonloadProxy = (0, _downloadProxy.startDownloadProxy)(configuration);
   dwonloadProxy.beforeSend(function (context) {
     if ((0, _resourceUtils.isAllowedRequestUrl)(configuration, context.url)) {
       context.requestIndex = getNextRequestIndex();

package/esm/boot/buildEnv.js

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

package/esm/boot/rum.entry.js

@@ -1,4 +1,4 @@
-import { isPercentage, extend2Lev, now, createContextManager, defineGlobal, getGlobalObject, isString, isObject } from '../helper/utils';
+import { isPercentage, extend2Lev, extend, now, createContextManager, defineGlobal, getGlobalObject, isString, isObject } from '../helper/utils';
 import { startRum } from './rum';
 import { ActionType } from '../helper/enums';
 export var makeRum = function makeRum(startRumImpl) {
@@ -34,7 +34,9 @@ export var makeRum = function makeRum(startRumImpl) {
       isAlreadyInitialized = true;
     },
     initVue3: function initVue3(userConfiguration) {
-      this.init({}, userConfiguration);
+      this.init({}, extend({
+        isVue2: false
+      }, userConfiguration));
     },
     getInternalContext: function getInternalContext(startTime) {
       return _getInternalContext(startTime);

package/esm/core/configuration.js

@@ -26,8 +26,9 @@ export var DEFAULT_CONFIGURATION = {
   trackInteractions: false,
   traceType: TraceType.DDTRACE,
   traceId128Bit: false,
-  allowedTracingOrigins: [] // 新增
-
+  allowedTracingOrigins: [],
+  // 新增
+  isVue2: true
 };
 
 function trim(str) {
@@ -44,6 +45,7 @@ export function commonInit(userConfiguration, buildEnv) {
     applicationId: userConfiguration.applicationId,
     env: userConfiguration.env || '',
     version: userConfiguration.version || '',
+    service: userConfiguration.service || '',
     sdkVersion: buildEnv.sdkVersion,
     sdkName: buildEnv.sdkName,
     datakitUrl: getDatakitUrlUrl(userConfiguration.datakitUrl || userConfiguration.datakitOrigin),
@@ -70,6 +72,10 @@ export function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.sampleRate = userConfiguration.sampleRate;
   }
 
+  if ('isVue2' in userConfiguration) {
+    transportConfiguration.isVue2 = userConfiguration.isVue2;
+  }
+
   return extend2Lev(DEFAULT_CONFIGURATION, transportConfiguration);
 }
 

package/esm/core/dataMap.js

@@ -6,6 +6,7 @@ export var commonTags = {
   app_id: 'application.id',
   env: '_dd.env',
   version: '_dd.version',
+  service: '_dd.service',
   userid: 'user.id',
   user_email: 'user.email',
   user_name: 'user.name',

package/esm/core/downloadProxy.js

@@ -5,9 +5,9 @@ var downloadProxySingleton;
 var beforeSendCallbacks = [];
 var onRequestCompleteCallbacks = [];
 var originalDownloadRequest;
-export function startDownloadProxy() {
+export function startDownloadProxy(userConfiguration) {
   if (!downloadProxySingleton) {
-    proxyDownload();
+    proxyDownload(userConfiguration);
     downloadProxySingleton = {
       beforeSend: function beforeSend(callback) {
         beforeSendCallbacks.push(callback);
@@ -29,7 +29,7 @@ export function resetDownloadProxy() {
   }
 }
 
-function proxyDownload() {
+function proxyDownload(userConfiguration) {
   originalDownloadRequest = sdk.downloadFile;
 
   sdk.downloadFile = function () {
@@ -45,23 +45,27 @@ function proxyDownload() {
     dataflux_xhr.startTime = now();
     var originalSuccess = arguments[0].success;
 
-    arguments[0].success = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalSuccess === 'function') {
+      arguments[0].success = function () {
+        reportXhr(arguments[0]);
 
-      if (originalSuccess) {
-        originalSuccess.apply(_this, arguments);
-      }
-    };
+        if (originalSuccess) {
+          originalSuccess.apply(_this, arguments);
+        }
+      };
+    }
 
     var originalFail = arguments[0].fail;
 
-    arguments[0].fail = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalFail === 'function') {
+      arguments[0].fail = function () {
+        reportXhr(arguments[0]);
 
-      if (originalFail) {
-        originalFail.apply(_this, arguments);
-      }
-    };
+        if (originalFail) {
+          originalFail.apply(_this, arguments);
+        }
+      };
+    }
 
     var hasBeenReported = false;
 
@@ -87,6 +91,35 @@ function proxyDownload() {
     beforeSendCallbacks.forEach(function (callback) {
       callback(dataflux_xhr);
     });
-    return originalDownloadRequest.apply(this, arguments);
+    var result = originalDownloadRequest.apply(this, arguments); // 判断结果是否为promise
+
+    var isPromise = function isPromise(obj) {
+      return !!obj && (typeof obj === "object" || typeof obj === "function") && typeof obj.then === "function";
+    };
+
+    if (isPromise(result) && userConfiguration.isVue2) {
+      // vue2 版本，success, fail 都在then返回
+      return result.then(function (res) {
+        if (res[0]) {
+          reportXhr(res[0]);
+        } else {
+          reportXhr(res[1]);
+        }
+
+        return res;
+      });
+    } else if (isPromise(result) && !userConfiguration.isVue2) {
+      return new Promise(function (resolve, reject) {
+        result.then(function (res) {
+          reportXhr(res);
+          resolve(res);
+        }).catch(function (err) {
+          reportXhr(err);
+          reject(err);
+        });
+      });
+    } else {
+      return result;
+    }
   };
 }

package/esm/core/errorCollection.js

@@ -91,10 +91,10 @@ export function startAutomaticErrorCollection(configuration) {
   return errorObservable;
 }
 export function trackNetworkError(configuration, errorObservable) {
-  startXhrProxy().onRequestComplete(function (context) {
+  startXhrProxy(configuration).onRequestComplete(function (context) {
     return handleCompleteRequest(context.type, context);
   });
-  startDownloadProxy().onRequestComplete(function (context) {
+  startDownloadProxy(configuration).onRequestComplete(function (context) {
     return handleCompleteRequest(context.type, context);
   });
 

package/esm/core/xhrProxy.js

@@ -5,9 +5,9 @@ var xhrProxySingleton;
 var beforeSendCallbacks = [];
 var onRequestCompleteCallbacks = [];
 var originalXhrRequest;
-export function startXhrProxy() {
+export function startXhrProxy(userConfiguration) {
   if (!xhrProxySingleton) {
-    proxyXhr();
+    proxyXhr(userConfiguration);
     xhrProxySingleton = {
       beforeSend: function beforeSend(callback) {
         beforeSendCallbacks.push(callback);
@@ -29,7 +29,7 @@ export function resetXhrProxy() {
   }
 }
 
-function proxyXhr() {
+function proxyXhr(userConfiguration) {
   originalXhrRequest = sdk.request;
 
   sdk.request = function () {
@@ -46,23 +46,27 @@ function proxyXhr() {
     dataflux_xhr.startTime = now();
     var originalSuccess = arguments[0].success;
 
-    arguments[0].success = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalSuccess === 'function') {
+      arguments[0].success = function () {
+        reportXhr(arguments[0]);
 
-      if (originalSuccess) {
-        originalSuccess.apply(_this, arguments);
-      }
-    };
+        if (originalSuccess) {
+          originalSuccess.apply(_this, arguments);
+        }
+      };
+    }
 
     var originalFail = arguments[0].fail;
 
-    arguments[0].fail = function () {
-      reportXhr(arguments[0]);
+    if (typeof originalFail === 'function') {
+      arguments[0].fail = function () {
+        reportXhr(arguments[0]);
 
-      if (originalFail) {
-        originalFail.apply(_this, arguments);
-      }
-    };
+        if (originalFail) {
+          originalFail.apply(_this, arguments);
+        }
+      };
+    }
 
     var hasBeenReported = false;
 
@@ -85,6 +89,35 @@ function proxyXhr() {
     beforeSendCallbacks.forEach(function (callback) {
       callback(dataflux_xhr);
     });
-    return originalXhrRequest.call(this, dataflux_xhr.option);
+    var result = originalXhrRequest.call(this, dataflux_xhr.option); // 判断结果是否为promise
+
+    var isPromise = function isPromise(obj) {
+      return !!obj && (typeof obj === "object" || typeof obj === "function") && typeof obj.then === "function";
+    };
+
+    if (isPromise(result) && userConfiguration.isVue2) {
+      // vue2 版本，success, fail 都在then返回
+      return result.then(function (res) {
+        if (res[0]) {
+          reportXhr(res[0]);
+        } else {
+          reportXhr(res[1]);
+        }
+
+        return res;
+      });
+    } else if (isPromise(result) && !userConfiguration.isVue2) {
+      return new Promise(function (resolve, reject) {
+        result.then(function (res) {
+          reportXhr(res);
+          resolve(res);
+        }).catch(function (err) {
+          reportXhr(err);
+          reject(err);
+        });
+      });
+    } else {
+      return result;
+    }
   };
 }

package/esm/rumEventsCollection/assembly.js

@@ -28,7 +28,8 @@ export function startRumAssembly(applicationId, configuration, session, lifeCycl
           sdkName: configuration.sdkName,
           sdkVersion: configuration.sdkVersion,
           env: configuration.env,
-          version: configuration.version
+          version: configuration.version,
+          service: configuration.service
         },
         tags: configuration.tags,
         application: {

package/esm/rumEventsCollection/page/index.js

@@ -10,7 +10,6 @@ function proxyPage(pageOptions, lifeCycle) {
       startTime = now();
   ['onReady', 'onShow', 'onLoad', 'onUnload', 'onHide'].forEach(methodName => {
     var userDefinedMethod = pageOptions[methodName];
-    if (typeof userDefinedMethod !== 'function') return;
 
     pageOptions[methodName] = function () {
       var mpType = this.mpType || this.$vm.mpType;

package/esm/rumEventsCollection/requestCollection.js

@@ -31,7 +31,7 @@ function getHeaderString(header) {
 }
 
 export function trackXhr(lifeCycle, configuration, tracer) {
-  var xhrProxy = startXhrProxy();
+  var xhrProxy = startXhrProxy(configuration);
   xhrProxy.beforeSend(function (context) {
     if (isAllowedRequestUrl(configuration, context.url)) {
       tracer.traceXhr(context);
@@ -62,7 +62,7 @@ export function trackXhr(lifeCycle, configuration, tracer) {
   return xhrProxy;
 }
 export function trackDownload(lifeCycle, configuration) {
-  var dwonloadProxy = startDownloadProxy();
+  var dwonloadProxy = startDownloadProxy(configuration);
   dwonloadProxy.beforeSend(function (context) {
     if (isAllowedRequestUrl(configuration, context.url)) {
       context.requestIndex = getNextRequestIndex();

package/package.json

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