Skip to content

feat(core)!: Remove queryParams in favor of urlQueryParams #22711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s1gr1d merged 2 commits into from
Jul 28, 2026
Merged

feat(core)!: Remove queryParams in favor of urlQueryParams #22711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a481882
feat(core)!: Remove `=queryParams` in favor of `urlQueryParams`
s1gr1d Jul 27, 2026
0b0c757
fix cloudflare test
s1gr1d Jul 28, 2026
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 dev-packages/cloudflare-integration-tests/suites/tracing/workers-ai/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ interface Env {
SENTRY_DSN: string;
}

const ai = instrumentWorkersAiClient(new MockAi());
const ai = instrumentWorkersAiClient(new MockAi(), { recordInputs: false, recordOutputs: false });

export default Sentry.withSentry(
(env: Env) => ({
Expand Down
6 changes: 1 addition & 5 deletions packages/core/src/types/datacollection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ export interface DataCollection {
*/
httpBodies?: HttpBodyCollectionTarget[];

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

/**
* Controls URL query parameter collection and sensitive value filtering.
* @default true
Expand Down Expand Up @@ -112,8 +109,7 @@ export interface DataCollection {
/**
* Fully resolved `DataCollection` with all defaults applied.
*/
// todo(v11): change `Omit<DataCollection, 'queryParams'>` to just `DataCollection`
export type ResolvedDataCollection = Required<Omit<DataCollection, 'queryParams'>> & {
export type ResolvedDataCollection = Required<DataCollection> & {
httpHeaders: Required<NonNullable<DataCollection['httpHeaders']>>;
graphQL: Required<NonNullable<DataCollection['graphQL']>>;
genAI: Required<NonNullable<DataCollection['genAI']>>;
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/utils/data-collection/resolveDataCollectionOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ export function resolveDataCollectionOptions(options: {
response: dc.httpHeaders?.response ?? base.httpHeaders.response,
},
httpBodies: dc.httpBodies ?? base.httpBodies,
// oxlint-disable-next-line typescript/no-deprecated
urlQueryParams: dc.urlQueryParams ?? dc.queryParams ?? base.urlQueryParams,
urlQueryParams: dc.urlQueryParams ?? base.urlQueryParams,
graphQL: {
document: dc.graphQL?.document ?? base.graphQL.document,
variables: dc.graphQL?.variables ?? base.graphQL.variables,
Expand Down
32 changes: 0 additions & 32 deletions packages/core/test/lib/utils/data-collection/resolveDataCollectionOptions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,36 +213,4 @@ 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);
});
});
});
Loading