-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
fix(node-core): Ignore worker threads in OnUncaughtException #18689
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
4 changes: 4 additions & 0 deletions
4
...gration-tests/suites/public-api/OnUncaughtException/worker-thread/caught-worker-inline.js
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| // reuse the same worker script as the other tests | ||
| // just now in one file | ||
| require('./instrument.js'); | ||
| require('./caught-worker.js'); |
23 changes: 23 additions & 0 deletions
23
...de-integration-tests/suites/public-api/OnUncaughtException/worker-thread/caught-worker.js
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| const path = require('path'); | ||
| const { Worker } = require('worker_threads'); | ||
|
|
||
| function runJob() { | ||
| const worker = new Worker(path.join(__dirname, 'job.js')); | ||
| return new Promise((resolve, reject) => { | ||
| worker.once('error', reject); | ||
| worker.once('exit', code => { | ||
| if (code) reject(new Error(`Worker exited with code ${code}`)); | ||
| else resolve(); | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| runJob() | ||
| .then(() => { | ||
| // eslint-disable-next-line no-console | ||
| console.log('Job completed successfully'); | ||
| }) | ||
| .catch(err => { | ||
| // eslint-disable-next-line no-console | ||
| console.error('caught', err); | ||
| }); |
24 changes: 24 additions & 0 deletions
24
...e-integration-tests/suites/public-api/OnUncaughtException/worker-thread/caught-worker.mjs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import path from 'path'; | ||
| import { Worker } from 'worker_threads'; | ||
|
|
||
| const __dirname = new URL('.', import.meta.url).pathname; | ||
|
|
||
| function runJob() { | ||
| const worker = new Worker(path.join(__dirname, 'job.js')); | ||
| return new Promise((resolve, reject) => { | ||
| worker.once('error', reject); | ||
| worker.once('exit', code => { | ||
| if (code) reject(new Error(`Worker exited with code ${code}`)); | ||
| else resolve(); | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| try { | ||
| await runJob(); | ||
| // eslint-disable-next-line no-console | ||
| console.log('Job completed successfully'); | ||
| } catch (err) { | ||
| // eslint-disable-next-line no-console | ||
| console.error('caught', err); | ||
| } |
9 changes: 9 additions & 0 deletions
9
.../node-integration-tests/suites/public-api/OnUncaughtException/worker-thread/instrument.js
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| const Sentry = require('@sentry/node'); | ||
| const { loggingTransport } = require('@sentry-internal/node-integration-tests'); | ||
|
|
||
| Sentry.init({ | ||
| dsn: 'https://[email protected]/1337', | ||
| tracesSampleRate: 0, | ||
| debug: false, | ||
| transport: loggingTransport, | ||
| }); |
9 changes: 9 additions & 0 deletions
9
...node-integration-tests/suites/public-api/OnUncaughtException/worker-thread/instrument.mjs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| import * as Sentry from '@sentry/node'; | ||
| import { loggingTransport } from '@sentry-internal/node-integration-tests'; | ||
|
|
||
| Sentry.init({ | ||
| dsn: 'https://[email protected]/1337', | ||
| tracesSampleRate: 0, | ||
| debug: false, | ||
| transport: loggingTransport, | ||
| }); |
1 change: 1 addition & 0 deletions
1
...ackages/node-integration-tests/suites/public-api/OnUncaughtException/worker-thread/job.js
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| throw new Error('job failed'); |
17 changes: 17 additions & 0 deletions
17
...integration-tests/suites/public-api/OnUncaughtException/worker-thread/uncaught-worker.mjs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import path from 'path'; | ||
| import { Worker } from 'worker_threads'; | ||
|
|
||
| const __dirname = new URL('.', import.meta.url).pathname; | ||
|
|
||
| function runJob() { | ||
| const worker = new Worker(path.join(__dirname, 'job.js')); | ||
| return new Promise((resolve, reject) => { | ||
| worker.once('error', reject); | ||
| worker.once('exit', code => { | ||
| if (code) reject(new Error(`Worker exited with code ${code}`)); | ||
| else resolve(); | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| await runJob(); |
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.