update node integration tests & e2e tests to work

Author: mydea

dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json

@@ -12,7 +12,7 @@
     "test:assert": "pnpm test"
   },
   "dependencies": {
-    "@sentry/node": "latest || *",
+    "@sentry/node-experimental": "latest || *",
     "@sentry/sveltekit": "latest || *",
     "@sentry/remix": "latest || *",
     "@sentry/astro": "latest || *",

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

@@ -1,7 +1,7 @@
 import * as SentryAstro from '@sentry/astro';
 import * as SentryBun from '@sentry/bun';
 import * as SentryNextJs from '@sentry/nextjs';
-import * as SentryNode from '@sentry/node';
+import * as SentryNode from '@sentry/node-experimental';
 import * as SentryRemix from '@sentry/remix';
 import * as SentryServerless from '@sentry/serverless';
 import * as SentrySvelteKit from '@sentry/sveltekit';

dev-packages/e2e-tests/test-applications/node-express-app/src/app.ts

@@ -22,9 +22,6 @@ Sentry.init({
 const app = express();
 const port = 3030;
 
-app.use(Sentry.Handlers.requestHandler());
-app.use(Sentry.Handlers.tracingHandler());
-
 app.get('/test-success', function (req, res) {
   res.send({ version: 'v1' });
 });
@@ -73,7 +70,7 @@ app.get('/test-local-variables-caught', function (req, res) {
   res.send({ exceptionId, randomVariableToRecord });
 });
 
-app.use(Sentry.Handlers.errorHandler());
+Sentry.setupExpressErrorHandler(app);
 
 // @ts-ignore
 app.use(function onError(err, req, res, next) {

dev-packages/e2e-tests/test-applications/node-hapi-app/src/app.js

@@ -10,7 +10,6 @@ Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.E2E_TEST_DSN,
   includeLocalVariables: true,
-  integrations: [Sentry.hapiIntegration({ server })],
   debug: true,
   tunnel: `http://localhost:3031/`, // proxy server
   tracesSampleRate: 1,
@@ -56,6 +55,7 @@ const init = async () => {
 
 (async () => {
   init();
+  await Sentry.setupHapiErrorHandler(server);
   await server.start();
   console.log('Server running on %s', server.info.uri);
 })();

dev-packages/node-integration-tests/package.json

@@ -16,12 +16,9 @@
     "build:types": "tsc -p tsconfig.types.json",
     "clean": "rimraf -g **/node_modules && run-p clean:script",
     "clean:script": "node scripts/clean.js",
-    "prisma:init": "(cd suites/tracing/prisma-orm && ts-node ./setup.ts)",
-    "prisma:init:new": "(cd suites/tracing-new/prisma-orm && ts-node ./setup.ts)",
     "lint": "eslint . --format stylish",
     "fix": "eslint . --format stylish --fix",
     "type-check": "tsc",
-    "pretest": "run-s --silent prisma:init prisma:init:new",
     "test": "ts-node ./utils/run-tests.ts",
     "jest": "jest --config ./jest.config.js",
     "test:watch": "yarn test --watch"

dev-packages/node-integration-tests/suites/express/handle-error/server.ts

@@ -1,5 +1,5 @@
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import express from 'express';
 
 const app = express();

dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/server.ts

@@ -1,5 +1,5 @@
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import cors from 'cors';
 import express from 'express';
 

dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix/server.ts

@@ -1,5 +1,5 @@
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import cors from 'cors';
 import express from 'express';
 

dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/server.ts

@@ -1,5 +1,5 @@
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import cors from 'cors';
 import express from 'express';
 

dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/server.ts

@@ -1,5 +1,5 @@
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import cors from 'cors';
 import express from 'express';
 

dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/server.ts

@@ -1,5 +1,5 @@
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import cors from 'cors';
 import express from 'express';
 

dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/server.ts

@@ -1,5 +1,5 @@
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import cors from 'cors';
 import express from 'express';
 

dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix/server.ts

@@ -1,5 +1,5 @@
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import cors from 'cors';
 import express from 'express';
 

dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/server.ts

@@ -1,5 +1,5 @@
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import express from 'express';
 
 const app = express();

dev-packages/node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/server.ts

@@ -1,5 +1,5 @@
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import express from 'express';
 
 const app = express();

dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts

@@ -1,6 +1,6 @@
 import http from 'http';
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import cors from 'cors';
 import express from 'express';
 

dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts

@@ -1,6 +1,6 @@
 import * as http from 'http';
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import cors from 'cors';
 import express from 'express';
 

dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors/server.ts

@@ -1,6 +1,6 @@
 import http from 'http';
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import cors from 'cors';
 import express from 'express';
 

dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts

@@ -1,7 +1,7 @@
 import http from 'http';
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
 import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import cors from 'cors';
 import express from 'express';
 

dev-packages/node-integration-tests/suites/express/sentry-trace/server.ts

@@ -1,6 +1,6 @@
 import http from 'http';
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import cors from 'cors';
 import express from 'express';
 

dev-packages/node-integration-tests/suites/express/tracing/server.ts

@@ -1,5 +1,5 @@
 import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import cors from 'cors';
 import express from 'express';
 

dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/mimic-native-behaviour-additional-listener-test-script.js

@@ -2,17 +2,11 @@ const Sentry = require('@sentry/node');
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
-  integrations: integrations => {
-    return integrations.map(integration => {
-      if (integration.name === 'OnUncaughtException') {
-        return new Sentry.Integrations.OnUncaughtException({
-          exitEvenIfOtherHandlersAreRegistered: false,
-        });
-      } else {
-        return integration;
-      }
-    });
-  },
+  integrations: [
+    Sentry.onUncaughtExceptionIntegration({
+      exitEvenIfOtherHandlersAreRegistered: false,
+    }),
+  ],
 });
 
 process.on('uncaughtException', () => {

dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/mimic-native-behaviour-no-additional-listener-test-script.js

@@ -2,17 +2,11 @@ const Sentry = require('@sentry/node');
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
-  integrations: integrations => {
-    return integrations.map(integration => {
-      if (integration.name === 'OnUncaughtException') {
-        return new Sentry.Integrations.OnUncaughtException({
-          exitEvenIfOtherHandlersAreRegistered: false,
-        });
-      } else {
-        return integration;
-      }
-    });
-  },
+  integrations: [
+    Sentry.onUncaughtExceptionIntegration({
+      exitEvenIfOtherHandlersAreRegistered: false,
+    }),
+  ],
 });
 
 setTimeout(() => {

dev-packages/node-integration-tests/suites/public-api/startTransaction/basic-usage/scenario.ts renamed to dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage/scenario.ts

@@ -12,7 +12,7 @@ Sentry.startSpan({ name: 'root_span' }, () => {
   Sentry.startSpan(
     {
       name: 'span_1',
-      data: {
+      attributes: {
         foo: 'bar',
         baz: [1, 2, 3],
       },
@@ -25,7 +25,7 @@ Sentry.startSpan({ name: 'root_span' }, () => {
 
   Sentry.startSpan({ name: 'span_3' }, () => {
     // span_4 is the child of span_3 but doesn't finish.
-    Sentry.startInactiveSpan({ name: 'span_4', data: { qux: 'quux' } });
+    Sentry.startInactiveSpan({ name: 'span_4', attributes: { qux: 'quux' } });
 
     // span_5 is another child of span_3 but finishes.
     Sentry.startSpan({ name: 'span_5' }, () => undefined);

dev-packages/node-integration-tests/suites/public-api/startTransaction/basic-usage/test.ts renamed to dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage/test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 import type { SessionFlusher } from '@sentry/core';
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 import express from 'express';
 
 const app = express();