@cloudcare/rum-uniapp 1.0.3 → 2.1.2

package/esm/boot/rum.entry.js

@@ -1,7 +1,15 @@
-import { isPercentage } from '../helper/utils';
+import { isPercentage, extend2Lev, now, createContextManager, defineGlobal, getGlobalObject, isString, isObject } from '../helper/utils';
 import { startRum } from './rum';
+import { ActionType } from '../helper/enums';
 export var makeRum = function makeRum(startRumImpl) {
   var isAlreadyInitialized = false;
+  var globalContextManager = createContextManager();
+  var user = {};
+
+  var _getInternalContext = function getInternalContext() {};
+
+  var addActionStrategy = function addActionStrategy() {};
+
   var rumGlobal = {
     init: function init(Vue, userConfiguration) {
       if (typeof userConfiguration === 'undefined') {
@@ -14,8 +22,45 @@ export var makeRum = function makeRum(startRumImpl) {
         return;
       }
 
-      startRumImpl(Vue, userConfiguration);
+      var _startRumImpl = startRumImpl(Vue, userConfiguration, function () {
+        return {
+          user: user,
+          context: globalContextManager.get()
+        };
+      });
+
+      _getInternalContext = _startRumImpl.getInternalContext;
+      addActionStrategy = _startRumImpl.addAction;
       isAlreadyInitialized = true;
+    },
+    getInternalContext: function getInternalContext(startTime) {
+      return _getInternalContext(startTime);
+    },
+    addRumGlobalContext: globalContextManager.add,
+    removeRumGlobalContext: globalContextManager.remove,
+    getRumGlobalContext: globalContextManager.get,
+    setRumGlobalContext: globalContextManager.set,
+    addAction: function addAction(name, context) {
+      if (isObject(context) && isString(name)) {
+        addActionStrategy({
+          name: name,
+          context: extend2Lev({}, context),
+          startClocks: now(),
+          type: ActionType.custom
+        });
+      }
+    },
+    setUser: function setUser(newUser) {
+      var sanitizedUser = sanitizeUser(newUser);
+
+      if (sanitizedUser) {
+        user = sanitizedUser;
+      } else {
+        console.error('Unsupported user:', newUser);
+      }
+    },
+    removeUser: function removeUser() {
+      user = {};
     }
   };
   return rumGlobal;
@@ -43,5 +88,28 @@ export var makeRum = function makeRum(startRumImpl) {
 
     return true;
   }
+
+  function sanitizeUser(newUser) {
+    if (typeof newUser !== 'object' || !newUser) {
+      return;
+    }
+
+    var result = 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;
+  }
 };
-export var datafluxRum = makeRum(startRum);
+export var datafluxRum = makeRum(startRum);
+defineGlobal(getGlobalObject(), 'DATAFLUX_RUM_MIN', datafluxRum);

package/esm/boot/rum.js

@@ -12,13 +12,16 @@ import { startAppCollection } from '../rumEventsCollection/app/appCollection';
 import { startPagePerformanceObservable } from '../rumEventsCollection/performanceCollection';
 import { startSetDataColloction } from '../rumEventsCollection/setDataCollection';
 import { startActionCollection } from '../rumEventsCollection/action/actionCollection';
+import { sessionManagement } from '../core/sessionManagement';
+import { startInternalContext } from '../rumEventsCollection/internalContext';
 import { sdk } from '../core/sdk';
-export var startRum = function startRum(Vue, userConfiguration) {
+export var startRum = function startRum(Vue, userConfiguration, getCommonContext) {
   var configuration = commonInit(userConfiguration, buildEnv);
   var lifeCycle = new LifeCycle();
   var parentContexts = startParentContexts(lifeCycle);
   var batch = startRumBatch(configuration, lifeCycle);
-  startRumAssembly(userConfiguration.applicationId, configuration, lifeCycle, parentContexts);
+  var session = new sessionManagement(configuration);
+  startRumAssembly(userConfiguration.applicationId, configuration, session, lifeCycle, parentContexts, getCommonContext);
   startAppCollection(lifeCycle, configuration);
   startResourceCollection(lifeCycle, configuration);
   startViewCollection(lifeCycle, configuration, Vue);
@@ -26,5 +29,12 @@ export var startRum = function startRum(Vue, userConfiguration) {
   startRequestCollection(lifeCycle, configuration);
   startPagePerformanceObservable(lifeCycle, configuration);
   startSetDataColloction(lifeCycle, Vue);
-  startActionCollection(lifeCycle, configuration, Vue);
+
+  var _startActionCollection = startActionCollection(lifeCycle, configuration, Vue);
+
+  var internalContext = startInternalContext(userConfiguration.applicationId, session, parentContexts);
+  return {
+    addAction: _startActionCollection.addAction,
+    getInternalContext: internalContext.get
+  };
 };

package/esm/core/baseInfo.js

@@ -4,7 +4,6 @@ import { CLIENT_ID_TOKEN } from '../helper/enums';
 
 class BaseInfo {
   constructor() {
-    this.sessionId = UUID();
     this.getDeviceInfo();
     this.getNetWork();
   }
@@ -63,10 +62,6 @@ class BaseInfo {
     });
   }
 
-  getSessionId() {
-    return this.sessionId;
-  }
-
 }
 
 export default new BaseInfo();

package/esm/core/boundedBuffer.js

@@ -0,0 +1,20 @@
+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;
+  }
+};
+export var BoundedBuffer = _BoundedBuffer;

