@cloudcare/browser-core 1.0.13 → 1.0.16

package/cjs/configuration.js

@@ -14,6 +14,8 @@ var _cookie = require("./cookie");
 
 var _urlPolyfill = require("./helper/urlPolyfill");
 
+var _enums = require("./helper/enums");
+
 var TRIM_REGIX = /^\s+|\s+$/g;
 var DEFAULT_CONFIGURATION = {
   resourceSampleRate: 100,
@@ -39,11 +41,21 @@ var DEFAULT_CONFIGURATION = {
   batchBytesLimit: 16 * _tools.ONE_KILO_BYTE,
   datakitUrl: '',
   logsEndpoint: '',
+  traceType: _enums.TraceType.DDTRACE,
+  traceId128Bit: false,
   trackInteractions: false,
   //是否开启交互action收集
   allowedDDTracingOrigins: [],
-  //
-  beforeSend: function beforeSend(event) {}
+  //废弃
+  allowedTracingOrigins: [],
+  // 新增
+  isServiceSampling: false,
+  // 是否不抛弃采样是数据， 采用在服务端菜样的方式
+  beforeSend: function beforeSend(event) {},
+  isServerError: function isServerError(request) {
+    return false;
+  } // 判断请求是否为error 请求
+
 };
 exports.DEFAULT_CONFIGURATION = DEFAULT_CONFIGURATION;
 
@@ -90,7 +102,11 @@ function commonInit(userConfiguration, buildEnv) {
   };
 
   if ('allowedDDTracingOrigins' in userConfiguration) {
-    transportConfiguration.allowedDDTracingOrigins = userConfiguration.allowedDDTracingOrigins;
+    transportConfiguration.allowedTracingOrigins = userConfiguration.allowedDDTracingOrigins;
+  }
+
+  if ('allowedTracingOrigins' in userConfiguration) {
+    transportConfiguration.allowedTracingOrigins = userConfiguration.allowedTracingOrigins;
   }
 
   if ('sampleRate' in userConfiguration) {
@@ -105,9 +121,30 @@ function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions;
   }
 
+  if ('isServerError' in userConfiguration && (0, _tools.isFunction)(userConfiguration.isServerError) && (0, _tools.isBoolean)(userConfiguration.isServerError())) {
+    transportConfiguration.isServerError = userConfiguration.isServerError;
+  }
+
+  if ('traceId128Bit' in userConfiguration) {
+    transportConfiguration.traceId128Bit = !!userConfiguration.traceId128Bit;
+  }
+
+  if ('traceType' in userConfiguration && hasTraceType(userConfiguration.traceType)) {
+    transportConfiguration.traceType = userConfiguration.traceType;
+  }
+
+  if ('isServiceSampling' in userConfiguration && (0, _tools.isBoolean)(userConfiguration.isServiceSampling)) {
+    transportConfiguration.isServiceSampling = userConfiguration.isServiceSampling;
+  }
+
   return (0, _tools.extend2Lev)({}, DEFAULT_CONFIGURATION, transportConfiguration);
 }
 
+function hasTraceType(traceType) {
+  if (traceType && (0, _tools.values)(_enums.TraceType).indexOf(traceType) > -1) return true;
+  return false;
+}
+
 function mustUseSecureCookie(userConfiguration) {
   return !!userConfiguration.useSecureSessionCookie || !!userConfiguration.useCrossSiteSessionCookie;
 }

package/cjs/cookie.js

@@ -42,6 +42,10 @@ function cacheCookieAccess(name, options) {
       setCookie(name, value, expireDelay, options);
       cache = value;
       cacheAccess();
+    },
+    clearCache: function clearCache() {
+      window.clearTimeout(timeout);
+      hasCache = false;
     }
   };
 }

package/cjs/dataMap.js

