@arms/rum-core 0.0.7 → 0.0.8

package/lib/model/reporter.js

@@ -4,7 +4,6 @@ exports.__esModule = true;
 exports["default"] = void 0;
 var _rumEvent = require("../types/rum-event");
 var _exception = require("../utils/exception");
-// import { IReporter } from '../types/reporter';
 var Reporter = exports["default"] = /*#__PURE__*/function () {
   function Reporter() {
     this.name = 'reporter';

package/lib/types/client.d.ts

@@ -2,7 +2,6 @@ import { ICollector } from './collector';
 import { IProcessor } from './processor';
 import { IReporter } from './reporter';
 import { RumEvent, RumEventBundle, IViewData } from './rum-event';
-import { ITracingOption } from '../utils/trace';
 export declare enum EventType {
     /**
      * 收集数据
@@ -92,9 +91,5 @@ export interface IConfiguration {
      * 各个 collector config
      */
     collectors?: any;
-    /**
-     * tracing 配置 'tracecontext' | 'b3' | 'b3multi' | 'jaeger';
-     */
-    tracing?: boolean | ITracingOption;
     [key: string]: any;
 }

package/lib/utils/trace.d.ts

@@ -4,17 +4,12 @@ export type TraceOption = {
     match: MatchOption;
     propagatorTypes: PropagatorType[];
 };
-export type Baggage = {
-    appType?: string;
-    pid?: string;
-    uid?: string;
-    sid?: string;
-};
 export declare function isTraceOption(option: any): option is TraceOption;
 export interface ITracingOption {
     enable?: boolean;
     sample?: number | undefined;
     allowedUrls?: Array<MatchOption | TraceOption> | undefined;
+    tracestate?: boolean;
     baggage?: boolean;
 }
 export declare function generateTraceId(): any;
@@ -22,5 +17,5 @@ export declare function generateSpanId(): any;
 export interface ITracingHeaders {
     [key: string]: string;
 }
-export declare function makeTracingHeaders(traceId: string, spanId: string, sampled: boolean, propagatorTypes: PropagatorType[], baggage?: Baggage): ITracingHeaders;
+export declare function makeTracingHeaders(traceId: string, spanId: string, sampled: boolean, propagatorTypes: PropagatorType[], tracestate?: string, baggage?: string): ITracingHeaders;
 export declare function parseTracingOptions(tracingOption: boolean | ITracingOption): ITracingOption;

package/lib/utils/trace.js

@@ -12,7 +12,7 @@ var SPAN_ID_BYTES = 8;
 var TRACE_ID_BYTES = 16;
 var SHARED_CHAR_CODES_ARRAY = Array(32);
 function isTraceOption(option) {
-  return option && (0, _match.isMatchOption)(option.match) && Array.isArray(option.propagatorTypes);
+  return option && (0, _match.isMatchOption)(option.match) && (0, _is.isArray)(option.propagatorTypes);
 }
 function generateId(bytes) {
   for (var i = 0; i < bytes * 2; i++) {
@@ -38,7 +38,7 @@ function generateTraceId() {
 function generateSpanId() {
   return generateId(SPAN_ID_BYTES);
 }
-function makeTracingHeaders(traceId, spanId, sampled, propagatorTypes, baggage) {
+function makeTracingHeaders(traceId, spanId, sampled, propagatorTypes, tracestate, baggage) {
   var tracingHeaders = {};
   var sample = sampled ? '1' : '0';
   propagatorTypes.forEach(function (propagatorType) {
@@ -58,15 +58,14 @@ function makeTracingHeaders(traceId, spanId, sampled, propagatorTypes, baggage)
       case 'tracecontext': // https://www.w3.org/TR/trace-context/
       default:
         tracingHeaders['traceparent'] = "00-" + traceId + "-" + spanId + "-0" + sample;
+        if (tracestate) {
+          tracingHeaders['tracestate'] = tracestate;
+        }
         break;
     }
   });
   if (baggage) {
-    var bagValList = ['rum=v2'];
-    Object.keys(baggage).forEach(function (key) {
-      bagValList.push(key + "=" + baggage[key]);
-    });
-    bagValList.length && (tracingHeaders['baggage'] = bagValList.join(','));
+    tracingHeaders['baggage'] = baggage;
   }
   return tracingHeaders;
 }
@@ -76,7 +75,8 @@ function parseTracingOptions(tracingOption) {
       enable: !!tracingOption,
       sample: 100,
       allowedUrls: [],
-      baggage: true
+      tracestate: true,
+      baggage: false
     };
   }
   var _tracingOption$enable = tracingOption.enable,
@@ -85,8 +85,10 @@ function parseTracingOptions(tracingOption) {
     sample = _tracingOption$sample === void 0 ? 100 : _tracingOption$sample,
     _tracingOption$allowe = tracingOption.allowedUrls,
     allowedUrls = _tracingOption$allowe === void 0 ? [] : _tracingOption$allowe,
+    _tracingOption$traces = tracingOption.tracestate,
+    tracestate = _tracingOption$traces === void 0 ? true : _tracingOption$traces,
     _tracingOption$baggag = tracingOption.baggage,
-    baggage = _tracingOption$baggag === void 0 ? true : _tracingOption$baggag;
+    baggage = _tracingOption$baggag === void 0 ? false : _tracingOption$baggag;
   var traceOptions = [];
   if ((0, _is.isArray)(allowedUrls) && allowedUrls.length) {
     allowedUrls.forEach(function (item) {
@@ -104,6 +106,7 @@ function parseTracingOptions(tracingOption) {
     enable: (0, _is.isBoolean)(enable) ? enable : true,
     sample: (0, _is.isNumber)(sample) ? sample : 100,
     allowedUrls: traceOptions,
+    tracestate: tracestate,
     baggage: baggage
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arms/rum-core",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "arms rum javascript sdk core",
   "author": "guangli.fj <guangli.fj@alibaba-inc.com>",
   "license": "ISC",