Revert "feat(node): Rework ANR to use worker script via an integration (#9823)"

.gitignore

@@ -50,9 +50,6 @@ tmp.js
 .eslintcache
 **/eslintcache/*
 
-# node worker scripts
-packages/node/src/integrations/anr/worker-script.*
-
 # deno
 packages/deno/build-types
 packages/deno/build-test

packages/core/src/index.ts

@@ -5,7 +5,7 @@ export type { ServerRuntimeClientOptions } from './server-runtime-client';
 export type { RequestDataIntegrationOptions } from './integrations/requestdata';
 
 export * from './tracing';
-export { createEventEnvelope, createSessionEnvelope } from './envelope';
+export { createEventEnvelope } from './envelope';
 export {
   addBreadcrumb,
   captureCheckIn,

packages/node-experimental/src/sdk/init.ts

@@ -4,6 +4,7 @@ import {
   defaultIntegrations as defaultNodeIntegrations,
   defaultStackParser,
   getSentryRelease,
+  isAnrChildProcess,
   makeNodeTransport,
 } from '@sentry/node';
 import type { Integration } from '@sentry/types';
@@ -112,14 +113,15 @@ 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'
+    typeof release !== 'string' || isAnrChildProcess()
       ? false
       : options.autoSessionTracking === undefined
         ? true
         : options.autoSessionTracking;
-
-  const tracesSampleRate = getTracesSampleRate(options.tracesSampleRate);
+  // We enforce tracesSampleRate = 0 in ANR child processes
+  const tracesSampleRate = isAnrChildProcess() ? 0 : getTracesSampleRate(options.tracesSampleRate);
 
   const baseOptions = dropUndefinedKeys({
     transport: makeNodeTransport,

packages/node-integration-tests/suites/anr/basic-session.js

@@ -1,28 +1,31 @@
 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();
-}, 10000);
+}, 5000);
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   release: '1.0',
   debug: true,
-  integrations: [new Sentry.Integrations.Anr({ captureStackTrace: true, anrThreshold: 200 })],
+  transport,
 });
 
-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);
+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');
+    }
   }
-}
 
-setTimeout(() => {
-  longWork();
-}, 1000);
+  setTimeout(() => {
+    longWork();
+  }, 1000);
+});

packages/node-integration-tests/suites/anr/basic.js

@@ -1,29 +1,32 @@
 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();
-}, 10000);
+}, 5000);
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   release: '1.0',
   debug: true,
   autoSessionTracking: false,
-  integrations: [new Sentry.Integrations.Anr({ captureStackTrace: true, anrThreshold: 200 })],
+  transport,
 });
 
-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);
+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');
+    }
   }
-}
 
-setTimeout(() => {
-  longWork();
-}, 1000);
+  setTimeout(() => {
+    longWork();
+  }, 1000);
+});

packages/node-integration-tests/suites/anr/basic.mjs

@@ -1,26 +1,29 @@
-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();
-}, 10000);
+}, 5000);
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   release: '1.0',
   debug: true,
   autoSessionTracking: false,
-  integrations: [new Sentry.Integrations.Anr({ captureStackTrace: true, anrThreshold: 200 })],
+  transport,
 });
 
+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);
   }
 }
 

packages/node-integration-tests/suites/anr/forked.js

@@ -1,29 +1,32 @@
 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();
-}, 10000);
+}, 5000);
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
   release: '1.0',
   debug: true,
   autoSessionTracking: false,
-  integrations: [new Sentry.Integrations.Anr({ captureStackTrace: true, anrThreshold: 200 })],
+  transport,
 });
 
-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);
+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');
+    }
   }
-}
 
-setTimeout(() => {
-  longWork();
-}, 1000);
+  setTimeout(() => {
+    longWork();
+  }, 1000);
+});

packages/node-integration-tests/suites/anr/test-transport.js

@@ -0,0 +1,17 @@
+const { TextEncoder, TextDecoder } = require('util');
+
+const { createTransport } = require('@sentry/core');
+const { parseEnvelope } = require('@sentry/utils');
+
+const textEncoder = new TextEncoder();
+const textDecoder = new TextDecoder();
+
+// A transport that just logs the envelope payloads to console for checking in tests
+exports.transport = () => {
+  return createTransport({ recordDroppedEvent: () => {}, textEncoder }, async request => {
+    const env = parseEnvelope(request.body, textEncoder, textDecoder);
+    // eslint-disable-next-line no-console
+    console.log(JSON.stringify(env[1][0][1]));
+    return { statusCode: 200 };
+  });
+};