@@ -18,6 +18,7 @@ var commonTags = {
   user_name: 'user.name',
   session_id: 'session.id',
   session_type: 'session.type',
+  session_sampling: 'session.is_sampling',
   is_signin: 'user.is_signin',
   os: 'device.os',
   os_version: 'device.os_version',

package/cjs/errorCollection.js

@@ -113,7 +113,7 @@ function trackNetworkError(configuration, errorObservable) {
   });
 
   function handleCompleteRequest(type, request) {
-    if (!(0, _configuration.isIntakeRequest)(request.url, configuration) && (!configuration.isEnabled('remove-network-errors') || !request.isAborted) && (isRejected(request) || isServerError(request))) {
+    if (!(0, _configuration.isIntakeRequest)(request.url, configuration) && !request.isAborted && (isRejected(request) || isServerError(request) || configuration.isServerError(request))) {
       errorObservable.notify({
         message: format(type) + ' error ' + request.method + ' ' + request.url,
         resource: {

package/cjs/helper/enums.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RequestType = exports.RumEventType = exports.ActionType = exports.ResourceType = exports.DOM_EVENT = void 0;
+exports.ErrorHandling = exports.TraceType = exports.RequestType = exports.RumEventType = exports.ActionType = exports.ResourceType = exports.DOM_EVENT = void 0;
 var DOM_EVENT = {
   BEFORE_UNLOAD: 'beforeunload',
   CLICK: 'click',
@@ -53,4 +53,18 @@ var RequestType = {
   FETCH: ResourceType.FETCH,
   XHR: ResourceType.XHR
 };
-exports.RequestType = RequestType;
+exports.RequestType = RequestType;
+var TraceType = {
+  DDTRACE: 'ddtrace',
+  ZIPKIN_MULTI_HEADER: 'zipkin',
+  ZIPKIN_SINGLE_HEADER: 'zipkin_single_header',
+  W3C_TRACEPARENT: 'w3c_traceparent',
+  SKYWALKING_V3: 'skywalking_v3',
+  JAEGER: 'jaeger'
+};
+exports.TraceType = TraceType;
+var ErrorHandling = {
+  HANDLED: 'handled',
+  UNHANDLED: 'unhandled'
+};
+exports.ErrorHandling = ErrorHandling;

package/cjs/sessionManagement.js

@@ -53,6 +53,7 @@ function startSessionManagement(options, productKey, computeSessionState) {
   var currentSession = retrieveActiveSession(sessionCookie);
   var currentSessionId = currentSession.id;
   var expandOrRenewSession = (0, _tools.throttle)(function () {
+    sessionCookie.clearCache();
     var session = retrieveActiveSession(sessionCookie);
     var state = computeSessionState(session[productKey]);
     session[productKey] = state.trackingType;
@@ -72,6 +73,7 @@ function startSessionManagement(options, productKey, computeSessionState) {
   }, _cookie.COOKIE_ACCESS_DELAY);
 
   var expandSession = function expandSession() {
+    sessionCookie.clearCache();
     var session = retrieveActiveSession(sessionCookie);
     persistSession(session, sessionCookie);
   };

package/cjs/transport.js

@@ -47,7 +47,10 @@ var HttpRequest = httpRequest;
 exports.HttpRequest = HttpRequest;
 
 var processedMessageByDataMap = function processedMessageByDataMap(message) {
-  if (!message || !message.type) return '';
+  if (!message || !message.type) return {
+    rowStr: '',
+    rowData: undefined
+  };
   var rowData = {
     tags: {},
     fields: {}

package/esm/configuration.js

@@ -1,6 +1,7 @@
-import { ONE_KILO_BYTE, ONE_SECOND, extend2Lev, isArray, includes } from './helper/tools';
+import { ONE_KILO_BYTE, ONE_SECOND, extend2Lev, isArray, includes, isFunction, isBoolean, values } from './helper/tools';
 import { getCurrentSite } from './cookie';
 import { haveSameOrigin } from './helper/urlPolyfill';
+import { TraceType } from './helper/enums';
 var TRIM_REGIX = /^\s+|\s+$/g;
 export var DEFAULT_CONFIGURATION = {
   resourceSampleRate: 100,
@@ -26,11 +27,21 @@ export var DEFAULT_CONFIGURATION = {
   batchBytesLimit: 16 * ONE_KILO_BYTE,
   datakitUrl: '',
   logsEndpoint: '',
+  traceType: TraceType.DDTRACE,
+  traceId128Bit: false,
   trackInteractions: false,
   //是否开启交互action收集
   allowedDDTracingOrigins: [],
-  //
-  beforeSend: function beforeSend(event) {}
+  //废弃
+  allowedTracingOrigins: [],
+  // 新增
+  isServiceSampling: false,
+  // 是否不抛弃采样是数据， 采用在服务端菜样的方式
+  beforeSend: function beforeSend(event) {},
+  isServerError: function isServerError(request) {
+    return false;
+  } // 判断请求是否为error 请求
+
 };
 
 function trim(str) {
@@ -76,7 +87,11 @@ export function commonInit(userConfiguration, buildEnv) {
   };
 
   if ('allowedDDTracingOrigins' in userConfiguration) {
-    transportConfiguration.allowedDDTracingOrigins = userConfiguration.allowedDDTracingOrigins;
+    transportConfiguration.allowedTracingOrigins = userConfiguration.allowedDDTracingOrigins;
+  }
+
+  if ('allowedTracingOrigins' in userConfiguration) {
+    transportConfiguration.allowedTracingOrigins = userConfiguration.allowedTracingOrigins;
   }
 
   if ('sampleRate' in userConfiguration) {
@@ -91,9 +106,30 @@ export function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions;
   }
 
+  if ('isServerError' in userConfiguration && isFunction(userConfiguration.isServerError) && isBoolean(userConfiguration.isServerError())) {
+    transportConfiguration.isServerError = userConfiguration.isServerError;
+  }
+
+  if ('traceId128Bit' in userConfiguration) {
+    transportConfiguration.traceId128Bit = !!userConfiguration.traceId128Bit;
+  }
+
+  if ('traceType' in userConfiguration && hasTraceType(userConfiguration.traceType)) {
+    transportConfiguration.traceType = userConfiguration.traceType;
+  }
+
+  if ('isServiceSampling' in userConfiguration && isBoolean(userConfiguration.isServiceSampling)) {
+    transportConfiguration.isServiceSampling = userConfiguration.isServiceSampling;
+  }
+
   return extend2Lev({}, DEFAULT_CONFIGURATION, transportConfiguration);
 }
 
+function hasTraceType(traceType) {
+  if (traceType && values(TraceType).indexOf(traceType) > -1) return true;
+  return false;
+}
+
 function mustUseSecureCookie(userConfiguration) {
   return !!userConfiguration.useSecureSessionCookie || !!userConfiguration.useCrossSiteSessionCookie;
 }

package/esm/cookie.js

@@ -27,6 +27,10 @@ export function cacheCookieAccess(name, options) {
       setCookie(name, value, expireDelay, options);
       cache = value;
       cacheAccess();
+    },
+    clearCache: function clearCache() {
+      window.clearTimeout(timeout);
+      hasCache = false;
     }
   };
 }

package/esm/dataMap.js

@@ -10,6 +10,7 @@ export var commonTags = {
   user_name: 'user.name',
   session_id: 'session.id',
   session_type: 'session.type',
+  session_sampling: 'session.is_sampling',
   is_signin: 'user.is_signin',
   os: 'device.os',
   os_version: 'device.os_version',

package/esm/errorCollection.js

@@ -87,7 +87,7 @@ export function trackNetworkError(configuration, errorObservable) {
   });
 
   function handleCompleteRequest(type, request) {
-    if (!isIntakeRequest(request.url, configuration) && (!configuration.isEnabled('remove-network-errors') || !request.isAborted) && (isRejected(request) || isServerError(request))) {
+    if (!isIntakeRequest(request.url, configuration) && !request.isAborted && (isRejected(request) || isServerError(request) || configuration.isServerError(request))) {
       errorObservable.notify({
         message: format(type) + ' error ' + request.method + ' ' + request.url,
         resource: {

package/esm/helper/enums.js

@@ -42,4 +42,16 @@ export var RumEventType = {
 export var RequestType = {
   FETCH: ResourceType.FETCH,
   XHR: ResourceType.XHR
+};
+export var TraceType = {
+  DDTRACE: 'ddtrace',
+  ZIPKIN_MULTI_HEADER: 'zipkin',
+  ZIPKIN_SINGLE_HEADER: 'zipkin_single_header',
+  W3C_TRACEPARENT: 'w3c_traceparent',
+  SKYWALKING_V3: 'skywalking_v3',
+  JAEGER: 'jaeger'
+};
+export var ErrorHandling = {
+  HANDLED: 'handled',
+  UNHANDLED: 'unhandled'
 };

package/esm/sessionManagement.js

@@ -31,6 +31,7 @@ export function startSessionManagement(options, productKey, computeSessionState)
   var currentSession = retrieveActiveSession(sessionCookie);
   var currentSessionId = currentSession.id;
   var expandOrRenewSession = throttle(function () {
+    sessionCookie.clearCache();
     var session = retrieveActiveSession(sessionCookie);
     var state = computeSessionState(session[productKey]);
     session[productKey] = state.trackingType;
@@ -50,6 +51,7 @@ export function startSessionManagement(options, productKey, computeSessionState)
   }, COOKIE_ACCESS_DELAY);
 
   var expandSession = function expandSession() {
+    sessionCookie.clearCache();
     var session = retrieveActiveSession(sessionCookie);
     persistSession(session, sessionCookie);
   };

package/esm/transport.js

@@ -35,7 +35,10 @@ httpRequest.prototype = {
 };
 export var HttpRequest = httpRequest;
 export var processedMessageByDataMap = function processedMessageByDataMap(message) {
-  if (!message || !message.type) return '';
+  if (!message || !message.type) return {
+    rowStr: '',
+    rowData: undefined
+  };
   var rowData = {
     tags: {},
     fields: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudcare/browser-core",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "scripts": {
@@ -20,5 +20,5 @@
   "author": "dataflux",
   "license": "MIT",
   "description": "DataFlux RUM Web 端数据指标监控",
-  "gitHead": "666c0183f62de2c65313ff5cc2be75843aa95c25"
+  "gitHead": "82f05e083d4c4a86615dd759de38dda0674eb84f"
 }

package/src/configuration.js

@@ -3,10 +3,14 @@ import {
   ONE_SECOND,
   extend2Lev,
   isArray,
-  includes
+  includes,
+  isFunction,
+  isBoolean,
+  values
 } from './helper/tools'
 import { getCurrentSite } from './cookie'
 import { haveSameOrigin } from './helper/urlPolyfill'
+import { TraceType } from './helper/enums'
 var TRIM_REGIX = /^\s+|\s+$/g
 export var DEFAULT_CONFIGURATION = {
   resourceSampleRate: 100,
@@ -30,9 +34,14 @@ export var DEFAULT_CONFIGURATION = {
   batchBytesLimit: 16 * ONE_KILO_BYTE,
   datakitUrl: '',
   logsEndpoint: '',
+  traceType: TraceType.DDTRACE,
+  traceId128Bit: false,
   trackInteractions: false, //是否开启交互action收集
-  allowedDDTracingOrigins: [], //
-  beforeSend: function (event) {}
+  allowedDDTracingOrigins: [], //废弃
+  allowedTracingOrigins:[], // 新增
+  isServiceSampling: false, // 是否不抛弃采样是数据， 采用在服务端菜样的方式
+  beforeSend: function (event) {},
+  isServerError: function(request) {return false}  // 判断请求是否为error 请求
 }
 function trim(str) {
   return str.replace(TRIM_REGIX, '')
@@ -78,10 +87,12 @@ export function commonInit(userConfiguration, buildEnv) {
     cookieOptions: buildCookieOptions(userConfiguration)
   }
   if ('allowedDDTracingOrigins' in userConfiguration) {
-    transportConfiguration.allowedDDTracingOrigins =
+    transportConfiguration.allowedTracingOrigins =
       userConfiguration.allowedDDTracingOrigins
   }
-
+  if ('allowedTracingOrigins' in userConfiguration) {
+    transportConfiguration.allowedTracingOrigins = userConfiguration.allowedTracingOrigins
+  }
   if ('sampleRate' in userConfiguration) {
     transportConfiguration.sampleRate = userConfiguration.sampleRate
   }
@@ -94,8 +105,24 @@ export function commonInit(userConfiguration, buildEnv) {
   if ('trackInteractions' in userConfiguration) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions
   }
+  if ('isServerError' in userConfiguration && isFunction(userConfiguration.isServerError) && isBoolean(userConfiguration.isServerError())) {
+    transportConfiguration.isServerError = userConfiguration.isServerError
+  }
+  if ('traceId128Bit' in userConfiguration) {
+    transportConfiguration.traceId128Bit = !!userConfiguration.traceId128Bit
+  }
+  if ('traceType' in userConfiguration && hasTraceType(userConfiguration.traceType)) {
+    transportConfiguration.traceType = userConfiguration.traceType
+  }
+  if ('isServiceSampling' in userConfiguration && isBoolean(userConfiguration.isServiceSampling)) {
+    transportConfiguration.isServiceSampling = userConfiguration.isServiceSampling
+  }
   return extend2Lev({}, DEFAULT_CONFIGURATION, transportConfiguration)
 }
+function hasTraceType(traceType) {
+  if (traceType && values(TraceType).indexOf(traceType) > -1) return true
+  return false
+}
 function mustUseSecureCookie(userConfiguration) {
   return (
     !!userConfiguration.useSecureSessionCookie ||

package/src/cookie.js

@@ -26,7 +26,11 @@ export function cacheCookieAccess(name, options) {
       setCookie(name, value, expireDelay, options)
       cache = value
       cacheAccess()
-    }
+    },
+    clearCache: function() {
+      window.clearTimeout(timeout)
+      hasCache = false
+    },
   }
 }
 

package/src/dataMap.js

@@ -10,6 +10,7 @@ export var commonTags = {
   user_name: 'user.name',
   session_id: 'session.id',
   session_type: 'session.type',
+  session_sampling: 'session.is_sampling',
   is_signin: 'user.is_signin',
   os: 'device.os',
   os_version: 'device.os_version',

package/src/errorCollection.js

@@ -108,9 +108,8 @@ export function trackNetworkError(configuration, errorObservable) {
   function handleCompleteRequest(type, request) {
     if (
       !isIntakeRequest(request.url, configuration) &&
-      (!configuration.isEnabled('remove-network-errors') ||
-        !request.isAborted) &&
-      (isRejected(request) || isServerError(request))
+      !request.isAborted &&
+      (isRejected(request) || isServerError(request) || configuration.isServerError(request))
     ) {
       errorObservable.notify({
         message: format(type) + ' error ' + request.method + ' ' + request.url,

package/src/helper/enums.js

@@ -45,3 +45,16 @@ export var RequestType = {
   FETCH: ResourceType.FETCH,
   XHR: ResourceType.XHR
 }
+
+export var TraceType = {
+  DDTRACE: 'ddtrace',
+  ZIPKIN_MULTI_HEADER: 'zipkin',
+  ZIPKIN_SINGLE_HEADER: 'zipkin_single_header',
+  W3C_TRACEPARENT: 'w3c_traceparent',
+  SKYWALKING_V3: 'skywalking_v3',
+  JAEGER: 'jaeger',
+}
+export var ErrorHandling = {
+  HANDLED: 'handled',
+  UNHANDLED: 'unhandled',
+}

package/src/sessionManagement.js

@@ -41,6 +41,7 @@ export function startSessionManagement(
   var currentSession = retrieveActiveSession(sessionCookie)
   var currentSessionId = currentSession.id
   var expandOrRenewSession = throttle(function () {
+    sessionCookie.clearCache()
     var session = retrieveActiveSession(sessionCookie)
     var state = computeSessionState(session[productKey])
     session[productKey] = state.trackingType
@@ -59,6 +60,7 @@ export function startSessionManagement(
   }, COOKIE_ACCESS_DELAY)
 
   var expandSession = function () {
+    sessionCookie.clearCache()
     var session = retrieveActiveSession(sessionCookie)
     persistSession(session, sessionCookie)
   }

package/src/transport.js

@@ -44,7 +44,10 @@ httpRequest.prototype = {
 
 export var HttpRequest = httpRequest
 export var processedMessageByDataMap = function (message) {
-  if (!message || !message.type) return ''
+  if (!message || !message.type) return {
+    rowStr: '',
+    rowData: undefined
+  }
   var rowData = { tags: {}, fields: {} }
   var hasFileds = false
   var rowStr = ''

package/src/xhrProxy.js

@@ -84,7 +84,6 @@ function proxyXhr() {
           response: _this.response,
           status: _this.status
         })
-
         each(onRequestCompleteCallbacks, function (callback) {
           callback(xhrCompleteContext, _this)
         })