@cloudcare/rum-uniapp 1.0.3 → 2.0.1

package/esm/boot/rum.js

@@ -13,12 +13,12 @@ import { startPagePerformanceObservable } from '../rumEventsCollection/performan
 import { startSetDataColloction } from '../rumEventsCollection/setDataCollection';
 import { startActionCollection } from '../rumEventsCollection/action/actionCollection';
 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);
+  startRumAssembly(userConfiguration.applicationId, configuration, lifeCycle, parentContexts, getCommonContext);
   startAppCollection(lifeCycle, configuration);
   startResourceCollection(lifeCycle, configuration);
   startViewCollection(lifeCycle, configuration, Vue);

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,26 @@ 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;
+  }
+
   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/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,121 @@ 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 (message.type === RumEventType.LOGGER) {
+        // 这里处理日志类型数据自定义字段
+        each(message, function (value, key) {
+          if (filterFileds.indexOf(key) === -1 && (isNumber(value) || isString(value) || isBoolean(value))) {
+            tagsStr.push(escapeRowData(key) + '=' + escapeRowData(value));
+          }
+        });
+      }
+
+      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 +180,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

@@ -33,4 +33,12 @@ 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'
 };

package/esm/helper/utils.js

@@ -6,6 +6,7 @@ var hasOwnProperty = ObjProto.hasOwnProperty;
 var slice = ArrayProto.slice;
 var toString = ObjProto.toString;
 var nativeForEach = ArrayProto.forEach;
