Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion packages/astro/test/server/middleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ describe('sentryMiddleware', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/integrations/requestdata.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ const _requestDataIntegration = ((options: RequestDataIntegrationOptions = {}) =
data: true,
headers: dataCollection.httpHeaders.request !== false,
ip: dataCollection.userInfo,
query_string: dataCollection.queryParams !== false,
query_string: dataCollection.urlQueryParams !== false,
// No dataCollection equivalent — URL is always included
url: true,
...options.include,
Expand Down
10 changes: 7 additions & 3 deletions packages/core/src/types/datacollection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,11 +44,14 @@ export interface DataCollection {
*/
httpBodies?: HttpBodyCollectionTarget[];

/** @deprecated Use `urlQueryParams` instead. */
queryParams?: CollectBehavior;

/**
* Controls query parameter collection and sensitive value filtering.
* Controls URL query parameter collection and sensitive value filtering.
* @default true
*/
queryParams?: CollectBehavior;
urlQueryParams?: CollectBehavior;

/**
* Allow collection of GraphQL operation data when using the SDK's GraphQL integrations
Expand DownExpand Up@@ -102,7 +105,8 @@ export interface DataCollection {
/**
* Fully resolved `DataCollection` with all defaults applied.
*/
export type ResolvedDataCollection = Required<DataCollection> & {
// todo(v11): change `Omit<DataCollection, 'queryParams'>` to just `DataCollection`
export type ResolvedDataCollection = Required<Omit<DataCollection, 'queryParams'>> & {
httpHeaders: Required<NonNullable<DataCollection['httpHeaders']>>;
graphQL: Required<NonNullable<DataCollection['graphQL']>>;
genAI: Required<NonNullable<DataCollection['genAI']>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -27,7 +27,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: { deny: PII_HEADER_SNIPPETS },
httpHeaders: { request: { deny: PII_HEADER_SNIPPETS }, response: { deny: PII_HEADER_SNIPPETS } },
httpBodies: [],
queryParams: { deny: PII_HEADER_SNIPPETS },
urlQueryParams: { deny: PII_HEADER_SNIPPETS },
// The GraphQL document has literal values redacted at collection time, so it was historically
// always attached regardless of `sendDefaultPii`; keep it on to preserve that behavior.
graphQL: { document: true, variables: true },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const DEFAULTS: ResolvedDataCollection = {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -44,7 +44,8 @@ export function resolveDataCollectionOptions(options: {
response: dc.httpHeaders?.response ?? base.httpHeaders.response,
},
httpBodies: dc.httpBodies ?? base.httpBodies,
queryParams: dc.queryParams ?? base.queryParams,
// oxlint-disable-next-line typescript/no-deprecated
urlQueryParams: dc.urlQueryParams ?? dc.queryParams ?? base.urlQueryParams,
graphQL: {
document: dc.graphQL?.document ?? base.graphQL.document,
variables: dc.graphQL?.variables ?? base.graphQL.variables,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ export function createMockClient(userInfo = true, genAI?: { inputs: boolean; out
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: genAIOptions,
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ describe('defaultPiiToCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -26,7 +26,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -44,7 +44,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -62,7 +62,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ describe('resolveDataCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -49,7 +49,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.httpBodies).toEqual(['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse']);
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -96,7 +96,7 @@ describe('resolveDataCollectionOptions', () => {
// Everything else is spec default
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -147,14 +147,14 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toEqual({ deny: ['x-custom'] });
});

it('supports turning off query params', () => {
it('supports turning off URL query params', () => {
const result = resolveDataCollectionOptions({
dataCollection: {
queryParams: false,
urlQueryParams: false,
},
});

expect(result.queryParams).toBe(false);
expect(result.urlQueryParams).toBe(false);
});

it('supports turning off database query data', () => {
Expand All@@ -179,7 +179,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('httpHeaders.request');
expect(result).toHaveProperty('httpHeaders.response');
expect(result).toHaveProperty('httpBodies');
expect(result).toHaveProperty('queryParams');
expect(result).toHaveProperty('urlQueryParams');
expect(result).toHaveProperty('graphQL');
expect(result).toHaveProperty('graphQL.document');
expect(result).toHaveProperty('graphQL.variables');
Expand All@@ -191,4 +191,36 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('frameContextLines');
});
});

describe('deprecated queryParams alias', () => {
it('honors deprecated queryParams when urlQueryParams is not set', () => {
expect(resolveDataCollectionOptions({ dataCollection: { queryParams: false } }).urlQueryParams).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { queryParams: { deny: ['token'] } } }).urlQueryParams,
).toEqual({ deny: ['token'] });
});

it('prefers urlQueryParams over the deprecated queryParams when both are set', () => {
// new field wins, even when it is the "off" value
expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: false, queryParams: true } }).urlQueryParams,
).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: true, queryParams: false } }).urlQueryParams,
).toBe(true);
});

it('falls back to the default when neither is set', () => {
// dataCollection provided → spec default (collect)
expect(resolveDataCollectionOptions({ dataCollection: {} }).urlQueryParams).toBe(true);
});

it('does not leak the deprecated queryParams key into the resolved output', () => {
const result = resolveDataCollectionOptions({ dataCollection: { queryParams: false } });
expect(result).not.toHaveProperty('queryParams');
expect(Object.keys(result)).toHaveLength(10);
});
});
});
2 changes: 1 addition & 1 deletion packages/core/test/lib/utils/request.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -873,7 +873,7 @@ describe('request utils', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ describe('wrapMiddlewareHandlerWithSentry', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/remix/test/server/errors.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ function createMockClient(httpBodies: string[] = []): Client {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies,
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion packages/astro/test/server/middleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ describe('sentryMiddleware', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/integrations/requestdata.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ const _requestDataIntegration = ((options: RequestDataIntegrationOptions = {}) =
data: true,
headers: dataCollection.httpHeaders.request !== false,
ip: dataCollection.userInfo,
query_string: dataCollection.queryParams !== false,
query_string: dataCollection.urlQueryParams !== false,
// No dataCollection equivalent — URL is always included
url: true,
...options.include,
Expand Down
10 changes: 7 additions & 3 deletions packages/core/src/types/datacollection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,11 +44,14 @@ export interface DataCollection {
*/
httpBodies?: HttpBodyCollectionTarget[];

/** @deprecated Use `urlQueryParams` instead. */
queryParams?: CollectBehavior;

/**
* Controls query parameter collection and sensitive value filtering.
* Controls URL query parameter collection and sensitive value filtering.
* @default true
*/
queryParams?: CollectBehavior;
urlQueryParams?: CollectBehavior;

/**
* Allow collection of GraphQL operation data when using the SDK's GraphQL integrations
Expand DownExpand Up@@ -102,7 +105,8 @@ export interface DataCollection {
/**
* Fully resolved `DataCollection` with all defaults applied.
*/
export type ResolvedDataCollection = Required<DataCollection> & {
// todo(v11): change `Omit<DataCollection, 'queryParams'>` to just `DataCollection`
export type ResolvedDataCollection = Required<Omit<DataCollection, 'queryParams'>> & {
httpHeaders: Required<NonNullable<DataCollection['httpHeaders']>>;
graphQL: Required<NonNullable<DataCollection['graphQL']>>;
genAI: Required<NonNullable<DataCollection['genAI']>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -27,7 +27,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: { deny: PII_HEADER_SNIPPETS },
httpHeaders: { request: { deny: PII_HEADER_SNIPPETS }, response: { deny: PII_HEADER_SNIPPETS } },
httpBodies: [],
queryParams: { deny: PII_HEADER_SNIPPETS },
urlQueryParams: { deny: PII_HEADER_SNIPPETS },
// The GraphQL document has literal values redacted at collection time, so it was historically
// always attached regardless of `sendDefaultPii`; keep it on to preserve that behavior.
graphQL: { document: true, variables: true },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const DEFAULTS: ResolvedDataCollection = {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -44,7 +44,8 @@ export function resolveDataCollectionOptions(options: {
response: dc.httpHeaders?.response ?? base.httpHeaders.response,
},
httpBodies: dc.httpBodies ?? base.httpBodies,
queryParams: dc.queryParams ?? base.queryParams,
// oxlint-disable-next-line typescript/no-deprecated
urlQueryParams: dc.urlQueryParams ?? dc.queryParams ?? base.urlQueryParams,
graphQL: {
document: dc.graphQL?.document ?? base.graphQL.document,
variables: dc.graphQL?.variables ?? base.graphQL.variables,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ export function createMockClient(userInfo = true, genAI?: { inputs: boolean; out
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: genAIOptions,
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ describe('defaultPiiToCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -26,7 +26,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -44,7 +44,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -62,7 +62,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ describe('resolveDataCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -49,7 +49,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.httpBodies).toEqual(['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse']);
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -96,7 +96,7 @@ describe('resolveDataCollectionOptions', () => {
// Everything else is spec default
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -147,14 +147,14 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toEqual({ deny: ['x-custom'] });
});

it('supports turning off query params', () => {
it('supports turning off URL query params', () => {
const result = resolveDataCollectionOptions({
dataCollection: {
queryParams: false,
urlQueryParams: false,
},
});

expect(result.queryParams).toBe(false);
expect(result.urlQueryParams).toBe(false);
});

it('supports turning off database query data', () => {
Expand All@@ -179,7 +179,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('httpHeaders.request');
expect(result).toHaveProperty('httpHeaders.response');
expect(result).toHaveProperty('httpBodies');
expect(result).toHaveProperty('queryParams');
expect(result).toHaveProperty('urlQueryParams');
expect(result).toHaveProperty('graphQL');
expect(result).toHaveProperty('graphQL.document');
expect(result).toHaveProperty('graphQL.variables');
Expand All@@ -191,4 +191,36 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('frameContextLines');
});
});

describe('deprecated queryParams alias', () => {
it('honors deprecated queryParams when urlQueryParams is not set', () => {
expect(resolveDataCollectionOptions({ dataCollection: { queryParams: false } }).urlQueryParams).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { queryParams: { deny: ['token'] } } }).urlQueryParams,
).toEqual({ deny: ['token'] });
});

it('prefers urlQueryParams over the deprecated queryParams when both are set', () => {
// new field wins, even when it is the "off" value
expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: false, queryParams: true } }).urlQueryParams,
).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: true, queryParams: false } }).urlQueryParams,
).toBe(true);
});

it('falls back to the default when neither is set', () => {
// dataCollection provided → spec default (collect)
expect(resolveDataCollectionOptions({ dataCollection: {} }).urlQueryParams).toBe(true);
});

it('does not leak the deprecated queryParams key into the resolved output', () => {
const result = resolveDataCollectionOptions({ dataCollection: { queryParams: false } });
expect(result).not.toHaveProperty('queryParams');
expect(Object.keys(result)).toHaveLength(10);
});
});
});
2 changes: 1 addition & 1 deletion packages/core/test/lib/utils/request.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -873,7 +873,7 @@ describe('request utils', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ describe('wrapMiddlewareHandlerWithSentry', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/remix/test/server/errors.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ function createMockClient(httpBodies: string[] = []): Client {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies,
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion packages/astro/test/server/middleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ describe('sentryMiddleware', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/integrations/requestdata.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ const _requestDataIntegration = ((options: RequestDataIntegrationOptions = {}) =
data: true,
headers: dataCollection.httpHeaders.request !== false,
ip: dataCollection.userInfo,
query_string: dataCollection.queryParams !== false,
query_string: dataCollection.urlQueryParams !== false,
// No dataCollection equivalent — URL is always included
url: true,
...options.include,
Expand Down
10 changes: 7 additions & 3 deletions packages/core/src/types/datacollection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,11 +44,14 @@ export interface DataCollection {
*/
httpBodies?: HttpBodyCollectionTarget[];

/** @deprecated Use `urlQueryParams` instead. */
queryParams?: CollectBehavior;

/**
* Controls query parameter collection and sensitive value filtering.
* Controls URL query parameter collection and sensitive value filtering.
* @default true
*/
queryParams?: CollectBehavior;
urlQueryParams?: CollectBehavior;

/**
* Allow collection of GraphQL operation data when using the SDK's GraphQL integrations
Expand DownExpand Up@@ -102,7 +105,8 @@ export interface DataCollection {
/**
* Fully resolved `DataCollection` with all defaults applied.
*/
export type ResolvedDataCollection = Required<DataCollection> & {
// todo(v11): change `Omit<DataCollection, 'queryParams'>` to just `DataCollection`
export type ResolvedDataCollection = Required<Omit<DataCollection, 'queryParams'>> & {
httpHeaders: Required<NonNullable<DataCollection['httpHeaders']>>;
graphQL: Required<NonNullable<DataCollection['graphQL']>>;
genAI: Required<NonNullable<DataCollection['genAI']>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -27,7 +27,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: { deny: PII_HEADER_SNIPPETS },
httpHeaders: { request: { deny: PII_HEADER_SNIPPETS }, response: { deny: PII_HEADER_SNIPPETS } },
httpBodies: [],
queryParams: { deny: PII_HEADER_SNIPPETS },
urlQueryParams: { deny: PII_HEADER_SNIPPETS },
// The GraphQL document has literal values redacted at collection time, so it was historically
// always attached regardless of `sendDefaultPii`; keep it on to preserve that behavior.
graphQL: { document: true, variables: true },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const DEFAULTS: ResolvedDataCollection = {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -44,7 +44,8 @@ export function resolveDataCollectionOptions(options: {
response: dc.httpHeaders?.response ?? base.httpHeaders.response,
},
httpBodies: dc.httpBodies ?? base.httpBodies,
queryParams: dc.queryParams ?? base.queryParams,
// oxlint-disable-next-line typescript/no-deprecated
urlQueryParams: dc.urlQueryParams ?? dc.queryParams ?? base.urlQueryParams,
graphQL: {
document: dc.graphQL?.document ?? base.graphQL.document,
variables: dc.graphQL?.variables ?? base.graphQL.variables,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ export function createMockClient(userInfo = true, genAI?: { inputs: boolean; out
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: genAIOptions,
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ describe('defaultPiiToCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -26,7 +26,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -44,7 +44,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -62,7 +62,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ describe('resolveDataCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -49,7 +49,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.httpBodies).toEqual(['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse']);
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -96,7 +96,7 @@ describe('resolveDataCollectionOptions', () => {
// Everything else is spec default
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -147,14 +147,14 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toEqual({ deny: ['x-custom'] });
});

it('supports turning off query params', () => {
it('supports turning off URL query params', () => {
const result = resolveDataCollectionOptions({
dataCollection: {
queryParams: false,
urlQueryParams: false,
},
});

expect(result.queryParams).toBe(false);
expect(result.urlQueryParams).toBe(false);
});

it('supports turning off database query data', () => {
Expand All@@ -179,7 +179,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('httpHeaders.request');
expect(result).toHaveProperty('httpHeaders.response');
expect(result).toHaveProperty('httpBodies');
expect(result).toHaveProperty('queryParams');
expect(result).toHaveProperty('urlQueryParams');
expect(result).toHaveProperty('graphQL');
expect(result).toHaveProperty('graphQL.document');
expect(result).toHaveProperty('graphQL.variables');
Expand All@@ -191,4 +191,36 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('frameContextLines');
});
});

describe('deprecated queryParams alias', () => {
it('honors deprecated queryParams when urlQueryParams is not set', () => {
expect(resolveDataCollectionOptions({ dataCollection: { queryParams: false } }).urlQueryParams).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { queryParams: { deny: ['token'] } } }).urlQueryParams,
).toEqual({ deny: ['token'] });
});

it('prefers urlQueryParams over the deprecated queryParams when both are set', () => {
// new field wins, even when it is the "off" value
expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: false, queryParams: true } }).urlQueryParams,
).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: true, queryParams: false } }).urlQueryParams,
).toBe(true);
});

it('falls back to the default when neither is set', () => {
// dataCollection provided → spec default (collect)
expect(resolveDataCollectionOptions({ dataCollection: {} }).urlQueryParams).toBe(true);
});

it('does not leak the deprecated queryParams key into the resolved output', () => {
const result = resolveDataCollectionOptions({ dataCollection: { queryParams: false } });
expect(result).not.toHaveProperty('queryParams');
expect(Object.keys(result)).toHaveLength(10);
});
});
});
2 changes: 1 addition & 1 deletion packages/core/test/lib/utils/request.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -873,7 +873,7 @@ describe('request utils', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ describe('wrapMiddlewareHandlerWithSentry', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/remix/test/server/errors.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ function createMockClient(httpBodies: string[] = []): Client {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies,
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion packages/astro/test/server/middleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ describe('sentryMiddleware', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/integrations/requestdata.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ const _requestDataIntegration = ((options: RequestDataIntegrationOptions = {}) =
data: true,
headers: dataCollection.httpHeaders.request !== false,
ip: dataCollection.userInfo,
query_string: dataCollection.queryParams !== false,
query_string: dataCollection.urlQueryParams !== false,
// No dataCollection equivalent — URL is always included
url: true,
...options.include,
Expand Down
10 changes: 7 additions & 3 deletions packages/core/src/types/datacollection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,11 +44,14 @@ export interface DataCollection {
*/
httpBodies?: HttpBodyCollectionTarget[];

/** @deprecated Use `urlQueryParams` instead. */
queryParams?: CollectBehavior;

/**
* Controls query parameter collection and sensitive value filtering.
* Controls URL query parameter collection and sensitive value filtering.
* @default true
*/
queryParams?: CollectBehavior;
urlQueryParams?: CollectBehavior;

/**
* Allow collection of GraphQL operation data when using the SDK's GraphQL integrations
Expand DownExpand Up@@ -102,7 +105,8 @@ export interface DataCollection {
/**
* Fully resolved `DataCollection` with all defaults applied.
*/
export type ResolvedDataCollection = Required<DataCollection> & {
// todo(v11): change `Omit<DataCollection, 'queryParams'>` to just `DataCollection`
export type ResolvedDataCollection = Required<Omit<DataCollection, 'queryParams'>> & {
httpHeaders: Required<NonNullable<DataCollection['httpHeaders']>>;
graphQL: Required<NonNullable<DataCollection['graphQL']>>;
genAI: Required<NonNullable<DataCollection['genAI']>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -27,7 +27,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: { deny: PII_HEADER_SNIPPETS },
httpHeaders: { request: { deny: PII_HEADER_SNIPPETS }, response: { deny: PII_HEADER_SNIPPETS } },
httpBodies: [],
queryParams: { deny: PII_HEADER_SNIPPETS },
urlQueryParams: { deny: PII_HEADER_SNIPPETS },
// The GraphQL document has literal values redacted at collection time, so it was historically
// always attached regardless of `sendDefaultPii`; keep it on to preserve that behavior.
graphQL: { document: true, variables: true },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const DEFAULTS: ResolvedDataCollection = {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -44,7 +44,8 @@ export function resolveDataCollectionOptions(options: {
response: dc.httpHeaders?.response ?? base.httpHeaders.response,
},
httpBodies: dc.httpBodies ?? base.httpBodies,
queryParams: dc.queryParams ?? base.queryParams,
// oxlint-disable-next-line typescript/no-deprecated
urlQueryParams: dc.urlQueryParams ?? dc.queryParams ?? base.urlQueryParams,
graphQL: {
document: dc.graphQL?.document ?? base.graphQL.document,
variables: dc.graphQL?.variables ?? base.graphQL.variables,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ export function createMockClient(userInfo = true, genAI?: { inputs: boolean; out
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: genAIOptions,
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ describe('defaultPiiToCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -26,7 +26,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -44,7 +44,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -62,7 +62,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ describe('resolveDataCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -49,7 +49,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.httpBodies).toEqual(['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse']);
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -96,7 +96,7 @@ describe('resolveDataCollectionOptions', () => {
// Everything else is spec default
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -147,14 +147,14 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toEqual({ deny: ['x-custom'] });
});

it('supports turning off query params', () => {
it('supports turning off URL query params', () => {
const result = resolveDataCollectionOptions({
dataCollection: {
queryParams: false,
urlQueryParams: false,
},
});

expect(result.queryParams).toBe(false);
expect(result.urlQueryParams).toBe(false);
});

it('supports turning off database query data', () => {
Expand All@@ -179,7 +179,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('httpHeaders.request');
expect(result).toHaveProperty('httpHeaders.response');
expect(result).toHaveProperty('httpBodies');
expect(result).toHaveProperty('queryParams');
expect(result).toHaveProperty('urlQueryParams');
expect(result).toHaveProperty('graphQL');
expect(result).toHaveProperty('graphQL.document');
expect(result).toHaveProperty('graphQL.variables');
Expand All@@ -191,4 +191,36 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('frameContextLines');
});
});

describe('deprecated queryParams alias', () => {
it('honors deprecated queryParams when urlQueryParams is not set', () => {
expect(resolveDataCollectionOptions({ dataCollection: { queryParams: false } }).urlQueryParams).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { queryParams: { deny: ['token'] } } }).urlQueryParams,
).toEqual({ deny: ['token'] });
});

it('prefers urlQueryParams over the deprecated queryParams when both are set', () => {
// new field wins, even when it is the "off" value
expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: false, queryParams: true } }).urlQueryParams,
).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: true, queryParams: false } }).urlQueryParams,
).toBe(true);
});

it('falls back to the default when neither is set', () => {
// dataCollection provided → spec default (collect)
expect(resolveDataCollectionOptions({ dataCollection: {} }).urlQueryParams).toBe(true);
});

it('does not leak the deprecated queryParams key into the resolved output', () => {
const result = resolveDataCollectionOptions({ dataCollection: { queryParams: false } });
expect(result).not.toHaveProperty('queryParams');
expect(Object.keys(result)).toHaveLength(10);
});
});
});
2 changes: 1 addition & 1 deletion packages/core/test/lib/utils/request.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -873,7 +873,7 @@ describe('request utils', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ describe('wrapMiddlewareHandlerWithSentry', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/remix/test/server/errors.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ function createMockClient(httpBodies: string[] = []): Client {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies,
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion packages/astro/test/server/middleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ describe('sentryMiddleware', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/integrations/requestdata.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ const _requestDataIntegration = ((options: RequestDataIntegrationOptions = {}) =
data: true,
headers: dataCollection.httpHeaders.request !== false,
ip: dataCollection.userInfo,
query_string: dataCollection.queryParams !== false,
query_string: dataCollection.urlQueryParams !== false,
// No dataCollection equivalent — URL is always included
url: true,
...options.include,
Expand Down
10 changes: 7 additions & 3 deletions packages/core/src/types/datacollection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,11 +44,14 @@ export interface DataCollection {
*/
httpBodies?: HttpBodyCollectionTarget[];

/** @deprecated Use `urlQueryParams` instead. */
queryParams?: CollectBehavior;

/**
* Controls query parameter collection and sensitive value filtering.
* Controls URL query parameter collection and sensitive value filtering.
* @default true
*/
queryParams?: CollectBehavior;
urlQueryParams?: CollectBehavior;

/**
* Allow collection of GraphQL operation data when using the SDK's GraphQL integrations
Expand DownExpand Up@@ -102,7 +105,8 @@ export interface DataCollection {
/**
* Fully resolved `DataCollection` with all defaults applied.
*/
export type ResolvedDataCollection = Required<DataCollection> & {
// todo(v11): change `Omit<DataCollection, 'queryParams'>` to just `DataCollection`
export type ResolvedDataCollection = Required<Omit<DataCollection, 'queryParams'>> & {
httpHeaders: Required<NonNullable<DataCollection['httpHeaders']>>;
graphQL: Required<NonNullable<DataCollection['graphQL']>>;
genAI: Required<NonNullable<DataCollection['genAI']>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -27,7 +27,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: { deny: PII_HEADER_SNIPPETS },
httpHeaders: { request: { deny: PII_HEADER_SNIPPETS }, response: { deny: PII_HEADER_SNIPPETS } },
httpBodies: [],
queryParams: { deny: PII_HEADER_SNIPPETS },
urlQueryParams: { deny: PII_HEADER_SNIPPETS },
// The GraphQL document has literal values redacted at collection time, so it was historically
// always attached regardless of `sendDefaultPii`; keep it on to preserve that behavior.
graphQL: { document: true, variables: true },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const DEFAULTS: ResolvedDataCollection = {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -44,7 +44,8 @@ export function resolveDataCollectionOptions(options: {
response: dc.httpHeaders?.response ?? base.httpHeaders.response,
},
httpBodies: dc.httpBodies ?? base.httpBodies,
queryParams: dc.queryParams ?? base.queryParams,
// oxlint-disable-next-line typescript/no-deprecated
urlQueryParams: dc.urlQueryParams ?? dc.queryParams ?? base.urlQueryParams,
graphQL: {
document: dc.graphQL?.document ?? base.graphQL.document,
variables: dc.graphQL?.variables ?? base.graphQL.variables,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ export function createMockClient(userInfo = true, genAI?: { inputs: boolean; out
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: genAIOptions,
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ describe('defaultPiiToCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -26,7 +26,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -44,7 +44,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -62,7 +62,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ describe('resolveDataCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -49,7 +49,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.httpBodies).toEqual(['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse']);
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -96,7 +96,7 @@ describe('resolveDataCollectionOptions', () => {
// Everything else is spec default
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -147,14 +147,14 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toEqual({ deny: ['x-custom'] });
});

it('supports turning off query params', () => {
it('supports turning off URL query params', () => {
const result = resolveDataCollectionOptions({
dataCollection: {
queryParams: false,
urlQueryParams: false,
},
});

expect(result.queryParams).toBe(false);
expect(result.urlQueryParams).toBe(false);
});

it('supports turning off database query data', () => {
Expand All@@ -179,7 +179,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('httpHeaders.request');
expect(result).toHaveProperty('httpHeaders.response');
expect(result).toHaveProperty('httpBodies');
expect(result).toHaveProperty('queryParams');
expect(result).toHaveProperty('urlQueryParams');
expect(result).toHaveProperty('graphQL');
expect(result).toHaveProperty('graphQL.document');
expect(result).toHaveProperty('graphQL.variables');
Expand All@@ -191,4 +191,36 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('frameContextLines');
});
});

describe('deprecated queryParams alias', () => {
it('honors deprecated queryParams when urlQueryParams is not set', () => {
expect(resolveDataCollectionOptions({ dataCollection: { queryParams: false } }).urlQueryParams).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { queryParams: { deny: ['token'] } } }).urlQueryParams,
).toEqual({ deny: ['token'] });
});

it('prefers urlQueryParams over the deprecated queryParams when both are set', () => {
// new field wins, even when it is the "off" value
expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: false, queryParams: true } }).urlQueryParams,
).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: true, queryParams: false } }).urlQueryParams,
).toBe(true);
});

it('falls back to the default when neither is set', () => {
// dataCollection provided → spec default (collect)
expect(resolveDataCollectionOptions({ dataCollection: {} }).urlQueryParams).toBe(true);
});

it('does not leak the deprecated queryParams key into the resolved output', () => {
const result = resolveDataCollectionOptions({ dataCollection: { queryParams: false } });
expect(result).not.toHaveProperty('queryParams');
expect(Object.keys(result)).toHaveLength(10);
});
});
});
2 changes: 1 addition & 1 deletion packages/core/test/lib/utils/request.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -873,7 +873,7 @@ describe('request utils', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ describe('wrapMiddlewareHandlerWithSentry', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/remix/test/server/errors.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ function createMockClient(httpBodies: string[] = []): Client {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies,
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion packages/astro/test/server/middleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ describe('sentryMiddleware', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/integrations/requestdata.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ const _requestDataIntegration = ((options: RequestDataIntegrationOptions = {}) =
data: true,
headers: dataCollection.httpHeaders.request !== false,
ip: dataCollection.userInfo,
query_string: dataCollection.queryParams !== false,
query_string: dataCollection.urlQueryParams !== false,
// No dataCollection equivalent — URL is always included
url: true,
...options.include,
Expand Down
10 changes: 7 additions & 3 deletions packages/core/src/types/datacollection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,11 +44,14 @@ export interface DataCollection {
*/
httpBodies?: HttpBodyCollectionTarget[];

/** @deprecated Use `urlQueryParams` instead. */
queryParams?: CollectBehavior;

/**
* Controls query parameter collection and sensitive value filtering.
* Controls URL query parameter collection and sensitive value filtering.
* @default true
*/
queryParams?: CollectBehavior;
urlQueryParams?: CollectBehavior;

/**
* Allow collection of GraphQL operation data when using the SDK's GraphQL integrations
Expand DownExpand Up@@ -102,7 +105,8 @@ export interface DataCollection {
/**
* Fully resolved `DataCollection` with all defaults applied.
*/
export type ResolvedDataCollection = Required<DataCollection> & {
// todo(v11): change `Omit<DataCollection, 'queryParams'>` to just `DataCollection`
export type ResolvedDataCollection = Required<Omit<DataCollection, 'queryParams'>> & {
httpHeaders: Required<NonNullable<DataCollection['httpHeaders']>>;
graphQL: Required<NonNullable<DataCollection['graphQL']>>;
genAI: Required<NonNullable<DataCollection['genAI']>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -27,7 +27,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: { deny: PII_HEADER_SNIPPETS },
httpHeaders: { request: { deny: PII_HEADER_SNIPPETS }, response: { deny: PII_HEADER_SNIPPETS } },
httpBodies: [],
queryParams: { deny: PII_HEADER_SNIPPETS },
urlQueryParams: { deny: PII_HEADER_SNIPPETS },
// The GraphQL document has literal values redacted at collection time, so it was historically
// always attached regardless of `sendDefaultPii`; keep it on to preserve that behavior.
graphQL: { document: true, variables: true },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const DEFAULTS: ResolvedDataCollection = {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -44,7 +44,8 @@ export function resolveDataCollectionOptions(options: {
response: dc.httpHeaders?.response ?? base.httpHeaders.response,
},
httpBodies: dc.httpBodies ?? base.httpBodies,
queryParams: dc.queryParams ?? base.queryParams,
// oxlint-disable-next-line typescript/no-deprecated
urlQueryParams: dc.urlQueryParams ?? dc.queryParams ?? base.urlQueryParams,
graphQL: {
document: dc.graphQL?.document ?? base.graphQL.document,
variables: dc.graphQL?.variables ?? base.graphQL.variables,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ export function createMockClient(userInfo = true, genAI?: { inputs: boolean; out
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: genAIOptions,
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ describe('defaultPiiToCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -26,7 +26,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -44,7 +44,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -62,7 +62,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ describe('resolveDataCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -49,7 +49,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.httpBodies).toEqual(['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse']);
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -96,7 +96,7 @@ describe('resolveDataCollectionOptions', () => {
// Everything else is spec default
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -147,14 +147,14 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toEqual({ deny: ['x-custom'] });
});

it('supports turning off query params', () => {
it('supports turning off URL query params', () => {
const result = resolveDataCollectionOptions({
dataCollection: {
queryParams: false,
urlQueryParams: false,
},
});

expect(result.queryParams).toBe(false);
expect(result.urlQueryParams).toBe(false);
});

it('supports turning off database query data', () => {
Expand All@@ -179,7 +179,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('httpHeaders.request');
expect(result).toHaveProperty('httpHeaders.response');
expect(result).toHaveProperty('httpBodies');
expect(result).toHaveProperty('queryParams');
expect(result).toHaveProperty('urlQueryParams');
expect(result).toHaveProperty('graphQL');
expect(result).toHaveProperty('graphQL.document');
expect(result).toHaveProperty('graphQL.variables');
Expand All@@ -191,4 +191,36 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('frameContextLines');
});
});

describe('deprecated queryParams alias', () => {
it('honors deprecated queryParams when urlQueryParams is not set', () => {
expect(resolveDataCollectionOptions({ dataCollection: { queryParams: false } }).urlQueryParams).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { queryParams: { deny: ['token'] } } }).urlQueryParams,
).toEqual({ deny: ['token'] });
});

it('prefers urlQueryParams over the deprecated queryParams when both are set', () => {
// new field wins, even when it is the "off" value
expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: false, queryParams: true } }).urlQueryParams,
).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: true, queryParams: false } }).urlQueryParams,
).toBe(true);
});

it('falls back to the default when neither is set', () => {
// dataCollection provided → spec default (collect)
expect(resolveDataCollectionOptions({ dataCollection: {} }).urlQueryParams).toBe(true);
});

it('does not leak the deprecated queryParams key into the resolved output', () => {
const result = resolveDataCollectionOptions({ dataCollection: { queryParams: false } });
expect(result).not.toHaveProperty('queryParams');
expect(Object.keys(result)).toHaveLength(10);
});
});
});
2 changes: 1 addition & 1 deletion packages/core/test/lib/utils/request.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -873,7 +873,7 @@ describe('request utils', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ describe('wrapMiddlewareHandlerWithSentry', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/remix/test/server/errors.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ function createMockClient(httpBodies: string[] = []): Client {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies,
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion packages/astro/test/server/middleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ describe('sentryMiddleware', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/integrations/requestdata.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ const _requestDataIntegration = ((options: RequestDataIntegrationOptions = {}) =
data: true,
headers: dataCollection.httpHeaders.request !== false,
ip: dataCollection.userInfo,
query_string: dataCollection.queryParams !== false,
query_string: dataCollection.urlQueryParams !== false,
// No dataCollection equivalent — URL is always included
url: true,
...options.include,
Expand Down
10 changes: 7 additions & 3 deletions packages/core/src/types/datacollection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,11 +44,14 @@ export interface DataCollection {
*/
httpBodies?: HttpBodyCollectionTarget[];

/** @deprecated Use `urlQueryParams` instead. */
queryParams?: CollectBehavior;

/**
* Controls query parameter collection and sensitive value filtering.
* Controls URL query parameter collection and sensitive value filtering.
* @default true
*/
queryParams?: CollectBehavior;
urlQueryParams?: CollectBehavior;

/**
* Allow collection of GraphQL operation data when using the SDK's GraphQL integrations
Expand DownExpand Up@@ -102,7 +105,8 @@ export interface DataCollection {
/**
* Fully resolved `DataCollection` with all defaults applied.
*/
export type ResolvedDataCollection = Required<DataCollection> & {
// todo(v11): change `Omit<DataCollection, 'queryParams'>` to just `DataCollection`
export type ResolvedDataCollection = Required<Omit<DataCollection, 'queryParams'>> & {
httpHeaders: Required<NonNullable<DataCollection['httpHeaders']>>;
graphQL: Required<NonNullable<DataCollection['graphQL']>>;
genAI: Required<NonNullable<DataCollection['genAI']>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -27,7 +27,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: { deny: PII_HEADER_SNIPPETS },
httpHeaders: { request: { deny: PII_HEADER_SNIPPETS }, response: { deny: PII_HEADER_SNIPPETS } },
httpBodies: [],
queryParams: { deny: PII_HEADER_SNIPPETS },
urlQueryParams: { deny: PII_HEADER_SNIPPETS },
// The GraphQL document has literal values redacted at collection time, so it was historically
// always attached regardless of `sendDefaultPii`; keep it on to preserve that behavior.
graphQL: { document: true, variables: true },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const DEFAULTS: ResolvedDataCollection = {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -44,7 +44,8 @@ export function resolveDataCollectionOptions(options: {
response: dc.httpHeaders?.response ?? base.httpHeaders.response,
},
httpBodies: dc.httpBodies ?? base.httpBodies,
queryParams: dc.queryParams ?? base.queryParams,
// oxlint-disable-next-line typescript/no-deprecated
urlQueryParams: dc.urlQueryParams ?? dc.queryParams ?? base.urlQueryParams,
graphQL: {
document: dc.graphQL?.document ?? base.graphQL.document,
variables: dc.graphQL?.variables ?? base.graphQL.variables,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ export function createMockClient(userInfo = true, genAI?: { inputs: boolean; out
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: genAIOptions,
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ describe('defaultPiiToCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -26,7 +26,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -44,7 +44,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -62,7 +62,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ describe('resolveDataCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -49,7 +49,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.httpBodies).toEqual(['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse']);
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -96,7 +96,7 @@ describe('resolveDataCollectionOptions', () => {
// Everything else is spec default
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -147,14 +147,14 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toEqual({ deny: ['x-custom'] });
});

it('supports turning off query params', () => {
it('supports turning off URL query params', () => {
const result = resolveDataCollectionOptions({
dataCollection: {
queryParams: false,
urlQueryParams: false,
},
});

expect(result.queryParams).toBe(false);
expect(result.urlQueryParams).toBe(false);
});

it('supports turning off database query data', () => {
Expand All@@ -179,7 +179,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('httpHeaders.request');
expect(result).toHaveProperty('httpHeaders.response');
expect(result).toHaveProperty('httpBodies');
expect(result).toHaveProperty('queryParams');
expect(result).toHaveProperty('urlQueryParams');
expect(result).toHaveProperty('graphQL');
expect(result).toHaveProperty('graphQL.document');
expect(result).toHaveProperty('graphQL.variables');
Expand All@@ -191,4 +191,36 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('frameContextLines');
});
});

describe('deprecated queryParams alias', () => {
it('honors deprecated queryParams when urlQueryParams is not set', () => {
expect(resolveDataCollectionOptions({ dataCollection: { queryParams: false } }).urlQueryParams).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { queryParams: { deny: ['token'] } } }).urlQueryParams,
).toEqual({ deny: ['token'] });
});

it('prefers urlQueryParams over the deprecated queryParams when both are set', () => {
// new field wins, even when it is the "off" value
expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: false, queryParams: true } }).urlQueryParams,
).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: true, queryParams: false } }).urlQueryParams,
).toBe(true);
});

it('falls back to the default when neither is set', () => {
// dataCollection provided → spec default (collect)
expect(resolveDataCollectionOptions({ dataCollection: {} }).urlQueryParams).toBe(true);
});

it('does not leak the deprecated queryParams key into the resolved output', () => {
const result = resolveDataCollectionOptions({ dataCollection: { queryParams: false } });
expect(result).not.toHaveProperty('queryParams');
expect(Object.keys(result)).toHaveLength(10);
});
});
});
2 changes: 1 addition & 1 deletion packages/core/test/lib/utils/request.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -873,7 +873,7 @@ describe('request utils', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ describe('wrapMiddlewareHandlerWithSentry', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/remix/test/server/errors.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ function createMockClient(httpBodies: string[] = []): Client {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies,
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion packages/astro/test/server/middleware.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@ describe('sentryMiddleware', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/integrations/requestdata.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ const _requestDataIntegration = ((options: RequestDataIntegrationOptions = {}) =
data: true,
headers: dataCollection.httpHeaders.request !== false,
ip: dataCollection.userInfo,
query_string: dataCollection.queryParams !== false,
query_string: dataCollection.urlQueryParams !== false,
// No dataCollection equivalent — URL is always included
url: true,
...options.include,
Expand Down
10 changes: 7 additions & 3 deletions packages/core/src/types/datacollection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,11 +44,14 @@ export interface DataCollection {
*/
httpBodies?: HttpBodyCollectionTarget[];

/** @deprecated Use `urlQueryParams` instead. */
queryParams?: CollectBehavior;

/**
* Controls query parameter collection and sensitive value filtering.
* Controls URL query parameter collection and sensitive value filtering.
* @default true
*/
queryParams?: CollectBehavior;
urlQueryParams?: CollectBehavior;

/**
* Allow collection of GraphQL operation data when using the SDK's GraphQL integrations
Expand DownExpand Up@@ -102,7 +105,8 @@ export interface DataCollection {
/**
* Fully resolved `DataCollection` with all defaults applied.
*/
export type ResolvedDataCollection = Required<DataCollection> & {
// todo(v11): change `Omit<DataCollection, 'queryParams'>` to just `DataCollection`
export type ResolvedDataCollection = Required<Omit<DataCollection, 'queryParams'>> & {
httpHeaders: Required<NonNullable<DataCollection['httpHeaders']>>;
graphQL: Required<NonNullable<DataCollection['graphQL']>>;
genAI: Required<NonNullable<DataCollection['genAI']>>;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -27,7 +27,7 @@ export function defaultPiiToCollectionOptions(sendDefaultPii?: boolean): Resolve
cookies: { deny: PII_HEADER_SNIPPETS },
httpHeaders: { request: { deny: PII_HEADER_SNIPPETS }, response: { deny: PII_HEADER_SNIPPETS } },
httpBodies: [],
queryParams: { deny: PII_HEADER_SNIPPETS },
urlQueryParams: { deny: PII_HEADER_SNIPPETS },
// The GraphQL document has literal values redacted at collection time, so it was historically
// always attached regardless of `sendDefaultPii`; keep it on to preserve that behavior.
graphQL: { document: true, variables: true },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ const DEFAULTS: ResolvedDataCollection = {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -44,7 +44,8 @@ export function resolveDataCollectionOptions(options: {
response: dc.httpHeaders?.response ?? base.httpHeaders.response,
},
httpBodies: dc.httpBodies ?? base.httpBodies,
queryParams: dc.queryParams ?? base.queryParams,
// oxlint-disable-next-line typescript/no-deprecated
urlQueryParams: dc.urlQueryParams ?? dc.queryParams ?? base.urlQueryParams,
graphQL: {
document: dc.graphQL?.document ?? base.graphQL.document,
variables: dc.graphQL?.variables ?? base.graphQL.variables,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ export function createMockClient(userInfo = true, genAI?: { inputs: boolean; out
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: genAIOptions,
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ describe('defaultPiiToCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand All@@ -26,7 +26,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -44,7 +44,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand All@@ -62,7 +62,7 @@ describe('defaultPiiToCollectionOptions', () => {
response: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
},
httpBodies: [],
queryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
urlQueryParams: { deny: ['forwarded', '-ip', 'remote-', 'via', '-user'] },
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: false,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ describe('resolveDataCollectionOptions', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: ['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse'],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand DownExpand Up@@ -49,7 +49,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.httpBodies).toEqual(['incomingRequest', 'outgoingRequest', 'incomingResponse', 'outgoingResponse']);
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -96,7 +96,7 @@ describe('resolveDataCollectionOptions', () => {
// Everything else is spec default
expect(result.cookies).toBe(true);
expect(result.httpHeaders).toEqual({ request: true, response: true });
expect(result.queryParams).toBe(true);
expect(result.urlQueryParams).toBe(true);
expect(result.graphQL).toEqual({ document: true, variables: true });
expect(result.genAI).toEqual({ inputs: true, outputs: true });
expect(result.databaseQueryData).toBe(true);
Expand DownExpand Up@@ -147,14 +147,14 @@ describe('resolveDataCollectionOptions', () => {
expect(result.cookies).toEqual({ deny: ['x-custom'] });
});

it('supports turning off query params', () => {
it('supports turning off URL query params', () => {
const result = resolveDataCollectionOptions({
dataCollection: {
queryParams: false,
urlQueryParams: false,
},
});

expect(result.queryParams).toBe(false);
expect(result.urlQueryParams).toBe(false);
});

it('supports turning off database query data', () => {
Expand All@@ -179,7 +179,7 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('httpHeaders.request');
expect(result).toHaveProperty('httpHeaders.response');
expect(result).toHaveProperty('httpBodies');
expect(result).toHaveProperty('queryParams');
expect(result).toHaveProperty('urlQueryParams');
expect(result).toHaveProperty('graphQL');
expect(result).toHaveProperty('graphQL.document');
expect(result).toHaveProperty('graphQL.variables');
Expand All@@ -191,4 +191,36 @@ describe('resolveDataCollectionOptions', () => {
expect(result).toHaveProperty('frameContextLines');
});
});

describe('deprecated queryParams alias', () => {
it('honors deprecated queryParams when urlQueryParams is not set', () => {
expect(resolveDataCollectionOptions({ dataCollection: { queryParams: false } }).urlQueryParams).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { queryParams: { deny: ['token'] } } }).urlQueryParams,
).toEqual({ deny: ['token'] });
});

it('prefers urlQueryParams over the deprecated queryParams when both are set', () => {
// new field wins, even when it is the "off" value
expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: false, queryParams: true } }).urlQueryParams,
).toBe(false);

expect(
resolveDataCollectionOptions({ dataCollection: { urlQueryParams: true, queryParams: false } }).urlQueryParams,
).toBe(true);
});

it('falls back to the default when neither is set', () => {
// dataCollection provided → spec default (collect)
expect(resolveDataCollectionOptions({ dataCollection: {} }).urlQueryParams).toBe(true);
});

it('does not leak the deprecated queryParams key into the resolved output', () => {
const result = resolveDataCollectionOptions({ dataCollection: { queryParams: false } });
expect(result).not.toHaveProperty('queryParams');
expect(Object.keys(result)).toHaveLength(10);
});
});
});
2 changes: 1 addition & 1 deletion packages/core/test/lib/utils/request.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -873,7 +873,7 @@ describe('request utils', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ describe('wrapMiddlewareHandlerWithSentry', () => {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies: [],
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: false, outputs: false },
databaseQueryData: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/remix/test/server/errors.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ function createMockClient(httpBodies: string[] = []): Client {
cookies: true,
httpHeaders: { request: true, response: true },
httpBodies,
queryParams: true,
urlQueryParams: true,
graphQL: { document: true, variables: true },
genAI: { inputs: true, outputs: true },
databaseQueryData: true,
Expand Down
Loading