incorporate HttpTextFormat interface

open-telemetry · Jul 16, 2019 · 034584d · 034584d
1 parent 7754528
commit 034584d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/packages/opentelemetry-core/src/context/propagation/NoopHttpTextFormat.ts b/packages/opentelemetry-core/src/context/propagation/NoopHttpTextFormat.ts
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-import { Propagator, SpanContext } from '@opentelemetry/types';
+import { HttpTextFormat, SpanContext } from '@opentelemetry/types';
 
 /**
- * No-op implementations of {@link Propagator}.
- *
- * @todo: Change Propagator to HttpTextFormat based on https://github.com/open-telemetry/opentelemetry-js/pull/70
+ * No-op implementations of {@link HttpTextFormat}.
  */
-class NoopHttpTextFormat implements Propagator {
+class NoopHttpTextFormat implements HttpTextFormat {
   // By default does nothing
   inject(spanContext: SpanContext, format: string, carrier: unknown): void {}
   // By default does nothing

diff --git a/packages/opentelemetry-core/src/trace/NoopTracer.ts b/packages/opentelemetry-core/src/trace/NoopTracer.ts
@@ -18,7 +18,7 @@ import {
   Tracer,
   SpanOptions,
   Span,
-  Propagator,
+  HttpTextFormat,
   BinaryFormat,
 } from '@opentelemetry/types';
 import { NOOP_HTTP_TEXT_FORMAT } from '../context/propagation/NoopHttpTextFormat';
@@ -57,9 +57,8 @@ export class NoopTracer implements Tracer {
     return NOOP_BINARY_FORMAT;
   }
 
-  // @todo: Use new interface https://github.com/open-telemetry/opentelemetry-js/pull/70
   // By default does nothing
-  getHttpTextFormat(): Propagator {
+  getHttpTextFormat(): HttpTextFormat {
     return NOOP_HTTP_TEXT_FORMAT;
   }
 }