From f93ba37269dc47b3deec8b8ca97e7f7bfcca6aa8 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Mon, 29 Jan 2024 12:59:35 +0100 Subject: [PATCH 1/5] feat(serverless): Add missing `@sentry/node` re-exports --- .../node-exports-test-app/scripts/consistentExports.ts | 2 -- packages/serverless/src/index.ts | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts index f77b14445d57..9ce9a21564a6 100644 --- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts +++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts @@ -70,8 +70,6 @@ const DEPENDENTS: Dependent[] = [ 'runWithAsyncContext', 'hapiErrorPlugin', ], - // TODO: Fix exports in serverless - skip: true, }, { package: '@sentry/sveltekit', diff --git a/packages/serverless/src/index.ts b/packages/serverless/src/index.ts index 8db1e4ba5be0..74cfde9bc0d8 100644 --- a/packages/serverless/src/index.ts +++ b/packages/serverless/src/index.ts @@ -79,4 +79,10 @@ export { startSpanManual, continueTrace, parameterize, + requestDataIntegration, + linkedErrorsIntegration, + inboundFiltersIntegration, + functionToStringIntegration, + createGetModuleFromFilename, + metrics, } from '@sentry/node'; From 2d29cac38b6f564b86f22863b7aa4f67a50c3918 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Mon, 29 Jan 2024 14:04:01 +0100 Subject: [PATCH 2/5] add missing export --- packages/serverless/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/serverless/src/index.ts b/packages/serverless/src/index.ts index 74cfde9bc0d8..ce6a3a6c4a6c 100644 --- a/packages/serverless/src/index.ts +++ b/packages/serverless/src/index.ts @@ -38,6 +38,7 @@ export { getGlobalScope, getIsolationScope, getHubFromCarrier, + getSpanStatusFromHttpCode, // eslint-disable-next-line deprecation/deprecation makeMain, setCurrentClient, From 512d340bb7b9b5c2a9109233b1082ccaf9fd758f Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Mon, 29 Jan 2024 16:55:30 +0100 Subject: [PATCH 3/5] also export deprecated APIs --- .../node-exports-test-app/scripts/consistentExports.ts | 6 +----- packages/serverless/src/index.ts | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts index 9ce9a21564a6..37aa4a4b1c8c 100644 --- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts +++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts @@ -11,7 +11,7 @@ const NODE_EXPORTS_IGNORE = [ 'default', // Probably generated by transpilation, no need to require it '__esModule', - // this function was deprecates almost immediately after it was introduced + // this function was deprecated almost immediately after it was introduced // due to a name change (startSpan). No need to re-export it IMHO. 'startActiveSpan', // this was never meant for external use (and documented as such) @@ -61,10 +61,6 @@ const DEPENDENTS: Dependent[] = [ package: '@sentry/serverless', exports: Object.keys(SentryServerless), ignoreExports: [ - // Deprecated, no need to add this now to serverless - 'extractTraceparentData', - 'getModuleFromFilename', - 'enableAnrDetection', // TODO: Should these be exported from serverless? 'cron', 'runWithAsyncContext', diff --git a/packages/serverless/src/index.ts b/packages/serverless/src/index.ts index ce6a3a6c4a6c..b755bd55b981 100644 --- a/packages/serverless/src/index.ts +++ b/packages/serverless/src/index.ts @@ -38,6 +38,8 @@ export { getGlobalScope, getIsolationScope, getHubFromCarrier, + // eslint-disable-next-line deprecation/deprecation + spanStatusfromHttpCode, getSpanStatusFromHttpCode, // eslint-disable-next-line deprecation/deprecation makeMain, @@ -84,6 +86,10 @@ export { linkedErrorsIntegration, inboundFiltersIntegration, functionToStringIntegration, + // eslint-disable-next-line deprecation/deprecation + getModuleFromFilename, createGetModuleFromFilename, metrics, + // eslint-disable-next-line deprecation/deprecation + extractTraceparentData, } from '@sentry/node'; From 3e20521d479c455a23e8f9570095e2c511204869 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Tue, 30 Jan 2024 09:51:07 +0100 Subject: [PATCH 4/5] adjust after feedback --- .../node-exports-test-app/scripts/consistentExports.ts | 7 +------ packages/serverless/src/index.ts | 3 +++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts index 37aa4a4b1c8c..23bb11e9d237 100644 --- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts +++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts @@ -60,12 +60,7 @@ const DEPENDENTS: Dependent[] = [ { package: '@sentry/serverless', exports: Object.keys(SentryServerless), - ignoreExports: [ - // TODO: Should these be exported from serverless? - 'cron', - 'runWithAsyncContext', - 'hapiErrorPlugin', - ], + ignoreExports: ['cron', 'hapiErrorPlugin'], }, { package: '@sentry/sveltekit', diff --git a/packages/serverless/src/index.ts b/packages/serverless/src/index.ts index b755bd55b981..34dd1338f03c 100644 --- a/packages/serverless/src/index.ts +++ b/packages/serverless/src/index.ts @@ -92,4 +92,7 @@ export { metrics, // eslint-disable-next-line deprecation/deprecation extractTraceparentData, + runWithAsyncContext, + // eslint-disable-next-line deprecation/deprecation + enableAnrDetection, } from '@sentry/node'; From 5c7b484b70ff212972073a8dfff7d70bbb977487 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Tue, 30 Jan 2024 10:52:19 +0100 Subject: [PATCH 5/5] rm anr detection --- .../node-exports-test-app/scripts/consistentExports.ts | 2 +- packages/serverless/src/index.ts | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts index 23bb11e9d237..cf8233680c11 100644 --- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts +++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts @@ -60,7 +60,7 @@ const DEPENDENTS: Dependent[] = [ { package: '@sentry/serverless', exports: Object.keys(SentryServerless), - ignoreExports: ['cron', 'hapiErrorPlugin'], + ignoreExports: ['cron', 'hapiErrorPlugin', 'enableAnrDetection'], }, { package: '@sentry/sveltekit', diff --git a/packages/serverless/src/index.ts b/packages/serverless/src/index.ts index 34dd1338f03c..abc135a6b750 100644 --- a/packages/serverless/src/index.ts +++ b/packages/serverless/src/index.ts @@ -93,6 +93,4 @@ export { // eslint-disable-next-line deprecation/deprecation extractTraceparentData, runWithAsyncContext, - // eslint-disable-next-line deprecation/deprecation - enableAnrDetection, } from '@sentry/node';