chore: fixing zone from which to fork a new zone (open-telemetry#1209)

* chore: fixing zone from which to fork a new zone * chore: adding tests for creating zone Co-authored-by: Mayur Kale <[email protected]>
srikanthccv · Jun 18, 2020 · 2486c3d · 2486c3d
1 parent 28ad2ce
commit 2486c3d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/packages/opentelemetry-context-zone-peer-dep/src/ZoneContextManager.ts b/packages/opentelemetry-context-zone-peer-dep/src/ZoneContextManager.ts
@@ -113,7 +113,7 @@ export class ZoneContextManager implements ContextManager {
    * @param context A context (span) to be bind with Zone
    */
   private _createZone(zoneName: string, context: unknown): Zone {
-    return Zone.root.fork({
+    return Zone.current.fork({
       name: zoneName,
       properties: {
         [ZONE_CONTEXT_KEY]: context,

diff --git a/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts b/packages/opentelemetry-context-zone-peer-dep/test/ZoneContextManager.test.ts
@@ -199,6 +199,23 @@ describe('ZoneContextManager', () => {
         });
       });
     });
+
+    it('should fork new zone from active one', () => {
+      const context = Context.ROOT_CONTEXT;
+      const rootZone = Zone.current;
+      contextManager.with(context, () => {
+        const zone1 = Zone.current;
+        assert.ok(zone1.parent === rootZone);
+        contextManager.with(context, () => {
+          const zone2 = Zone.current;
+          contextManager.with(context, () => {
+            const zone3 = Zone.current;
+            assert.ok(zone3.parent === zone2);
+          });
+          assert.ok(zone2.parent === zone1);
+        });
+      });
+    });
   });
 
   describe('.bind(function)', () => {