Merge ce482c4 into 3d4d8b5

open-telemetry · Apr 7, 2021 · aeed39c · aeed39c
2 parents 3d4d8b5 + ce482c4
commit aeed39c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/packages/opentelemetry-tracing/src/MultiSpanProcessor.ts b/packages/opentelemetry-tracing/src/MultiSpanProcessor.ts
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-import { Context } from '@opentelemetry/api';
+import { Context, Span } from '@opentelemetry/api';
 import { globalErrorHandler } from '@opentelemetry/core';
 import { ReadableSpan } from './export/ReadableSpan';
-import { Span } from './Span';
 import { SpanProcessor } from './SpanProcessor';
 
 /**

diff --git a/packages/opentelemetry-tracing/src/NoopSpanProcessor.ts b/packages/opentelemetry-tracing/src/NoopSpanProcessor.ts
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-import { Context } from '@opentelemetry/api';
+import { Context, Span } from '@opentelemetry/api';
 import { ReadableSpan } from './export/ReadableSpan';
-import { Span } from './Span';
 import { SpanProcessor } from './SpanProcessor';
 
 /** No-op implementation of SpanProcessor */

diff --git a/packages/opentelemetry-tracing/src/SpanProcessor.ts b/packages/opentelemetry-tracing/src/SpanProcessor.ts
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-import { Context } from '@opentelemetry/api';
+import { Context, Span } from '@opentelemetry/api';
 import { ReadableSpan } from './export/ReadableSpan';
-import { Span } from './Span';
 
 /**
  * SpanProcessor is the interface Tracer SDK uses to allow synchronous hooks

diff --git a/packages/opentelemetry-tracing/src/export/BatchSpanProcessor.ts b/packages/opentelemetry-tracing/src/export/BatchSpanProcessor.ts
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-import { context, suppressInstrumentation } from '@opentelemetry/api';
+import { context, Span, suppressInstrumentation } from '@opentelemetry/api';
 import {
   ExportResultCode,
   globalErrorHandler,
   unrefTimer,
   getEnv,
 } from '@opentelemetry/core';
-import { Span } from '../Span';
 import { SpanProcessor } from '../SpanProcessor';
 import { BufferConfig } from '../types';
 import { ReadableSpan } from './ReadableSpan';

diff --git a/packages/opentelemetry-tracing/src/export/SimpleSpanProcessor.ts b/packages/opentelemetry-tracing/src/export/SimpleSpanProcessor.ts
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-import { context, suppressInstrumentation } from '@opentelemetry/api';
+import { context, suppressInstrumentation, Span } from '@opentelemetry/api';
 import { ExportResultCode, globalErrorHandler } from '@opentelemetry/core';
-import { Span } from '../Span';
 import { SpanExporter } from './SpanExporter';
 import { SpanProcessor } from '../SpanProcessor';
 import { ReadableSpan } from './ReadableSpan';