Skip to content

feat(remix)!: Remove import-in-the-middle instrumentation #22815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreiborza merged 2 commits into from
Jul 29, 2026
Merged

feat(remix)!: Remove import-in-the-middle instrumentation #22815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
368b96e
feat(remix)!: Remove import-in-the-middle instrumentation
andreiborza Jul 29, 2026
d685c8a
Drop OTel-parity comments in remix tracing-channel
andreiborza Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions packages/remix/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@
"access": "public"
},
"dependencies": {
"@opentelemetry/api": "^1.9.1",
"@opentelemetry/instrumentation": "^0.220.0",
"@remix-run/router": "^1.23.3",
"@sentry/cli": "^2.58.6",
"@sentry/conventions": "^0.16.0",
Expand Down
15 changes: 1 addition & 14 deletions packages/remix/src/server/integrations/RemixIntegration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration, getClient } from '@sentry/core';
import { isOrchestrionInjected } from '@sentry/server-utils/orchestrion';
import { instrumentRemix } from './tracing-channel';
import { addRemixSpanAttributes, instrumentRemixWithOpenTelemetry } from './opentelemetry';
import type { RemixOptions } from '../../utils/remixOptions';

const INTEGRATION_NAME = 'Remix' as const;
Expand All @@ -17,18 +15,7 @@ const _remixIntegration = (() => {
? options?.captureActionFormDataKeys
: undefined;

if (isOrchestrionInjected()) {
instrumentRemix(actionFormDataAttributes);
} else {
instrumentRemixWithOpenTelemetry({ actionFormDataAttributes });
}
},
setup(client) {
if (!isOrchestrionInjected()) {
client.on('spanStart', span => {
addRemixSpanAttributes(span);
});
}
instrumentRemix(actionFormDataAttributes);
},
};
}) satisfies IntegrationFn;
Expand Down
40 changes: 0 additions & 40 deletions packages/remix/src/server/integrations/opentelemetry.ts
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions packages/remix/src/server/integrations/tracing-channel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ const ORIGIN = 'auto.http.orchestrion.remix';

const NOOP = (): void => {};

// `match.route.id` / `match.params.*` mirror `RemixSemanticAttributes` from the vendored
// `RemixInstrumentation` this integration replaces.
const MATCH_ROUTE_ID = 'match.route.id';
const MATCH_PARAMS = 'match.params';

Expand Down Expand Up @@ -103,8 +101,7 @@ function setResponseStatus(span: Span, result: unknown): void {

/**
* `matchServerRoutes` opens no span of its own; it enriches the enclosing request span with the
* matched route (used to derive the `http.server` transaction name), mirroring the vendored
* instrumentation's patch.
* matched route (used to derive the `http.server` transaction name).
*/
function enrichActiveSpanWithRoute(result: unknown): void {
const span = getActiveSpan();
Expand Down
Loading
Loading