Skip to content

Commit c84c6e5

Browse files
committed
fix stuff & exports
1 parent 01e552c commit c84c6e5

File tree

10 files changed

+83
-19
lines changed

10 files changed

+83
-19
lines changed

packages/astro/src/index.server.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,17 @@ export {
7070
// eslint-disable-next-line deprecation/deprecation
7171
deepReadDirSync,
7272
Integrations,
73+
consoleIntegration,
74+
onUncaughtExceptionIntegration,
75+
onUnhandledRejectionIntegration,
76+
modulesIntegration,
77+
contextLinesIntegration,
78+
nodeContextIntegration,
79+
localVariablesIntegration,
80+
requestDataIntegration,
81+
functionToStringIntegration,
82+
inboundFiltersIntegration,
83+
linkedErrorsIntegration,
7384
Handlers,
7485
setMeasurement,
7586
getActiveSpan,

packages/bun/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ import * as BunIntegrations from './integrations';
122122
const INTEGRATIONS = {
123123
// eslint-disable-next-line deprecation/deprecation
124124
...CoreIntegrations,
125+
// eslint-disable-next-line deprecation/deprecation
125126
...NodeIntegrations,
126127
...BunIntegrations,
127128
};

packages/bun/src/sdk.ts

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
/* eslint-disable max-lines */
2-
import { FunctionToString, InboundFilters, LinkedErrors } from '@sentry/core';
3-
import { Integrations as NodeIntegrations, init as initNode } from '@sentry/node';
2+
import {
3+
functionToStringIntegration,
4+
inboundFiltersIntegration,
5+
linkedErrorsIntegration,
6+
requestDataIntegration,
7+
} from '@sentry/core';
8+
import {
9+
consoleIntegration,
10+
contextLinesIntegration,
11+
httpIntegration,
12+
init as initNode,
13+
modulesIntegration,
14+
nodeContextIntegration,
15+
undiciIntegration,
16+
} from '@sentry/node';
417
import type { Integration, Options } from '@sentry/types';
518

619
import { BunClient } from './client';
@@ -10,25 +23,23 @@ import type { BunOptions } from './types';
1023

1124
/** @deprecated Use `getDefaultIntegrations(options)` instead. */
1225
export const defaultIntegrations = [
13-
/* eslint-disable deprecation/deprecation */
1426
// Common
15-
new InboundFilters(),
16-
new FunctionToString(),
17-
new LinkedErrors(),
18-
/* eslint-enable deprecation/deprecation */
27+
inboundFiltersIntegration(),
28+
functionToStringIntegration(),
29+
linkedErrorsIntegration(),
30+
requestDataIntegration(),
1931
// Native Wrappers
20-
new NodeIntegrations.Console(),
21-
new NodeIntegrations.Http(),
22-
new NodeIntegrations.Undici(),
32+
consoleIntegration(),
33+
httpIntegration(),
34+
undiciIntegration(),
2335
// Global Handlers # TODO (waiting for https://github.com/oven-sh/bun/issues/5091)
2436
// new NodeIntegrations.OnUncaughtException(),
2537
// new NodeIntegrations.OnUnhandledRejection(),
2638
// Event Info
27-
new NodeIntegrations.ContextLines(),
39+
contextLinesIntegration(),
2840
// new NodeIntegrations.LocalVariables(), # does't work with Bun
29-
new NodeIntegrations.Context(),
30-
new NodeIntegrations.Modules(),
31-
new NodeIntegrations.RequestData(),
41+
nodeContextIntegration(),
42+
modulesIntegration(),
3243
// Bun Specific
3344
new BunServer(),
3445
];

packages/node-experimental/src/index.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ import { Integrations as CoreIntegrations } from '@sentry/core';
22

33
import * as NodeExperimentalIntegrations from './integrations';
44

5-
const INTEGRATIONS = {
5+
export const Integrations = {
66
// eslint-disable-next-line deprecation/deprecation
77
...CoreIntegrations,
88
...NodeExperimentalIntegrations,
99
};
1010

1111
export { init } from './sdk/init';
12-
export { INTEGRATIONS as Integrations };
1312
export { getAutoPerformanceIntegrations } from './integrations/getAutoPerformanceIntegrations';
1413
export * as Handlers from './sdk/handlers';
1514
export type { Span } from './types';
@@ -74,6 +73,17 @@ export {
7473
captureCheckIn,
7574
withMonitor,
7675
hapiErrorPlugin,
76+
consoleIntegration,
77+
onUncaughtExceptionIntegration,
78+
onUnhandledRejectionIntegration,
79+
modulesIntegration,
80+
contextLinesIntegration,
81+
nodeContextIntegration,
82+
localVariablesIntegration,
83+
requestDataIntegration,
84+
functionToStringIntegration,
85+
inboundFiltersIntegration,
86+
linkedErrorsIntegration,
7787
} from '@sentry/node';
7888

7989
export type {

packages/node-experimental/src/integrations/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const {
99
Context,
1010
RequestData,
1111
LocalVariables,
12+
// eslint-disable-next-line deprecation/deprecation
1213
} = NodeIntegrations;
1314

1415
export {

packages/node-experimental/src/sdk/init.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { endSession, getIntegrationsToSetup, hasTracingEnabled, startSession } from '@sentry/core';
22
import {
3-
Integrations,
43
defaultIntegrations as defaultNodeIntegrations,
54
defaultStackParser,
65
getDefaultIntegrations as getDefaultNodeIntegrations,
76
getSentryRelease,
87
makeNodeTransport,
8+
spotlightIntegration,
99
} from '@sentry/node';
1010
import type { Client, Integration, Options } from '@sentry/types';
1111
import {
@@ -94,7 +94,7 @@ export function init(options: NodeExperimentalOptions | undefined = {}): void {
9494
client.addIntegration(integration);
9595
}
9696
client.addIntegration(
97-
new Integrations.Spotlight({
97+
spotlightIntegration({
9898
sidecarUrl: typeof options.spotlight === 'string' ? options.spotlight : undefined,
9999
}),
100100
);

packages/node/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ import * as Handlers from './handlers';
122122
import * as NodeIntegrations from './integrations';
123123
import * as TracingIntegrations from './tracing/integrations';
124124

125-
/** @deprecated Import the integration function directly, e.g. `inboundFiltersIntegration()` instead of `new Integrations.InboundFilter(). */
125+
// TODO: Deprecate this once we migrated tracing integrations
126126
export const Integrations = {
127127
// eslint-disable-next-line deprecation/deprecation
128128
...CoreIntegrations,

packages/remix/src/index.server.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,17 @@ export {
7474
// eslint-disable-next-line deprecation/deprecation
7575
deepReadDirSync,
7676
Integrations,
77+
consoleIntegration,
78+
onUncaughtExceptionIntegration,
79+
onUnhandledRejectionIntegration,
80+
modulesIntegration,
81+
contextLinesIntegration,
82+
nodeContextIntegration,
83+
localVariablesIntegration,
84+
requestDataIntegration,
85+
functionToStringIntegration,
86+
inboundFiltersIntegration,
87+
linkedErrorsIntegration,
7788
Handlers,
7889
setMeasurement,
7990
getActiveSpan,

packages/serverless/src/index.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export {
7272
// eslint-disable-next-line deprecation/deprecation
7373
deepReadDirSync,
7474
Handlers,
75+
// eslint-disable-next-line deprecation/deprecation
7576
Integrations,
7677
setMeasurement,
7778
getActiveSpan,
@@ -93,4 +94,11 @@ export {
9394
// eslint-disable-next-line deprecation/deprecation
9495
extractTraceparentData,
9596
runWithAsyncContext,
97+
consoleIntegration,
98+
onUncaughtExceptionIntegration,
99+
onUnhandledRejectionIntegration,
100+
modulesIntegration,
101+
contextLinesIntegration,
102+
nodeContextIntegration,
103+
localVariablesIntegration,
96104
} from '@sentry/node';

packages/sveltekit/src/server/index.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,17 @@ export {
6868
// eslint-disable-next-line deprecation/deprecation
6969
deepReadDirSync,
7070
Integrations,
71+
consoleIntegration,
72+
onUncaughtExceptionIntegration,
73+
onUnhandledRejectionIntegration,
74+
modulesIntegration,
75+
contextLinesIntegration,
76+
nodeContextIntegration,
77+
localVariablesIntegration,
78+
requestDataIntegration,
79+
functionToStringIntegration,
80+
inboundFiltersIntegration,
81+
linkedErrorsIntegration,
7182
Handlers,
7283
setMeasurement,
7384
getActiveSpan,

0 commit comments

Comments
 (0)