@cloudcare/browser-core 1.0.15 → 1.0.18

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,10 +41,16 @@ var DEFAULT_CONFIGURATION = {
   batchBytesLimit: 16 * _tools.ONE_KILO_BYTE,
   datakitUrl: '',
   logsEndpoint: '',
+  traceType: _enums.TraceType.DDTRACE,
+  traceId128Bit: false,
   trackInteractions: false,
   //是否开启交互action收集
   allowedDDTracingOrigins: [],
-  //
+  //废弃
+  allowedTracingOrigins: [],
+  // 新增
+  isServiceSampling: false,
+  // 是否不抛弃采样是数据， 采用在服务端菜样的方式
   beforeSend: function beforeSend(event) {},
   isServerError: function isServerError(request) {
     return false;
@@ -83,6 +91,7 @@ function commonInit(userConfiguration, buildEnv) {
     applicationId: userConfiguration.applicationId,
     env: userConfiguration.env || '',
     version: userConfiguration.version || '',
+    service: userConfiguration.service || 'browser',
     sdkVersion: buildEnv.sdkVersion,
     sdkName: buildEnv.sdkName,
     datakitUrl: getDatakitUrl(userConfiguration.datakitUrl || userConfiguration.datakitOrigin),
@@ -94,7 +103,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) {
@@ -113,9 +126,26 @@ function commonInit(userConfiguration, buildEnv) {
     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',
@@ -101,6 +102,7 @@ var dataMap = {
     tags: {
       error_source: 'error.source',
       error_type: 'error.type',
+      error_handling: 'error.handling',
       resource_url: 'error.resource.url',
       resource_url_host: 'error.resource.url_host',
       resource_url_path: 'error.resource.url_path',

package/cjs/errorCollection.js

@@ -46,14 +46,16 @@ function startConsoleTracking(errorObservable) {
 
   console.error = function () {
     originalConsoleError.apply(console, arguments);
-    errorObservable.notify((0, _tools.extend)({}, buildErrorFromParams((0, _tools.toArray)(arguments)), {
+    var handlingStack = (0, _errorTools.createHandlingStack)();
+    errorObservable.notify((0, _tools.extend)({}, buildErrorFromParams((0, _tools.toArray)(arguments), handlingStack), {
       source: _errorTools.ErrorSource.CONSOLE,
-      startClocks: (0, _tools.clocksNow)()
+      startClocks: (0, _tools.clocksNow)(),
+      handling: _enums.ErrorHandling.HANDLED
     }));
   };
 }
 
-function buildErrorFromParams(params) {
+function buildErrorFromParams(params, handlingStack) {
   var firstErrorParam = (0, _tools.find)(params, function (param) {
     return param instanceof Error;
   });
@@ -63,7 +65,8 @@ function buildErrorFromParams(params) {
   }).join(' ');
   return {
     message: message,
-    stack: firstErrorParam ? (0, _errorTools.toStackTraceString)((0, _tracekit.computeStackTrace)(firstErrorParam)) : undefined
+    stack: firstErrorParam ? (0, _errorTools.toStackTraceString)((0, _tracekit.computeStackTrace)(firstErrorParam)) : undefined,
+    handlingStack: handlingStack
   };
 }
 
@@ -93,7 +96,8 @@ function startRuntimeErrorTracking(errorObservable) {
       stack: error.stack,
       type: error.type,
       source: _errorTools.ErrorSource.SOURCE,
-      startClocks: (0, _tools.clocksNow)()
+      startClocks: (0, _tools.clocksNow)(),
+      handling: _enums.ErrorHandling.UNHANDLED
     });
   };
 

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/helper/errorTools.js

@@ -4,12 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.formatUnknownError = formatUnknownError;
+exports.createHandlingStack = createHandlingStack;
 exports.toStackTraceString = toStackTraceString;
 exports.formatErrorMessage = formatErrorMessage;
 exports.ErrorSource = void 0;
 
 var _tools = require("./tools");
 
+var _tracekit = require("../tracekit");
+
 var ErrorSource = {
   AGENT: 'agent',
   CONSOLE: 'console',
@@ -20,11 +23,12 @@ var ErrorSource = {
 };
 exports.ErrorSource = ErrorSource;
 
-function formatUnknownError(stackTrace, errorObject, nonErrorPrefix) {
+function formatUnknownError(stackTrace, errorObject, nonErrorPrefix, handlingStack) {
   if (!stackTrace || stackTrace.message === undefined && !(errorObject instanceof Error)) {
     return {
       message: nonErrorPrefix + '' + JSON.stringify(errorObject),
       stack: 'No stack, consider using an instance of Error',
+      handlingStack: handlingStack,
       type: stackTrace && stackTrace.name
     };
   }
@@ -32,9 +36,43 @@ function formatUnknownError(stackTrace, errorObject, nonErrorPrefix) {
   return {
     message: stackTrace.message || 'Empty message',
     stack: toStackTraceString(stackTrace),
+    handlingStack: handlingStack,
     type: stackTrace.name
   };
 }
+/**
+ Creates a stacktrace without SDK internal frames.
+ 
+ Constraints:
+ - Has to be called at the utmost position of the call stack.
+ - No internal monitoring should encapsulate the function, that is why we need to use callMonitored inside of it.
+ */
+
+
+function createHandlingStack() {
+  /**
+   * Skip the two internal frames:
+   * - SDK API (console.error, ...)
+   * - this function
+   * in order to keep only the user calls
+   */
+  var internalFramesToSkip = 2;
+  var error = new Error();
+  var formattedStack; // IE needs to throw the error to fill in the stack trace
+
+  if (!error.stack) {
+    try {
+      throw error;
+    } catch (e) {
+      (0, _tools.noop)();
+    }
+  }
+
+  var stackTrace = (0, _tracekit.computeStackTrace)(error);
+  stackTrace.stack = stackTrace.stack.slice(internalFramesToSkip);
+  formattedStack = toStackTraceString(stackTrace);
+  return formattedStack;
+}
 
 function toStackTraceString(stack) {
   var result = stack.name || 'Error' + ': ' + stack.message;

package/cjs/helper/tools.js

@@ -5,6 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.UUID = UUID;
 exports.replaceNumberCharByPath = replaceNumberCharByPath;
+exports.getType = getType;
+exports.mergeInto = mergeInto;
+exports.deepClone = deepClone;
 exports.getStatusGroup = getStatusGroup;
 exports.jsonStringify = jsonStringify;
 exports.noop = noop;
@@ -803,8 +806,8 @@ var urlParse = function urlParse(para) {
 
   URLParser.prototype.getUrl = function () {
     var url = '';
-    url += this._values.Origin;
-    url += this._values.Port ? ':' + this._values.Port : '';
+    url += this._values.Origin; // url += this._values.Port ? ':' + this._values.Port : ''
+
     url += this._values.Path;
     url += this._values.QueryString ? '?' + this._values.QueryString : '';
     return url;
@@ -825,8 +828,11 @@ var urlParse = function urlParse(para) {
       }
     }
 
+    this._values['Path'] = this._values['Path'] || '/';
     this._values['Hostname'] = this._values['Host'].replace(/:\d+$/, '');
-    this._values['Origin'] = this._values['Protocol'] + '://' + this._values['Hostname'];
+    this._values['Origin'] = this._values['Protocol'] + '://' + this._values['Hostname'] + (this._values.Port ? ':' + this._values.Port : ''); // this._values['Hostname'] = this._values['Host'].replace(/:\d+$/, '')
+    // this._values['Origin'] =
+    //   this._values['Protocol'] + '://' + this._values['Hostname']
   };
 
   return new URLParser(para);
@@ -1309,6 +1315,113 @@ var getURLSearchParams = function getURLSearchParams(queryString) {
 
 exports.getURLSearchParams = getURLSearchParams;
 
+function createCircularReferenceChecker() {
+  if (typeof WeakSet !== 'undefined') {
+    var set = new WeakSet();
+    return {
+      hasAlreadyBeenSeen: function hasAlreadyBeenSeen(value) {
+        var has = set.has(value);
+
+        if (!has) {
+          set.add(value);
+        }
+
+        return has;
+      }
+    };
+  }
+
+  var array = [];
+  return {
+    hasAlreadyBeenSeen: function hasAlreadyBeenSeen(value) {
+      var has = array.indexOf(value) >= 0;
+
+      if (!has) {
+        array.push(value);
+      }
+
+      return has;
+    }
+  };
+}
+/**
+ * Similar to `typeof`, but distinguish plain objects from `null` and arrays
+ */
+
+
+function getType(value) {
+  if (value === null) {
+    return 'null';
+  }
+
+  if (Array.isArray(value)) {
+    return 'array';
+  }
+
+  return _typeof(value);
+}
+/**
+ * Iterate over source and affect its sub values into destination, recursively.
+ * If the source and destination can't be merged, return source.
+ */
+
+
+function mergeInto(destination, source, circularReferenceChecker) {
+  // ignore the source if it is undefined
+  if (typeof circularReferenceChecker === 'undefined') {
+    circularReferenceChecker = createCircularReferenceChecker();
+  }
+
+  if (source === undefined) {
+    return destination;
+  }
+
+  if (_typeof(source) !== 'object' || source === null) {
+    // primitive values - just return source
+    return source;
+  } else if (source instanceof Date) {
+    return new Date(source.getTime());
+  } else if (source instanceof RegExp) {
+    var flags = source.flags || // old browsers compatibility
+    [source.global ? 'g' : '', source.ignoreCase ? 'i' : '', source.multiline ? 'm' : '', source.sticky ? 'y' : '', source.unicode ? 'u' : ''].join('');
+    return new RegExp(source.source, flags);
+  }
+
+  if (circularReferenceChecker.hasAlreadyBeenSeen(source)) {
+    // remove circular references
+    return undefined;
+  } else if (Array.isArray(source)) {
+    var merged = Array.isArray(destination) ? destination : [];
+
+    for (var i = 0; i < source.length; ++i) {
+      merged[i] = mergeInto(merged[i], source[i], circularReferenceChecker);
+    }
+
+    return merged;
+  }
+
+  var merged = getType(destination) === 'object' ? destination : {};
+
+  for (var key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      merged[key] = mergeInto(merged[key], source[key], circularReferenceChecker);
+    }
+  }
+
+  return merged;
+}
+/**
+ * A simplistic implementation of a deep clone algorithm.
+ * Caveats:
+ * - It doesn't maintain prototype chains - don't use with instances of custom classes.
+ * - It doesn't handle Map and Set
+ */
+
+
+function deepClone(value) {
+  return mergeInto(undefined, value);
+}
+
 var _URL = function _URL(url) {
   var result = {};
   var basicProps = ['hash', 'host', 'hostname', 'href', 'origin', 'password', 'pathname', 'port', 'protocol', 'search', 'username'];

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, isFunction, isBoolean } 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,10 +27,16 @@ export var DEFAULT_CONFIGURATION = {
   batchBytesLimit: 16 * ONE_KILO_BYTE,
   datakitUrl: '',
   logsEndpoint: '',
+  traceType: TraceType.DDTRACE,
+  traceId128Bit: false,
   trackInteractions: false,
   //是否开启交互action收集
   allowedDDTracingOrigins: [],
-  //
+  //废弃
+  allowedTracingOrigins: [],
+  // 新增
+  isServiceSampling: false,
+  // 是否不抛弃采样是数据， 采用在服务端菜样的方式
   beforeSend: function beforeSend(event) {},
   isServerError: function isServerError(request) {
     return false;
@@ -69,6 +76,7 @@ export function commonInit(userConfiguration, buildEnv) {
     applicationId: userConfiguration.applicationId,
     env: userConfiguration.env || '',
     version: userConfiguration.version || '',
+    service: userConfiguration.service || 'browser',
     sdkVersion: buildEnv.sdkVersion,
     sdkName: buildEnv.sdkName,
     datakitUrl: getDatakitUrl(userConfiguration.datakitUrl || userConfiguration.datakitOrigin),
@@ -80,7 +88,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) {
@@ -99,9 +111,26 @@ export function commonInit(userConfiguration, buildEnv) {
     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',
@@ -92,6 +93,7 @@ export var dataMap = {
     tags: {
       error_source: 'error.source',
       error_type: 'error.type',
+      error_handling: 'error.handling',
       resource_url: 'error.resource.url',
       resource_url_host: 'error.resource.url_host',
       resource_url_path: 'error.resource.url_path',

package/esm/errorCollection.js

@@ -1,9 +1,9 @@
 import { toArray, jsonStringify, find, clocksNow, map, extend } from './helper/tools';
-import { ErrorSource, formatUnknownError, toStackTraceString, formatErrorMessage } from './helper/errorTools';
+import { ErrorSource, formatUnknownError, toStackTraceString, formatErrorMessage, createHandlingStack } from './helper/errorTools';
 import { computeStackTrace, subscribe, unsubscribe } from './tracekit';
 import { Observable } from './helper/observable';
 import { isIntakeRequest } from './configuration';
-import { RequestType } from './helper/enums';
+import { RequestType, ErrorHandling } from './helper/enums';
 import { resetXhrProxy, startXhrProxy } from './xhrProxy';
 import { resetFetchProxy, startFetchProxy } from './fetchProxy';
 var errorObservable;
@@ -23,14 +23,16 @@ export function startConsoleTracking(errorObservable) {
 
   console.error = function () {
     originalConsoleError.apply(console, arguments);
-    errorObservable.notify(extend({}, buildErrorFromParams(toArray(arguments)), {
+    var handlingStack = createHandlingStack();
+    errorObservable.notify(extend({}, buildErrorFromParams(toArray(arguments), handlingStack), {
       source: ErrorSource.CONSOLE,
-      startClocks: clocksNow()
+      startClocks: clocksNow(),
+      handling: ErrorHandling.HANDLED
     }));
   };
 }
 
-function buildErrorFromParams(params) {
+function buildErrorFromParams(params, handlingStack) {
   var firstErrorParam = find(params, function (param) {
     return param instanceof Error;
   });
@@ -40,7 +42,8 @@ function buildErrorFromParams(params) {
   }).join(' ');
   return {
     message: message,
-    stack: firstErrorParam ? toStackTraceString(computeStackTrace(firstErrorParam)) : undefined
+    stack: firstErrorParam ? toStackTraceString(computeStackTrace(firstErrorParam)) : undefined,
+    handlingStack: handlingStack
   };
 }
 
@@ -69,7 +72,8 @@ export function startRuntimeErrorTracking(errorObservable) {
       stack: error.stack,
       type: error.type,
       source: ErrorSource.SOURCE,
-      startClocks: clocksNow()
+      startClocks: clocksNow(),
+      handling: ErrorHandling.UNHANDLED
     });
   };
 

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/helper/errorTools.js

@@ -1,4 +1,5 @@
-import { each } from './tools';
+import { each, noop } from './tools';
+import { computeStackTrace } from '../tracekit';
 export var ErrorSource = {
   AGENT: 'agent',
   CONSOLE: 'console',
@@ -7,11 +8,12 @@ export var ErrorSource = {
   LOGGER: 'logger',
   CUSTOM: 'custom'
 };
-export function formatUnknownError(stackTrace, errorObject, nonErrorPrefix) {
+export function formatUnknownError(stackTrace, errorObject, nonErrorPrefix, handlingStack) {
   if (!stackTrace || stackTrace.message === undefined && !(errorObject instanceof Error)) {
     return {
       message: nonErrorPrefix + '' + JSON.stringify(errorObject),
       stack: 'No stack, consider using an instance of Error',
+      handlingStack: handlingStack,
       type: stackTrace && stackTrace.name
     };
   }
@@ -19,9 +21,42 @@ export function formatUnknownError(stackTrace, errorObject, nonErrorPrefix) {
   return {
     message: stackTrace.message || 'Empty message',
     stack: toStackTraceString(stackTrace),
+    handlingStack: handlingStack,
     type: stackTrace.name
   };
 }
+/**
+ Creates a stacktrace without SDK internal frames.
+ 
+ Constraints:
+ - Has to be called at the utmost position of the call stack.
+ - No internal monitoring should encapsulate the function, that is why we need to use callMonitored inside of it.
+ */
+
+export function createHandlingStack() {
+  /**
+   * Skip the two internal frames:
+   * - SDK API (console.error, ...)
+   * - this function
+   * in order to keep only the user calls
+   */
+  var internalFramesToSkip = 2;
+  var error = new Error();
+  var formattedStack; // IE needs to throw the error to fill in the stack trace
+
+  if (!error.stack) {
+    try {
+      throw error;
+    } catch (e) {
+      noop();
+    }
+  }
+
+  var stackTrace = computeStackTrace(error);
+  stackTrace.stack = stackTrace.stack.slice(internalFramesToSkip);
+  formattedStack = toStackTraceString(stackTrace);
+  return formattedStack;
+}
 export function toStackTraceString(stack) {
   var result = stack.name || 'Error' + ': ' + stack.message;
   each(stack.stack, function (frame) {

package/esm/helper/tools.js

@@ -625,8 +625,8 @@ export var urlParse = function urlParse(para) {
 
   URLParser.prototype.getUrl = function () {
     var url = '';
-    url += this._values.Origin;
-    url += this._values.Port ? ':' + this._values.Port : '';
+    url += this._values.Origin; // url += this._values.Port ? ':' + this._values.Port : ''
+
     url += this._values.Path;
     url += this._values.QueryString ? '?' + this._values.QueryString : '';
     return url;
@@ -647,8 +647,11 @@ export var urlParse = function urlParse(para) {
       }
     }
 
+    this._values['Path'] = this._values['Path'] || '/';
     this._values['Hostname'] = this._values['Host'].replace(/:\d+$/, '');
-    this._values['Origin'] = this._values['Protocol'] + '://' + this._values['Hostname'];
+    this._values['Origin'] = this._values['Protocol'] + '://' + this._values['Hostname'] + (this._values.Port ? ':' + this._values.Port : ''); // this._values['Hostname'] = this._values['Host'].replace(/:\d+$/, '')
+    // this._values['Origin'] =
+    //   this._values['Protocol'] + '://' + this._values['Hostname']
   };
 
   return new URLParser(para);
@@ -1095,6 +1098,113 @@ export var getURLSearchParams = function getURLSearchParams(queryString) {
 
   return args;
 };
+
+function createCircularReferenceChecker() {
+  if (typeof WeakSet !== 'undefined') {
+    var set = new WeakSet();
+    return {
+      hasAlreadyBeenSeen(value) {
+        var has = set.has(value);
+
+        if (!has) {
+          set.add(value);
+        }
+
+        return has;
+      }
+
+    };
+  }
+
+  var array = [];
+  return {
+    hasAlreadyBeenSeen(value) {
+      var has = array.indexOf(value) >= 0;
+
+      if (!has) {
+        array.push(value);
+      }
+
+      return has;
+    }
+
+  };
+}
+/**
+ * Similar to `typeof`, but distinguish plain objects from `null` and arrays
+ */
+
+
+export function getType(value) {
+  if (value === null) {
+    return 'null';
+  }
+
+  if (Array.isArray(value)) {
+    return 'array';
+  }
+
+  return typeof value;
+}
+/**
+ * Iterate over source and affect its sub values into destination, recursively.
+ * If the source and destination can't be merged, return source.
+ */
+
+export function mergeInto(destination, source, circularReferenceChecker) {
+  // ignore the source if it is undefined
+  if (typeof circularReferenceChecker === 'undefined') {
+    circularReferenceChecker = createCircularReferenceChecker();
+  }
+
+  if (source === undefined) {
+    return destination;
+  }
+
+  if (typeof source !== 'object' || source === null) {
+    // primitive values - just return source
+    return source;
+  } else if (source instanceof Date) {
+    return new Date(source.getTime());
+  } else if (source instanceof RegExp) {
+    var flags = source.flags || // old browsers compatibility
+    [source.global ? 'g' : '', source.ignoreCase ? 'i' : '', source.multiline ? 'm' : '', source.sticky ? 'y' : '', source.unicode ? 'u' : ''].join('');
+    return new RegExp(source.source, flags);
+  }
+
+  if (circularReferenceChecker.hasAlreadyBeenSeen(source)) {
+    // remove circular references
+    return undefined;
+  } else if (Array.isArray(source)) {
+    var merged = Array.isArray(destination) ? destination : [];
+
+    for (var i = 0; i < source.length; ++i) {
+      merged[i] = mergeInto(merged[i], source[i], circularReferenceChecker);
+    }
+
+    return merged;
+  }
+
+  var merged = getType(destination) === 'object' ? destination : {};
+
+  for (var key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      merged[key] = mergeInto(merged[key], source[key], circularReferenceChecker);
+    }
+  }
+
+  return merged;
+}
+/**
+ * A simplistic implementation of a deep clone algorithm.
+ * Caveats:
+ * - It doesn't maintain prototype chains - don't use with instances of custom classes.
+ * - It doesn't handle Map and Set
+ */
+
+export function deepClone(value) {
+  return mergeInto(undefined, value);
+}
 export var _URL = function _URL(url) {
   var result = {};
   var basicProps = ['hash', 'host', 'hostname', 'href', 'origin', 'password', 'pathname', 'port', 'protocol', 'search', 'username'];

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.15",
+  "version": "1.0.18",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "scripts": {
@@ -20,5 +20,5 @@
   "author": "dataflux",
   "license": "MIT",
   "description": "DataFlux RUM Web 端数据指标监控",
-  "gitHead": "d8b3295bcb924ddd649b22ecffcf3ec6ccb4072d"
+  "gitHead": "677c6f4023801b95eada2bacf237290848ddfb08"
 }

package/src/configuration.js

@@ -5,10 +5,12 @@ import {
   isArray,
   includes,
   isFunction,
-  isBoolean
+  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,
@@ -32,8 +34,12 @@ export var DEFAULT_CONFIGURATION = {
   batchBytesLimit: 16 * ONE_KILO_BYTE,
   datakitUrl: '',
   logsEndpoint: '',
+  traceType: TraceType.DDTRACE,
+  traceId128Bit: false,
   trackInteractions: false, //是否开启交互action收集
-  allowedDDTracingOrigins: [], //
+  allowedDDTracingOrigins: [], //废弃
+  allowedTracingOrigins:[], // 新增
+  isServiceSampling: false, // 是否不抛弃采样是数据， 采用在服务端菜样的方式
   beforeSend: function (event) {},
   isServerError: function(request) {return false}  // 判断请求是否为error 请求
 }
@@ -71,6 +77,7 @@ export function commonInit(userConfiguration, buildEnv) {
     applicationId: userConfiguration.applicationId,
     env: userConfiguration.env || '',
     version: userConfiguration.version || '',
+    service: userConfiguration.service || 'browser',
     sdkVersion: buildEnv.sdkVersion,
     sdkName: buildEnv.sdkName,
     datakitUrl: getDatakitUrl(
@@ -81,10 +88,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
   }
@@ -100,8 +109,21 @@ export function commonInit(userConfiguration, buildEnv) {
   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',
@@ -92,6 +93,7 @@ export var dataMap = {
     tags: {
       error_source: 'error.source',
       error_type: 'error.type',
+      error_handling: 'error.handling',
       resource_url: 'error.resource.url',
       resource_url_host: 'error.resource.url_host',
       resource_url_path: 'error.resource.url_path',

package/src/errorCollection.js

@@ -10,12 +10,13 @@ import {
   ErrorSource,
   formatUnknownError,
   toStackTraceString,
-  formatErrorMessage
+  formatErrorMessage,
+  createHandlingStack
 } from './helper/errorTools'
 import { computeStackTrace, subscribe, unsubscribe } from './tracekit'
 import { Observable } from './helper/observable'
 import { isIntakeRequest } from './configuration'
-import { RequestType } from './helper/enums'
+import { RequestType, ErrorHandling } from './helper/enums'
 import { resetXhrProxy, startXhrProxy } from './xhrProxy'
 import { resetFetchProxy, startFetchProxy } from './fetchProxy'
 
@@ -37,16 +38,18 @@ export function startConsoleTracking(errorObservable) {
   originalConsoleError = console.error
   console.error = function () {
     originalConsoleError.apply(console, arguments)
+    const handlingStack = createHandlingStack()
     errorObservable.notify(
-      extend({}, buildErrorFromParams(toArray(arguments)), {
+      extend({}, buildErrorFromParams(toArray(arguments), handlingStack), {
         source: ErrorSource.CONSOLE,
-        startClocks: clocksNow()
+        startClocks: clocksNow(),
+        handling: ErrorHandling.HANDLED
       })
     )
   }
 }
 
-function buildErrorFromParams(params) {
+function buildErrorFromParams(params, handlingStack) {
   var firstErrorParam = find(params, function (param) {
     return param instanceof Error
   })
@@ -58,7 +61,8 @@ function buildErrorFromParams(params) {
     message: message,
     stack: firstErrorParam
       ? toStackTraceString(computeStackTrace(firstErrorParam))
-      : undefined
+      : undefined,
+    handlingStack: handlingStack
   }
 }
 
@@ -86,7 +90,8 @@ export function startRuntimeErrorTracking(errorObservable) {
       stack: error.stack,
       type: error.type,
       source: ErrorSource.SOURCE,
-      startClocks: clocksNow()
+      startClocks: clocksNow(),
+      handling: ErrorHandling.UNHANDLED
     })
   }
 

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/helper/errorTools.js

@@ -1,4 +1,6 @@
-import { each } from './tools'
+import { each , noop} from './tools'
+import { computeStackTrace} from '../tracekit'
+
 export var ErrorSource = {
   AGENT: 'agent',
   CONSOLE: 'console',
@@ -7,7 +9,8 @@ export var ErrorSource = {
   LOGGER: 'logger',
   CUSTOM: 'custom'
 }
-export function formatUnknownError(stackTrace, errorObject, nonErrorPrefix) {
+
+export function formatUnknownError(stackTrace, errorObject, nonErrorPrefix,handlingStack) {
   if (
     !stackTrace ||
     (stackTrace.message === undefined && !(errorObject instanceof Error))
@@ -15,16 +18,50 @@ export function formatUnknownError(stackTrace, errorObject, nonErrorPrefix) {
     return {
       message: nonErrorPrefix + '' + JSON.stringify(errorObject),
       stack: 'No stack, consider using an instance of Error',
+      handlingStack:handlingStack,
       type: stackTrace && stackTrace.name
     }
   }
   return {
     message: stackTrace.message || 'Empty message',
     stack: toStackTraceString(stackTrace),
+    handlingStack:handlingStack,
     type: stackTrace.name
   }
 }
+/**
+ Creates a stacktrace without SDK internal frames.
+ 
+ Constraints:
+ - Has to be called at the utmost position of the call stack.
+ - No internal monitoring should encapsulate the function, that is why we need to use callMonitored inside of it.
+ */
+ export function createHandlingStack() {
+  /**
+   * Skip the two internal frames:
+   * - SDK API (console.error, ...)
+   * - this function
+   * in order to keep only the user calls
+   */
+  const internalFramesToSkip = 2
+  const error = new Error()
+  let formattedStack
 
+  // IE needs to throw the error to fill in the stack trace
+  if (!error.stack) {
+    try {
+      throw error
+    } catch (e) {
+      noop()
+    }
+  }
+
+  const stackTrace = computeStackTrace(error)
+  stackTrace.stack = stackTrace.stack.slice(internalFramesToSkip)
+  formattedStack = toStackTraceString(stackTrace)
+
+  return formattedStack
+}
 export function toStackTraceString(stack) {
   var result = stack.name || 'Error' + ': ' + stack.message
   each(stack.stack, function (frame) {

package/src/helper/tools.js

@@ -613,7 +613,7 @@ export var urlParse = function (para) {
   URLParser.prototype.getUrl = function () {
     var url = ''
     url += this._values.Origin
-    url += this._values.Port ? ':' + this._values.Port : ''
+    // url += this._values.Port ? ':' + this._values.Port : ''
     url += this._values.Path
     url += this._values.QueryString ? '?' + this._values.QueryString : ''
     return url
@@ -629,9 +629,13 @@ export var urlParse = function (para) {
         this._values[c] = b[this._fields[c]]
       }
     }
-    this._values['Hostname'] = this._values['Host'].replace(/:\d+$/, '')
-    this._values['Origin'] =
-      this._values['Protocol'] + '://' + this._values['Hostname']
+    this._values['Path'] = this._values['Path'] || '/'
+		this._values['Hostname'] = this._values['Host'].replace(/:\d+$/, '')
+		this._values['Origin'] =
+			this._values['Protocol'] + '://' + this._values['Hostname'] + (this._values.Port ? ':' + this._values.Port : '')
+    // this._values['Hostname'] = this._values['Host'].replace(/:\d+$/, '')
+    // this._values['Origin'] =
+    //   this._values['Protocol'] + '://' + this._values['Hostname']
   }
   return new URLParser(para)
 }
@@ -1060,7 +1064,107 @@ export var getURLSearchParams = function (queryString) {
   }
   return args
 }
+function createCircularReferenceChecker() {
+  if (typeof WeakSet !== 'undefined') {
+    var set = new WeakSet()
+    return {
+      hasAlreadyBeenSeen(value) {
+        var has = set.has(value)
+        if (!has) {
+          set.add(value)
+        }
+        return has
+      },
+    }
+  }
+  var array = []
+  return {
+    hasAlreadyBeenSeen(value) {
+      var has = array.indexOf(value) >= 0
+      if (!has) {
+        array.push(value)
+      }
+      return has
+    },
+  }
+}
+/**
+ * Similar to `typeof`, but distinguish plain objects from `null` and arrays
+ */
+ export function getType(value) {
+  if (value === null) {
+    return 'null'
+  }
+  if (Array.isArray(value)) {
+    return 'array'
+  }
+  return typeof value
+}
+/**
+ * Iterate over source and affect its sub values into destination, recursively.
+ * If the source and destination can't be merged, return source.
+ */
+ export function mergeInto(
+  destination,
+  source,
+  circularReferenceChecker
+) {
+  // ignore the source if it is undefined
+  if (typeof circularReferenceChecker === 'undefined') {
+    circularReferenceChecker = createCircularReferenceChecker()
+  }
+  if (source === undefined) {
+    return destination
+  }
+
+  if (typeof source !== 'object' || source === null) {
+    // primitive values - just return source
+    return source
+  } else if (source instanceof Date) {
+    return new Date(source.getTime())
+  } else if (source instanceof RegExp) {
+    var flags =
+      source.flags ||
+      // old browsers compatibility
+      [
+        source.global ? 'g' : '',
+        source.ignoreCase ? 'i' : '',
+        source.multiline ? 'm' : '',
+        source.sticky ? 'y' : '',
+        source.unicode ? 'u' : '',
+      ].join('')
+    return new RegExp(source.source, flags)
+  }
+
+  if (circularReferenceChecker.hasAlreadyBeenSeen(source)) {
+    // remove circular references
+    return undefined
+  } else if (Array.isArray(source)) {
+    var merged= Array.isArray(destination) ? destination : []
+    for (var i = 0; i < source.length; ++i) {
+      merged[i] = mergeInto(merged[i], source[i], circularReferenceChecker)
+    }
+    return merged
+  }
+
+  var merged = getType(destination) === 'object' ? destination : {}
+  for (var key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      merged[key] = mergeInto(merged[key], source[key], circularReferenceChecker)
+    }
+  }
+  return merged
+}
 
+/**
+ * A simplistic implementation of a deep clone algorithm.
+ * Caveats:
+ * - It doesn't maintain prototype chains - don't use with instances of custom classes.
+ * - It doesn't handle Map and Set
+ */
+export function deepClone(value){
+  return mergeInto(undefined, value)
+}
 export var _URL = function (url) {
   var result = {}
   var basicProps = [

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 = ''