jest: wrap outer hooks too (#7587)

Author: juan-fernandez

integration-tests/ci-visibility/test-custom-tags/custom-tags.js

@@ -4,20 +4,32 @@ const tracer = require('dd-trace')
 const assert = require('assert')
 
 const sum = require('../test/sum')
-describe('test optimization custom tags', () => {
+describe('test optimization', () => {
   beforeEach(() => {
     const testSpan = tracer.scope().active()
-    testSpan.setTag('custom_tag.beforeEach', 'true')
+    testSpan.setTag('outer_scope.beforeEach', 'true')
   })
 
-  it('can report tests', () => {
-    const testSpan = tracer.scope().active()
-    testSpan.setTag('custom_tag.it', 'true')
-    assert.strictEqual(sum(1, 2), 3)
+  describe('custom tags', () => {
+    beforeEach(() => {
+      const testSpan = tracer.scope().active()
+      testSpan.setTag('custom_tag.beforeEach', 'true')
+    })
+
+    it('can report tests', () => {
+      const testSpan = tracer.scope().active()
+      testSpan.setTag('custom_tag.it', 'true')
+      assert.strictEqual(sum(1, 2), 3)
+    })
+
+    afterEach(() => {
+      const testSpan = tracer.scope().active()
+      testSpan.setTag('custom_tag.afterEach', 'true')
+    })
   })
 
   afterEach(() => {
     const testSpan = tracer.scope().active()
-    testSpan.setTag('custom_tag.afterEach', 'true')
+    testSpan.setTag('outer_scope.afterEach', 'true')
   })
 })

integration-tests/jest/jest.spec.js

@@ -5971,9 +5971,11 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
 
           assertObjectContains(test, {
             meta: {
+              'outer_scope.beforeEach': 'true',
               'custom_tag.beforeEach': 'true',
               'custom_tag.it': 'true',
               'custom_tag.afterEach': 'true',
+              'outer_scope.afterEach': 'true',
             },
           })
         })

packages/datadog-instrumentations/src/jest.js

@@ -466,7 +466,13 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         testContexts.set(event.test, ctx)
 
         testStartCh.runStores(ctx, () => {
-          for (const hook of event.test.parent.hooks) {
+          let p = event.test.parent
+          const hooks = []
+          while (p != null) {
+            hooks.push(...p.hooks)
+            p = p.parent
+          }
+          for (const hook of hooks) {
             let hookFn = hook.fn
             if (originalHookFns.has(hook)) {
               hookFn = originalHookFns.get(hook)