cleanup

Author: mydea

packages/remix/src/server/index.ts

@@ -145,4 +145,4 @@ export { init, getRemixDefaultIntegrations } from './sdk';
 export { captureRemixServerException } from './errors';
 export { sentryHandleError, wrapHandleErrorWithSentry, instrumentBuild } from './instrumentServer';
 export { generateSentryServerTimingHeader } from './serverTimingTracePropagation';
-export { remixIntegration } from './integrations';
+export { remixIntegration } from './integrations/RemixIntegration';

…s/remix/src/server/integrations/index.ts …/server/integrations/RemixIntegration.tspackages/remix/src/server/integrations/index.ts renamed to packages/remix/src/server/integrations/RemixIntegration.ts packages/remix/src/server/integrations/index.ts renamed to packages/remix/src/server/integrations/RemixIntegration.ts

@@ -20,9 +20,6 @@ const _remixIntegration = (() => {
       if (isOrchestrionInjected()) {
         instrumentRemix(actionFormDataAttributes);
       } else {
-        // `RemixInstrumentation` takes an options object; passing the bare map would leave its
-        // default `{ _action: 'actionType' }` mapping in place (applying even when capture wasn't
-        // configured, and ignoring the opted-in keys).
         instrumentRemixWithOpenTelemetry({ actionFormDataAttributes });
       }
     },

packages/remix/src/server/sdk.ts

@@ -6,7 +6,7 @@ import { DEBUG_BUILD } from '../utils/debug-build';
 import type { RemixOptions } from '../utils/remixOptions';
 import { instrumentServer } from './instrumentServer';
 import { httpIntegration } from './integrations/http';
-import { remixIntegration } from './integrations';
+import { remixIntegration } from './integrations/RemixIntegration';
 
 /**
  * Returns the default Remix integrations.

packages/remix/test/server/remix-integration-otel.test.ts

@@ -17,7 +17,7 @@ vi.mock('../../src/server/integrations/tracing-channel', () => ({
   instrumentRemix: vi.fn(),
 }));
 
-import { remixIntegration } from '../../src/server/integrations';
+import { remixIntegration } from '../../src/server/integrations/RemixIntegration';
 import { instrumentRemixWithOpenTelemetry } from '../../src/server/integrations/opentelemetry';
 import { instrumentRemix } from '../../src/server/integrations/tracing-channel';
 
@@ -31,7 +31,7 @@ function mockClient(
   } as unknown as NodeClient);
 }
 
-describe('remixIntegration (OpenTelemetry path)', () => {
+describe('remixIntegration (OpenTelemetry-based)', () => {
   afterEach(() => {
     vi.clearAllMocks();
     vi.restoreAllMocks();

packages/remix/test/server/tracing-channel-no-form-data.test.ts

@@ -3,12 +3,12 @@ import type { Span } from '@sentry/core';
 import * as SentryCore from '@sentry/core';
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, type MockInstance, vi } from 'vitest';
 import {
-  CHANNELS,
   makeRequest,
   makeSpan,
-  setupRemixChannelIntegration,
+  setupRemixInstrumentation,
   teardownTestAsyncContextStrategy,
 } from './tracing-channel-test-utils';
+import { remixChannels } from '@sentry/server-utils/orchestrion';
 
 // Runs in its own file so the channel subscriptions register with NO form-data capture configured -
 // the default for most apps. `captureActionFormDataKeys` gates only the optional attribute
@@ -19,7 +19,7 @@ describe('remixIntegration with orchestrion (no form-data capture configured)',
   let span: Span;
 
   beforeAll(() => {
-    setupRemixChannelIntegration(undefined);
+    setupRemixInstrumentation(undefined);
   });
 
   afterAll(() => {
@@ -48,7 +48,7 @@ describe('remixIntegration with orchestrion (no form-data capture configured)',
       ],
     };
 
-    await tracingChannel(CHANNELS.CALL_ROUTE_ACTION).tracePromise(async () => ({ status: 201 }), ctx);
+    await tracingChannel(remixChannels.REMIX_CALL_ROUTE_ACTION).tracePromise(async () => ({ status: 201 }), ctx);
 
     expect(startInactiveSpanSpy).toHaveBeenCalledWith(
       expect.objectContaining({

packages/remix/test/server/tracing-channel-test-utils.ts

@@ -11,13 +11,6 @@ import type { NodeClient } from '@sentry/node';
 import { vi } from 'vitest';
 import { instrumentRemix } from '../../src/server/integrations/tracing-channel';
 
-export const CHANNELS = {
-  REQUEST_HANDLER: 'orchestrion:@remix-run/server-runtime:requestHandler',
-  MATCH_SERVER_ROUTES: 'orchestrion:@remix-run/server-runtime:matchServerRoutes',
-  CALL_ROUTE_LOADER: 'orchestrion:@remix-run/server-runtime:callRouteLoader',
-  CALL_ROUTE_ACTION: 'orchestrion:@remix-run/server-runtime:callRouteAction',
-} as const;
-
 interface TestStore {
   scope: Scope;
   isolationScope: Scope;
@@ -102,11 +95,11 @@ export function makeRequest(
 }
 
 /**
- * Install the async-context strategy, mock the client with the given form-data config, and run the
- * integration's `setupOnce` so the channel subscriptions register. `captureActionFormDataKeys`
- * left undefined mimics an app that hasn't opted into form-data capture.
+ * Install the async-context strategy, mock the client with the given form-data config, and orchestrion-based remix instrumentation
+ * so the channel subscriptions register.
+ * `captureActionFormDataKeys` left undefined mimics an app that hasn't opted into form-data capture.
  */
-export function setupRemixChannelIntegration(captureActionFormDataKeys?: Record<string, string | boolean>): void {
+export function setupRemixInstrumentation(captureActionFormDataKeys?: Record<string, string | boolean>): void {
   installTestAsyncContextStrategy();
   vi.spyOn(SentryNode, 'getClient').mockReturnValue({
     getOptions: () => ({ captureActionFormDataKeys }),

packages/remix/test/server/tracing-channel.test.ts

@@ -3,21 +3,21 @@ import type { Span } from '@sentry/core';
 import * as SentryCore from '@sentry/core';
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, type MockInstance, vi } from 'vitest';
 import {
-  CHANNELS,
   makeRequest,
   makeSpan,
-  setupRemixChannelIntegration,
+  setupRemixInstrumentation,
   teardownTestAsyncContextStrategy,
 } from './tracing-channel-test-utils';
+import { remixChannels } from '@sentry/server-utils/orchestrion';
 
-describe('remixChannelIntegration', () => {
+describe('remixIntegration (Orchestrion-based)', () => {
   let startInactiveSpanSpy: MockInstance;
   let getActiveSpanSpy: MockInstance;
   let span: Span;
 
   beforeAll(() => {
     // Configure form-data capture so the ACTION span also extracts the mapped keys.
-    setupRemixChannelIntegration({ _action: 'actionType' });
+    setupRemixInstrumentation({ _action: 'actionType' });
   });
 
   afterAll(() => {
@@ -39,7 +39,7 @@ describe('remixChannelIntegration', () => {
   it('requestHandler: builds the http.server span and sets the response status', async () => {
     const ctx = { arguments: [makeRequest({ method: 'GET', url: 'http://localhost/users' })] };
 
-    await tracingChannel(CHANNELS.REQUEST_HANDLER).tracePromise(async () => ({ status: 200 }), ctx);
+    await tracingChannel(remixChannels.REMIX_REQUEST_HANDLER).tracePromise(async () => ({ status: 200 }), ctx);
 
     expect(startInactiveSpanSpy).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -65,7 +65,7 @@ describe('remixChannelIntegration', () => {
       result: [{ route: { path: 'users/:userId', id: 'routes/users.$userId' } }],
     };
 
-    tracingChannel(CHANNELS.MATCH_SERVER_ROUTES).traceSync(() => ctx.result, ctx);
+    tracingChannel(remixChannels.REMIX_MATCH_SERVER_ROUTES).traceSync(() => ctx.result, ctx);
 
     expect(span.setAttribute).toHaveBeenCalledWith('http.route', 'users/:userId');
     expect(span.setAttribute).toHaveBeenCalledWith('match.route.id', 'routes/users.$userId');
@@ -76,7 +76,7 @@ describe('remixChannelIntegration', () => {
     getActiveSpanSpy.mockReturnValue(undefined);
     const ctx = { arguments: [], result: [{ route: { path: 'users/:userId', id: 'x' } }] };
 
-    tracingChannel(CHANNELS.MATCH_SERVER_ROUTES).traceSync(() => ctx.result, ctx);
+    tracingChannel(remixChannels.REMIX_MATCH_SERVER_ROUTES).traceSync(() => ctx.result, ctx);
 
     expect(span.setAttribute).not.toHaveBeenCalled();
   });
@@ -92,7 +92,7 @@ describe('remixChannelIntegration', () => {
       ],
     };
 
-    await tracingChannel(CHANNELS.CALL_ROUTE_LOADER).tracePromise(async () => ({ status: 200 }), ctx);
+    await tracingChannel(remixChannels.REMIX_CALL_ROUTE_LOADER).tracePromise(async () => ({ status: 200 }), ctx);
 
     expect(startInactiveSpanSpy).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -116,7 +116,7 @@ describe('remixChannelIntegration', () => {
     getActiveSpanSpy.mockReturnValue(undefined);
     const ctx = { arguments: [{ routeId: 'x', request: makeRequest(), params: {} }] };
 
-    await tracingChannel(CHANNELS.CALL_ROUTE_LOADER).tracePromise(async () => ({ status: 200 }), ctx);
+    await tracingChannel(remixChannels.REMIX_CALL_ROUTE_LOADER).tracePromise(async () => ({ status: 200 }), ctx);
 
     expect(startInactiveSpanSpy).not.toHaveBeenCalled();
   });
@@ -132,7 +132,7 @@ describe('remixChannelIntegration', () => {
       ],
     };
 
-    await tracingChannel(CHANNELS.CALL_ROUTE_ACTION).tracePromise(async () => ({ status: 201 }), ctx);
+    await tracingChannel(remixChannels.REMIX_CALL_ROUTE_ACTION).tracePromise(async () => ({ status: 201 }), ctx);
 
     expect(startInactiveSpanSpy).toHaveBeenCalledWith(
       expect.objectContaining({

packages/server-utils/src/orchestrion/config/remix.ts

@@ -1,15 +1,10 @@
 import type { InstrumentationConfig } from '..';
 
-// Ports the vendored `RemixInstrumentation` (an OTel `InstrumentationBase` that patched
-// `@remix-run/server-runtime`) to orchestrion channel injection. The subscriber lives in
-// `@sentry/remix` (`instrumentRemix`), because it needs remix-specific SDK options.
-//
-// Four concepts, one channel each. Where a function was renamed across the supported range, both
-// names publish to the same channel so the subscriber only ever knows one name per concept:
+// Four concepts, one channel each:
 //   - `requestHandler`    → the async handler returned by `createRequestHandler` (the server span)
 //   - `matchServerRoutes` → sync route match; enriches the active span (creates no span of its own)
-//   - `callRouteLoader`   → LOADER span. Remix 2.0–2.8 named it `callRouteLoaderRR`.
-//   - `callRouteAction`   → ACTION span. Remix 2.0–2.8 named it `callRouteActionRR`.
+//   - `callRouteLoader`   → LOADER span. Remix 2.0–2.8 named it `callRouteLoaderRR`
+//   - `callRouteAction`   → ACTION span. Remix 2.0–2.8 named it `callRouteActionRR`
 //
 // Emitted for both the CJS (`dist/*`) and ESM (`dist/esm/*`) builds, which share function shapes.
 const remixInstrumentationConfig = (dir: string): InstrumentationConfig[] => [