@cloudcare/rum-uniapp 2.2.1 → 2.2.3

package/cjs/boot/buildEnv.js

@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildEnv = void 0;
 var buildEnv = exports.buildEnv = {
-  sdkVersion: '2.2.1',
+  sdkVersion: '2.2.3',
   sdkName: 'df_uniapp_rum_sdk'
 };

package/cjs/core/configuration.js

@@ -66,7 +66,8 @@ function commonInit(userConfiguration, buildEnv) {
     sdkName: buildEnv.sdkName,
     datakitUrl: getDatakitEndPoint(userConfiguration),
     tags: userConfiguration.tags || [],
-    injectTraceHeader: userConfiguration.injectTraceHeader && (0, _catchUserErrors.catchUserErrors)(userConfiguration.injectTraceHeader, 'injectTraceHeader threw an error:')
+    injectTraceHeader: userConfiguration.injectTraceHeader && (0, _catchUserErrors.catchUserErrors)(userConfiguration.injectTraceHeader, 'injectTraceHeader threw an error:'),
+    generateTraceId: userConfiguration.generateTraceId && (0, _catchUserErrors.catchUserErrors)(userConfiguration.generateTraceId, 'generateTraceId threw an error:')
   };
   if ('trackInteractions' in userConfiguration) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions;

package/cjs/rumEventsCollection/tracing/ddtraceTracer.js

