refactor: moves test and fix tests

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

@@ -17,17 +17,8 @@
 import { TimeInput } from '../common/Time';
 import { Attributes } from './attributes';
 import { Span } from './span';
-import { SpanContext } from './span_context';
+import { INVALID_SPAN_CONTEXT, SpanContext } from './span_context';
 import { Status } from './status';
-import { TraceFlags } from './trace_flags';
-
-export const INVALID_TRACE_ID = '0';
-export const INVALID_SPAN_ID = '0';
-const INVALID_SPAN_CONTEXT: SpanContext = new SpanContext({
-  traceId: INVALID_TRACE_ID,
-  spanId: INVALID_SPAN_ID,
-  traceFlags: TraceFlags.NONE,
-});
 
 /**
  * The NoopSpan is the default {@link Span} that is used when no Span

packages/opentelemetry-api/src/trace/span_context.ts

@@ -17,9 +17,6 @@
 import { TraceFlags } from './trace_flags';
 import { TraceState } from './trace_state';
 
-export const INVALID_SPANID = '0';
-export const INVALID_TRACEID = '0';
-
 /**
  * A SpanContext represents the portion of a {@link Span} which must be
  * serialized and propagated along side of a {@link CorrelationContext}.
@@ -97,3 +94,11 @@ export class SpanContext {
     return this.traceId !== INVALID_TRACEID && this.spanId !== INVALID_SPANID;
   }
 }
+
+export const INVALID_SPANID = '0';
+export const INVALID_TRACEID = '0';
+export const INVALID_SPAN_CONTEXT: SpanContext = new SpanContext({
+  traceId: INVALID_TRACEID,
+  spanId: INVALID_SPANID,
+  traceFlags: TraceFlags.NONE,
+});

packages/opentelemetry-api/test/api/api.test.ts

@@ -23,6 +23,8 @@ import api, {
   SpanOptions,
   Span,
   SpanContext,
+  INVALID_TRACEID,
+  INVALID_SPANID,
   context,
   trace,
   propagation,
@@ -38,6 +40,44 @@ describe('API', () => {
     assert.strictEqual(typeof tracer, 'object');
   });
 
+  describe('SpanContext', () => {
+    it('should return true for valid spancontext', () => {
+      const spanContext = new SpanContext({
+        traceId: 'd4cda95b652f4a1592b449d5929fda1b',
+        spanId: '6e0c63257de34c92',
+        traceFlags: TraceFlags.NONE,
+      });
+      assert.ok(spanContext.isValid());
+    });
+
+    it('should return false when traceId is invalid', () => {
+      const spanContext = new SpanContext({
+        traceId: INVALID_TRACEID,
+        spanId: '6e0c63257de34c92',
+        traceFlags: TraceFlags.NONE,
+      });
+      assert.ok(!spanContext.isValid());
+    });
+
+    it('should return false when spanId is invalid', () => {
+      const spanContext = new SpanContext({
+        traceId: 'd4cda95b652f4a1592b449d5929fda1b',
+        spanId: INVALID_SPANID,
+        traceFlags: TraceFlags.NONE,
+      });
+      assert.ok(!spanContext.isValid());
+    });
+
+    it('should return false when traceId & spanId is invalid', () => {
+      const spanContext = new SpanContext({
+        traceId: INVALID_TRACEID,
+        spanId: INVALID_SPANID,
+        traceFlags: TraceFlags.NONE,
+      });
+      assert.ok(!spanContext.isValid());
+    });
+  });
+
   describe('GlobalTracerProvider', () => {
     const spanContext = new SpanContext({
       traceId: 'd4cda95b652f4a1592b449d5929fda1b',

packages/opentelemetry-api/test/noop-implementations/noop-span.test.ts

@@ -17,8 +17,8 @@
 import * as assert from 'assert';
 import {
   CanonicalCode,
-  INVALID_SPAN_ID,
-  INVALID_TRACE_ID,
+  INVALID_SPANID,
+  INVALID_TRACEID,
   NoopSpan,
   SpanContext,
   TraceFlags,
@@ -45,11 +45,14 @@ describe('NoopSpan', () => {
     span.updateName('my-span');
 
     assert.ok(!span.isRecording());
-    assert.deepStrictEqual(span.context(), new SpanContext({
-      traceId: INVALID_TRACE_ID,
-      spanId: INVALID_SPAN_ID,
-      traceFlags: TraceFlags.NONE,
-    }));
+    assert.deepStrictEqual(
+      span.context(),
+      new SpanContext({
+        traceId: INVALID_TRACEID,
+        spanId: INVALID_SPANID,
+        traceFlags: TraceFlags.NONE,
+      })
+    );
     span.end();
   });
 });

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

@@ -172,12 +172,15 @@ export class B3Propagator implements HttpTextPropagator {
     ) {
       context = context.setValue(PARENT_SPAN_ID_KEY, parentSpanId);
       context = context.setValue(DEBUG_FLAG_KEY, debug);
-      return setExtractedSpanContext(context, new SpanContext({
-        traceId,
-        spanId,
-        isRemote: true,
-        traceFlags,
-      }));
+      return setExtractedSpanContext(
+        context,
+        new SpanContext({
+          traceId,
+          spanId,
+          isRemote: true,
+          traceFlags,
+        })
+      );
     }
     return context;
   }

packages/opentelemetry-core/src/index.ts

@@ -33,7 +33,6 @@ export * from './trace/sampler/AlwaysOffSampler';
 export * from './trace/sampler/AlwaysOnSampler';
 export * from './trace/sampler/ParentOrElseSampler';
 export * from './trace/sampler/ProbabilitySampler';
-export * from './trace/spancontext-utils';
 export * from './trace/TraceState';
 export * from './trace/IdGenerator';
 export * from './utils/url';

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

@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-import { SpanContext, NoopSpan } from '@opentelemetry/api';
-import { INVALID_SPAN_CONTEXT } from '../trace/spancontext-utils';
+import {
+  INVALID_SPAN_CONTEXT,
+  SpanContext,
+  NoopSpan,
+} from '@opentelemetry/api';
 
 /**
  * The NoRecordingSpan extends the {@link NoopSpan}, making all operations no-op