Skip to content

Commit

Permalink
feat(node): Rework ANR to use worker script via an integration (#9945)
Browse files Browse the repository at this point in the history
  • Loading branch information
timfish authored Dec 21, 2023
1 parent 52810b3 commit 6173846
Show file tree
Hide file tree
Showing 24 changed files with 617 additions and 898 deletions.
2 changes: 1 addition & 1 deletion packages/core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export type { ServerRuntimeClientOptions } from './server-runtime-client';
export type { RequestDataIntegrationOptions } from './integrations/requestdata';

export * from './tracing';
export { createEventEnvelope } from './envelope';
export { createEventEnvelope, createSessionEnvelope } from './envelope';
export {
addBreadcrumb,
captureCheckIn,
Expand Down
8 changes: 3 additions & 5 deletions packages/node-experimental/src/sdk/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
defaultIntegrations as defaultNodeIntegrations,
defaultStackParser,
getSentryRelease,
isAnrChildProcess,
makeNodeTransport,
} from '@sentry/node';
import type { Integration } from '@sentry/types';
Expand Down Expand Up @@ -113,15 +112,14 @@ function getClientOptions(options: NodeExperimentalOptions): NodeExperimentalCli

const release = getRelease(options.release);

// If there is no release, or we are in an ANR child process, we disable autoSessionTracking by default
const autoSessionTracking =
typeof release !== 'string' || isAnrChildProcess()
typeof release !== 'string'
? false
: options.autoSessionTracking === undefined
? true
: options.autoSessionTracking;
// We enforce tracesSampleRate = 0 in ANR child processes
const tracesSampleRate = isAnrChildProcess() ? 0 : getTracesSampleRate(options.tracesSampleRate);

const tracesSampleRate = getTracesSampleRate(options.tracesSampleRate);

const baseOptions = dropUndefinedKeys({
transport: makeNodeTransport,
Expand Down
29 changes: 13 additions & 16 deletions packages/node-integration-tests/suites/anr/basic-session.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
const crypto = require('crypto');
const assert = require('assert');

const Sentry = require('@sentry/node');

const { transport } = require('./test-transport.js');

// close both processes after 5 seconds
setTimeout(() => {
process.exit();
}, 5000);
}, 10000);

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
debug: true,
transport,
integrations: [new Sentry.Integrations.Anr({ captureStackTrace: true, anrThreshold: 200 })],
});

Sentry.enableAnrDetection({ captureStackTrace: true, anrThreshold: 200 }).then(() => {
function longWork() {
for (let i = 0; i < 100; i++) {
const salt = crypto.randomBytes(128).toString('base64');
// eslint-disable-next-line no-unused-vars
const hash = crypto.pbkdf2Sync('myPassword', salt, 10000, 512, 'sha512');
}
function longWork() {
for (let i = 0; i < 100; i++) {
const salt = crypto.randomBytes(128).toString('base64');
// eslint-disable-next-line no-unused-vars
const hash = crypto.pbkdf2Sync('myPassword', salt, 10000, 512, 'sha512');
assert.ok(hash);
}
}

setTimeout(() => {
longWork();
}, 1000);
});
setTimeout(() => {
longWork();
}, 1000);
29 changes: 13 additions & 16 deletions packages/node-integration-tests/suites/anr/basic.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,29 @@
const crypto = require('crypto');
const assert = require('assert');

const Sentry = require('@sentry/node');

const { transport } = require('./test-transport.js');

// close both processes after 5 seconds
setTimeout(() => {
process.exit();
}, 5000);
}, 10000);

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
debug: true,
autoSessionTracking: false,
transport,
integrations: [new Sentry.Integrations.Anr({ captureStackTrace: true, anrThreshold: 200 })],
});

