From a481882f5ea3506f1bd1f6f4dcefa6f35782603a Mon Sep 17 00:00:00 2001
From: s1gr1d <32902192+s1gr1d@users.noreply.github.com>
Date: Mon, 27 Jul 2026 15:45:05 +0200
Subject: [PATCH 1/2] feat(core)!: Remove `=queryParams` in favor of
 `urlQueryParams`

---
 packages/core/src/types/datacollection.ts     |  6 +---
 .../resolveDataCollectionOptions.ts           |  3 +-
 .../resolveDataCollectionOptions.test.ts      | 32 -------------------
 3 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/packages/core/src/types/datacollection.ts b/packages/core/src/types/datacollection.ts
index 8d87b07f9577..1c8db871209b 100644
--- a/packages/core/src/types/datacollection.ts
+++ b/packages/core/src/types/datacollection.ts
@@ -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
@@ -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']>>;
diff --git a/packages/core/src/utils/data-collection/resolveDataCollectionOptions.ts b/packages/core/src/utils/data-collection/resolveDataCollectionOptions.ts
index 4c558737903e..9f4f60ce5a73 100644
--- a/packages/core/src/utils/data-collection/resolveDataCollectionOptions.ts
+++ b/packages/core/src/utils/data-collection/resolveDataCollectionOptions.ts
@@ -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,
diff --git a/packages/core/test/lib/utils/data-collection/resolveDataCollectionOptions.test.ts b/packages/core/test/lib/utils/data-collection/resolveDataCollectionOptions.test.ts
index 8d6ec21a0ab6..5b2f9a22cee1 100644
--- a/packages/core/test/lib/utils/data-collection/resolveDataCollectionOptions.test.ts
+++ b/packages/core/test/lib/utils/data-collection/resolveDataCollectionOptions.test.ts
@@ -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);
-    });
-  });
 });

From 0b0c75774f3132a85285dac3db225c08d0ea994c Mon Sep 17 00:00:00 2001
From: s1gr1d <32902192+s1gr1d@users.noreply.github.com>
Date: Tue, 28 Jul 2026 13:11:07 +0200
Subject: [PATCH 2/2] fix cloudflare test

---
 .../suites/tracing/workers-ai/index.ts                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-packages/cloudflare-integration-tests/suites/tracing/workers-ai/index.ts b/dev-packages/cloudflare-integration-tests/suites/tracing/workers-ai/index.ts
index ade153d04c12..d376b90a0a07 100644
--- a/dev-packages/cloudflare-integration-tests/suites/tracing/workers-ai/index.ts
+++ b/dev-packages/cloudflare-integration-tests/suites/tracing/workers-ai/index.ts
@@ -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) => ({