💥 always collect early requests

.claude/skills/manual-testing/SKILL.md

@@ -5,7 +5,7 @@ description: Run a manual test of the current change end-to-end and output repro
 
 ## Step 1: Understand the change
 
-Review the current diff to identify what SDK behavior changed and what events/fields need to be verified.
+If you don't have the PR changes in memory, review all commits in the PR to identify what SDK behavior changed and what events/fields need to be verified.
 
 ## Step 2: Start the dev server
 
@@ -52,6 +52,13 @@ yarn dev-server intake <selector> | jq '<field>'
 
 Use `yarn dev-server intake --help` to find the right selector.
 
+To evaluate JavaScript on the page (e.g. to inspect `window` state set by `beforeSend`), switch focus back to tab 0 first, then use `agent-browser eval`:
+
+```bash
+agent-browser tab 0
+agent-browser eval 'window.someValue'
+```
+
 ## Step 5: Verify the output matches expectations, then present the test instructions
 
 Output a self-contained bash snippet with the exact commands run and the expected output. This goes directly into the PR "Test instructions" section.

packages/core/src/browser/fetchObservable.spec.ts

@@ -301,8 +301,8 @@ describe('fetch proxy with ResponseBodyAction', () => {
     })
   })
 
-  it('should not collect response body with WAIT or IGNORE action', (done) => {
-    setupFetchTracking(() => ResponseBodyAction.WAIT)
+  it('should not collect response body with IGNORE action', (done) => {
+    setupFetchTracking(() => ResponseBodyAction.IGNORE)
 
     fetch(FAKE_URL).resolveWith({ status: 200, responseText: 'response body content' })
 
@@ -313,7 +313,7 @@ describe('fetch proxy with ResponseBodyAction', () => {
   })
 
   it('should use the highest priority action when multiple getters are registered', (done) => {
-    setupFetchTracking(() => ResponseBodyAction.WAIT)
+    setupFetchTracking(() => ResponseBodyAction.IGNORE)
 
     initFetchObservable({
       responseBodyAction: () => ResponseBodyAction.COLLECT,

packages/core/src/browser/fetchObservable.ts

@@ -45,10 +45,7 @@ type ResponseBodyActionGetter = (context: FetchResolveContext) => ResponseBodyAc
  */
 export const enum ResponseBodyAction {
   IGNORE = 0,
-  // TODO(next-major): Remove the "WAIT" action when `trackEarlyRequests` is removed, as the
-  // duration of fetch requests will always come from PerformanceResourceTiming
-  WAIT = 1,
-  COLLECT = 2,
+  COLLECT = 1,
 }
 
 const FETCH_BUFFER_LIMIT = 500
@@ -154,14 +151,12 @@ async function afterSend(
     ResponseBodyAction.IGNORE
   ) as ResponseBodyAction
 
-  if (responseBodyCondition !== ResponseBodyAction.IGNORE) {
+  if (responseBodyCondition === ResponseBodyAction.COLLECT) {
     const clonedResponse = tryToClone(response)
     if (clonedResponse && clonedResponse.body) {
       try {
-        const bytes = await readBytesFromStream(clonedResponse.body, {
-          collectStreamBody: responseBodyCondition === ResponseBodyAction.COLLECT,
-        })
-        context.responseBody = bytes && new TextDecoder().decode(bytes)
+        const bytes = await readBytesFromStream(clonedResponse.body)
+        context.responseBody = new TextDecoder().decode(bytes)
       } catch {
         // Ignore errors when reading the response body (e.g., stream aborted, network errors)
         // This is not critical and should not be reported as an SDK error

packages/core/src/tools/readBytesFromStream.spec.ts

@@ -14,18 +14,9 @@ describe('readBytesFromStream', () => {
   })
 
   it('should read full stream', async () => {
-    const bytes = await readBytesFromStream(stream, {
-      collectStreamBody: true,
-    })
+    const bytes = await readBytesFromStream(stream)
 
-    expect(bytes?.length).toBe(27)
-  })
-
-  it('should read full stream without body', async () => {
-    const bytes = await readBytesFromStream(stream, {
-      collectStreamBody: false,
-    })
-    expect(bytes).toBeUndefined()
+    expect(bytes.length).toBe(27)
   })
 
   it('should handle rejection error on read', async () => {
@@ -36,9 +27,7 @@ describe('readBytesFromStream', () => {
     })
 
     try {
-      await readBytesFromStream(stream, {
-        collectStreamBody: true,
-      })
+      await readBytesFromStream(stream)
       fail('Should have thrown an error')
     } catch (error) {
       expect(error).toEqual(jasmine.any(Error))
@@ -54,9 +43,7 @@ describe('readBytesFromStream', () => {
       cancel: () => Promise.reject(new Error('foo')),
     })
 
-    const bytes = await readBytesFromStream(stream, {
-      collectStreamBody: true,
-    })
+    const bytes = await readBytesFromStream(stream)
     expect(bytes).toBeDefined()
   })
 })

packages/core/src/tools/readBytesFromStream.ts

@@ -2,17 +2,10 @@ import type { Uint8ArrayBuffer } from './utils/byteUtils'
 import { concatBuffers } from './utils/byteUtils'
 import { noop } from './utils/functionUtils'
 
-interface Options {
-  // TODO(next-major): always collect stream body when `trackEarlyRequests` is removed, as we don't
-  // need to use this function to just wait for the end of the stream without collecting it
-  collectStreamBody?: boolean
-}
-
 /**
  * Read bytes from a ReadableStream until the end of the stream.
- * Returns the bytes if collectStreamBody is true, otherwise returns undefined.
  */
-export async function readBytesFromStream(stream: ReadableStream<Uint8ArrayBuffer>, options: Options) {
+export async function readBytesFromStream(stream: ReadableStream<Uint8ArrayBuffer>) {
   const reader = stream.getReader()
   const chunks: Uint8ArrayBuffer[] = []
 
@@ -22,9 +15,7 @@ export async function readBytesFromStream(stream: ReadableStream<Uint8ArrayBuffe
       break
     }
 
-    if (options.collectStreamBody) {
-      chunks.push(result.value)
-    }
+    chunks.push(result.value)
   }
 
   reader.cancel().catch(
@@ -33,5 +24,5 @@ export async function readBytesFromStream(stream: ReadableStream<Uint8ArrayBuffe
     noop
   )
 
-  return options.collectStreamBody ? concatBuffers(chunks) : undefined
+  return concatBuffers(chunks)
 }

packages/rum-core/src/boot/startRum.ts

@@ -219,7 +219,7 @@ export function startRumEventCollection(
 
   cleanupTasks.push(stopViewCollection)
 
-  const resourceCollection = startResourceCollection(lifeCycle, configuration, pageStateHistory)
+  const resourceCollection = startResourceCollection(lifeCycle, configuration)
   cleanupTasks.push(resourceCollection.stop)
 
   const { stop: stopLongTaskCollection } = startLongTaskCollection(lifeCycle, configuration)

packages/rum-core/src/domain/configuration/configuration.spec.ts

@@ -695,7 +695,6 @@ describe('serializeRumConfiguration', () => {
       trackViewsManually: true,
       trackResources: true,
       trackLongTasks: true,
-      trackEarlyRequests: true,
       remoteConfigurationId: '123',
       remoteConfigurationProxy: 'config',
       plugins: [{ name: 'foo', getConfigurationTelemetry: () => ({ bar: true }) }],
@@ -750,7 +749,6 @@ describe('serializeRumConfiguration', () => {
       enable_privacy_for_action_name: false,
       track_resources: true,
       track_long_task: true,
-      track_early_requests: true,
       use_worker_url: true,
       compress_intake_requests: true,
       plugins: [{ name: 'foo', bar: true }],

packages/rum-core/src/domain/configuration/configuration.ts

@@ -260,14 +260,6 @@ export interface RumInitConfiguration extends InitConfiguration {
    */
   trackLongTasks?: boolean | undefined
 
-  /**
-   * Enables early request collection before resource timing entries are available.
-   *
-   * @category Data Collection
-   * @defaultValue false
-   */
-  trackEarlyRequests?: boolean | undefined
-
   /**
    * List of plugins to enable. The plugins API is unstable and experimental, and may change without
    * notice. Please use only plugins provided by Datadog matching the version of the SDK you are
@@ -336,7 +328,6 @@ export interface RumConfiguration extends Configuration {
   trackResources: boolean
   trackResourceHeaders: MatchOption[]
   trackLongTasks: boolean
-  trackEarlyRequests: boolean
   subdomain?: string
   traceContextInjection: TraceContextInjection
   plugins: RumPlugin[]
@@ -408,7 +399,6 @@ export function validateAndBuildRumConfiguration(
     trackResources: !!(initConfiguration.trackResources ?? true),
     trackResourceHeaders: validateAndBuildTrackResourceHeaders(initConfiguration),
     trackLongTasks: !!(initConfiguration.trackLongTasks ?? true),
-    trackEarlyRequests: !!initConfiguration.trackEarlyRequests,
     subdomain: initConfiguration.subdomain,
     defaultPrivacyLevel: objectHasValue(DefaultPrivacyLevel, initConfiguration.defaultPrivacyLevel)
       ? initConfiguration.defaultPrivacyLevel
@@ -586,7 +576,6 @@ export function serializeRumConfiguration(configuration: RumInitConfiguration) {
     track_user_interactions: configuration.trackUserInteractions,
     track_resources: configuration.trackResources,
     track_long_task: configuration.trackLongTasks,
-    track_early_requests: configuration.trackEarlyRequests,
     plugins: configuration.plugins?.map((plugin) => ({
       name: plugin.name,
       ...plugin.getConfigurationTelemetry?.(),

packages/rum-core/src/domain/requestCollection.ts

@@ -115,7 +115,7 @@ export function trackFetch(lifeCycle: LifeCycle, configuration: RumConfiguration
       if (findGraphQlConfiguration(context.url, configuration)?.trackResponseErrors) {
         return ResponseBodyAction.COLLECT
       }
-      return ResponseBodyAction.WAIT
+      return ResponseBodyAction.IGNORE
     },
   }).subscribe((rawContext) => {
     const context = rawContext as RumFetchResolveContext | RumFetchStartContext