Sentry.enableAnrDetection({ captureStackTrace: true, anrThreshold: 200 }).then(() => {
function longWork() {
for (let i = 0; i < 100; i++) {
const salt = crypto.randomBytes(128).toString('base64');
// eslint-disable-next-line no-unused-vars
const hash = crypto.pbkdf2Sync('myPassword', salt, 10000, 512, 'sha512');
}
function longWork() {
for (let i = 0; i < 100; i++) {
const salt = crypto.randomBytes(128).toString('base64');
// eslint-disable-next-line no-unused-vars
const hash = crypto.pbkdf2Sync('myPassword', salt, 10000, 512, 'sha512');
assert.ok(hash);
}
}

setTimeout(() => {
longWork();
}, 1000);
});
setTimeout(() => {
longWork();
}, 1000);
11 changes: 4 additions & 7 deletions packages/node-integration-tests/suites/anr/basic.mjs
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
import * as assert from 'assert';
import * as crypto from 'crypto';

import * as Sentry from '@sentry/node';

const { transport } = await import('./test-transport.js');

// close both processes after 5 seconds
setTimeout(() => {
process.exit();
}, 5000);
}, 10000);

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
debug: true,
autoSessionTracking: false,
transport,
integrations: [new Sentry.Integrations.Anr({ captureStackTrace: true, anrThreshold: 200 })],
});

await Sentry.enableAnrDetection({ captureStackTrace: true, anrThreshold: 200 });

function longWork() {
for (let i = 0; i < 100; i++) {
const salt = crypto.randomBytes(128).toString('base64');
// eslint-disable-next-line no-unused-vars
const hash = crypto.pbkdf2Sync('myPassword', salt, 10000, 512, 'sha512');
assert.ok(hash);
}
}

Expand Down
29 changes: 13 additions & 16 deletions packages/node-integration-tests/suites/anr/forked.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,29 @@
const crypto = require('crypto');
const assert = require('assert');

const Sentry = require('@sentry/node');

const { transport } = require('./test-transport.js');

// close both processes after 5 seconds
setTimeout(() => {
process.exit();
}, 5000);
}, 10000);

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
debug: true,
autoSessionTracking: false,
transport,
integrations: [new Sentry.Integrations.Anr({ captureStackTrace: true, anrThreshold: 200 })],
});

Sentry.enableAnrDetection({ captureStackTrace: true, anrThreshold: 200 }).then(() => {
function longWork() {
for (let i = 0; i < 100; i++) {
const salt = crypto.randomBytes(128).toString('base64');
// eslint-disable-next-line no-unused-vars
const hash = crypto.pbkdf2Sync('myPassword', salt, 10000, 512, 'sha512');
}
function longWork() {
for (let i = 0; i < 100; i++) {
const salt = crypto.randomBytes(128).toString('base64');
// eslint-disable-next-line no-unused-vars
const hash = crypto.pbkdf2Sync('myPassword', salt, 10000, 512, 'sha512');
assert.ok(hash);
}
}

setTimeout(() => {
longWork();
}, 1000);
});
setTimeout(() => {
longWork();
}, 1000);
31 changes: 31 additions & 0 deletions packages/node-integration-tests/suites/anr/legacy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
const crypto = require('crypto');
const assert = require('assert');

const Sentry = require('@sentry/node');

setTimeout(() => {
process.exit();
}, 10000);

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
debug: true,
autoSessionTracking: false,
});

// eslint-disable-next-line deprecation/deprecation
Sentry.enableAnrDetection({ captureStackTrace: true, anrThreshold: 200 }).then(() => {
function longWork() {
for (let i = 0; i < 100; i++) {
const salt = crypto.randomBytes(128).toString('base64');
// eslint-disable-next-line no-unused-vars
const hash = crypto.pbkdf2Sync('myPassword', salt, 10000, 512, 'sha512');
assert.ok(hash);
}
}

setTimeout(() => {
longWork();
}, 1000);
});
17 changes: 0 additions & 17 deletions packages/node-integration-tests/suites/anr/test-transport.js

This file was deleted.

Loading

0 comments on commit 6173846

Please sign in to comment.