@cloudcare/rum-uniapp 1.0.2 → 2.0.2

package/README.md

@@ -37,14 +37,17 @@ datafluxRum.init({
 
 ### 初始化参数
 
-| 参数                | 类型    | 是否必须 | 默认值  | 描述                                                                                                         |
-| ------------------- | ------- | -------- | ------- | ------------------------------------------------------------------------------------------------------------ |
-| `applicationId`     | String  | 是       |         | 从 dataflux 创建的应用 ID                                                                                    |
-| `datakitOrigin`     | String  | 是       |         | datakit 数据上报 Origin;`注意：需要在小程序管理后台加上request白名单`                                        |
-| `env`               | String  | 否       |         | 小程序 应用当前环境， 如 prod：线上环境；gray：灰度环境；pre：预发布环境 common：日常环境；local：本地环境； |
-| `version`           | String  | 否       |         | 小程序 应用的版本号                                                                                          |
-| `sampleRate`        | Number  | 否       | `100`   | 指标数据收集百分比: `100`表示全收集，`0`表示不收集                                                           |
-| `trackInteractions` | Boolean | 否       | `false` | 是否开启用户行为采集                                                                                         |
+| 参数                                            | 类型    | 是否必须 | 默认值    | 描述                                                                                                                                                                                                                                    |
+| ----------------------------------------------- | ------- | -------- | --------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `applicationId`                                 | String  | 是       |           | 从 dataflux 创建的应用 ID                                                                                                                                                                                                               |
+| `datakitOrigin`                                 | String  | 是       |           | datakit 数据上报 Origin;`注意：需要在小程序管理后台加上request白名单`                                                                                                                                                                   |
+| `env`                                           | String  | 否       |           | 小程序 应用当前环境， 如 prod：线上环境；gray：灰度环境；pre：预发布环境 common：日常环境；local：本地环境；                                                                                                                            |
+| `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`三种类型* |
+| `traceId128Bit` $\color{#FF0000}{新增}$         | Boolean | 否       | `false`   | 是否以128位的方式生成 `traceID`，与`traceType` 对应，目前支持类型 `zipkin`、`jaeger`                                                                                                                                                    |
+| `allowedTracingOrigins` $\color{#FF0000}{新增}$ | Array   | 否       | `[]`      | 允许注入 `trace` 采集器所需header头部的所有请求列表。可以是请求的origin，也可以是是正则，origin: `协议（包括：//），域名（或IP地址）[和端口号]` 例如：`["https://api.example.com", /https:\/\/.*\.my-api-domain\.com/]`                 |
+| `trackInteractions`                             | Boolean | 否       | `false`   | 是否开启用户行为采集                                                                                                                                                                                                                    |
 
 ## 注意事项
 

package/cjs/boot/buildEnv.js

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

package/cjs/boot/rum.entry.js

@@ -9,8 +9,22 @@ var _utils = require("../helper/utils");
 
 var _rum = require("./rum");
 
+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 makeRum = function makeRum(startRumImpl) {
   var isAlreadyInitialized = false;
+  var globalContextManager = (0, _utils.createContextManager)();
+  var user = {};
+
+  var _getInternalContext = function getInternalContext() {};
+
+  function clonedCommonContext() {
+    return (0, _utils.extend2Lev)({}, {
+      context: globalContextManager.get(),
+      user: user
+    });
+  }
+
   var rumGlobal = {
     init: function init(Vue, userConfiguration) {
       if (typeof userConfiguration === 'undefined') {
@@ -23,8 +37,34 @@ var makeRum = function makeRum(startRumImpl) {
         return;
       }
 
-      startRumImpl(Vue, userConfiguration);
+      var _startRumImpl = startRumImpl(Vue, userConfiguration, function () {
+        return {
+          user: user,
+          context: globalContextManager.get()
+        };
+      });
+
+      _getInternalContext = _startRumImpl.getInternalContext;
       isAlreadyInitialized = true;
+    },
+    getInternalContext: function getInternalContext(startTime) {
+      return _getInternalContext(startTime);
+    },
+    addRumGlobalContext: globalContextManager.add,
+    removeRumGlobalContext: globalContextManager.remove,
+    getRumGlobalContext: globalContextManager.get,
+    setRumGlobalContext: globalContextManager.set,
+    setUser: function setUser(newUser) {
+      var sanitizedUser = sanitizeUser(newUser);
+
+      if (sanitizedUser) {
+        user = sanitizedUser;
+      } else {
+        console.error('Unsupported user:', newUser);
+      }
+    },
+    removeUser: function removeUser() {
+      user = {};
     }
   };
   return rumGlobal;
@@ -52,8 +92,31 @@ var makeRum = function makeRum(startRumImpl) {
 
     return true;
   }
+
+  function sanitizeUser(newUser) {
+    if (_typeof(newUser) !== 'object' || !newUser) {
+      return;
+    }
+
+    var result = (0, _utils.extend2Lev)({}, newUser);
+
+    if ('id' in result) {
+      result.id = String(result.id);
+    }
+
+    if ('name' in result) {
+      result.name = String(result.name);
+    }
+
+    if ('email' in result) {
+      result.email = String(result.email);
+    }
+
+    return result;
+  }
 };
 
 exports.makeRum = makeRum;
 var datafluxRum = makeRum(_rum.startRum);
-exports.datafluxRum = datafluxRum;
+exports.datafluxRum = datafluxRum;
+(0, _utils.defineGlobal)((0, _utils.getGlobalObject)(), 'DATAFLUX_RUM_MIN', datafluxRum);

package/cjs/boot/rum.js

@@ -33,14 +33,19 @@ var _setDataCollection = require("../rumEventsCollection/setDataCollection");
 
 var _actionCollection = require("../rumEventsCollection/action/actionCollection");
 
+var _sessionManagement = require("../core/sessionManagement");
+
+var _internalContext = require("../rumEventsCollection/internalContext");
+
 var _sdk = require("../core/sdk");
 
-var startRum = function startRum(Vue, userConfiguration) {
+var startRum = function startRum(Vue, userConfiguration, getCommonContext) {
   var configuration = (0, _configuration.commonInit)(userConfiguration, _buildEnv.buildEnv);
   var lifeCycle = new _lifeCycle.LifeCycle();
   var parentContexts = (0, _parentContexts.startParentContexts)(lifeCycle);
   var batch = (0, _batch.startRumBatch)(configuration, lifeCycle);
-  (0, _assembly.startRumAssembly)(userConfiguration.applicationId, configuration, lifeCycle, parentContexts);
+  var session = new _sessionManagement.sessionManagement(configuration);
+  (0, _assembly.startRumAssembly)(userConfiguration.applicationId, configuration, session, lifeCycle, parentContexts, getCommonContext);
   (0, _appCollection.startAppCollection)(lifeCycle, configuration);
   (0, _resourceCollection.startResourceCollection)(lifeCycle, configuration);
   (0, _viewCollection.startViewCollection)(lifeCycle, configuration, Vue);
@@ -49,6 +54,10 @@ var startRum = function startRum(Vue, userConfiguration) {
   (0, _performanceCollection.startPagePerformanceObservable)(lifeCycle, configuration);
   (0, _setDataCollection.startSetDataColloction)(lifeCycle, Vue);
   (0, _actionCollection.startActionCollection)(lifeCycle, configuration, Vue);
+  var internalContext = (0, _internalContext.startInternalContext)(userConfiguration.applicationId, session, parentContexts);
+  return {
+    getInternalContext: internalContext.get
+  };
 };
 
 exports.startRum = startRum;

package/cjs/core/baseInfo.js

@@ -21,7 +21,6 @@ var BaseInfo = /*#__PURE__*/function () {
   function BaseInfo() {
     _classCallCheck(this, BaseInfo);
 
-    this.sessionId = (0, _utils.UUID)();
     this.getDeviceInfo();
     this.getNetWork();
   }
@@ -88,11 +87,6 @@ var BaseInfo = /*#__PURE__*/function () {
         _this.deviceInfo.network = e.networkType ? e.networkType : 'unknown';
       });
     }
-  }, {
-    key: "getSessionId",
-    value: function getSessionId() {
-      return this.sessionId;
-    }
   }]);
 
   return BaseInfo;

package/cjs/core/boundedBuffer.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BoundedBuffer = void 0;
+
+var _BoundedBuffer = function _BoundedBuffer() {
+  this.buffer = [];
+};
+
+_BoundedBuffer.prototype = {
+  add: function add(item) {
+    var length = this.buffer.push(item);
+
+    if (length > this.limit) {
+      this.buffer.splice(0, 1);
+    }
+  },
+  drain: function drain(fn) {
+    this.buffer.forEach(function (item) {
+      fn(item);
+    });
+    this.buffer.length = 0;
+  }
+};
+var BoundedBuffer = _BoundedBuffer;
+exports.BoundedBuffer = BoundedBuffer;

package/cjs/core/configuration.js

@@ -34,7 +34,11 @@ var DEFAULT_CONFIGURATION = {
    * arbitrary value, byte precision not needed
    */
   requestErrorResponseLengthLimit: 32 * _enums.ONE_KILO_BYTE,
-  trackInteractions: false
+  trackInteractions: false,
+  traceType: _enums.TraceType.DDTRACE,
+  traceId128Bit: false,
+  allowedTracingOrigins: [] // 新增
+
 };
 exports.DEFAULT_CONFIGURATION = DEFAULT_CONFIGURATION;
 
@@ -62,9 +66,30 @@ function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions;
   }
 
+  if ('allowedTracingOrigins' in userConfiguration) {
+    transportConfiguration.allowedTracingOrigins = userConfiguration.allowedTracingOrigins;
+  }
+
+  if ('traceId128Bit' in userConfiguration) {
+    transportConfiguration.traceId128Bit = !!userConfiguration.traceId128Bit;
+  }
+
+  if ('traceType' in userConfiguration && hasTraceType(userConfiguration.traceType)) {
+    transportConfiguration.traceType = userConfiguration.traceType;
+  }
+
+  if ('sampleRate' in userConfiguration) {
+    transportConfiguration.sampleRate = userConfiguration.sampleRate;
+  }
+
   return (0, _utils.extend2Lev)(DEFAULT_CONFIGURATION, transportConfiguration);
 }
 
+function hasTraceType(traceType) {
+  if (traceType && (0, _utils.values)(_enums.TraceType).indexOf(traceType) > -1) return true;
+  return false;
+}
+
 var haveSameOrigin = function haveSameOrigin(url1, url2) {
   var parseUrl1 = (0, _utils.urlParse)(url1).getParse();
   var parseUrl2 = (0, _utils.urlParse)(url2).getParse();

package/cjs/core/dataMap.js

@@ -14,7 +14,9 @@ var commonTags = {
   app_id: 'application.id',
   env: '_dd.env',
   version: '_dd.version',
-  userid: 'user.user_id',
+  userid: 'user.id',
+  user_email: 'user.email',
+  user_name: 'user.name',
   session_id: 'session.id',
   session_type: 'session.type',
   is_signin: 'user.is_signin',
@@ -59,6 +61,8 @@ var dataMap = {
   resource: {
     type: _enums.RumEventType.RESOURCE,
     tags: {
+      trace_id: '_dd.trace_id',
+      span_id: '_dd.span_id',
       resource_type: 'resource.type',
       resource_status: 'resource.status',
       resource_status_group: 'resource.status_group',

package/cjs/core/errorCollection.js

@@ -106,18 +106,17 @@ function stopRuntimeErrorTracking() {
   _tracekit.report.unsubscribe(traceKitReportHandler);
 }
 
-var filteredErrorsObservable;
+var errorObservable;
 
 function startAutomaticErrorCollection(configuration) {
-  if (!filteredErrorsObservable) {
-    var errorObservable = new _observable.Observable();
+  if (!errorObservable) {
+    errorObservable = new _observable.Observable();
     trackNetworkError(configuration, errorObservable);
     startConsoleTracking(errorObservable);
-    startRuntimeErrorTracking(errorObservable);
-    filteredErrorsObservable = filterErrors(configuration, errorObservable);
+    startRuntimeErrorTracking(errorObservable); // filteredErrorsObservable = filterErrors(configuration, errorObservable)
   }
 
-  return filteredErrorsObservable;
+  return errorObservable;
 }
 
 function trackNetworkError(configuration, errorObservable) {

package/cjs/core/errorFilter.js

@@ -0,0 +1,47 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createErrorFilter = createErrorFilter;
+
+var _errorTools = require("./errorTools");
+
+var _utils = require("../helper/utils");
+
+function createErrorFilter(configuration, onLimitReached) {
+  var errorCount = 0;
+  var allowNextError = false;
+  return {
+    isLimitReached: function isLimitReached() {
+      if (errorCount === 0) {
+        setTimeout(function () {
+          errorCount = 0;
+        }, _utils.ONE_MINUTE);
+      }
+
+      errorCount += 1;
+
+      if (errorCount <= configuration.maxErrorsByMinute || allowNextError) {
+        allowNextError = false;
+        return false;
+      }
+
+      if (errorCount === configuration.maxErrorsByMinute + 1) {
+        allowNextError = true;
+
+        try {
+          onLimitReached({
+            message: "Reached max number of errors by minute: ".concat(configuration.maxErrorsByMinute),
+            source: _errorTools.ErrorSource.AGENT,
+            startTime: (0, _utils.now)()
+          });
+        } finally {
+          allowNextError = false;
+        }
+      }
+
+      return true;
+    }
+  };
+}

package/cjs/core/errorTools.js

@@ -11,7 +11,8 @@ var ErrorSource = {
   CONSOLE: 'console',
   NETWORK: 'network',
   SOURCE: 'source',
-  LOGGER: 'logger'
+  LOGGER: 'logger',
+  CUSTOM: 'custom'
 };
 exports.ErrorSource = ErrorSource;
 

package/cjs/core/lifeCycle.js

@@ -68,6 +68,7 @@ var LifeCycleEventType = {
   REQUEST_STARTED: 'REQUEST_STARTED',
   REQUEST_COMPLETED: 'REQUEST_COMPLETED',
   RAW_RUM_EVENT_COLLECTED: 'RAW_RUM_EVENT_COLLECTED',
+  RAW_ERROR_COLLECTED: 'RAW_ERROR_COLLECTED',
   RUM_EVENT_COLLECTED: 'RUM_EVENT_COLLECTED'
 };
 exports.LifeCycleEventType = LifeCycleEventType;

package/cjs/core/sdk.js

@@ -43,7 +43,6 @@ function getSDK() {
     console.warn('unsupport platform, Fail to start');
   }
 
-  console.log('------get SDK-------');
   return {
     sdk: sdk,
     tracker: tracker

package/cjs/core/sessionManagement.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sessionManagement = exports.SessionType = void 0;
+
+var _utils = require("../helper/utils");
+
+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, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var SessionType = {
+  SYNTHETICS: 'synthetics',
+  USER: 'user'
+};
+exports.SessionType = SessionType;
+
+var sessionManagement = /*#__PURE__*/function () {
+  function sessionManagement(configuration) {
+    _classCallCheck(this, sessionManagement);
+
+    this.sessionId = (0, _utils.UUID)();
+    this.isTrack = (0, _utils.performDraw)(configuration.sampleRate);
+  }
+
+  _createClass(sessionManagement, [{
+    key: "getSessionId",
+    value: function getSessionId() {
+      return this.sessionId;
+    }
+  }, {
+    key: "isTracked",
+    value: function isTracked() {
+      return this.isTrack;
+    }
+  }]);
+
+  return sessionManagement;
+}();
+
+exports.sessionManagement = sessionManagement;

package/cjs/core/transport.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Batch = exports.HttpRequest = void 0;
+exports.Batch = exports.processedMessageByDataMap = exports.HttpRequest = void 0;
 
 var _utils = require("../helper/utils");
 
@@ -13,8 +13,11 @@ var _lifeCycle = require("../core/lifeCycle");
 
 var _dataMap = require("./dataMap");
 
+var _enums = require("../helper/enums");
+
 // https://en.wikipedia.org/wiki/UTF-8
 var HAS_MULTI_BYTES_CHARACTERS = /[^\u0000-\u007F]/;
+var CUSTOM_KEYS = 'custom_keys';
 
 function addBatchPrecision(url) {
   if (!url) return url;
@@ -43,6 +46,115 @@ httpRequest.prototype = {
 var HttpRequest = httpRequest;
 exports.HttpRequest = HttpRequest;
 
+var processedMessageByDataMap = function processedMessageByDataMap(message) {
+  if (!message || !message.type) return {
+    rowStr: '',
+    rowData: undefined
+  };
+  var rowData = {
+    tags: {},
+    fields: {}
+  };
+  var hasFileds = false;
+  var rowStr = '';
+  (0, _utils.each)(_dataMap.dataMap, function (value, key) {
+    if (value.type === message.type) {
+      if (value.alias_key) {
+        rowStr += value.alias_key + ',';
+      } else {
+        rowStr += key + ',';
+      }
+
+      rowData.measurement = key;
+      var tagsStr = [];
+      var tags = (0, _utils.extend)({}, _dataMap.commonTags, value.tags);
+      var filterFileds = ['date', 'type']; // 已经在datamap中定义过的fields和tags
+
+      (0, _utils.each)(tags, function (value_path, _key) {
+        var _value = (0, _utils.findByPath)(message, value_path);
+
+        filterFileds.push(_key);
+
+        if (_value || (0, _utils.isNumber)(_value)) {
+          rowData.tags[_key] = _value;
+          tagsStr.push((0, _utils.escapeRowData)(_key) + '=' + (0, _utils.escapeRowData)(_value));
+        }
+      });
+
+      if (message.tags && (0, _utils.isObject)(message.tags) && !(0, _utils.isEmptyObject)(message.tags)) {
+        // 自定义tag
+        var _tagKeys = [];
+        (0, _utils.each)(message.tags, function (_value, _key) {
+          // 如果和之前tag重名，则舍弃
+          if (filterFileds.indexOf(_key) > -1) return;
+          filterFileds.push(_key);
+
+          if (_value || (0, _utils.isNumber)(_value)) {
+            _tagKeys.push(_key);
+
+            rowData.tags[_key] = _value;
+            tagsStr.push((0, _utils.escapeRowData)(_key) + '=' + (0, _utils.escapeRowData)(_value));
+          }
+        });
+
+        if (_tagKeys.length) {
+          rowData.tags[CUSTOM_KEYS] = _tagKeys;
+          tagsStr.push((0, _utils.escapeRowData)(CUSTOM_KEYS) + '=' + (0, _utils.escapeRowData)(_tagKeys));
+        }
+      }
+
+      var fieldsStr = [];
+      (0, _utils.each)(value.fields, function (_value, _key) {
+        if ((0, _utils.isArray)(_value) && _value.length === 2) {
+          var type = _value[0],
+              value_path = _value[1];
+
+          var _valueData = (0, _utils.findByPath)(message, value_path);
+
+          filterFileds.push(_key);
+
+          if (_valueData || (0, _utils.isNumber)(_valueData)) {
+            rowData.fields[_key] = _valueData; // 这里不需要转译
+
+            _valueData = type === 'string' ? '"' + _valueData.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') + '"' : (0, _utils.escapeRowData)(_valueData);
+            fieldsStr.push((0, _utils.escapeRowData)(_key) + '=' + _valueData);
+          }
+        } else if ((0, _utils.isString)(_value)) {
+          var _valueData = (0, _utils.findByPath)(message, _value);
+
+          filterFileds.push(_key);
+
+          if (_valueData || (0, _utils.isNumber)(_valueData)) {
+            rowData.fields[_key] = _valueData; // 这里不需要转译
+
+            _valueData = (0, _utils.escapeRowData)(_valueData);
+            fieldsStr.push((0, _utils.escapeRowData)(_key) + '=' + _valueData);
+          }
+        }
+      });
+
+      if (tagsStr.length) {
+        rowStr += tagsStr.join(',');
+      }
+
+      if (fieldsStr.length) {
+        rowStr += ' ';
+        rowStr += fieldsStr.join(',');
+        hasFileds = true;
+      }
+
+      rowStr = rowStr + ' ' + message.date;
+      rowData.time = (0, _utils.toServerDuration)(message.date); // 这里不需要转译
+    }
+  });
+  return {
+    rowStr: hasFileds ? rowStr : '',
+    rowData: hasFileds ? rowData : undefined
+  };
+};
+
+exports.processedMessageByDataMap = processedMessageByDataMap;
+
 function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, lifeCycle) {
   this.request = request;
   this.maxSize = maxSize;
@@ -76,74 +188,7 @@ batch.prototype = {
     }
   },
   processSendData: function processSendData(message) {
-    // var data = safeJSONParse(message)
-    if (!message || !message.type) return '';
-    var rowStr = '';
-    var hasFileds = false;
-    (0, _utils.each)(_dataMap.dataMap, function (value, key) {
-      if (value.type === message.type) {
-        // 做一下别名处理
-        if (value.alias_key) {
-          rowStr += value.alias_key + ',';
-        } else {
-          rowStr += key + ',';
-        }
-
-        var tagsStr = [];
-        var tags = (0, _utils.extend)({}, _dataMap.commonTags, value.tags);
-        (0, _utils.each)(tags, function (value_path, _key) {
-          var _value = (0, _utils.findByPath)(message, value_path);
-
-          if (_value || (0, _utils.isNumber)(_value)) {
-            tagsStr.push((0, _utils.escapeRowData)(_key) + '=' + (0, _utils.escapeRowData)(_value));
-          }
-        });
-
-        if (message.tags.length) {
-          // 自定义tag
-          (0, _utils.each)(message.tags, function (_value, _key) {
-            if (_value || (0, _utils.isNumber)(_value)) {
-              tagsStr.push((0, _utils.escapeRowData)(_key) + '=' + (0, _utils.escapeRowData)(_value));
-            }
-          });
-        }
-
-        var fieldsStr = [];
-        (0, _utils.each)(value.fields, function (_value, _key) {
-          if (Array.isArray(_value) && _value.length === 2) {
-            var type = _value[0],
-                value_path = _value[1];
-
-            var _valueData = (0, _utils.findByPath)(message, value_path);
-
-            if (_valueData || (0, _utils.isNumber)(_valueData)) {
-              _valueData = type === 'string' ? '"' + String(_valueData).replace(/[\\]*"/g, '"').replace(/"/g, '\\"') + '"' : (0, _utils.escapeRowData)(_valueData);
-              fieldsStr.push((0, _utils.escapeRowData)(_key) + '=' + _valueData);
-            }
-          } else if ((0, _utils.isString)(_value)) {
-            var _valueData = (0, _utils.findByPath)(message, _value);
-
-            if (_valueData || (0, _utils.isNumber)(_valueData)) {
-              _valueData = (0, _utils.escapeRowData)(_valueData);
-              fieldsStr.push((0, _utils.escapeRowData)(_key) + '=' + _valueData);
-            }
-          }
-        });
-
-        if (tagsStr.length) {
-          rowStr += tagsStr.join(',');
-        }
-
-        if (fieldsStr.length) {
-          rowStr += ' ';
-          rowStr += fieldsStr.join(',');
-          hasFileds = true;
-        }
-
-        rowStr = rowStr + ' ' + message.date;
-      }
-    });
-    return hasFileds ? rowStr : '';
+    return processedMessageByDataMap(message).rowStr;
   },
   sizeInBytes: function sizeInBytes(candidate) {
     // Accurate byte size computations can degrade performances when there is a lot of events to process

package/cjs/core/xhrProxy.js

@@ -53,7 +53,8 @@ function proxyXhr() {
       startTime: 0,
       url: arguments[0].url,
       type: _enums.RequestType.XHR,
-      responseType: arguments[0].responseType || 'text'
+      responseType: arguments[0].responseType || 'text',
+      option: arguments[0]
     };
     dataflux_xhr.startTime = (0, _utils.now)();
     var originalSuccess = arguments[0].success;
@@ -97,6 +98,6 @@ function proxyXhr() {
     beforeSendCallbacks.forEach(function (callback) {
       callback(dataflux_xhr);
     });
-    return originalXhrRequest.apply(this, arguments);
+    return originalXhrRequest.call(this, dataflux_xhr.option);
   };
 }