Skip to content

Commit 553d256

Browse files
committed
WIP FIX IT??
1 parent 5a5d7cf commit 553d256

File tree

7 files changed

+26
-23
lines changed

7 files changed

+26
-23
lines changed

packages/node-experimental/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ export {
4747
extractRequestData,
4848
} from '@sentry/utils';
4949

50+
export { getDynamicSamplingContextFromSpan } from '@sentry/opentelemetry';
51+
5052
export {
5153
addBreadcrumb,
5254
isInitialized,

packages/opentelemetry/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ export {
1818
spanHasStatus,
1919
} from './utils/spanTypes';
2020

21+
export { getDynamicSamplingContextFromSpan } from './utils/dynamicSamplingContext';
22+
2123
export { isSentryRequestSpan } from './utils/isSentryRequest';
2224

2325
export { getActiveSpan } from './utils/getActiveSpan';

packages/remix/src/utils/instrumentServer.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ import {
33
SEMANTIC_ATTRIBUTE_SENTRY_OP,
44
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
55
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
6+
captureException,
67
continueTrace,
8+
getActiveSpan,
79
getClient,
8-
getDynamicSamplingContextFromSpan,
10+
getRootSpan,
911
handleCallbackErrors,
1012
hasTracingEnabled,
1113
setHttpStatus,
@@ -14,7 +16,7 @@ import {
1416
startSpan,
1517
withIsolationScope,
1618
} from '@sentry/core';
17-
import { captureException, getActiveSpan, getRootSpan } from '@sentry/node';
19+
import { getDynamicSamplingContextFromSpan } from '@sentry/node';
1820
import type { Span, TransactionSource, WrappedFunction } from '@sentry/types';
1921
import {
2022
addExceptionMechanism,

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1-
import './tracing.server';
21
// it is important this is first!
2+
import * as Sentry from '@sentry/remix';
3+
4+
Sentry.init({
5+
dsn: 'https://public@dsn.ingest.sentry.io/1337',
6+
tracesSampleRate: 1,
7+
tracePropagationTargets: ['example.org'],
8+
// Disabling to test series of envelopes deterministically.
9+
autoSessionTracking: false,
10+
});
311

412
import type { EntryContext } from '@remix-run/node';
513
import { RemixServer } from '@remix-run/react';

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
1-
import './tracing.server';
21
// it is important this is first!
2+
import * as Sentry from '@sentry/remix';
3+
4+
Sentry.init({
5+
dsn: 'https://public@dsn.ingest.sentry.io/1337',
6+
tracesSampleRate: 1,
7+
tracePropagationTargets: ['example.org'],
8+
// Disabling to test series of envelopes deterministically.
9+
autoSessionTracking: false,
10+
});
311

412
import type { EntryContext } from '@remix-run/node';
513
import { RemixServer } from '@remix-run/react';
6-
import * as Sentry from '@sentry/remix';
714
import { renderToString } from 'react-dom/server';
815

916
export const handleError = Sentry.wrapRemixHandleError;

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)