[ci-visibility] Fix active span in mocha hooks#2167
Merged
juan-fernandez merged 4 commits intomasterfrom Jul 8, 2022
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## master #2167 +/- ##
==========================================
+ Coverage 92.96% 93.00% +0.03%
==========================================
Files 213 213
Lines 8515 8534 +19
==========================================
+ Hits 7916 7937 +21
+ Misses 599 597 -2
📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more |
juan-fernandez
commented
Jul 7, 2022
| if (!testStartCh.hasSubscribers || isRetry(this.test)) { | ||
| return runTest.apply(this, arguments) | ||
| shimmer.wrap(Runner.prototype, 'run', run => function () { | ||
| if (!testStartCh.hasSubscribers) { |
Collaborator
Author
There was a problem hiding this comment.
run is only called once per test run, so we set up here every listener that we need
juan-fernandez
commented
Jul 7, 2022
| status = 'fail' | ||
| } | ||
|
|
||
| if (!test.parent._afterEach.length) { |
Collaborator
Author
There was a problem hiding this comment.
if there are afterEach hooks, we don't finish the test yet
juan-fernandez
commented
Jul 7, 2022
| return | ||
| } | ||
| const asyncResource = new AsyncResource('bound-anonymous-fn') | ||
| testToAr.set(test.fn, asyncResource) |
Collaborator
Author
There was a problem hiding this comment.
we store the test's async resource here so we can run the hooks with the correct resource
juan-fernandez
commented
Jul 7, 2022
| if (isLastAfterEach) { | ||
| const asyncResource = getTestAsyncResource(test) | ||
| asyncResource.runInAsyncScope(() => { | ||
| testFinishCh.publish('pass') |
Collaborator
Author
There was a problem hiding this comment.
we finish the test on the last afterEach
juan-fernandez
commented
Jul 7, 2022
| // we store the original function, not to lose it | ||
| originalFns.set(newFn, this.fn) | ||
|
|
||
| this.fn = newFn |
Collaborator
Author
There was a problem hiding this comment.
this piece is so that the test function and hook functions are called with the correct context (we bind the asyncResource)
rochdev
approved these changes
Jul 7, 2022
rochdev
pushed a commit
that referenced
this pull request
Jul 15, 2022
rochdev
pushed a commit
that referenced
this pull request
Jul 15, 2022
smcroskey
added a commit
to smcroskey/dd-trace-js
that referenced
this pull request
Dec 10, 2025
Implements proper span parenting for Jest's beforeAll and afterAll hooks to ensure they are traced as children of the test suite span, similar to the Mocha implementation in PR DataDog#2167. Changes: - Add hook type detection functions (getHookType, isSuiteLevelHook) - Create suite-level channel (suiteFnCh) for suite hook execution - Modify hook wrapping to use appropriate context (suite vs test) - Store suite context in DatadogEnvironment and suiteContexts map - Update plugin to handle suite function channel binding - Add comprehensive tests for hook instrumentation This ensures beforeAll/afterAll hooks create spans parented to the test suite span, while beforeEach/afterEach remain parented to test spans. Fixes DataDog#5677
5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Fix the active spans in mocha hooks.
This rewrites the whole mocha plugin to fix the active span in
beforeEachandafterEachhooks.Motivation
Fixes #2157
Plugin Checklist
Additional Notes