Remove noops and fix tests

open-telemetry · Apr 29, 2021 · b9e2dcc · b9e2dcc
1 parent 15b2002
commit b9e2dcc
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 26 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -18,14 +18,11 @@ export * from './baggage';
 export * from './common/Exception';
 export * from './common/Time';
 export * from './diag';
-export * from './propagation/NoopTextMapPropagator';
 export * from './propagation/TextMapPropagator';
 export * from './trace/attributes';
 export * from './trace/Event';
 export * from './trace/link_context';
 export * from './trace/link';
-export * from './trace/NoopTracer';
-export * from './trace/NoopTracerProvider';
 export * from './trace/ProxyTracer';
 export * from './trace/ProxyTracerProvider';
 export * from './trace/Sampler';
@@ -51,7 +48,6 @@ export {
 } from './trace/spancontext-utils';
 
 export * from './context/context';
-export * from './context/NoopContextManager';
 export * from './context/types';
 
 import { ContextAPI } from './api/context';

diff --git a/src/trace/ProxyTracerProvider.ts b/src/trace/ProxyTracerProvider.ts
@@ -19,7 +19,7 @@ import { TracerProvider } from './tracer_provider';
 import { ProxyTracer } from './ProxyTracer';
 import { NoopTracerProvider } from './NoopTracerProvider';
 
-export const NOOP_TRACER_PROVIDER = new NoopTracerProvider();
+const NOOP_TRACER_PROVIDER = new NoopTracerProvider();
 
 /**
  * Tracer provider which provides {@link ProxyTracer}s.

diff --git a/test/api/api.test.ts b/test/api/api.test.ts
@@ -16,25 +16,25 @@
 
 import * as assert from 'assert';
 import api, {
-  TraceFlags,
-  NoopTracerProvider,
-  NoopTracer,
-  SpanOptions,
-  Span,
   context,
-  trace,
-  propagation,
-  TextMapPropagator,
   Context,
-  TextMapSetter,
-  TextMapGetter,
-  ROOT_CONTEXT,
-  defaultTextMapSetter,
   defaultTextMapGetter,
+  defaultTextMapSetter,
   diag,
+  propagation,
+  ROOT_CONTEXT,
+  Span,
+  SpanOptions,
+  TextMapGetter,
+  TextMapPropagator,
+  TextMapSetter,
+  trace,
+  TraceFlags,
 } from '../../src';
 import { DiagAPI } from '../../src/api/diag';
 import { NonRecordingSpan } from '../../src/trace/NonRecordingSpan';
+import { NoopTracer } from '../../src/trace/NoopTracer';
+import { NoopTracerProvider } from '../../src/trace/NoopTracerProvider';
 
 // DiagLogger implementation
 const diagLoggerFunctions = [

diff --git a/test/noop-implementations/noop-tracer.test.ts b/test/noop-implementations/noop-tracer.test.ts
@@ -16,14 +16,14 @@
 
 import * as assert from 'assert';
 import {
-  NoopTracer,
+  context,
+  setSpanContext,
   SpanContext,
   SpanKind,
   TraceFlags,
-  context,
-  setSpanContext,
 } from '../../src';
 import { NonRecordingSpan } from '../../src/trace/NonRecordingSpan';
+import { NoopTracer } from '../../src/trace/NoopTracer';
 
 describe('NoopTracer', () => {
   it('should not crash', () => {

diff --git a/test/proxy-implementations/proxy-tracer.test.ts b/test/proxy-implementations/proxy-tracer.test.ts
@@ -17,17 +17,17 @@
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import {
-  ProxyTracerProvider,
-  SpanKind,
-  TracerProvider,
   ProxyTracer,
-  Tracer,
-  Span,
-  NoopTracer,
+  ProxyTracerProvider,
   ROOT_CONTEXT,
+  Span,
+  SpanKind,
   SpanOptions,
+  Tracer,
+  TracerProvider,
 } from '../../src';
 import { NonRecordingSpan } from '../../src/trace/NonRecordingSpan';
+import { NoopTracer } from '../../src/trace/NoopTracer';
 
 describe('ProxyTracer', () => {
   let provider: ProxyTracerProvider;