+var nativeIsArray = Array.isArray;
 var breaker = false;
 export var isArguments = function isArguments(obj) {
   return !!(obj && hasOwnProperty.call(obj, 'callee'));
@@ -46,6 +47,13 @@ export var values = function values(obj) {
 export function round(num, decimals) {
   return +num.toFixed(decimals);
 }
+export function toServerDuration(duration) {
+  if (!isNumber(duration)) {
+    return duration;
+  }
+
+  return round(duration * 1e6, 0);
+}
 export function msToNs(duration) {
   if (typeof duration !== 'number') {
     return duration;
@@ -68,6 +76,9 @@ export var isBoolean = function isBoolean(obj) {
 export var isNumber = function isNumber(obj) {
   return toString.call(obj) === '[object Number]' && /[\d\.]+/.test(String(obj));
 };
+export var isArray = nativeIsArray || function (obj) {
+  return toString.call(obj) === '[object Array]';
+};
 export var toArray = function toArray(iterable) {
   if (!iterable) return [];
 
@@ -149,6 +160,92 @@ export function jsonStringify(value, replacer, space) {
 
   return result;
 }
+export var utf8Encode = function utf8Encode(string) {
+  string = (string + '').replace(/\r\n/g, '\n').replace(/\r/g, '\n');
+  var utftext = '',
+      start,
+      end;
+  var stringl = 0,
+      n;
+  start = end = 0;
+  stringl = string.length;
+
+  for (n = 0; n < stringl; n++) {
+    var c1 = string.charCodeAt(n);
+    var enc = null;
+
+    if (c1 < 128) {
+      end++;
+    } else if (c1 > 127 && c1 < 2048) {
+      enc = String.fromCharCode(c1 >> 6 | 192, c1 & 63 | 128);
+    } else {
+      enc = String.fromCharCode(c1 >> 12 | 224, c1 >> 6 & 63 | 128, c1 & 63 | 128);
+    }
+
+    if (enc !== null) {
+      if (end > start) {
+        utftext += string.substring(start, end);
+      }
+
+      utftext += enc;
+      start = end = n + 1;
+    }
+  }
+
+  if (end > start) {
+    utftext += string.substring(start, string.length);
+  }
+
+  return utftext;
+};
+export var base64Encode = function base64Encode(data) {
+  data = String(data);
+  var b64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+  var o1,
+      o2,
+      o3,
+      h1,
+      h2,
+      h3,
+      h4,
+      bits,
+      i = 0,
+      ac = 0,
+      enc = '',
+      tmp_arr = [];
+
+  if (!data) {
+    return data;
+  }
+
+  data = utf8Encode(data);
+
+  do {
+    o1 = data.charCodeAt(i++);
+    o2 = data.charCodeAt(i++);
+    o3 = data.charCodeAt(i++);
+    bits = o1 << 16 | o2 << 8 | o3;
+    h1 = bits >> 18 & 0x3f;
+    h2 = bits >> 12 & 0x3f;
+    h3 = bits >> 6 & 0x3f;
+    h4 = bits & 0x3f;
+    tmp_arr[ac++] = b64.charAt(h1) + b64.charAt(h2) + b64.charAt(h3) + b64.charAt(h4);
+  } while (i < data.length);
+
+  enc = tmp_arr.join('');
+
+  switch (data.length % 3) {
+    case 1:
+      enc = enc.slice(0, -2) + '==';
+      break;
+
+    case 2:
+      enc = enc.slice(0, -1) + '=';
+      break;
+  }
+
+  return enc;
+};
 
 function hasToJSON(value) {
   return typeof value === 'object' && value !== null && value.hasOwnProperty('toJSON');
@@ -376,7 +473,12 @@ export function toSnakeCase(word) {
   }).replace(/-/g, '_');
 }
 export function escapeRowData(str) {
-  if (!isString(str)) return str;
+  if (typeof str === 'object' && str) {
+    str = jsonStringify(str);
+  } else if (!isString(str)) {
+    return str;
+  }
+
   var reg = /[\s=,"]/g;
   return String(str).replace(reg, function (word) {
     return '\\' + word;
@@ -446,8 +548,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;
@@ -468,8 +570,9 @@ 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 : '');
   };
 
   return new URLParser(para);
@@ -525,4 +628,41 @@ export var deepMixObject = function deepMixObject(targetObj) {
   }
 
   return targetObj;
-};
+};
+export function getOrigin(url) {
+  return urlParse(url).getParse().Origin;
+}
+export function createContextManager() {
+  var context = {};
+  return {
+    get: function get() {
+      return context;
+    },
+    add: function add(key, value) {
+      if (isString(key)) {
+        context[key] = value;
+      } else {
+        console.error('key 需要传递字符串类型');
+      }
+    },
+    remove: function remove(key) {
+      delete context[key];
+    },
+    set: function set(newContext) {
+      if (isObject(newContext)) {
+        context = newContext;
+      } else {
+        console.error('content 需要传递对象类型数据');
+      }
+    }
+  };
+}
+export function getActivePage() {
+  var curPages = typeof getCurrentPages === 'function' ? getCurrentPages() : [];
+
+  if (curPages.length) {
+    return curPages[curPages.length - 1];
+  }
+
+  return {};
+}

package/esm/rumEventsCollection/assembly.js

@@ -1,4 +1,4 @@
-import { extend2Lev, withSnakeCaseKeys, performDraw } from '../helper/utils';
+import { extend2Lev, withSnakeCaseKeys, performDraw, isEmptyObject } from '../helper/utils';
 import { LifeCycleEventType } from '../core/lifeCycle';
 import { RumEventType } from '../helper/enums';
 import baseInfo from '../core/baseInfo';
@@ -11,17 +11,20 @@ var SessionType = {
   SYNTHETICS: 'synthetics',
   USER: 'user'
 };
-export function startRumAssembly(applicationId, configuration, lifeCycle, parentContexts) {
+export function startRumAssembly(applicationId, configuration, lifeCycle, parentContexts, getCommonContext) {
   lifeCycle.subscribe(LifeCycleEventType.RAW_RUM_EVENT_COLLECTED, function (data) {
     var startTime = data.startTime;
     var rawRumEvent = data.rawRumEvent;
     var viewContext = parentContexts.findView(startTime);
+    var savedCommonContext = data.savedGlobalContext;
+    var customerContext = data.customerContext;
     var deviceContext = {
       device: baseInfo.deviceInfo
     };
 
     if (isTracked(configuration) && (viewContext || rawRumEvent.type === RumEventType.APP)) {
       var actionContext = parentContexts.findAction(startTime);
+      var commonContext = savedCommonContext || getCommonContext();
       var rumContext = {
         _dd: {
           sdkName: configuration.sdkName,
@@ -40,12 +43,26 @@ export function startRumAssembly(applicationId, configuration, lifeCycle, parent
           type: SessionType.USER
         },
         user: {
-          user_id: configuration.user_id || baseInfo.getClientID(),
+          id: configuration.user_id || baseInfo.getClientID(),
           is_signin: configuration.user_id ? 'T' : 'F'
         }
       };
       var rumEvent = extend2Lev(rumContext, deviceContext, viewContext, actionContext, rawRumEvent);
       var serverRumEvent = withSnakeCaseKeys(rumEvent);
+      var context = extend2Lev(commonContext.context, customerContext);
+
+      if (!isEmptyObject(context)) {
+        serverRumEvent.tags = context;
+      }
+
+      if (!isEmptyObject(commonContext.user)) {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+        serverRumEvent.user = extend2Lev({
+          id: baseInfo.getClientID(),
+          is_signin: 'T'
+        }, commonContext.user);
+      }
+
       lifeCycle.notify(LifeCycleEventType.RUM_EVENT_COLLECTED, serverRumEvent);
     }
   });

package/esm/rumEventsCollection/page/index.js

@@ -1,4 +1,4 @@
-import { extend, now, throttle, UUID, isNumber } from '../../helper/utils';
+import { extend, now, throttle, UUID, isNumber, getActivePage } from '../../helper/utils';
 import { trackEventCounts } from '../trackEventCounts';
 import { LifeCycleEventType } from '../../core/lifeCycle';
 import { sdk } from '../../core/sdk'; // 劫持原小程序App方法
@@ -213,14 +213,4 @@ function trackSetDataTime(lifeCycle, callback) {
   return {
     stop: subscribe.unsubscribe
   };
-}
-
-function getActivePage() {
-  var curPages = getCurrentPages();
-
-  if (curPages.length) {
-    return curPages[curPages.length - 1];
-  }
-
-  return {};
 }

package/esm/rumEventsCollection/requestCollection.js

@@ -3,9 +3,11 @@ import { startDownloadProxy } from '../core/downloadProxy';
 import { LifeCycleEventType } from '../core/lifeCycle';
 import { isObject } from '../helper/utils';
 import { isAllowedRequestUrl } from '../rumEventsCollection/resource/resourceUtils';
+import { startTracer } from '../rumEventsCollection/tracing/tracer';
 var nextRequestIndex = 1;
 export function startRequestCollection(lifeCycle, configuration) {
-  trackXhr(lifeCycle, configuration);
+  var tracer = startTracer(configuration);
+  trackXhr(lifeCycle, configuration, tracer);
   trackDownload(lifeCycle, configuration);
 }
 
@@ -28,10 +30,11 @@ function getHeaderString(header) {
   return headerStr;
 }
 
-export function trackXhr(lifeCycle, configuration) {
+export function trackXhr(lifeCycle, configuration, tracer) {
   var xhrProxy = startXhrProxy();
   xhrProxy.beforeSend(function (context) {
     if (isAllowedRequestUrl(configuration, context.url)) {
+      tracer.traceXhr(context);
       context.requestIndex = getNextRequestIndex();
       lifeCycle.notify(LifeCycleEventType.REQUEST_STARTED, {
         requestIndex: context.requestIndex
@@ -40,6 +43,7 @@ export function trackXhr(lifeCycle, configuration) {
   });
   xhrProxy.onRequestComplete(function (context) {
     if (isAllowedRequestUrl(configuration, context.url)) {
+      tracer.clearTracingIfCancelled(context);
       lifeCycle.notify(LifeCycleEventType.REQUEST_COMPLETED, {
         duration: context.duration,
         method: context.method,
@@ -48,6 +52,8 @@ export function trackXhr(lifeCycle, configuration) {
         response: context.response,
         startTime: context.startTime,
         status: context.status,
+        traceId: context.traceId,
+        spanId: context.spanId,
         type: context.type,
         url: context.url
       });