ci: gts fix for ci build

Signed-off-by: Olivier Albertini <[email protected]>

packages/opentelemetry-basic-tracer/package.json

@@ -41,7 +41,7 @@
     "@types/mocha": "^5.2.5",
     "@types/node": "^12.6.8",
     "codecov": "^3.1.0",
-    "gts": "^1.0.0",
+    "gts": "^1.1.0",
     "mocha": "^6.1.0",
     "nyc": "^14.1.1",
     "ts-mocha": "^6.0.0",

packages/opentelemetry-basic-tracer/src/Span.ts

@@ -15,12 +15,7 @@
  */
 
 import * as types from '@opentelemetry/types';
-import {
-  randomSpanId,
-  randomTraceId,
-  INVALID_SPAN_CONTEXT,
-  isValid,
-} from '@opentelemetry/core';
+import { randomSpanId, randomTraceId, INVALID_SPAN_CONTEXT, isValid } from '@opentelemetry/core';
 import { performance } from 'perf_hooks';
 import { TraceOptions } from '@opentelemetry/types';
 
@@ -36,19 +31,15 @@ export class Span implements types.Span {
   private readonly _links: types.Link[] = [];
   private readonly _events: types.Event[] = [];
   private _status: types.Status = {
-    code: types.CanonicalCode.OK,
+    code: types.CanonicalCode.OK
   };
   private _name: string;
   private _ended = false;
   private _startTime: number;
   private _endTime = 0;
 
   /** Constructs a new Span instance. */
-  constructor(
-    parentTracer: types.Tracer,
-    spanName: string,
-    options: types.SpanOptions
-  ) {
+  constructor(parentTracer: types.Tracer, spanName: string, options: types.SpanOptions) {
     this._tracer = parentTracer;
     this._name = spanName;
     this._spanContext.spanId = randomSpanId();
@@ -132,14 +123,12 @@ export class Span implements types.Span {
       kind: this._kind,
       status: this._status,
       startTime: this._startTime,
-      endTime: this._endTime,
+      endTime: this._endTime
     });
     return `Span${json}`;
   }
 
-  private _getParentSpanContext(
-    parent: types.Span | types.SpanContext | undefined
-  ): types.SpanContext | undefined {
+  private _getParentSpanContext(parent: types.Span | types.SpanContext | undefined): types.SpanContext | undefined {
     if (!parent) return undefined;
 
     // parent is a SpanContext

packages/opentelemetry-basic-tracer/src/types.ts

@@ -15,13 +15,7 @@
  */
 
 import { ScopeManager } from '@opentelemetry/scope-base';
-import {
-  Attributes,
-  BinaryFormat,
-  HttpTextFormat,
-  Logger,
-  Sampler,
-} from '@opentelemetry/types';
+import { Attributes, BinaryFormat, HttpTextFormat, Logger, Sampler } from '@opentelemetry/types';
 
 /**
  * BasicTracerConfig provides an interface for configuring a Basic Tracer.

packages/opentelemetry-basic-tracer/test/BasicTracer.test.ts

@@ -21,7 +21,7 @@ import {
   HttpTraceContext,
   NEVER_SAMPLER,
   NOOP_SPAN,
-  NoopLogger,
+  NoopLogger
 } from '@opentelemetry/core';
 import { BasicTracer } from '../src/BasicTracer';
 import { NoopScopeManager } from '@opentelemetry/scope-base';
@@ -31,39 +31,39 @@ describe('BasicTracer', () => {
   describe('constructor', () => {
     it('should construct an instance with required only options', () => {
       const tracer = new BasicTracer({
-        scopeManager: new NoopScopeManager(),
+        scopeManager: new NoopScopeManager()
       });
       assert.ok(tracer instanceof BasicTracer);
     });
 
     it('should construct an instance with binary format', () => {
       const tracer = new BasicTracer({
         binaryFormat: new BinaryTraceContext(),
-        scopeManager: new NoopScopeManager(),
+        scopeManager: new NoopScopeManager()
       });
       assert.ok(tracer instanceof BasicTracer);
     });
 
     it('should construct an instance with http text format', () => {
       const tracer = new BasicTracer({
         httpTextFormat: new HttpTraceContext(),
-        scopeManager: new NoopScopeManager(),
+        scopeManager: new NoopScopeManager()
       });
       assert.ok(tracer instanceof BasicTracer);
     });
 
     it('should construct an instance with logger', () => {
       const tracer = new BasicTracer({
         logger: new NoopLogger(),
-        scopeManager: new NoopScopeManager(),
+        scopeManager: new NoopScopeManager()
       });
       assert.ok(tracer instanceof BasicTracer);
     });
 
     it('should construct an instance with sampler', () => {
       const tracer = new BasicTracer({
         scopeManager: new NoopScopeManager(),
-        sampler: ALWAYS_SAMPLER,
+        sampler: ALWAYS_SAMPLER
       });
       assert.ok(tracer instanceof BasicTracer);
     });
@@ -72,9 +72,9 @@ describe('BasicTracer', () => {
       const tracer = new BasicTracer({
         defaultAttributes: {
           region: 'eu-west',
-          asg: 'my-asg',
+          asg: 'my-asg'
         },
-        scopeManager: new NoopScopeManager(),
+        scopeManager: new NoopScopeManager()
       });
       assert.ok(tracer instanceof BasicTracer);
     });
@@ -83,7 +83,7 @@ describe('BasicTracer', () => {
   describe('.startSpan()', () => {
     it('should start a span with name only', () => {
       const tracer = new BasicTracer({
-        scopeManager: new NoopScopeManager(),
+        scopeManager: new NoopScopeManager()
       });
       const span = tracer.startSpan('my-span');
       assert.ok(span);
@@ -92,7 +92,7 @@ describe('BasicTracer', () => {
 
     it('should start a span with name and options', () => {
       const tracer = new BasicTracer({
-        scopeManager: new NoopScopeManager(),
+        scopeManager: new NoopScopeManager()
       });
       const span = tracer.startSpan('my-span', {});
       assert.ok(span);
@@ -102,7 +102,7 @@ describe('BasicTracer', () => {
     it('should return a default span with no sampling', () => {
       const tracer = new BasicTracer({
         sampler: NEVER_SAMPLER,
-        scopeManager: new NoopScopeManager(),
+        scopeManager: new NoopScopeManager()
       });
       const span = tracer.startSpan('my-span');
       assert.deepStrictEqual(span, NOOP_SPAN);
@@ -118,7 +118,7 @@ describe('BasicTracer', () => {
   describe('.getCurrentSpan()', () => {
     it('should return null with NoopScopeManager', () => {
       const tracer = new BasicTracer({
-        scopeManager: new NoopScopeManager(),
+        scopeManager: new NoopScopeManager()
       });
       const currentSpan = tracer.getCurrentSpan();
       assert.deepStrictEqual(currentSpan, null);
@@ -128,7 +128,7 @@ describe('BasicTracer', () => {
   describe('.withSpan()', () => {
     it('should run scope with NoopScopeManager scope manager', done => {
       const tracer = new BasicTracer({
-        scopeManager: new NoopScopeManager(),
+        scopeManager: new NoopScopeManager()
       });
       const span = tracer.startSpan('my-span');
       tracer.withSpan(span, () => {
@@ -145,7 +145,7 @@ describe('BasicTracer', () => {
   describe('.getBinaryFormat()', () => {
     it('should get default binary formatter', () => {
       const tracer = new BasicTracer({
-        scopeManager: new NoopScopeManager(),
+        scopeManager: new NoopScopeManager()
       });
       assert.ok(tracer.getBinaryFormat() instanceof BinaryTraceContext);
     });
@@ -154,7 +154,7 @@ describe('BasicTracer', () => {
   describe('.getHttpTextFormat()', () => {
     it('should get default HTTP text formatter', () => {
       const tracer = new BasicTracer({
-        scopeManager: new NoopScopeManager(),
+        scopeManager: new NoopScopeManager()
       });
       assert.ok(tracer.getHttpTextFormat() instanceof HttpTraceContext);
     });

packages/opentelemetry-basic-tracer/test/Span.test.ts

@@ -16,20 +16,15 @@
 
 import * as assert from 'assert';
 import { Span } from '../src/Span';
-import {
-  SpanKind,
-  SpanContext,
-  TraceOptions,
-  CanonicalCode,
-} from '@opentelemetry/types';
+import { SpanKind, SpanContext, TraceOptions, CanonicalCode } from '@opentelemetry/types';
 import { NoopTracer } from '@opentelemetry/core';
 
 describe('Span', () => {
   const tracer = new NoopTracer();
   const spanContext: SpanContext = {
     traceId: 'd4cda95b652f4a1592b449d5929fda1b',
     spanId: '6e0c63257de34c92',
-    traceOptions: TraceOptions.SAMPLED,
+    traceOptions: TraceOptions.SAMPLED
   };
   const name = 'span1';
 
@@ -57,7 +52,7 @@ describe('Span', () => {
 
   it('should set an attribute', () => {
     const span = new Span(tracer, name, {
-      attributes: { service: 'service-1' },
+      attributes: { service: 'service-1' }
     });
 
     ['String', 'Number', 'Boolean'].map(attType => {
@@ -82,14 +77,14 @@ describe('Span', () => {
     const span = new Span(tracer, name, {});
     span.setStatus({
       code: CanonicalCode.PERMISSION_DENIED,
-      message: 'This is an error',
+      message: 'This is an error'
     });
   });
 
   it('should return toString', () => {
     const span = new Span(tracer, name, {
       kind: SpanKind.SERVER,
-      startTime: 100,
+      startTime: 100
     });
     const context = span.context();
 

packages/opentelemetry-core/package.json

@@ -48,7 +48,7 @@
     "@types/node": "^12.6.8",
     "@types/webpack-env": "1.13.9",
     "codecov": "^3.1.0",
-    "gts": "^1.0.0",
+    "gts": "^1.1.0",
     "karma": "^4.1.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-mocha": "^1.3.0",

packages/opentelemetry-core/src/context/propagation/BinaryTraceContext.ts

@@ -35,8 +35,7 @@ const SPAN_ID_OFFSET = SPAN_ID_FIELD_ID_OFFSET + ID_SIZE;
 const TRACE_OPTION_FIELD_ID_OFFSET = SPAN_ID_OFFSET + SPAN_ID_SIZE;
 const TRACE_OPTIONS_OFFSET = TRACE_OPTION_FIELD_ID_OFFSET + ID_SIZE;
 
-const FORMAT_LENGTH =
-  4 * ID_SIZE + TRACE_ID_SIZE + SPAN_ID_SIZE + TRACE_OPTION_SIZE;
+const FORMAT_LENGTH = 4 * ID_SIZE + TRACE_ID_SIZE + SPAN_ID_SIZE + TRACE_OPTION_SIZE;
 
 export class BinaryTraceContext implements BinaryFormat {
   toBytes(spanContext: SpanContext): Uint8Array {
@@ -88,9 +87,7 @@ export class BinaryTraceContext implements BinaryFormat {
     }
     // See serializeSpanContext for byte offsets.
     result.traceId = toHex(buf.slice(TRACE_ID_OFFSET, SPAN_ID_FIELD_ID_OFFSET));
-    result.spanId = toHex(
-      buf.slice(SPAN_ID_OFFSET, TRACE_OPTION_FIELD_ID_OFFSET)
-    );
+    result.spanId = toHex(buf.slice(SPAN_ID_OFFSET, TRACE_OPTION_FIELD_ID_OFFSET));
     result.traceOptions = buf[TRACE_OPTIONS_OFFSET];
     return result;
   }

packages/opentelemetry-core/src/context/propagation/HttpTraceContext.ts

@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  SpanContext,
-  HttpTextFormat,
-  TraceOptions,
-} from '@opentelemetry/types';
+import { SpanContext, HttpTextFormat, TraceOptions } from '@opentelemetry/types';
 import { TraceState } from '../../trace/TraceState';
 
 export const TRACE_PARENT_HEADER = 'traceparent';
@@ -37,11 +33,7 @@ function parse(traceParent: string): SpanContext | null {
   // tslint:disable-next-line:ban Needed to parse hexadecimal.
   const traceOptions = parseInt(option, 16);
 
-  if (
-    !isValidVersion(version) ||
-    !isValidTraceId(traceId) ||
-    !isValidSpanId(spanId)
-  ) {
+  if (!isValidVersion(version) || !isValidTraceId(traceId) || !isValidSpanId(spanId)) {
     return null;
   }
 
@@ -67,42 +59,29 @@ function isValidSpanId(spanId: string): boolean {
  * https://www.w3.org/TR/trace-context/
  */
 export class HttpTraceContext implements HttpTextFormat {
-  inject(
-    spanContext: SpanContext,
-    format: string,
-    carrier: { [key: string]: unknown }
-  ) {
-    const traceParent = `${VERSION}-${spanContext.traceId}-${
-      spanContext.spanId
-    }-0${Number(spanContext.traceOptions || TraceOptions.UNSAMPLED).toString(
-      16
-    )}`;
+  inject(spanContext: SpanContext, format: string, carrier: { [key: string]: unknown }) {
+    const traceParent = `${VERSION}-${spanContext.traceId}-${spanContext.spanId}-0${Number(
+      spanContext.traceOptions || TraceOptions.UNSAMPLED
+    ).toString(16)}`;
 
     carrier[TRACE_PARENT_HEADER] = traceParent;
     if (spanContext.traceState) {
       carrier[TRACE_STATE_HEADER] = spanContext.traceState.serialize();
     }
   }
 
-  extract(
-    format: string,
-    carrier: { [key: string]: unknown }
-  ): SpanContext | null {
+  extract(format: string, carrier: { [key: string]: unknown }): SpanContext | null {
     const traceParentHeader = carrier[TRACE_PARENT_HEADER];
     if (!traceParentHeader) return null;
-    const traceParent = Array.isArray(traceParentHeader)
-      ? traceParentHeader[0]
-      : traceParentHeader;
+    const traceParent = Array.isArray(traceParentHeader) ? traceParentHeader[0] : traceParentHeader;
     const spanContext = parse(traceParent);
     if (!spanContext) return null;
 
     const traceStateHeader = carrier[TRACE_STATE_HEADER];
     if (traceStateHeader) {
       // If more than one `tracestate` header is found, we merge them into a
       // single header.
-      const state = Array.isArray(traceStateHeader)
-        ? traceStateHeader.join(',')
-        : traceStateHeader;
+      const state = Array.isArray(traceStateHeader) ? traceStateHeader.join(',') : traceStateHeader;
       spanContext.traceState = new TraceState(state as string);
     }
     return spanContext;

packages/opentelemetry-core/src/internal/validators.ts

@@ -32,8 +32,5 @@ export function validateKey(key: string): boolean {
  * characters (i.e., the range 0x20 to 0x7E) except comma , and =.
  */
 export function validateValue(value: string): boolean {
-  return (
-    VALID_VALUE_BASE_REGEX.test(value) &&
-    !INVALID_VALUE_COMMA_EQUAL_REGEX.test(value)
-  );
+  return VALID_VALUE_BASE_REGEX.test(value) && !INVALID_VALUE_COMMA_EQUAL_REGEX.test(value);
 }

packages/opentelemetry-core/src/trace/NoopSpan.ts

@@ -24,9 +24,7 @@ import { INVALID_SPAN_CONTEXT } from '../trace/spancontext-utils';
  * propagation.
  */
 export class NoopSpan implements types.Span {
-  constructor(
-    private readonly _spanContext: SpanContext = INVALID_SPAN_CONTEXT
-  ) {}
+  constructor(private readonly _spanContext: SpanContext = INVALID_SPAN_CONTEXT) {}
 
   // Returns a SpanContext.
   context(): types.SpanContext {