feat(remix): Update remix SDK to be OTEL-powered

Author: mydea

dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/entry.server.tsx

@@ -1,3 +1,5 @@
+import './tracing';
+
 import { PassThrough } from 'node:stream';
 
 import type { AppLoadContext, EntryContext } from '@remix-run/node';
@@ -12,13 +14,6 @@ installGlobals();
 
 const ABORT_DELAY = 5_000;
 
-Sentry.init({
-  environment: 'qa', // dynamic sampling bias to keep transactions
-  dsn: process.env.E2E_TEST_DSN,
-  // Performance Monitoring
-  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
-});
-
 export const handleError = Sentry.wrapRemixHandleError;
 
 export default function handleRequest(

dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/tracing.tsx

@@ -0,0 +1,8 @@
+import * as Sentry from '@sentry/remix';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  // Performance Monitoring
+  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
+});

dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/entry.server.tsx

@@ -1,3 +1,5 @@
+import './tracing';
+
 /**
  * By default, Remix will handle generating the HTTP Response for you.
  * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
@@ -18,13 +20,6 @@ installGlobals();
 
 const ABORT_DELAY = 5_000;
 
-Sentry.init({
-  environment: 'qa', // dynamic sampling bias to keep transactions
-  dsn: process.env.E2E_TEST_DSN,
-  // Performance Monitoring
-  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
-});
-
 export const handleError = Sentry.wrapRemixHandleError;
 
 export default function handleRequest(

dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/tracing.tsx

@@ -0,0 +1,8 @@
+import * as Sentry from '@sentry/remix';
+
+Sentry.init({
+  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  // Performance Monitoring
+});

dev-packages/e2e-tests/test-applications/create-remix-app/app/entry.server.tsx

@@ -1,3 +1,5 @@
+import './tracing';
+
 /**
  * By default, Remix will handle generating the HTTP Response for you.
  * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
@@ -15,13 +17,6 @@ import { renderToPipeableStream } from 'react-dom/server';
 
 const ABORT_DELAY = 5_000;
 
-Sentry.init({
-  environment: 'qa', // dynamic sampling bias to keep transactions
-  dsn: process.env.E2E_TEST_DSN,
-  // Performance Monitoring
-  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
-});
-
 export const handleError = Sentry.wrapRemixHandleError;
 
 export default function handleRequest(

dev-packages/e2e-tests/test-applications/create-remix-app/app/tracing.tsx

@@ -0,0 +1,8 @@
+import * as Sentry from '@sentry/remix';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  // Performance Monitoring
+  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
+});

packages/astro/src/index.types.ts

@@ -24,15 +24,10 @@ export declare function flush(timeout?: number | undefined): PromiseLike<boolean
 
 // eslint-disable-next-line deprecation/deprecation
 export declare const makeMain: typeof clientSdk.makeMain;
-export declare const getActiveSpan: typeof clientSdk.getActiveSpan;
 // eslint-disable-next-line deprecation/deprecation
 export declare const getCurrentHub: typeof clientSdk.getCurrentHub;
 export declare const getClient: typeof clientSdk.getClient;
-export declare const startSpan: typeof clientSdk.startSpan;
-export declare const startInactiveSpan: typeof clientSdk.startInactiveSpan;
-export declare const startSpanManual: typeof clientSdk.startSpanManual;
-export declare const withActiveSpan: typeof clientSdk.withActiveSpan;
-export declare const getRootSpan: typeof clientSdk.getRootSpan;
+
 export declare const Span: clientSdk.Span;
 
 export declare const metrics: typeof clientSdk.metrics & typeof serverSdk.metrics;

packages/remix/package.json

@@ -48,7 +48,7 @@
     "@remix-run/router": "1.x",
     "@sentry/cli": "^2.30.0",
     "@sentry/core": "8.0.0-alpha.2",
-    "@sentry/node-experimental": "8.0.0-alpha.2",
+    "@sentry/node": "8.0.0-alpha.2",
     "@sentry/react": "8.0.0-alpha.2",
     "@sentry/types": "8.0.0-alpha.2",
     "@sentry/utils": "8.0.0-alpha.2",
@@ -82,10 +82,9 @@
     "fix": "eslint . --format stylish --fix",
     "lint": "eslint . --format stylish",
     "test": "yarn test:unit",
-    "test:integration": "run-s test:integration:v1 test:integration:v2 test:integration:tracingIntegration",
+    "test:integration": "run-s test:integration:v1 test:integration:v2",
     "test:integration:v1": "run-s test:integration:clean test:integration:prepare test:integration:client test:integration:server",
     "test:integration:v2": "export REMIX_VERSION=2 && run-s test:integration:v1",
-    "test:integration:tracingIntegration": "export TRACING_INTEGRATION=true && run-s test:integration:v2",
     "test:integration:ci": "run-s test:integration:clean test:integration:prepare test:integration:client:ci test:integration:server",
     "test:integration:prepare": "(cd test/integration && yarn install)",
     "test:integration:clean": "(cd test/integration && rimraf .cache node_modules build)",

packages/remix/src/index.server.ts

@@ -1,6 +1,6 @@
-import { applySdkMetadata } from '@sentry/core';
-import type { NodeOptions } from '@sentry/node-experimental';
-import { getClient, init as nodeInit, setTag } from '@sentry/node-experimental';
+import { applySdkMetadata, isInitialized } from '@sentry/core';
+import type { NodeOptions } from '@sentry/node';
+import { init as nodeInit, setTag } from '@sentry/node';
 import { logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from './utils/debug-build';
@@ -10,8 +10,6 @@ import type { RemixOptions } from './utils/remixOptions';
 // We need to explicitly export @sentry/node as they end up under `default` in ESM builds
 // See: https://github.com/getsentry/sentry-javascript/issues/8474
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  addGlobalEventProcessor,
   addEventProcessor,
   addBreadcrumb,
   addIntegration,
@@ -22,8 +20,6 @@ export {
   captureMessage,
   createTransport,
   // eslint-disable-next-line deprecation/deprecation
-  getActiveTransaction,
-  // eslint-disable-next-line deprecation/deprecation
   getCurrentHub,
   getClient,
   getCurrentScope,
@@ -46,7 +42,6 @@ export {
   setHttpStatus,
   withScope,
   withIsolationScope,
-  autoDiscoverNodePerformanceMonitoringIntegrations,
   makeNodeTransport,
   getDefaultIntegrations,
   defaultStackParser,
@@ -56,7 +51,6 @@ export {
   addRequestDataToEvent,
   DEFAULT_USER_INCLUDES,
   extractRequestData,
-  Integrations,
   consoleIntegration,
   onUncaughtExceptionIntegration,
   onUnhandledRejectionIntegration,
@@ -68,7 +62,6 @@ export {
   functionToStringIntegration,
   inboundFiltersIntegration,
   linkedErrorsIntegration,
-  Handlers,
   setMeasurement,
   getActiveSpan,
   getRootSpan,
@@ -83,15 +76,29 @@ export {
   parameterize,
   metrics,
   createGetModuleFromFilename,
-  hapiErrorPlugin,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
-} from '@sentry/node-experimental';
+  expressIntegration,
+  expressErrorHandler,
+  setupExpressErrorHandler,
+  fastifyIntegration,
+  graphqlIntegration,
+  mongoIntegration,
+  mongooseIntegration,
+  mysqlIntegration,
+  mysql2Integration,
+  nestIntegration,
+  postgresIntegration,
+  prismaIntegration,
+  hapiIntegration,
+  setupHapiErrorHandler,
+  spotlightIntegration,
+} from '@sentry/node';
 
 // Keeping the `*` exports for backwards compatibility and types
-export * from '@sentry/node-experimental';
+export * from '@sentry/node';
 
 export { captureRemixServerException, wrapRemixHandleError } from './utils/instrumentServer';
 export { ErrorBoundary, withErrorBoundary } from '@sentry/react';
@@ -102,15 +109,11 @@ export { wrapExpressCreateRequestHandler } from './utils/serverAdapters/express'
 
 export type { SentryMetaArgs } from './utils/types';
 
-function sdkAlreadyInitialized(): boolean {
-  return !!getClient();
-}
-
 /** Initializes Sentry Remix SDK on Node. */
 export function init(options: RemixOptions): void {
   applySdkMetadata(options, 'remix', ['remix', 'node']);
 
-  if (sdkAlreadyInitialized()) {
+  if (isInitialized()) {
     DEBUG_BUILD && logger.log('SDK already initialized');
 
     return;

packages/remix/src/index.types.ts

@@ -14,7 +14,7 @@ export declare function init(options: RemixOptions): void;
 
 // We export a merged Integrations object so that users can (at least typing-wise) use all integrations everywhere.
 // eslint-disable-next-line deprecation/deprecation
-export declare const Integrations: typeof clientSdk.Integrations & typeof serverSdk.Integrations;
+export declare const Integrations: typeof clientSdk.Integrations;
 
 export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
 export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;
@@ -27,6 +27,12 @@ export declare const defaultStackParser: StackParser;
 // methods from `@sentry/core`.
 declare const runtime: 'client' | 'server';
 
+// eslint-disable-next-line deprecation/deprecation
+export declare const makeMain: typeof clientSdk.makeMain;
+// eslint-disable-next-line deprecation/deprecation
+export declare const getCurrentHub: typeof clientSdk.getCurrentHub;
+export declare const getClient: typeof clientSdk.getClient;
+
 export const close = runtime === 'client' ? clientSdk.close : serverSdk.close;
 export const flush = runtime === 'client' ? clientSdk.flush : serverSdk.flush;
 

packages/remix/src/utils/instrumentServer.ts

@@ -14,7 +14,7 @@ import {
   startSpan,
   withIsolationScope,
 } from '@sentry/core';
-import { captureException, getActiveSpan, getRootSpan } from '@sentry/node-experimental';
+import { captureException, getActiveSpan, getRootSpan } from '@sentry/node';
 import type { Span, TransactionSource, WrappedFunction } from '@sentry/types';
 import {
   addExceptionMechanism,

packages/remix/src/utils/remixOptions.ts

@@ -1,4 +1,4 @@
-import type { NodeOptions } from '@sentry/node-experimental';
+import type { NodeOptions } from '@sentry/node';
 import type { BrowserOptions } from '@sentry/react';
 import type { Options } from '@sentry/types';
 

packages/remix/src/utils/serverAdapters/express.ts

@@ -1,5 +1,5 @@
 import { getClient, getCurrentHub, hasTracingEnabled, setHttpStatus, withIsolationScope } from '@sentry/core';
-import { flush } from '@sentry/node-experimental';
+import { flush } from '@sentry/node';
 import type { Hub, Span } from '@sentry/types';
 import { extractRequestData, fill, isString, logger } from '@sentry/utils';
 

packages/remix/test/index.server.test.ts

@@ -1,6 +1,6 @@
-import * as SentryNode from '@sentry/node-experimental';
+import * as SentryNode from '@sentry/node';
 
-import { Integrations, init } from '../src/index.server';
+import { init } from '../src/index.server';
 
 const nodeInit = jest.spyOn(SentryNode, 'init');
 
@@ -55,9 +55,4 @@ describe('Server init()', () => {
 
     expect(SentryNode.getIsolationScope().getScopeData().tags).toEqual({ runtime: 'node' });
   });
-
-  it('has both node and tracing integrations', () => {
-    expect(Integrations.Apollo).not.toBeUndefined();
-    expect(Integrations.Http).not.toBeUndefined();
-  });
 });

packages/remix/test/integration/app_v1/entry.server.tsx

@@ -1,16 +1,10 @@
+import './tracing.server';
+// it is important this is first!
+
 import type { EntryContext } from '@remix-run/node';
 import { RemixServer } from '@remix-run/react';
-import * as Sentry from '@sentry/remix';
 import { renderToString } from 'react-dom/server';
 
-Sentry.init({
-  dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  tracesSampleRate: 1,
-  tracePropagationTargets: ['example.org'],
-  // Disabling to test series of envelopes deterministically.
-  autoSessionTracking: false,
-});
-
 export default function handleRequest(
   request: Request,
   responseStatusCode: number,

packages/remix/test/integration/app_v1/tracing.server.tsx

@@ -0,0 +1,9 @@
+import * as Sentry from '@sentry/remix';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  tracesSampleRate: 1,
+  tracePropagationTargets: ['example.org'],
+  // Disabling to test series of envelopes deterministically.
+  autoSessionTracking: false,
+});

packages/remix/test/integration/app_v2/entry.server.tsx

@@ -1,16 +1,11 @@
+import './tracing.server';
+// it is important this is first!
+
 import type { EntryContext } from '@remix-run/node';
 import { RemixServer } from '@remix-run/react';
 import * as Sentry from '@sentry/remix';
 import { renderToString } from 'react-dom/server';
 
-Sentry.init({
-  dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  tracesSampleRate: 1,
-  tracePropagationTargets: ['example.org'],
-  // Disabling to test series of envelopes deterministically.
-  autoSessionTracking: false,
-});
-
 export const handleError = Sentry.wrapRemixHandleError;
 
 export default function handleRequest(

packages/remix/test/integration/app_v2/tracing.server.tsx

@@ -0,0 +1,9 @@
+import * as Sentry from '@sentry/remix';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  tracesSampleRate: 1,
+  tracePropagationTargets: ['example.org'],
+  // Disabling to test series of envelopes deterministically.
+  autoSessionTracking: false,
+});