@cloudcare/browser-core 1.0.24 → 1.0.29

package/cjs/configuration.js

@@ -51,6 +51,9 @@ var DEFAULT_CONFIGURATION = {
   // 新增
   isServiceSampling: false,
   // 是否不抛弃采样是数据， 采用在服务端菜样的方式
+  isJsBirdge: false,
+  // 是否需要对webview 发送数据，需要装我们对应ios sdk
+  isLineProtocolToJson: false,
   beforeSend: function beforeSend(event) {},
   isServerError: function isServerError(request) {
     return false;
@@ -102,6 +105,14 @@ function commonInit(userConfiguration, buildEnv) {
     cookieOptions: buildCookieOptions(userConfiguration)
   };
 
+  if ('isJsBirdge' in userConfiguration) {
+    transportConfiguration.isJsBirdge = userConfiguration.isJsBirdge;
+  }
+
+  if ('isLineProtocolToJson' in userConfiguration) {
+    transportConfiguration.isLineProtocolToJson = userConfiguration.isLineProtocolToJson;
+  }
+
   if ('allowedDDTracingOrigins' in userConfiguration) {
     transportConfiguration.allowedTracingOrigins = userConfiguration.allowedDDTracingOrigins;
   }

package/cjs/dataMap.js

@@ -101,6 +101,8 @@ var dataMap = {
   error: {
     type: _enums.RumEventType.ERROR,
     tags: {
+      trace_id: '_dd.trace_id',
+      span_id: '_dd.span_id',
       error_source: 'error.source',
       error_type: 'error.type',
       error_handling: 'error.handling',

package/cjs/errorCollection.js

@@ -123,7 +123,9 @@ function trackNetworkError(configuration, errorObservable) {
         resource: {
           method: request.method,
           statusCode: request.status,
-          url: request.url
+          url: request.url,
+          traceId: request.traceId,
+          spanId: request.spanId
         },
         source: _errorTools.ErrorSource.NETWORK,
         stack: truncateResponse(request.response, configuration) || 'Failed to load',

package/cjs/helper/mobileUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.userAgent = exports.jsBirdge = exports.isIos = exports.isAndroid = void 0;
+exports.userAgent = exports.isIos = exports.isAndroid = exports.JsBirdge = void 0;
 var userAgent = navigator.userAgent.toLowerCase();
 exports.userAgent = userAgent;
 
@@ -29,6 +29,7 @@ var JsBirdge = function JsBirdge() {
   } catch (err) {}
 };
 
+exports.JsBirdge = JsBirdge;
 JsBirdge.prototype = {
   initBridge: function initBridge() {
     var _this = this;
@@ -116,5 +117,5 @@ JsBirdge.prototype = {
     }
   }
 };
-var jsBirdge = new JsBirdge();
-exports.jsBirdge = jsBirdge;
+var JsBirdge = JsBirdge;
+exports.JsBirdge = JsBirdge;

package/cjs/helper/tools.js

@@ -19,6 +19,7 @@ exports.deepSnakeCase = deepSnakeCase;
 exports.each = void 0;
 exports.elapsed = elapsed;
 exports.encodeDates = void 0;
+exports.escapeJsonValue = escapeJsonValue;
 exports.escapeRowData = escapeRowData;
 exports.filter = exports.extend2Lev = exports.extend = void 0;
 exports.find = find;
@@ -2033,4 +2034,12 @@ function escapeRowData(str) {
   return String(str).replace(reg, function (word) {
     return '\\' + word;
   });
+}
+
+function escapeJsonValue(value) {
+  if (isString(value)) {
+    return value;
+  } else {
+    return jsonStringify(value);
+  }
 }

package/cjs/transport.js

@@ -20,18 +20,28 @@ function addBatchPrecision(url) {
   return url + (url.indexOf('?') === -1 ? '?' : '&') + 'precision=ms';
 }
 
-var httpRequest = function httpRequest(endpointUrl, bytesLimit) {
+var httpRequest = function httpRequest(endpointUrl, bytesLimit, isLineProtocolToJson) {
   this.endpointUrl = endpointUrl;
   this.bytesLimit = bytesLimit;
+  this.isLineProtocolToJson = isLineProtocolToJson;
 };
 
 httpRequest.prototype = {
   send: function send(data, size) {
     var url = addBatchPrecision(this.endpointUrl);
 
-    if (navigator.sendBeacon && size < this.bytesLimit) {
+    if (navigator.sendBeacon && size < this.bytesLimit && !this.isLineProtocolToJson) {
       var isQueued = navigator.sendBeacon(url, data);
 
+      if (isQueued) {
+        return;
+      }
+    } else if (navigator.sendBeacon && size < this.bytesLimit && this.isLineProtocolToJson) {
+      var blob = new Blob([JSON.stringify(data)], {
+        type: 'application/json'
+      });
+      var isQueued = navigator.sendBeacon(url, blob);
+
       if (isQueued) {
         return;
       }
@@ -40,7 +50,14 @@ httpRequest.prototype = {
     var request = new XMLHttpRequest();
     request.open('POST', url, true);
     request.withCredentials = true;
-    request.send(data);
+
+    if (this.isLineProtocolToJson) {
+      request.setRequestHeader('Content-type', 'application/json');
+      request.send(JSON.stringify(data));
+    } else {
+      request.setRequestHeader('Content-type', 'text/plain;charset=UTF-8');
+      request.send(data);
+    }
   }
 };
 var HttpRequest = httpRequest;
@@ -71,33 +88,10 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
         filterFileds.push(_key);
 
         if (_value || (0, _tools.isNumber)(_value)) {
-          rowData.tags[_key] = _value;
+          rowData.tags[_key] = (0, _tools.escapeJsonValue)(_value);
           tagsStr.push((0, _tools.escapeRowData)(_key) + '=' + (0, _tools.escapeRowData)(_value));
         }
       });
-
-      if (message.tags && (0, _tools.isObject)(message.tags) && !(0, _tools.isEmptyObject)(message.tags)) {
-        // 自定义tag
-        var _tagKeys = [];
-        (0, _tools.each)(message.tags, function (_value, _key) {
-          // 如果和之前tag重名，则舍弃
-          if (filterFileds.indexOf(_key) > -1) return;
-          filterFileds.push(_key);
-
-          if (_value || (0, _tools.isNumber)(_value)) {
-            _tagKeys.push(_key);
-
-            rowData.tags[_key] = _value;
-            tagsStr.push((0, _tools.escapeRowData)(_key) + '=' + (0, _tools.escapeRowData)(_value));
-          }
-        });
-
-        if (_tagKeys.length) {
-          rowData.tags[CUSTOM_KEYS] = _tagKeys;
-          tagsStr.push((0, _tools.escapeRowData)(CUSTOM_KEYS) + '=' + (0, _tools.escapeRowData)(_tagKeys));
-        }
-      }
-
       var fieldsStr = [];
       (0, _tools.each)(value.fields, function (_value, _key) {
         if ((0, _tools.isArray)(_value) && _value.length === 2) {
@@ -128,10 +122,33 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
         }
       });
 
+      if (message.tags && (0, _tools.isObject)(message.tags) && !(0, _tools.isEmptyObject)(message.tags)) {
+        // 自定义tag
+        var _tagKeys = [];
+        (0, _tools.each)(message.tags, function (_value, _key) {
+          // 如果和之前tag重名，则舍弃
+          if (filterFileds.indexOf(_key) > -1) return;
+          filterFileds.push(_key);
+
+          if (_value || (0, _tools.isNumber)(_value)) {
+            _tagKeys.push(_key);
+
+            rowData.tags[_key] = (0, _tools.escapeJsonValue)(_value);
+            tagsStr.push((0, _tools.escapeRowData)(_key) + '=' + (0, _tools.escapeRowData)(_value));
+          }
+        });
+
+        if (_tagKeys.length) {
+          rowData.tags[CUSTOM_KEYS] = (0, _tools.escapeJsonValue)(_tagKeys);
+          tagsStr.push((0, _tools.escapeRowData)(CUSTOM_KEYS) + '=' + (0, _tools.escapeRowData)(_tagKeys));
+        }
+      }
+
       if (message.type === _enums.RumEventType.LOGGER) {
         // 这里处理日志类型数据自定义字段
         (0, _tools.each)(message, function (value, key) {
           if (filterFileds.indexOf(key) === -1 && ((0, _tools.isNumber)(value) || (0, _tools.isString)(value) || (0, _tools.isBoolean)(value))) {
+            rowData.tags[key] = (0, _tools.escapeJsonValue)(value);
             tagsStr.push((0, _tools.escapeRowData)(key) + '=' + (0, _tools.escapeRowData)(value));
           }
         });
@@ -159,13 +176,13 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
 
 exports.processedMessageByDataMap = processedMessageByDataMap;
 
-function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, beforeUnloadCallback) {
+function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, isLineProtocolToJson, beforeUnloadCallback) {
   this.request = request;
   this.maxSize = maxSize;
   this.bytesLimit = bytesLimit;
   this.maxMessageSize = maxMessageSize;
   this.flushTimeout = flushTimeout;
-  this.beforeUnloadCallback = beforeUnloadCallback;
+  this.isLineProtocolToJson = isLineProtocolToJson, this.beforeUnloadCallback = beforeUnloadCallback;
   this.pushOnlyBuffer = [];
   this.upsertBuffer = {};
   this.bufferBytesSize = 0;
@@ -184,7 +201,16 @@ batch.prototype = {
   flush: function flush() {
     if (this.bufferMessageCount !== 0) {
       var messages = this.pushOnlyBuffer.concat((0, _tools.values)(this.upsertBuffer));
-      this.request.send(messages.join('\n'), this.bufferBytesSize);
+      if (messages.length === 0) return;
+
+      if (this.isLineProtocolToJson) {
+        this.request.send((0, _tools.map)(messages, function (rowdataStr) {
+          return JSON.parse(rowdataStr);
+        }), this.bufferBytesSize);
+      } else {
+        this.request.send(messages.join('\n'), this.bufferBytesSize);
+      }
+
       this.pushOnlyBuffer = [];
       this.upsertBuffer = {};
       this.bufferBytesSize = 0;
@@ -192,6 +218,10 @@ batch.prototype = {
     }
   },
   processSendData: function processSendData(message) {
+    if (this.isLineProtocolToJson) {
+      return JSON.stringify(processedMessageByDataMap(message).rowData);
+    }
+
     return processedMessageByDataMap(message).rowStr;
   },
   sizeInBytes: function sizeInBytes(candidate) {

package/esm/configuration.js

@@ -37,6 +37,9 @@ export var DEFAULT_CONFIGURATION = {
   // 新增
   isServiceSampling: false,
   // 是否不抛弃采样是数据， 采用在服务端菜样的方式
+  isJsBirdge: false,
+  // 是否需要对webview 发送数据，需要装我们对应ios sdk
+  isLineProtocolToJson: false,
   beforeSend: function beforeSend(event) {},
   isServerError: function isServerError(request) {
     return false;
@@ -87,6 +90,14 @@ export function commonInit(userConfiguration, buildEnv) {
     cookieOptions: buildCookieOptions(userConfiguration)
   };
 
+  if ('isJsBirdge' in userConfiguration) {
+    transportConfiguration.isJsBirdge = userConfiguration.isJsBirdge;
+  }
+
+  if ('isLineProtocolToJson' in userConfiguration) {
+    transportConfiguration.isLineProtocolToJson = userConfiguration.isLineProtocolToJson;
+  }
+
   if ('allowedDDTracingOrigins' in userConfiguration) {
     transportConfiguration.allowedTracingOrigins = userConfiguration.allowedDDTracingOrigins;
   }

package/esm/dataMap.js

@@ -92,6 +92,8 @@ export var dataMap = {
   error: {
     type: RumEventType.ERROR,
     tags: {
+      trace_id: '_dd.trace_id',
+      span_id: '_dd.span_id',
       error_source: 'error.source',
       error_type: 'error.type',
       error_handling: 'error.handling',

package/esm/errorCollection.js

@@ -97,7 +97,9 @@ export function trackNetworkError(configuration, errorObservable) {
         resource: {
           method: request.method,
           statusCode: request.status,
-          url: request.url
+          url: request.url,
+          traceId: request.traceId,
+          spanId: request.spanId
         },
         source: ErrorSource.NETWORK,
         stack: truncateResponse(request.response, configuration) || 'Failed to load',

package/esm/helper/mobileUtil.js

@@ -103,4 +103,4 @@ JsBirdge.prototype = {
     }
   }
 };
-export var jsBirdge = new JsBirdge();
+export var JsBirdge = JsBirdge;

package/esm/helper/tools.js

@@ -1726,4 +1726,11 @@ export function escapeRowData(str) {
   return String(str).replace(reg, function (word) {
     return '\\' + word;
   });
+}
+export function escapeJsonValue(value) {
+  if (isString(value)) {
+    return value;
+  } else {
+    return jsonStringify(value);
+  }
 }

package/esm/transport.js

@@ -1,4 +1,4 @@
-import { addEventListener, values, findByPath, escapeRowData, each, isNumber, isArray, extend, isString, toServerDuration, isBoolean, isEmptyObject, isObject } from './helper/tools';
+import { addEventListener, values, findByPath, escapeRowData, each, isNumber, isArray, extend, isString, toServerDuration, isBoolean, isEmptyObject, isObject, map, escapeJsonValue } from './helper/tools';
 import { DOM_EVENT, RumEventType } from './helper/enums';
 import { commonTags, dataMap } from './dataMap'; // https://en.wikipedia.org/wiki/UTF-8
 
@@ -10,18 +10,28 @@ function addBatchPrecision(url) {
   return url + (url.indexOf('?') === -1 ? '?' : '&') + 'precision=ms';
 }
 
-var httpRequest = function httpRequest(endpointUrl, bytesLimit) {
+var httpRequest = function httpRequest(endpointUrl, bytesLimit, isLineProtocolToJson) {
   this.endpointUrl = endpointUrl;
   this.bytesLimit = bytesLimit;
+  this.isLineProtocolToJson = isLineProtocolToJson;
 };
 
 httpRequest.prototype = {
   send: function send(data, size) {
     var url = addBatchPrecision(this.endpointUrl);
 
-    if (navigator.sendBeacon && size < this.bytesLimit) {
+    if (navigator.sendBeacon && size < this.bytesLimit && !this.isLineProtocolToJson) {
       var isQueued = navigator.sendBeacon(url, data);
 
+      if (isQueued) {
+        return;
+      }
+    } else if (navigator.sendBeacon && size < this.bytesLimit && this.isLineProtocolToJson) {
+      var blob = new Blob([JSON.stringify(data)], {
+        type: 'application/json'
+      });
+      var isQueued = navigator.sendBeacon(url, blob);
+
       if (isQueued) {
         return;
       }
@@ -30,7 +40,14 @@ httpRequest.prototype = {
     var request = new XMLHttpRequest();
     request.open('POST', url, true);
     request.withCredentials = true;
-    request.send(data);
+
+    if (this.isLineProtocolToJson) {
+      request.setRequestHeader('Content-type', 'application/json');
+      request.send(JSON.stringify(data));
+    } else {
+      request.setRequestHeader('Content-type', 'text/plain;charset=UTF-8');
+      request.send(data);
+    }
   }
 };
 export var HttpRequest = httpRequest;
@@ -59,33 +76,10 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
         filterFileds.push(_key);
 
         if (_value || isNumber(_value)) {
-          rowData.tags[_key] = _value;
+          rowData.tags[_key] = escapeJsonValue(_value);
           tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value));
         }
       });
-
-      if (message.tags && isObject(message.tags) && !isEmptyObject(message.tags)) {
-        // 自定义tag
-        var _tagKeys = [];
-        each(message.tags, function (_value, _key) {
-          // 如果和之前tag重名，则舍弃
-          if (filterFileds.indexOf(_key) > -1) return;
-          filterFileds.push(_key);
-
-          if (_value || isNumber(_value)) {
-            _tagKeys.push(_key);
-
-            rowData.tags[_key] = _value;
-            tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value));
-          }
-        });
-
-        if (_tagKeys.length) {
-          rowData.tags[CUSTOM_KEYS] = _tagKeys;
-          tagsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowData(_tagKeys));
-        }
-      }
-
       var fieldsStr = [];
       each(value.fields, function (_value, _key) {
         if (isArray(_value) && _value.length === 2) {
@@ -116,10 +110,33 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
         }
       });
 
+      if (message.tags && isObject(message.tags) && !isEmptyObject(message.tags)) {
+        // 自定义tag
+        var _tagKeys = [];
+        each(message.tags, function (_value, _key) {
+          // 如果和之前tag重名，则舍弃
+          if (filterFileds.indexOf(_key) > -1) return;
+          filterFileds.push(_key);
+
+          if (_value || isNumber(_value)) {
+            _tagKeys.push(_key);
+
+            rowData.tags[_key] = escapeJsonValue(_value);
+            tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value));
+          }
+        });
+
+        if (_tagKeys.length) {
+          rowData.tags[CUSTOM_KEYS] = escapeJsonValue(_tagKeys);
+          tagsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowData(_tagKeys));
+        }
+      }
+
       if (message.type === RumEventType.LOGGER) {
         // 这里处理日志类型数据自定义字段
         each(message, function (value, key) {
           if (filterFileds.indexOf(key) === -1 && (isNumber(value) || isString(value) || isBoolean(value))) {
+            rowData.tags[key] = escapeJsonValue(value);
             tagsStr.push(escapeRowData(key) + '=' + escapeRowData(value));
           }
         });
@@ -145,13 +162,13 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
   };
 };
 
-function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, beforeUnloadCallback) {
+function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, isLineProtocolToJson, beforeUnloadCallback) {
   this.request = request;
   this.maxSize = maxSize;
   this.bytesLimit = bytesLimit;
   this.maxMessageSize = maxMessageSize;
   this.flushTimeout = flushTimeout;
-  this.beforeUnloadCallback = beforeUnloadCallback;
+  this.isLineProtocolToJson = isLineProtocolToJson, this.beforeUnloadCallback = beforeUnloadCallback;
   this.pushOnlyBuffer = [];
   this.upsertBuffer = {};
   this.bufferBytesSize = 0;
@@ -170,7 +187,16 @@ batch.prototype = {
   flush: function flush() {
     if (this.bufferMessageCount !== 0) {
       var messages = this.pushOnlyBuffer.concat(values(this.upsertBuffer));
-      this.request.send(messages.join('\n'), this.bufferBytesSize);
+      if (messages.length === 0) return;
+
+      if (this.isLineProtocolToJson) {
+        this.request.send(map(messages, function (rowdataStr) {
+          return JSON.parse(rowdataStr);
+        }), this.bufferBytesSize);
+      } else {
+        this.request.send(messages.join('\n'), this.bufferBytesSize);
+      }
+
       this.pushOnlyBuffer = [];
       this.upsertBuffer = {};
       this.bufferBytesSize = 0;
@@ -178,6 +204,10 @@ batch.prototype = {
     }
   },
   processSendData: function processSendData(message) {
+    if (this.isLineProtocolToJson) {
+      return JSON.stringify(processedMessageByDataMap(message).rowData);
+    }
+
     return processedMessageByDataMap(message).rowStr;
   },
   sizeInBytes: function sizeInBytes(candidate) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudcare/browser-core",
-  "version": "1.0.24",
+  "version": "1.0.29",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "scripts": {
@@ -20,5 +20,5 @@
   "author": "dataflux",
   "license": "MIT",
   "description": "DataFlux RUM Web 端数据指标监控",
-  "gitHead": "e706f4d2de8f7619ed487234fc59d62d37c2f7a9"
+  "gitHead": "34770c27f33e4fbaaafc8743aa5e9f5ffd14bc14"
 }

package/src/configuration.js

@@ -40,6 +40,8 @@ export var DEFAULT_CONFIGURATION = {
   allowedDDTracingOrigins: [], //废弃
   allowedTracingOrigins:[], // 新增
   isServiceSampling: false, // 是否不抛弃采样是数据， 采用在服务端菜样的方式
+  isJsBirdge: false,// 是否需要对webview 发送数据，需要装我们对应ios sdk
+  isLineProtocolToJson: false,
   beforeSend: function (event) {},
   isServerError: function(request) {return false}  // 判断请求是否为error 请求
 }
@@ -87,6 +89,12 @@ export function commonInit(userConfiguration, buildEnv) {
     isEnabled: function(feature) {return includes(enableExperimentalFeatures, feature)},
     cookieOptions: buildCookieOptions(userConfiguration)
   }
+  if ('isJsBirdge' in userConfiguration) {
+    transportConfiguration.isJsBirdge = userConfiguration.isJsBirdge
+  }
+  if ('isLineProtocolToJson' in userConfiguration) {
+    transportConfiguration.isLineProtocolToJson = userConfiguration.isLineProtocolToJson
+  }
   if ('allowedDDTracingOrigins' in userConfiguration) {
     transportConfiguration.allowedTracingOrigins =
       userConfiguration.allowedDDTracingOrigins

package/src/dataMap.js

@@ -92,6 +92,8 @@ export var dataMap = {
   error: {
     type: RumEventType.ERROR,
     tags: {
+      trace_id: '_dd.trace_id',
+      span_id: '_dd.span_id',
       error_source: 'error.source',
       error_type: 'error.type',
       error_handling: 'error.handling',
@@ -101,7 +103,7 @@ export var dataMap = {
       resource_url_path_group: 'error.resource.url_path_group',
       resource_status: 'error.resource.status',
       resource_status_group: 'error.resource.status_group',
-      resource_method: 'error.resource.method'
+      resource_method: 'error.resource.method',
     },
     fields: {
       error_message: ['string', 'error.message'],

package/src/errorCollection.js

@@ -121,7 +121,9 @@ export function trackNetworkError(configuration, errorObservable) {
         resource: {
           method: request.method,
           statusCode: request.status,
-          url: request.url
+          url: request.url,
+          traceId: request.traceId,
+          spanId: request.spanId,
         },
         source: ErrorSource.NETWORK,
         stack:

package/src/helper/mobileUtil.js

@@ -99,4 +99,4 @@ JsBirdge.prototype = {
   }
 }
 
-export var jsBirdge = new JsBirdge()
+export var JsBirdge = JsBirdge

package/src/helper/tools.js

@@ -1702,3 +1702,11 @@ export function escapeRowData(str) {
     return '\\' + word
   })
 }
+
+export function escapeJsonValue(value) {
+  if (isString(value)) {
+    return value
+  } else {
+    return jsonStringify(value)
+  }
+}

package/src/transport.js

@@ -11,7 +11,9 @@ import {
   toServerDuration,
   isBoolean,
   isEmptyObject,
-  isObject
+  isObject,
+  map,
+  escapeJsonValue
 } from './helper/tools'
 import { DOM_EVENT, RumEventType } from './helper/enums'
 import { commonTags, dataMap } from './dataMap'
@@ -22,27 +24,47 @@ function addBatchPrecision(url) {
   if (!url) return url
   return url + (url.indexOf('?') === -1 ? '?' : '&') + 'precision=ms'
 }
-var httpRequest = function (endpointUrl, bytesLimit) {
+var httpRequest = function (endpointUrl, bytesLimit, isLineProtocolToJson) {
   this.endpointUrl = endpointUrl
   this.bytesLimit = bytesLimit
+  this.isLineProtocolToJson = isLineProtocolToJson
 }
 httpRequest.prototype = {
   send: function (data, size) {
+    
     var url = addBatchPrecision(this.endpointUrl)
-    if (navigator.sendBeacon && size < this.bytesLimit) {
+    if (navigator.sendBeacon && size < this.bytesLimit && !this.isLineProtocolToJson) {
       var isQueued = navigator.sendBeacon(url, data)
       if (isQueued) {
         return
       }
+    } else if (navigator.sendBeacon && size < this.bytesLimit && this.isLineProtocolToJson) {
+      const blob = new Blob([JSON.stringify(data)], {
+        type: 'application/json',
+      });
+      var isQueued = navigator.sendBeacon(url, blob)
+      if (isQueued) {
+        return
+      }
     }
     var request = new XMLHttpRequest()
     request.open('POST', url, true)
     request.withCredentials = true
-    request.send(data)
+    if (this.isLineProtocolToJson) {
+      request.setRequestHeader('Content-type', 'application/json')
+      request.send(JSON.stringify(data))
+    } else {
+      request.setRequestHeader('Content-type', 'text/plain;charset=UTF-8')
+      request.send(data)
+    }
+    
+    
+    
   }
 }
 
 export var HttpRequest = httpRequest
+
 export var processedMessageByDataMap = function (message) {
   if (!message || !message.type) return {
     rowStr: '',
@@ -63,28 +85,11 @@ export var processedMessageByDataMap = function (message) {
         var _value = findByPath(message, value_path)
         filterFileds.push(_key)
         if (_value || isNumber(_value)) {
-          rowData.tags[_key] = _value
+          rowData.tags[_key] = escapeJsonValue(_value)
           tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value))
         }
       })
-      if (message.tags && isObject(message.tags) && !isEmptyObject(message.tags)) {
-        // 自定义tag
-        const _tagKeys = []
-        each(message.tags, function (_value, _key) {
-          // 如果和之前tag重名，则舍弃
-          if (filterFileds.indexOf(_key) > -1) return
-          filterFileds.push(_key)
-          if (_value || isNumber(_value)) {
-            _tagKeys.push(_key)
-            rowData.tags[_key] = _value
-            tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value))
-          }
-        })
-        if (_tagKeys.length) {
-          rowData.tags[CUSTOM_KEYS] = _tagKeys
-          tagsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowData(_tagKeys))
-        }
-      }
+      
       var fieldsStr = []
       each(value.fields, function (_value, _key) {
         if (isArray(_value) && _value.length === 2) {
@@ -112,6 +117,24 @@ export var processedMessageByDataMap = function (message) {
           }
         }
       })
+      if (message.tags && isObject(message.tags) && !isEmptyObject(message.tags)) {
+        // 自定义tag
+        const _tagKeys = []
+        each(message.tags, function (_value, _key) {
+          // 如果和之前tag重名，则舍弃
+          if (filterFileds.indexOf(_key) > -1) return
+          filterFileds.push(_key)
+          if (_value || isNumber(_value)) {
+            _tagKeys.push(_key)
+            rowData.tags[_key] = escapeJsonValue(_value)
+            tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value))
+          }
+        })
+        if (_tagKeys.length) {
+          rowData.tags[CUSTOM_KEYS] = escapeJsonValue(_tagKeys)
+          tagsStr.push(escapeRowData(CUSTOM_KEYS) + '=' + escapeRowData(_tagKeys))
+        }
+      }
       if (message.type === RumEventType.LOGGER) {
         // 这里处理日志类型数据自定义字段
 
@@ -120,6 +143,7 @@ export var processedMessageByDataMap = function (message) {
             filterFileds.indexOf(key) === -1 &&
             (isNumber(value) || isString(value) || isBoolean(value))
           ) {
+            rowData.tags[key] = escapeJsonValue(value)
             tagsStr.push(escapeRowData(key) + '=' + escapeRowData(value))
           }
         })
@@ -147,6 +171,7 @@ function batch(
   bytesLimit,
   maxMessageSize,
   flushTimeout,
+  isLineProtocolToJson,
   beforeUnloadCallback
 ) {
   this.request = request
@@ -154,6 +179,7 @@ function batch(
   this.bytesLimit = bytesLimit
   this.maxMessageSize = maxMessageSize
   this.flushTimeout = flushTimeout
+  this.isLineProtocolToJson = isLineProtocolToJson,
   this.beforeUnloadCallback = beforeUnloadCallback
   this.pushOnlyBuffer = []
   this.upsertBuffer = {}
@@ -174,7 +200,15 @@ batch.prototype = {
   flush: function () {
     if (this.bufferMessageCount !== 0) {
       var messages = this.pushOnlyBuffer.concat(values(this.upsertBuffer))
-      this.request.send(messages.join('\n'), this.bufferBytesSize)
+      if (messages.length === 0) return
+      if (this.isLineProtocolToJson) {
+        this.request.send(map(messages, function(rowdataStr) {
+          return JSON.parse(rowdataStr)
+        }), this.bufferBytesSize)
+      } else {
+        this.request.send(messages.join('\n'), this.bufferBytesSize)
+      }
+      
       this.pushOnlyBuffer = []
       this.upsertBuffer = {}
       this.bufferBytesSize = 0
@@ -183,6 +217,9 @@ batch.prototype = {
   },
 
   processSendData: function (message) {
+    if (this.isLineProtocolToJson) {
+      return JSON.stringify(processedMessageByDataMap(message).rowData)
+    }
     return processedMessageByDataMap(message).rowStr
   },
   sizeInBytes: function (candidate) {