@arms/rum-core 0.0.19 → 0.0.22

package/lib/utils/base.d.ts

@@ -1,7 +1,7 @@
 /**
  * 劫持函数
  */
-export declare function interceptFunction(options: any, name: string, callback: Function): void;
+export declare function interceptFunction(target: any, name: string, callback: Function): void;
 /**
  * @description: GUID v4
  * @return {String}

package/lib/utils/base.js

@@ -7,15 +7,15 @@ exports.interceptFunction = interceptFunction;
 /**
  * 劫持函数
  */
-function interceptFunction(options, name, callback) {
-  var registeredMethod = options[name];
-  options[name] = function () {
+function interceptFunction(target, name, callback) {
+  var registeredMethod = target[name];
+  target[name] = function () {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    callback.apply(this, args);
+    callback.apply(target, args);
     if (registeredMethod) {
-      return registeredMethod.apply(this, args);
+      return registeredMethod.apply(target, args);
     }
   };
 }

package/lib/utils/trace.d.ts

@@ -8,15 +8,23 @@ export declare function isTraceOption(option: any): option is TraceOption;
 export interface ITracingOption {
     enable?: boolean;
     sample?: number | undefined;
+    propagatorTypes?: PropagatorType[];
     allowedUrls?: Array<MatchOption | TraceOption> | undefined;
     tracestate?: boolean;
     baggage?: boolean;
 }
 export declare function generateTraceId(): string;
-export declare function generateSpanId(): string;
+export declare function generateSpanId(): any;
 export interface ITracingHeaders {
     [key: string]: string;
 }
-export declare function generateTraceIdForSW8(pid: string): void;
-export declare function makeTracingHeaders(traceId: string, spanId: string, sampled: boolean, propagatorTypes: PropagatorType[], tracestate?: string, baggage?: string): ITracingHeaders;
+export interface TraceSubOption {
+    tracestate?: string;
+    baggage?: string;
+    appId?: string;
+    appVersion?: string;
+    viewName?: string;
+    host?: string;
+}
+export declare function makeTracingHeaders(traceId: string, spanId: string, sampled: boolean, propagatorTypes: PropagatorType[], subOption?: TraceSubOption): ITracingHeaders;
 export declare function parseTracingOptions(tracingOption: boolean | ITracingOption): ITracingOption;

package/lib/utils/trace.js

@@ -3,21 +3,18 @@
 exports.__esModule = true;
 exports.generateSpanId = generateSpanId;
 exports.generateTraceId = generateTraceId;
-exports.generateTraceIdForSW8 = generateTraceIdForSW8;
 exports.isTraceOption = isTraceOption;
 exports.makeTracingHeaders = makeTracingHeaders;
 exports.parseTracingOptions = parseTracingOptions;
 var _match = require("./match");
 var _is = require("./is");
 var _base = require("./base");
+var _jsBase = require("js-base64");
 function isTraceOption(option) {
   return option && (0, _match.isMatchOption)(option.match) && (0, _is.isArray)(option.propagatorTypes);
 }
-function generateId() {
-  return (0, _base.generateGUID)().replace(/-/g, '');
-}
 function generateTraceId() {
-  var traceId = generateId();
+  var traceId = (0, _base.generateGUID)().replace(/-/g, '');
   // 适配OpenTracing 实现（long long转成16进制最高位不能为0）
   if (traceId[0] === '0') {
     traceId = '1' + traceId.substring(1);
@@ -28,13 +25,26 @@ function generateTraceId() {
   return traceId;
 }
 function generateSpanId() {
-  return (0, _base.generateUUID)(8);
+  var list = Array(16);
+  for (var i = 0; i < 16; i++) {
+    list[i] = Math.floor(Math.random() * 16) + 48;
+    // valid hex characters in the range 48-57 and 97-102
+    if (list[i] >= 58) {
+      list[i] += 39;
+    }
+  }
+  return String.fromCharCode.apply(null, list);
 }
-//skywalking TraceId https://github.com/apache/skywalking-client-js
-function generateTraceIdForSW8(pid) {}
-function makeTracingHeaders(traceId, spanId, sampled, propagatorTypes, tracestate, baggage) {
+function makeTracingHeaders(traceId, spanId, sampled, propagatorTypes, subOption) {
+  if (subOption === void 0) {
+    subOption = {};
+  }
   var tracingHeaders = {};
   var sample = sampled ? '1' : '0';
+  // skywalking 标准具备排他性，如果包含sw8，则只使用sw8
+  if (propagatorTypes.includes('sw8')) {
+    propagatorTypes = ['sw8'];
+  }
   propagatorTypes.forEach(function (propagatorType) {
     switch (propagatorType) {
       case 'jaeger':
@@ -50,27 +60,37 @@ function makeTracingHeaders(traceId, spanId, sampled, propagatorTypes, tracestat
         tracingHeaders['X-B3-Sampled'] = sample;
         break;
       case 'sw8':
-        // tracingHeaders['sw8'] =  `${sample}-${traceIdStr}-${segmentId}-${0}-${pid}-${app.version}-${href}-${host}`;;
+        // https://github.com/apache/skywalking-client-js
+        var traceIdStr = String((0, _jsBase.encode)(traceId));
+        var segmentId = String((0, _jsBase.encode)(spanId));
+        var service = String((0, _jsBase.encode)(subOption.appId));
+        var instance = String((0, _jsBase.encode)(subOption.appVersion));
+        var endpoint = String((0, _jsBase.encode)(subOption.viewName));
+        var peer = String((0, _jsBase.encode)(subOption.host));
+        tracingHeaders['sw8'] = sample + "-" + traceIdStr + "-" + segmentId + "-" + 0 + "-" + service + "-" + instance + "-" + endpoint + "-" + peer;
         break;
-      case 'tracecontext': // https://www.w3.org/TR/trace-context/
+      case 'tracecontext':
       default:
+        // https://www.w3.org/TR/trace-context/
         tracingHeaders['traceparent'] = "00-" + traceId + "-" + spanId + "-0" + sample;
-        if (tracestate) {
-          tracingHeaders['tracestate'] = tracestate;
+        if (subOption.tracestate) {
+          tracingHeaders['tracestate'] = subOption.tracestate;
         }
         break;
     }
   });
-  if (baggage) {
-    tracingHeaders['baggage'] = baggage;
+  if (subOption.baggage) {
+    tracingHeaders['baggage'] = subOption.baggage;
   }
   return tracingHeaders;
 }
 function parseTracingOptions(tracingOption) {
+  var defPropagatorTypes = ['tracecontext'];
   if ((0, _is.isBoolean)(tracingOption) || !tracingOption) {
     return {
       enable: !!tracingOption,
       sample: 100,
+      propagatorTypes: defPropagatorTypes,
       allowedUrls: [],
       tracestate: true,
       baggage: false
@@ -80,6 +100,8 @@ function parseTracingOptions(tracingOption) {
     enable = _tracingOption$enable === void 0 ? true : _tracingOption$enable,
     _tracingOption$sample = tracingOption.sample,
     sample = _tracingOption$sample === void 0 ? 100 : _tracingOption$sample,
+    _tracingOption$propag = tracingOption.propagatorTypes,
+    propagatorTypes = _tracingOption$propag === void 0 ? defPropagatorTypes : _tracingOption$propag,
     _tracingOption$allowe = tracingOption.allowedUrls,
     allowedUrls = _tracingOption$allowe === void 0 ? [] : _tracingOption$allowe,
     _tracingOption$traces = tracingOption.tracestate,
@@ -92,7 +114,7 @@ function parseTracingOptions(tracingOption) {
       if ((0, _match.isMatchOption)(item)) {
         traceOptions.push({
           match: item,
-          propagatorTypes: ['tracecontext']
+          propagatorTypes: propagatorTypes
         });
       } else if (isTraceOption(item)) {
         traceOptions.push(item);
@@ -102,6 +124,7 @@ function parseTracingOptions(tracingOption) {
   return {
     enable: (0, _is.isBoolean)(enable) ? enable : true,
     sample: (0, _is.isNumber)(sample) ? sample : 100,
+    propagatorTypes: propagatorTypes,
     allowedUrls: traceOptions,
     tracestate: tracestate,
     baggage: baggage

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arms/rum-core",
-  "version": "0.0.19",
+  "version": "0.0.22",
   "description": "arms rum javascript sdk core",
   "author": "guangli.fj <guangli.fj@alibaba-inc.com>",
   "license": "ISC",
@@ -22,7 +22,8 @@
     "test": "node ./__tests__/@arms/core.test.js"
   },
   "dependencies": {
-    "events": "^3.3.0"
+    "events": "^3.3.0",
+    "js-base64": "^3.7.7"
   },
   "devDependencies": {
     "typescript": "^4.9.4"