diff --git a/packages/cloudflare/src/sdk.ts b/packages/cloudflare/src/sdk.ts index 96e5fcc643a9..54a96bcc4908 100644 --- a/packages/cloudflare/src/sdk.ts +++ b/packages/cloudflare/src/sdk.ts @@ -27,6 +27,7 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[ functionToStringIntegration(), linkedErrorsIntegration(), fetchIntegration(), + // TODO(v10): the `include` object should be defined directly in the integration based on `sendDefaultPii` requestDataIntegration(sendDefaultPii ? undefined : { include: { cookies: false } }), consoleIntegration(), ]; diff --git a/packages/core/src/integrations/requestdata.ts b/packages/core/src/integrations/requestdata.ts index c8271043ece2..767d2764002f 100644 --- a/packages/core/src/integrations/requestdata.ts +++ b/packages/core/src/integrations/requestdata.ts @@ -21,6 +21,7 @@ type RequestDataIntegrationOptions = { include?: RequestDataIncludeOptions; }; +// TODO(v10): Change defaults based on `sendDefaultPii` const DEFAULT_INCLUDE: RequestDataIncludeOptions = { cookies: true, data: true, diff --git a/packages/node/src/integrations/context.ts b/packages/node/src/integrations/context.ts index ed3e265b952b..89d594710343 100644 --- a/packages/node/src/integrations/context.ts +++ b/packages/node/src/integrations/context.ts @@ -61,6 +61,7 @@ const _nodeContextIntegration = ((options: ContextOptions = {}) => { const updatedContext = _updateContext(await cachedContext); + // TODO(v10): conditional with `sendDefaultPii` here? event.contexts = { ...event.contexts, app: { ...updatedContext.app, ...event.contexts?.app }, diff --git a/packages/replay-internal/src/coreHandlers/util/xhrUtils.ts b/packages/replay-internal/src/coreHandlers/util/xhrUtils.ts index 6028a09232ba..72c54eb52858 100644 --- a/packages/replay-internal/src/coreHandlers/util/xhrUtils.ts +++ b/packages/replay-internal/src/coreHandlers/util/xhrUtils.ts @@ -99,6 +99,8 @@ function _prepareXhrData( }; } + // ---- This additional network data below is only captured for URLs defined in `networkDetailAllowUrls` ---- + const xhrInfo = xhr[SENTRY_XHR_DATA_KEY]; const networkRequestHeaders = xhrInfo ? getAllowedHeaders(xhrInfo.request_headers, options.networkRequestHeaders) diff --git a/packages/vercel-edge/src/sdk.ts b/packages/vercel-edge/src/sdk.ts index 1a09b16496a9..fdd254a21d21 100644 --- a/packages/vercel-edge/src/sdk.ts +++ b/packages/vercel-edge/src/sdk.ts @@ -59,6 +59,7 @@ export function getDefaultIntegrations(options: Options): Integration[] { linkedErrorsIntegration(), winterCGFetchIntegration(), consoleIntegration(), + // TODO(v10): integration can be included - but integration should not add IP address etc ...(options.sendDefaultPii ? [requestDataIntegration()] : []), ]; }