Merge branch 'master' of https://github.com/open-telemetry/opentelemetry-js-contrib

Author: carolinee21

plugins/node/opentelemetry-plugin-dns/package.json

@@ -45,7 +45,7 @@
     "@opentelemetry/tracing": "0.9.0",
     "@types/mocha": "7.0.2",
     "@types/node": "12.12.47",
-    "@types/semver": "7.2.0",
+    "@types/semver": "7.3.0",
     "@types/shimmer": "1.0.1",
     "@types/sinon": "9.0.4",
     "codecov": "3.7.0",

plugins/node/opentelemetry-plugin-mongodb/package.json

@@ -45,7 +45,7 @@
     "@opentelemetry/node": "0.9.0",
     "@opentelemetry/tracing": "0.9.0",
     "@types/mocha": "7.0.2",
-    "@types/mongodb": "3.5.22",
+    "@types/mongodb": "3.5.25",
     "@types/node": "12.12.47",
     "@types/shimmer": "1.0.1",
     "codecov": "3.7.0",

plugins/web/opentelemetry-plugin-user-interaction/package.json

@@ -43,6 +43,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.10.3",
+    "@opentelemetry/context-base": "0.9.0",
     "@opentelemetry/context-zone-peer-dep": "0.9.0",
     "@opentelemetry/plugin-xml-http-request": "0.9.0",
     "@opentelemetry/tracing": "0.9.0",

plugins/web/opentelemetry-plugin-user-interaction/src/userInteraction.ts

@@ -313,28 +313,31 @@ export class UserInteractionPlugin extends BasePlugin<unknown> {
       ): Zone {
         const target: HTMLElement | undefined = plugin._getClickedElement(task);
         let span: api.Span | undefined;
+        const activeZone = this;
         if (target) {
           span = plugin._createSpan(target, 'click');
           if (span) {
             plugin._incrementTask(span);
-            try {
-              return plugin._tracer.withSpan(span, () => {
-                const currentZone = Zone.current;
-                task._zone = currentZone;
-                return original.call(currentZone, task, applyThis, applyArgs);
-              });
-            } finally {
-              plugin._decrementTask(span);
-            }
+            return activeZone.run(() => {
+              try {
+                return plugin._tracer.withSpan(span as api.Span, () => {
+                  const currentZone = Zone.current;
+                  task._zone = currentZone;
+                  return original.call(currentZone, task, applyThis, applyArgs);
+                });
+              } finally {
+                plugin._decrementTask(span as api.Span);
+              }
+            });
           }
         } else {
-          span = plugin._getCurrentSpan(this);
+          span = plugin._getCurrentSpan(activeZone);
         }
 
         try {
-          return original.call(this, task, applyThis, applyArgs);
+          return original.call(activeZone, task, applyThis, applyArgs);
         } finally {
-          if (span && plugin._shouldCountTask(task, Zone.current)) {
+          if (span && plugin._shouldCountTask(task, activeZone)) {
             plugin._decrementTask(span);
           }
         }

plugins/web/opentelemetry-plugin-user-interaction/test/userInteraction.test.ts

@@ -17,7 +17,7 @@
 // because of zone original timeout needs to be patched to be able to run
 // code outside zone.js. This needs to be done before all
 const originalSetTimeout = window.setTimeout;
-
+import { Context } from '@opentelemetry/context-base';
 import { context } from '@opentelemetry/api';
 import { isWrapped, LogLevel } from '@opentelemetry/core';
 import { XMLHttpRequestPlugin } from '@opentelemetry/plugin-xml-http-request';
@@ -200,6 +200,44 @@ describe('UserInteractionPlugin', () => {
       });
     });
 
+    it('should run task from different zone - angular test', done => {
+      const context = Context.ROOT_CONTEXT;
+      const rootZone = Zone.current;
+
+      interface CtxMngrWithPrv {
+        _createZone: Function;
+      }
+
+      const ctxMngrWithPrv = (contextManager as unknown) as CtxMngrWithPrv;
+      const newZone = ctxMngrWithPrv._createZone('test', context);
+
+      const element = createButton();
+      element.addEventListener('click', () => {
+        assert.ok(
+          Zone.current !== newZone,
+          'Current zone for 2nd listener click is wrong'
+        );
+        assert.ok(
+          Zone.current.parent === rootZone,
+          'Parent Zone for 2nd listener click is wrong'
+        );
+      });
+
+      newZone.run(() => {
+        assert.ok(Zone.current === newZone, 'New zone is wrong');
+        fakeInteraction(() => {
+          assert.ok(
+            Zone.current.parent === newZone,
+            'Parent zone for click is wrong'
+          );
+          const spanClick: tracing.ReadableSpan = exportSpy.args[0][0][0];
+          assertClickSpan(spanClick);
+
+          done();
+        }, element);
+      });
+    });
+
     it('should ignore interaction when element is disabled', done => {
       const btn = createButton(true);
       let called = false;