@@ -15,12 +15,18 @@ function randomTraceId() {
   return n;
 }
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 function DDtraceTracer(configuration) {
   this._spanId = randomTraceId();
   this._traceId = randomTraceId();
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 DDtraceTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -30,6 +36,7 @@ DDtraceTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   makeTracingHeaders: function makeTracingHeaders() {

package/cjs/rumEventsCollection/tracing/jaegerTracer.js

@@ -16,7 +16,7 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 function JaegerTracer(configuration) {
@@ -29,6 +29,12 @@ function JaegerTracer(configuration) {
     this._traceId = rootSpanId;
   }
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 JaegerTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -38,11 +44,12 @@ JaegerTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getUberTraceId: function getUberTraceId() {
     //{trace-id}:{span-id}:{parent-span-id}:{flags}
-    return this._traceId + ':' + this._spanId + ':' + '0' + ':' + '1';
+    return this.getTraceId() + ':' + this.getSpanId() + ':' + '0' + ':' + '1';
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {

package/cjs/rumEventsCollection/tracing/skywalkingTracer.js

@@ -17,7 +17,7 @@ function uuid() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  * @param {*} requestUrl 请求的url
  */
@@ -28,6 +28,12 @@ function SkyWalkingTracer(configuration, requestUrl) {
   this._env = configuration.env;
   this._version = configuration.version;
   this._urlParse = (0, _utils.urlParse)(requestUrl).getParse();
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 SkyWalkingTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -38,12 +44,13 @@ SkyWalkingTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getSkyWalkingSw8: function getSkyWalkingSw8() {
     try {
-      var traceIdStr = String((0, _utils.base64Encode)(this._traceId));
-      var segmentId = String((0, _utils.base64Encode)(this._spanId));
+      var traceIdStr = String((0, _utils.base64Encode)(this.getTraceId()));
+      var segmentId = String((0, _utils.base64Encode)(this.getSpanId()));
       var service = String((0, _utils.base64Encode)(this._applicationId + '_rum_' + this.env));
       var instance = String((0, _utils.base64Encode)(this._version));
       var activePage = (0, _utils.getActivePage)();
@@ -62,7 +69,7 @@ SkyWalkingTracer.prototype = {
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {
-      'sw8': this.getSkyWalkingSw8()
+      sw8: this.getSkyWalkingSw8()
     };
   }
 };

package/cjs/rumEventsCollection/tracing/tracer.js

@@ -55,7 +55,7 @@ function injectHeadersIfTracingAllowed(configuration, context, inject) {
   var tracer;
   switch (configuration.traceType) {
     case _enums.TraceType.DDTRACE:
-      tracer = new _ddtraceTracer.DDtraceTracer();
+      tracer = new _ddtraceTracer.DDtraceTracer(configuration);
       break;
     case _enums.TraceType.SKYWALKING_V3:
       tracer = new _skywalkingTracer.SkyWalkingTracer(configuration, context.url);

package/cjs/rumEventsCollection/tracing/w3cTraceParentTracer.js

@@ -16,13 +16,19 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 function W3cTraceParentTracer(configuration) {
   var rootSpanId = randomTraceId();
   this._traceId = randomTraceId() + rootSpanId;
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 W3cTraceParentTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -32,15 +38,16 @@ W3cTraceParentTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getTraceParent: function getTraceParent() {
     // '{version}-{traceId}-{spanId}-{sampleDecision}'
-    return '00-' + this._traceId + '-' + this._spanId + '-01';
+    return '00-' + this.getTraceId() + '-' + this.getSpanId() + '-01';
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {
-      'traceparent': this.getTraceParent()
+      traceparent: this.getTraceParent()
     };
   }
 };

package/cjs/rumEventsCollection/tracing/zipkinMultiTracer.js

@@ -16,7 +16,7 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 function ZipkinMultiTracer(configuration) {
@@ -28,6 +28,12 @@ function ZipkinMultiTracer(configuration) {
     this._traceId = rootSpanId;
   }
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 ZipkinMultiTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -37,6 +43,7 @@ ZipkinMultiTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   makeTracingHeaders: function makeTracingHeaders() {

package/cjs/rumEventsCollection/tracing/zipkinSingleTracer.js

@@ -16,13 +16,19 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 function ZipkinSingleTracer(configuration) {
   var rootSpanId = randomTraceId();
   this._traceId = randomTraceId() + rootSpanId;
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 ZipkinSingleTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -32,15 +38,16 @@ ZipkinSingleTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getB3Str: function getB3Str() {
     //{TraceId}-{SpanId}-{SamplingState}-{ParentSpanId}
-    return this._traceId + '-' + this._spanId + '-1';
+    return this.getTraceId() + '-' + this.getSpanId() + '-1';
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {
-      'b3': this.getB3Str()
+      b3: this.getB3Str()
     };
   }
 };

package/esm/boot/buildEnv.js

@@ -1,4 +1,4 @@
 export var buildEnv = {
-  sdkVersion: '2.2.1',
+  sdkVersion: '2.2.3',
   sdkName: 'df_uniapp_rum_sdk'
 };

package/esm/core/configuration.js

@@ -58,7 +58,8 @@ export function commonInit(userConfiguration, buildEnv) {
     sdkName: buildEnv.sdkName,
     datakitUrl: getDatakitEndPoint(userConfiguration),
     tags: userConfiguration.tags || [],
-    injectTraceHeader: userConfiguration.injectTraceHeader && catchUserErrors(userConfiguration.injectTraceHeader, 'injectTraceHeader threw an error:')
+    injectTraceHeader: userConfiguration.injectTraceHeader && catchUserErrors(userConfiguration.injectTraceHeader, 'injectTraceHeader threw an error:'),
+    generateTraceId: userConfiguration.generateTraceId && catchUserErrors(userConfiguration.generateTraceId, 'generateTraceId threw an error:')
   };
   if ('trackInteractions' in userConfiguration) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions;

package/esm/rumEventsCollection/tracing/ddtraceTracer.js

@@ -9,12 +9,18 @@ function randomTraceId() {
   return n;
 }
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 export function DDtraceTracer(configuration) {
   this._spanId = randomTraceId();
   this._traceId = randomTraceId();
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 DDtraceTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -24,6 +30,7 @@ DDtraceTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   makeTracingHeaders: function makeTracingHeaders() {

package/esm/rumEventsCollection/tracing/jaegerTracer.js

@@ -10,7 +10,7 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 export function JaegerTracer(configuration) {
@@ -23,6 +23,12 @@ export function JaegerTracer(configuration) {
     this._traceId = rootSpanId;
   }
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 JaegerTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -32,11 +38,12 @@ JaegerTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getUberTraceId: function getUberTraceId() {
     //{trace-id}:{span-id}:{parent-span-id}:{flags}
-    return this._traceId + ':' + this._spanId + ':' + '0' + ':' + '1';
+    return this.getTraceId() + ':' + this.getSpanId() + ':' + '0' + ':' + '1';
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {

package/esm/rumEventsCollection/tracing/skywalkingTracer.js

@@ -11,7 +11,7 @@ function uuid() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  * @param {*} requestUrl 请求的url
  */
@@ -22,6 +22,12 @@ export function SkyWalkingTracer(configuration, requestUrl) {
   this._env = configuration.env;
   this._version = configuration.version;
   this._urlParse = urlParse(requestUrl).getParse();
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 SkyWalkingTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -32,12 +38,13 @@ SkyWalkingTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getSkyWalkingSw8: function getSkyWalkingSw8() {
     try {
-      var traceIdStr = String(base64Encode(this._traceId));
-      var segmentId = String(base64Encode(this._spanId));
+      var traceIdStr = String(base64Encode(this.getTraceId()));
+      var segmentId = String(base64Encode(this.getSpanId()));
       var service = String(base64Encode(this._applicationId + '_rum_' + this.env));
       var instance = String(base64Encode(this._version));
       var activePage = getActivePage();
@@ -56,7 +63,7 @@ SkyWalkingTracer.prototype = {
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {
-      'sw8': this.getSkyWalkingSw8()
+      sw8: this.getSkyWalkingSw8()
     };
   }
 };

package/esm/rumEventsCollection/tracing/tracer.js

@@ -47,7 +47,7 @@ export function injectHeadersIfTracingAllowed(configuration, context, inject) {
   var tracer;
   switch (configuration.traceType) {
     case TraceType.DDTRACE:
-      tracer = new DDtraceTracer();
+      tracer = new DDtraceTracer(configuration);
       break;
     case TraceType.SKYWALKING_V3:
       tracer = new SkyWalkingTracer(configuration, context.url);

package/esm/rumEventsCollection/tracing/w3cTraceParentTracer.js

@@ -10,13 +10,19 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 export function W3cTraceParentTracer(configuration) {
   var rootSpanId = randomTraceId();
   this._traceId = randomTraceId() + rootSpanId;
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 W3cTraceParentTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -26,15 +32,16 @@ W3cTraceParentTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getTraceParent: function getTraceParent() {
     // '{version}-{traceId}-{spanId}-{sampleDecision}'
-    return '00-' + this._traceId + '-' + this._spanId + '-01';
+    return '00-' + this.getTraceId() + '-' + this.getSpanId() + '-01';
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {
-      'traceparent': this.getTraceParent()
+      traceparent: this.getTraceParent()
     };
   }
 };

package/esm/rumEventsCollection/tracing/zipkinMultiTracer.js

@@ -10,7 +10,7 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 export function ZipkinMultiTracer(configuration) {
@@ -22,6 +22,12 @@ export function ZipkinMultiTracer(configuration) {
     this._traceId = rootSpanId;
   }
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 ZipkinMultiTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -31,6 +37,7 @@ ZipkinMultiTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   makeTracingHeaders: function makeTracingHeaders() {

package/esm/rumEventsCollection/tracing/zipkinSingleTracer.js

@@ -10,13 +10,19 @@ function randomTraceId() {
 }
 
 /**
- * 
+ *
  * @param {*} configuration  配置信息
  */
 export function ZipkinSingleTracer(configuration) {
   var rootSpanId = randomTraceId();
   this._traceId = randomTraceId() + rootSpanId;
   this._spanId = rootSpanId;
+  if (configuration.generateTraceId && typeof configuration.generateTraceId === 'function') {
+    var customTraceId = configuration.generateTraceId();
+    if (typeof customTraceId === 'string') {
+      this.customTraceId = customTraceId;
+    }
+  }
 }
 ZipkinSingleTracer.prototype = {
   isTracingSupported: function isTracingSupported() {
@@ -26,15 +32,16 @@ ZipkinSingleTracer.prototype = {
     return this._spanId;
   },
   getTraceId: function getTraceId() {
+    if (this.customTraceId) return this.customTraceId;
     return this._traceId;
   },
   getB3Str: function getB3Str() {
     //{TraceId}-{SpanId}-{SamplingState}-{ParentSpanId}
-    return this._traceId + '-' + this._spanId + '-1';
+    return this.getTraceId() + '-' + this.getSpanId() + '-1';
   },
   makeTracingHeaders: function makeTracingHeaders() {
     return {
-      'b3': this.getB3Str()
+      b3: this.getB3Str()
     };
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudcare/rum-uniapp",
-    "version": "2.2.1",
+    "version": "2.2.3",
     "main": "cjs/index.js",
     "module": "esm/index.js",
     "miniprogram": "cjs",
@@ -40,8 +40,5 @@
         "url": "https://github.com/DataFlux-cn/datakit-miniprogram-uniapp",
         "type": "git"
     },
-    "description": "DataFlux RUM 小程序 端数据指标监控",
-    "engines": {
-        "node": "15.6.0"
-    }
+    "description": "DataFlux RUM 小程序 端数据指标监控"
 }