package/esm/core/configuration.js

@@ -1,5 +1,5 @@
-import { extend2Lev, urlParse } from '../helper/utils';
-import { ONE_KILO_BYTE, ONE_SECOND } from '../helper/enums';
+import { extend2Lev, urlParse, values } from '../helper/utils';
+import { ONE_KILO_BYTE, ONE_SECOND, TraceType } from '../helper/enums';
 var TRIM_REGIX = /^\s+|\s+$/g;
 export var DEFAULT_CONFIGURATION = {
   sampleRate: 100,
@@ -23,7 +23,11 @@ export var DEFAULT_CONFIGURATION = {
    * arbitrary value, byte precision not needed
    */
   requestErrorResponseLengthLimit: 32 * ONE_KILO_BYTE,
-  trackInteractions: false
+  trackInteractions: false,
+  traceType: TraceType.DDTRACE,
+  traceId128Bit: false,
+  allowedTracingOrigins: [] // 新增
+
 };
 
 function trim(str) {
@@ -50,9 +54,30 @@ export 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 extend2Lev(DEFAULT_CONFIGURATION, transportConfiguration);
 }
 
+function hasTraceType(traceType) {
+  if (traceType && values(TraceType).indexOf(traceType) > -1) return true;
+  return false;
+}
+
 var haveSameOrigin = function haveSameOrigin(url1, url2) {
   var parseUrl1 = urlParse(url1).getParse();
   var parseUrl2 = urlParse(url2).getParse();

package/esm/core/dataMap.js

@@ -6,7 +6,9 @@ export 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',
@@ -50,6 +52,8 @@ export var dataMap = {
   resource: {
     type: 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/esm/core/errorCollection.js

@@ -79,17 +79,16 @@ export function startRuntimeErrorTracking(errorObservable) {
 export function stopRuntimeErrorTracking() {
   report.unsubscribe(traceKitReportHandler);
 }
-var filteredErrorsObservable;
+var errorObservable;
 export function startAutomaticErrorCollection(configuration) {
-  if (!filteredErrorsObservable) {
-    var errorObservable = new Observable();
+  if (!errorObservable) {
+    errorObservable = new Observable();
     trackNetworkError(configuration, errorObservable);
     startConsoleTracking(errorObservable);
-    startRuntimeErrorTracking(errorObservable);
-    filteredErrorsObservable = filterErrors(configuration, errorObservable);
+    startRuntimeErrorTracking(errorObservable); // filteredErrorsObservable = filterErrors(configuration, errorObservable)
   }
 
-  return filteredErrorsObservable;
+  return errorObservable;
 }
 export function trackNetworkError(configuration, errorObservable) {
   startXhrProxy().onRequestComplete(function (context) {

package/esm/core/errorFilter.js

@@ -0,0 +1,38 @@
+import { ErrorSource } from './errorTools';
+import { now, ONE_MINUTE } from '../helper/utils';
+export function createErrorFilter(configuration, onLimitReached) {
+  var errorCount = 0;
+  var allowNextError = false;
+  return {
+    isLimitReached: function isLimitReached() {
+      if (errorCount === 0) {
+        setTimeout(function () {
+          errorCount = 0;
+        }, 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: ErrorSource.AGENT,
+            startTime: now()
+          });
+        } finally {
+          allowNextError = false;
+        }
+      }
+
+      return true;
+    }
+  };
+}

package/esm/core/errorTools.js

@@ -3,7 +3,8 @@ export var ErrorSource = {
   CONSOLE: 'console',
   NETWORK: 'network',
   SOURCE: 'source',
-  LOGGER: 'logger'
+  LOGGER: 'logger',
+  CUSTOM: 'custom'
 };
 export function formatUnknownError(stackTrace, errorObject, nonErrorPrefix) {
   if (!stackTrace || stackTrace.message === undefined && !(errorObject instanceof Error)) {

package/esm/core/lifeCycle.js

@@ -40,5 +40,6 @@ export 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'
 };

package/esm/core/sdk.js

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

package/esm/core/sessionManagement.js

@@ -0,0 +1,20 @@
+import { UUID, performDraw } from '../helper/utils';
+export var SessionType = {
+  SYNTHETICS: 'synthetics',
+  USER: 'user'
+};
+export class sessionManagement {
+  constructor(configuration) {
+    this.sessionId = UUID();
+    this.isTrack = performDraw(configuration.sampleRate);
+  }
+
+  getSessionId() {
+    return this.sessionId;
+  }
+
+  isTracked() {
+    return this.isTrack;
+  }
+
+}

package/esm/core/transport.js

@@ -1,9 +1,11 @@
-import { findByPath, escapeRowData, isNumber, each, isString, values, extend } from '../helper/utils';
+import { findByPath, escapeRowData, isNumber, each, isString, values, extend, isObject, isEmptyObject, isArray, isBoolean, toServerDuration } from '../helper/utils';
 import { sdk } from '../core/sdk';
 import { LifeCycleEventType } from '../core/lifeCycle';
-import { commonTags, dataMap } from './dataMap'; // https://en.wikipedia.org/wiki/UTF-8
+import { commonTags, dataMap } from './dataMap';
+import { RumEventType } from '../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;
@@ -29,6 +31,112 @@ httpRequest.prototype = {
   }
 };
 export var HttpRequest = httpRequest;
+export var processedMessageByDataMap = function processedMessageByDataMap(message) {
+  if (!message || !message.type) return {
+    rowStr: '',
+    rowData: undefined
+  };
+  var rowData = {
+    tags: {},
+    fields: {}
+  };
+  var hasFileds = false;
+  var rowStr = '';
+  each(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 = extend({}, commonTags, value.tags);
+      var filterFileds = ['date', 'type']; // 已经在datamap中定义过的fields和tags
+
+      each(tags, function (value_path, _key) {
+        var _value = findByPath(message, value_path);
+
+        filterFileds.push(_key);
+
+        if (_value || isNumber(_value)) {
+          rowData.tags[_key] = _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) {
+          var type = _value[0],
+              value_path = _value[1];
+
+          var _valueData = findByPath(message, value_path);
+
+          filterFileds.push(_key);
+
+          if (_valueData || isNumber(_valueData)) {
+            rowData.fields[_key] = _valueData; // 这里不需要转译
+
+            _valueData = type === 'string' ? '"' + _valueData.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') + '"' : escapeRowData(_valueData);
+            fieldsStr.push(escapeRowData(_key) + '=' + _valueData);
+          }
+        } else if (isString(_value)) {
+          var _valueData = findByPath(message, _value);
+
+          filterFileds.push(_key);
+
+          if (_valueData || isNumber(_valueData)) {
+            rowData.fields[_key] = _valueData; // 这里不需要转译
+
+            _valueData = escapeRowData(_valueData);
+            fieldsStr.push(escapeRowData(_key) + '=' + _valueData);
+          }
+        }
+      });
+
+      if (tagsStr.length) {
+        rowStr += tagsStr.join(',');
+      }
+
+      if (fieldsStr.length) {
+        rowStr += ' ';
+        rowStr += fieldsStr.join(',');
+        hasFileds = true;
+      }
+
+      rowStr = rowStr + ' ' + message.date;
+      rowData.time = toServerDuration(message.date); // 这里不需要转译
+    }
+  });
+  return {
+    rowStr: hasFileds ? rowStr : '',
+    rowData: hasFileds ? rowData : undefined
+  };
+};
 
 function batch(request, maxSize, bytesLimit, maxMessageSize, flushTimeout, lifeCycle) {
   this.request = request;
@@ -63,74 +171,7 @@ batch.prototype = {
     }
   },
   processSendData: function processSendData(message) {
-    // var data = safeJSONParse(message)
-    if (!message || !message.type) return '';
-    var rowStr = '';
-    var hasFileds = false;
-    each(dataMap, function (value, key) {
-      if (value.type === message.type) {
-        // 做一下别名处理
-        if (value.alias_key) {
-          rowStr += value.alias_key + ',';
-        } else {
-          rowStr += key + ',';
-        }
-
-        var tagsStr = [];
-        var tags = extend({}, commonTags, value.tags);
-        each(tags, function (value_path, _key) {
-          var _value = findByPath(message, value_path);
-
-          if (_value || isNumber(_value)) {
-            tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value));
-          }
-        });
-
-        if (message.tags.length) {
-          // 自定义tag
-          each(message.tags, function (_value, _key) {
-            if (_value || isNumber(_value)) {
-              tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value));
-            }
-          });
-        }
-
-        var fieldsStr = [];
-        each(value.fields, function (_value, _key) {
-          if (Array.isArray(_value) && _value.length === 2) {
-            var type = _value[0],
-                value_path = _value[1];
-
-            var _valueData = findByPath(message, value_path);
-
-            if (_valueData || isNumber(_valueData)) {
-              _valueData = type === 'string' ? '"' + String(_valueData).replace(/[\\]*"/g, '"').replace(/"/g, '\\"') + '"' : escapeRowData(_valueData);
-              fieldsStr.push(escapeRowData(_key) + '=' + _valueData);
-            }
-          } else if (isString(_value)) {
-            var _valueData = findByPath(message, _value);
-
-            if (_valueData || isNumber(_valueData)) {
-              _valueData = escapeRowData(_valueData);
-              fieldsStr.push(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/esm/core/xhrProxy.js

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

package/esm/helper/enums.js

@@ -10,7 +10,8 @@ export var RumEventType = {
   VIEW: 'view',
   RESOURCE: 'resource',
   APP: 'app',
-  ACTION: 'action'
+  ACTION: 'action',
+  LOGGER: 'logger'
 };
 export var RequestType = {
   XHR: 'network',
@@ -19,7 +20,8 @@ export var RequestType = {
 export var ActionType = {
   tap: 'tap',
   longpress: 'longpress',
-  longtap: 'longtap'
+  longtap: 'longtap',
+  custom: 'custom'
 };
 export var MpHook = {
   data: 1,
@@ -33,4 +35,16 @@ export var MpHook = {
   onResize: 1,
   onHide: 1,
   onUnload: 1
+};
+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/limitModification.js

@@ -0,0 +1,57 @@
+import { extend2Lev, each } from './utils';
+/**
+ * Current limitations:
+ * - field path do not support array, 'a.b.c' only
+ * - modifiable fields type must be string
+ */
+
+export function limitModification(object, modifiableFieldPaths, modifier) {
+  var clone = extend2Lev({}, object);
+  var result = modifier(clone);
+  each(modifiableFieldPaths, function (path) {
+    var originalValue = get(object, path);
+    var newValue = get(clone, path);
+
+    if (typeof originalValue === 'string' && typeof newValue === 'string') {
+      set(object, path, newValue);
+    }
+  });
+  return result;
+}
+
+function get(object, path) {
+  var current = object;
+
+  for (var field of path.split('.')) {
+    if (!isValidObjectContaining(current, field)) {
+      return;
+    }
+
+    current = current[field];
+  }
+
+  return current;
+}
+
+function set(object, path, value) {
+  var current = object;
+  var fields = path.split('.');
+
+  for (var i = 0; i < fields.length; i += 1) {
+    var field = fields[i];
+
+    if (!isValidObjectContaining(current, field)) {
+      return;
+    }
+
+    if (i !== fields.length - 1) {
+      current = current[field];
+    } else {
+      current[field] = value;
+    }
+  }
+}
+
+function isValidObjectContaining(object, field) {
+  return typeof object === 'object' && object !== null && field in object;
+}

package/esm/helper/tracekit.js

@@ -904,7 +904,7 @@ export var computeStackTrace = function computeStackTraceWrapper() {
 var ERROR_TYPES_RE = /^(?:[Uu]ncaught (?:exception: )?)?(?:((?:Eval|Internal|Range|Reference|Syntax|Type|URI|)Error): )?(.*)$/;
 
 function extractMessage(ex) {
-  var message = ex && ex.message; // console.log('message',message)
+  var message = ex && ex.message;
 
   if (!message) {
     return 'No error message';