Merge branch 'main' into aymeric/textencoder-is-not-available-on-edge-18

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

@@ -63,7 +63,6 @@ export interface Configuration extends TransportConfiguration {
   // Event limits
   eventRateLimiterThreshold: number // Limit the maximum number of actions, errors and logs per minutes
   maxInternalMonitoringMessagesPerPage: number
-  requestErrorResponseLengthLimit: number
 
   // Batch configuration
   batchBytesLimit: number
@@ -108,11 +107,6 @@ export function validateAndBuildConfiguration(
     eventRateLimiterThreshold: 3000,
     maxInternalMonitoringMessagesPerPage: 15,
 
-    /**
-     * arbitrary value, byte precision not needed
-     */
-    requestErrorResponseLengthLimit: 32 * ONE_KILO_BYTE,
-
     /**
      * flush automatically, aim to be lower than ALB connection timeout
      * to maximize connection reuse.

packages/core/test/specHelper.ts

@@ -144,15 +144,33 @@ export interface ResponseStubOptions {
   type?: ResponseType
   responseText?: string
   responseTextError?: Error
+  body?: ReadableStream<Uint8Array>
 }
 function notYetImplemented(): never {
   throw new Error('not yet implemented')
 }
 
 export class ResponseStub implements Response {
-  private _bodyUsed = false
-
-  constructor(private options: Readonly<ResponseStubOptions>) {}
+  private _body: ReadableStream<Uint8Array> | undefined
+
+  constructor(private options: Readonly<ResponseStubOptions>) {
+    if (this.options.body) {
+      this._body = this.options.body
+    } else if (this.options.responseTextError !== undefined) {
+      this._body = new ReadableStream({
+        start: (controller) => {
+          controller.error(this.options.responseTextError)
+        },
+      })
+    } else if (this.options.responseText !== undefined) {
+      this._body = new ReadableStream({
+        start: (controller) => {
+          controller.enqueue(new TextEncoder().encode(this.options.responseText))
+          controller.close()
+        },
+      })
+    }
+  }
 
   get status() {
     return this.options.status ?? 200
@@ -167,19 +185,11 @@ export class ResponseStub implements Response {
   }
 
   get bodyUsed() {
-    return this._bodyUsed
+    return this._body ? this._body.locked : false
   }
 
-  text() {
-    if (this.bodyUsed) {
-      return Promise.reject(new TypeError("Failed to execute 'text' on 'Response': body stream already read"))
-    }
-    this._bodyUsed = true
-    if (this.options.responseTextError !== undefined) {
-      return Promise.reject(this.options.responseTextError)
-    }
-
-    return Promise.resolve(this.options.responseText ?? '')
+  get body() {
+    return this._body || null
   }
 
   clone() {
@@ -192,6 +202,7 @@ export class ResponseStub implements Response {
   // Partial implementation, feel free to implement
   /* eslint-disable @typescript-eslint/member-ordering */
   arrayBuffer = notYetImplemented
+  text = notYetImplemented
   blob = notYetImplemented
   formData = notYetImplemented
   json = notYetImplemented
@@ -214,9 +225,6 @@ export class ResponseStub implements Response {
   get url() {
     return notYetImplemented()
   }
-  get body() {
-    return notYetImplemented()
-  }
 }
 
 export type FetchStub = (input: RequestInfo, init?: RequestInit) => FetchStubPromise

packages/logs/src/domain/configuration.ts

@@ -1,5 +1,5 @@
 import type { Configuration, InitConfiguration } from '@datadog/browser-core'
-import { validateAndBuildConfiguration } from '@datadog/browser-core'
+import { ONE_KILO_BYTE, validateAndBuildConfiguration } from '@datadog/browser-core'
 import { buildEnv } from '../boot/buildEnv'
 import type { LogsEvent } from '../logsEvent.types'
 
@@ -12,8 +12,14 @@ export type HybridInitConfiguration = Omit<LogsInitConfiguration, 'clientToken'>
 
 export interface LogsConfiguration extends Configuration {
   forwardErrorsToLogs: boolean
+  requestErrorResponseLengthLimit: number
 }
 
+/**
+ * arbitrary value, byte precision not needed
+ */
+export const DEFAULT_REQUEST_ERROR_RESPONSE_LENGTH_LIMIT = 32 * ONE_KILO_BYTE
+
 export function validateAndBuildLogsConfiguration(
   initConfiguration: LogsInitConfiguration
 ): LogsConfiguration | undefined {
@@ -26,5 +32,7 @@ export function validateAndBuildLogsConfiguration(
     ...baseConfiguration,
 
     forwardErrorsToLogs: !!initConfiguration.forwardErrorsToLogs,
+
+    requestErrorResponseLengthLimit: DEFAULT_REQUEST_ERROR_RESPONSE_LENGTH_LIMIT,
   }
 }

packages/logs/src/domain/trackNetworkError.spec.ts

@@ -152,10 +152,19 @@ describe('computeXhrResponseData', () => {
 })
 
 describe('computeFetchResponseText', () => {
+  let onunhandledrejectionSpy: jasmine.Spy
+
   beforeEach(() => {
     if (isIE()) {
       pending('IE does not support the fetch API')
     }
+
+    onunhandledrejectionSpy = jasmine.createSpy()
+    window.onunhandledrejection = onunhandledrejectionSpy
+  })
+
+  afterEach(() => {
+    window.onunhandledrejection = null
   })
 
   it('computes response text from Response objects', (done) => {
@@ -185,16 +194,69 @@ describe('computeFetchResponseText', () => {
     })
   })
 
-  it('truncates fetch response text', (done) => {
+  it('reads a limited amount of bytes from the response', (done) => {
+    // Creates a response that stream "f" indefinitely, one byte at a time
+    const cancelSpy = jasmine.createSpy()
+    const pullSpy = jasmine.createSpy().and.callFake((controller: ReadableStreamDefaultController<Uint8Array>) => {
+      controller.enqueue(new TextEncoder().encode('f'))
+    })
+    const response = new ResponseStub({
+      body: new ReadableStream({
+        pull: pullSpy,
+        cancel: cancelSpy,
+      }),
+    })
+
+    computeFetchResponseText(response, CONFIGURATION, () => {
+      expect(pullSpy).toHaveBeenCalledTimes(
+        // readLimitedAmountOfBytes may read one more byte than necessary to make sure it exceeds the limit
+        CONFIGURATION.requestErrorResponseLengthLimit + 1
+      )
+      expect(cancelSpy).toHaveBeenCalledTimes(1)
+      done()
+    })
+  })
+
+  it('truncates the response if its size is greater than the limit', (done) => {
+    const text = 'foobar'
     computeFetchResponseText(
-      new ResponseStub({ responseText: 'Lorem ipsum dolor sit amet orci aliquam.' }),
-      { ...CONFIGURATION, requestErrorResponseLengthLimit: 32 },
-      (responseText) => {
-        expect(responseText).toBe('Lorem ipsum dolor sit amet orci ...')
+      new ResponseStub({ responseText: text }),
+      { ...CONFIGURATION, requestErrorResponseLengthLimit: text.length - 1 },
+      (responseData) => {
+        expect(responseData).toBe('fooba...')
         done()
       }
     )
   })
+
+  it('does not truncate the response if its size is equal to the limit', (done) => {
+    const text = 'foo'
+    computeFetchResponseText(
+      new ResponseStub({ responseText: text }),
+      { ...CONFIGURATION, requestErrorResponseLengthLimit: text.length },
+      (responseData) => {
+        expect(responseData).toBe(text)
+        done()
+      }
+    )
+  })
+
+  it('does not yield an unhandled rejection error if the cancel promise is rejected', (done) => {
+    // Creates a response that stream "f" indefinitely and fails to be canceled
+    const response = new ResponseStub({
+      body: new ReadableStream({
+        pull: (controller) => controller.enqueue(new TextEncoder().encode('f')),
+        cancel: () => Promise.reject(new Error('foo')),
+      }),
+    })
+
+    computeFetchResponseText(response, CONFIGURATION, () => {
+      setTimeout(() => {
+        expect(onunhandledrejectionSpy).not.toHaveBeenCalled()
+        done()
+      })
+    })
+  })
 })
 
 describe('computeFetchErrorText', () => {

packages/logs/src/domain/trackNetworkError.ts

@@ -7,6 +7,7 @@ import {
   computeStackTrace,
   toStackTraceString,
   monitor,
+  noop,
 } from '@datadog/browser-core'
 import type { LogsConfiguration } from './configuration'
 
@@ -86,13 +87,56 @@ export function computeFetchResponseText(
   configuration: LogsConfiguration,
   callback: (responseText?: string) => void
 ) {
-  response
-    .clone()
-    .text()
-    .then(
-      monitor((text) => callback(truncateResponseText(text, configuration))),
-      monitor((error) => callback(`Unable to retrieve response: ${error as string}`))
+  if (!window.TextDecoder) {
+    // If the browser doesn't support TextDecoder, let's read the whole response then truncate it.
+    //
+    // This should only be the case on early versions of Edge (before they migrated to Chromium).
+    // Even if it could be possible to implement a workaround for the missing TextDecoder API (using
+    // a Blob and FileReader), we found another issue preventing us from reading only the first
+    // bytes from the response: contrary to other browsers, when reading from the cloned response,
+    // if the original response gets canceled, the cloned response is also canceled and we can't
+    // know about it.  In the following illustration, the promise returned by `reader.read()` may
+    // never be fulfilled:
+    //
+    // fetch('/').then((response) => {
+    //   const reader = response.clone().body.getReader()
+    //   readMore()
+    //   function readMore() {
+    //     reader.read().then(
+    //       (result) => {
+    //         if (result.done) {
+    //           console.log('done')
+    //         } else {
+    //           readMore()
+    //         }
+    //       },
+    //       () => console.log('error')
+    //     )
+    //   }
+    //   response.body.getReader().cancel()
+    // })
+    response
+      .clone()
+      .text()
+      .then(
+        monitor((text) => callback(truncateResponseText(text, configuration))),
+        monitor((error) => callback(`Unable to retrieve response: ${error as string}`))
+      )
+  } else if (!response.body) {
+    callback()
+  } else {
+    truncateResponseStream(
+      response.clone().body!,
+      configuration.requestErrorResponseLengthLimit,
+      (error, responseText) => {
+        if (error) {
+          callback(`Unable to retrieve response: ${(error as unknown) as string}`)
+        } else {
+          callback(responseText)
+        }
+      }
     )
+  }
 }
 
 function isRejected(request: { status: number; responseType?: string }) {
@@ -116,3 +160,84 @@ function format(type: RequestType) {
   }
   return 'Fetch'
 }
+
+function truncateResponseStream(
+  stream: ReadableStream<Uint8Array>,
+  limit: number,
+  callback: (error?: Error, responseText?: string) => void
+) {
+  readLimitedAmountOfBytes(stream, limit, (error, bytes, limitExceeded) => {
+    if (error) {
+      callback(error)
+    } else {
+      let responseText = new TextDecoder().decode(bytes)
+      if (limitExceeded) {
+        responseText += '...'
+      }
+      callback(undefined, responseText)
+    }
+  })
+}
+
+/**
+ * Read bytes from a ReadableStream until at least `limit` bytes have been read (or until the end of
+ * the stream). The callback is invoked with the at most `limit` bytes, and indicates that the limit
+ * has been exceeded if more bytes were available.
+ */
+function readLimitedAmountOfBytes(
+  stream: ReadableStream<Uint8Array>,
+  limit: number,
+  callback: (error?: Error, bytes?: Uint8Array, limitExceeded?: boolean) => void
+) {
+  const reader = stream.getReader()
+  const chunks: Uint8Array[] = []
+  let readBytesCount = 0
+
+  readMore()
+
+  function readMore() {
+    reader.read().then(
+      monitor((result: ReadableStreamReadResult<Uint8Array>) => {
+        if (result.done) {
+          onDone()
+          return
+        }
+
+        chunks.push(result.value)
+        readBytesCount += result.value.length
+
+        if (readBytesCount > limit) {
+          onDone()
+        } else {
+          readMore()
+        }
+      }),
+      monitor((error) => callback(error))
+    )
+  }
+
+  function onDone() {
+    reader.cancel().catch(
+      // we don't care if cancel fails, but we still need to catch the error to avoid reporting it
+      // as an unhandled rejection
+      noop
+    )
+
+    let completeBuffer: Uint8Array
+    if (chunks.length === 1) {
+      // optim: if the response is small enough to fit in a single buffer (provided by the browser), just
+      // use it directly.
+      completeBuffer = chunks[0]
+    } else {
+      // else, we need to copy buffers into a larger buffer to concatenate them.
+      completeBuffer = new Uint8Array(readBytesCount)
+      let offset = 0
+      chunks.forEach((chunk) => {
+        completeBuffer.set(chunk, offset)
+        offset += chunk.length
+      })
+    }
+
+    callback(undefined, completeBuffer.slice(0, limit), completeBuffer.length > limit)
+  }
+}

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

@@ -298,6 +298,7 @@ describe('rum assembly', () => {
       expect(serverRumEvents[0].view.id).toBeDefined()
       expect(serverRumEvents[0].date).toBeDefined()
       expect(serverRumEvents[0].session.id).toBeDefined()
+      expect(serverRumEvents[0].source).toBe('browser')
     })
 
     it('should be overwritten by event attributes', () => {

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

@@ -111,6 +111,7 @@ export function startRumAssembly(
           },
           date: timeStampNow(),
           service: configuration.service,
+          source: 'browser',
           session: {
             id: session.id,
             type: syntheticsContext ? SessionType.SYNTHETICS : ciTestContext ? SessionType.CI_TEST : SessionType.USER,