fix: update imports after rebase

Author: mwear

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

@@ -23,9 +23,10 @@ import {
   isValidSpanId,
   isValidTraceId,
   isSpanContextValid,
+  getParentSpanContext,
+  setExtractedSpanContext,
 } from '@opentelemetry/api';
 import { B3_DEBUG_FLAG_KEY } from './b3-common';
-import { getParentSpanContext, setExtractedSpanContext } from '../context';
 
 /* b3 multi-header keys */
 export const X_B3_TRACE_ID = 'x-b3-traceid';

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

@@ -23,9 +23,10 @@ import {
   isValidSpanId,
   isValidTraceId,
   isSpanContextValid,
+  getParentSpanContext,
+  setExtractedSpanContext,
 } from '@opentelemetry/api';
 import { B3_DEBUG_FLAG_KEY } from './b3-common';
-import { getParentSpanContext, setExtractedSpanContext } from '../context';
 
 /** B3 single-header name */
 export const B3_CONTEXT_HEADER = 'b3';

packages/opentelemetry-core/test/context/B3MultiPropagator.test.ts

@@ -19,13 +19,11 @@ import {
   defaultSetter,
   SpanContext,
   TraceFlags,
+  getExtractedSpanContext,
+  setExtractedSpanContext,
 } from '@opentelemetry/api';
 import { ROOT_CONTEXT } from '@opentelemetry/context-base';
 import * as assert from 'assert';
-import {
-  getExtractedSpanContext,
-  setExtractedSpanContext,
-} from '../../src/context/context';
 import {
   B3MultiPropagator,
   X_B3_FLAGS,

packages/opentelemetry-core/test/context/B3Propagator.test.ts

@@ -20,12 +20,10 @@ import {
   defaultSetter,
   SpanContext,
   TraceFlags,
-} from '@opentelemetry/api';
-import { ROOT_CONTEXT } from '@opentelemetry/context-base';
-import {
   getExtractedSpanContext,
   setExtractedSpanContext,
-} from '../../src/context/context';
+} from '@opentelemetry/api';
+import { ROOT_CONTEXT } from '@opentelemetry/context-base';
 import {
   B3Propagator,
   B3InjectEncoding,

packages/opentelemetry-core/test/context/B3SinglePropagator.test.ts

@@ -22,12 +22,10 @@ import {
   TraceFlags,
   INVALID_SPANID,
   INVALID_TRACEID,
-} from '@opentelemetry/api';
-import { ROOT_CONTEXT } from '@opentelemetry/context-base';
-import {
   getExtractedSpanContext,
   setExtractedSpanContext,
-} from '../../src/context/context';
+} from '@opentelemetry/api';
+import { ROOT_CONTEXT } from '@opentelemetry/context-base';
 import {
   B3SinglePropagator,
   B3_CONTEXT_HEADER,