use correct package for e2e & node integration tests

mydea · mydea · commit 469e0c6355c9 · 2024-02-21T11:09:56.000+01:00
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/package.json b/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/package.json
@@ -10,13 +10,11 @@
     "test:assert": "pnpm test"
   },
   "dependencies": {
-    "@sentry/node-experimental": "latest || *",
+    "@sentry/node": "latest || *",
     "@sentry/types": "latest || *",
     "@sentry/core": "latest || *",
     "@sentry/utils": "latest || *",
-    "@sentry/node": "latest || *",
-    "@sentry/opentelemetry-node": "latest || *",
-    "@sentry-internal/tracing": "latest || *",
+    "@sentry/opentelemetry": "latest || *",
     "@types/node": "18.15.1",
     "fastify": "4.23.2",
     "fastify-plugin": "4.5.1",
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/src/app.js b/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/src/app.js
@@ -1,6 +1,6 @@
 require('./tracing');
 
-const Sentry = require('@sentry/node-experimental');
+const Sentry = require('@sentry/node');
 const { fastify } = require('fastify');
 const fastifyPlugin = require('fastify-plugin');
 const http = require('http');
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/src/tracing.js b/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/src/tracing.js
@@ -1,10 +1,9 @@
-const Sentry = require('@sentry/node-experimental');
+const Sentry = require('@sentry/node');
 
 Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.E2E_TEST_DSN,
   integrations: [],
-  debug: true,
   tracesSampleRate: 1,
   tunnel: 'http://localhost:3031/', // proxy server
 });
diff --git a/dev-packages/node-integration-tests/suites/express/tracing-experimental/server.js b/dev-packages/node-integration-tests/suites/express/tracing-experimental/server.js
@@ -1,5 +1,5 @@
 const { loggingTransport, startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');
-const Sentry = require('@sentry/node-experimental');
+const Sentry = require('@sentry/node');
 const cors = require('cors');
 
 Sentry.init({
diff --git a/dev-packages/node-integration-tests/suites/tracing-experimental/apollo-graphql/scenario-mutation.js b/dev-packages/node-integration-tests/suites/tracing-experimental/apollo-graphql/scenario-mutation.js
@@ -1,4 +1,4 @@
-const Sentry = require('@sentry/node-experimental');
+const Sentry = require('@sentry/node');
 const { loggingTransport } = require('@sentry-internal/node-integration-tests');
 
 Sentry.init({
diff --git a/dev-packages/node-integration-tests/suites/tracing-experimental/apollo-graphql/scenario-query.js b/dev-packages/node-integration-tests/suites/tracing-experimental/apollo-graphql/scenario-query.js
@@ -1,4 +1,4 @@
-const Sentry = require('@sentry/node-experimental');
+const Sentry = require('@sentry/node');
 const { loggingTransport } = require('@sentry-internal/node-integration-tests');
 
 Sentry.init({
diff --git a/dev-packages/node-integration-tests/suites/tracing-experimental/hapi/scenario.js b/dev-packages/node-integration-tests/suites/tracing-experimental/hapi/scenario.js
@@ -1,5 +1,5 @@
 const { loggingTransport, sendPortToRunner } = require('@sentry-internal/node-integration-tests');
-const Sentry = require('@sentry/node-experimental');
+const Sentry = require('@sentry/node');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing-experimental/mongodb/scenario.js b/dev-packages/node-integration-tests/suites/tracing-experimental/mongodb/scenario.js
@@ -1,5 +1,5 @@
 const { loggingTransport } = require('@sentry-internal/node-integration-tests');
-const Sentry = require('@sentry/node-experimental');
+const Sentry = require('@sentry/node');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing-experimental/mongoose/scenario.js b/dev-packages/node-integration-tests/suites/tracing-experimental/mongoose/scenario.js
@@ -1,5 +1,5 @@
 const { loggingTransport } = require('@sentry-internal/node-integration-tests');
-const Sentry = require('@sentry/node-experimental');
+const Sentry = require('@sentry/node');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing-experimental/mysql/scenario-withConnect.js b/dev-packages/node-integration-tests/suites/tracing-experimental/mysql/scenario-withConnect.js
@@ -1,5 +1,5 @@
 const { loggingTransport } = require('@sentry-internal/node-integration-tests');
-const Sentry = require('@sentry/node-experimental');
+const Sentry = require('@sentry/node');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing-experimental/mysql/scenario-withoutCallback.js b/dev-packages/node-integration-tests/suites/tracing-experimental/mysql/scenario-withoutCallback.js
@@ -1,5 +1,5 @@
 const { loggingTransport } = require('@sentry-internal/node-integration-tests');
-const Sentry = require('@sentry/node-experimental');
+const Sentry = require('@sentry/node');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing-experimental/mysql/scenario-withoutConnect.js b/dev-packages/node-integration-tests/suites/tracing-experimental/mysql/scenario-withoutConnect.js
@@ -1,5 +1,5 @@
 const { loggingTransport } = require('@sentry-internal/node-integration-tests');
-const Sentry = require('@sentry/node-experimental');
+const Sentry = require('@sentry/node');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing-experimental/mysql2/scenario.js b/dev-packages/node-integration-tests/suites/tracing-experimental/mysql2/scenario.js
@@ -1,5 +1,5 @@
 const { loggingTransport } = require('@sentry-internal/node-integration-tests');
-const Sentry = require('@sentry/node-experimental');
+const Sentry = require('@sentry/node');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing-experimental/nestjs/scenario.ts b/dev-packages/node-integration-tests/suites/tracing-experimental/nestjs/scenario.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 /* eslint-disable @typescript-eslint/explicit-member-accessibility */
 import { loggingTransport, sendPortToRunner } from '@sentry-internal/node-integration-tests';
-import * as Sentry from '@sentry/node-experimental';
+import * as Sentry from '@sentry/node';
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing-experimental/postgres/scenario.js b/dev-packages/node-integration-tests/suites/tracing-experimental/postgres/scenario.js
@@ -1,5 +1,5 @@
 const { loggingTransport } = require('@sentry-internal/node-integration-tests');
-const Sentry = require('@sentry/node-experimental');
+const Sentry = require('@sentry/node');
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/packages/astro/src/integration/index.ts b/packages/astro/src/integration/index.ts
@@ -91,7 +91,7 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
                   // @sentry/node is required in case we have 2 different @sentry/node
                   // packages installed in the same project.
                   // Ref: https://github.com/getsentry/sentry-javascript/issues/10121
-                  noExternal: ['@sentry/astro', '@sentry/node-experimental'],
+                  noExternal: ['@sentry/astro', '@sentry/node-experimental', '@sentry/node'],
                 },
               },
             });

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const Sentry = require('@sentry/node-experimental');`
	`1`	`+const Sentry = require('@sentry/node');`
`2`	`2`	`const { loggingTransport } = require('@sentry-internal/node-integration-tests');`
`3`	`3`
`4`	`4`	`Sentry.init({`