refactor(context-zone-peer-dep): remove unnecessary helper methods and use meaningful zone names (#6452)

Author: dyladan

CHANGELOG.md

@@ -127,6 +127,7 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2
 
 ### :house: Internal
 
+* refactor(context-zone-peer-dep): remove unnecessary helper methods and use meaningful zone names[#6452](https://github.com/open-telemetry/opentelemetry-js/pull/6452) @dyladan
 * chore: enable tsconfig isolatedModules [#5697](https://github.com/open-telemetry/opentelemetry-js/pull/5697) @legendecas
 
 ## 2.0.1

packages/opentelemetry-context-zone-peer-dep/src/ZoneContextManager.ts

@@ -26,19 +26,6 @@ export class ZoneContextManager implements ContextManager {
    */
   private _enabled = false;
 
-  /**
-   * Helps to create a unique name for the zones - part of zone name
-   */
-  private _zoneCounter = 0;
-
-  /**
-   * Returns the active context from certain zone name
-   * @param activeZone
-   */
-  private _activeContextFromZone(activeZone: Zone | undefined): Context {
-    return (activeZone && activeZone.get(ZONE_CONTEXT_KEY)) || ROOT_CONTEXT;
-  }
-
   /**
    * @param context A context (span) to be executed within target function
    * @param target Function to be executed within the context
@@ -87,15 +74,6 @@ export class ZoneContextManager implements ContextManager {
     return obj;
   }
 
-  /**
-   * Creates a new unique zone name
-   */
-  private _createZoneName() {
-    this._zoneCounter++;
-    const random = Math.random();
-    return `${this._zoneCounter}-${random}`;
-  }
-
   /**
    * Creates a new zone
    * @param zoneName zone name
@@ -110,13 +88,6 @@ export class ZoneContextManager implements ContextManager {
     });
   }
 
-  /**
-   * Returns the active zone
-   */
-  private _getActiveZone(): Zone | undefined {
-    return Zone.current;
-  }
-
   /**
    * Patches addEventListener method
    * @param target any target that has "addEventListener" method
@@ -173,17 +144,10 @@ export class ZoneContextManager implements ContextManager {
    * Returns the active context
    */
   active(): Context {
-    if (!this._enabled) {
+    if (!this._enabled || !Zone.current) {
       return ROOT_CONTEXT;
     }
-    const activeZone = this._getActiveZone();
-
-    const active = this._activeContextFromZone(activeZone);
-    if (active) {
-      return active;
-    }
-
-    return ROOT_CONTEXT;
+    return Zone.current.get(ZONE_CONTEXT_KEY) || ROOT_CONTEXT;
   }
 
   /**
@@ -193,10 +157,6 @@ export class ZoneContextManager implements ContextManager {
    *  the provided context will be used as the active context for the duration of the call.
    */
   bind<T>(context: Context, target: T | TargetWithEvents): T {
-    // if no specific context to propagate is given, we use the current one
-    if (context === undefined) {
-      context = this.active();
-    }
     if (typeof target === 'function') {
       return this._bindFunction(context, target);
     } else if (isListenerObject(target)) {
@@ -236,10 +196,10 @@ export class ZoneContextManager implements ContextManager {
     thisArg?: ThisParameterType<F>,
     ...args: A
   ): ReturnType<F> {
-    const zoneName = this._createZoneName();
-
-    const newZone = this._createZone(zoneName, context);
-
-    return newZone.run(fn, thisArg, args);
+    let zoneName = 'otel:with';
+    if (fn.name) {
+      zoneName += `:${fn.name}`;
+    }
+    return this._createZone(zoneName, context).run(fn, thisArg, args);
   }
 }