chore: remove withAsync from ContextManager interface

open-telemetry · Apr 12, 2020 · cc6fcb4 · cc6fcb4
1 parent f40f6f1
commit cc6fcb4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 24 deletions.
diff --git a/packages/opentelemetry-context-base/src/NoopContextManager.ts b/packages/opentelemetry-context-base/src/NoopContextManager.ts
@@ -22,11 +22,10 @@ export class NoopContextManager implements types.ContextManager {
     return Context.ROOT_CONTEXT;
   }
 
-  with(context: Context, fn: Function) {
-    return fn();
-  }
-
-  withAsync(context: Context, fn: Function) {
+  with<T extends (...args: unknown[]) => ReturnType<T>>(
+    context: Context,	
+    fn: T	
+  ): ReturnType<T> {	
     return fn();
   }
 

diff --git a/packages/opentelemetry-context-base/src/types.ts b/packages/opentelemetry-context-base/src/types.ts
@@ -32,17 +32,6 @@ export interface ContextManager {
     fn: T
   ): ReturnType<T>;
 
-  /**
-   * Run the async fn callback with an active scope
-   *
-   * @param scope Context to be active during function invocation
-   * @param fn An async callback to be immediately run with an active context
-   */
-  withAsync<T extends Promise<any>, U extends (...args: unknown[]) => T>(
-    scope: Context,
-    fn: U
-  ): Promise<T>;
-
   /**
    * Bind an object as the current context (or a specific one)
    * @param target Any object to which a context need to be set

diff --git a/packages/opentelemetry-context-zone-peer-dep/src/ZoneContextManager.ts b/packages/opentelemetry-context-zone-peer-dep/src/ZoneContextManager.ts
@@ -248,8 +248,4 @@ export class ZoneContextManager implements ContextManager {
 
     return newZone.run(fn, context);
   }
-
-  withAsync(context: Context, fn: Function) {
-    return fn();
-  }
 }
diff --git a/packages/opentelemetry-web/src/StackContextManager.ts b/packages/opentelemetry-web/src/StackContextManager.ts
@@ -119,8 +119,4 @@ export class StackContextManager implements ContextManager {
       this._currentContext = previousContext;
     }
   }
-
-  withAsync(context: Context, fn: Function) {
-    return fn();
-  }
 }