Integrate d5a483d (#2587) from roman/responseStatus into staging-06

Co-authored-by: roman.gaignault <roman.gaignault@datadoghq.com>
DataDog · Feb 5, 2024 · 51d8f1e · 51d8f1e
2 parents 8fd5da3 + d5a483d
commit 51d8f1e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/packages/rum-core/src/browser/performanceCollection.ts b/packages/rum-core/src/browser/performanceCollection.ts
@@ -49,6 +49,7 @@ export enum RumPerformanceEntryType {
 export interface RumPerformanceResourceTiming {
   entryType: RumPerformanceEntryType.RESOURCE
   initiatorType: string
+  responseStatus?: number
   name: string
   startTime: RelativeTime
   duration: Duration

diff --git a/packages/rum-core/src/domain/resource/resourceCollection.spec.ts b/packages/rum-core/src/domain/resource/resourceCollection.spec.ts
@@ -54,6 +54,7 @@ describe('resourceCollection', () => {
         url: 'https://resource.com/valid',
         download: jasmine.any(Object),
         first_byte: jasmine.any(Object),
+        status_code: 200,
       },
       type: RumEventType.RESOURCE,
       _dd: {
@@ -315,6 +316,13 @@ describe('resourceCollection', () => {
     )
   })
 
+  it('should discard 0 status code', () => {
+    const { lifeCycle, rawRumEvents } = setupBuilder.build()
+    const performanceEntry = createPerformanceEntry(RumPerformanceEntryType.RESOURCE, { responseStatus: 0 })
+    lifeCycle.notify(LifeCycleEventType.PERFORMANCE_ENTRIES_COLLECTED, [performanceEntry])
+    expect((rawRumEvents[0].rawRumEvent as RawRumResourceEvent).resource.status_code).toBe(undefined)
+  })
+
   describe('tracing info', () => {
     it('should be processed from traced initial document', () => {
       const { lifeCycle, rawRumEvents } = setupBuilder.build()

diff --git a/packages/rum-core/src/domain/resource/resourceCollection.ts b/packages/rum-core/src/domain/resource/resourceCollection.ts
@@ -102,7 +102,6 @@ function processRequest(
     correspondingTimingOverrides,
     pageStateInfo
   )
-
   return {
     startTime: startClocks.relative,
     rawRumEvent: resourceEvent,
@@ -142,6 +141,7 @@ function processResourceEntry(
         id: generateUUID(),
         type,
         url: entry.name,
+        status_code: discardZeroStatus(entry.responseStatus),
       },
       type: RumEventType.RESOURCE as const,
       _dd: {
@@ -235,3 +235,11 @@ function computeRequestDuration(pageStateHistory: PageStateHistory, startClocks:
 
   return !requestCrossedFrozenState ? toServerDuration(duration) : undefined
 }
+
+/**
+ * The status is 0 for cross origin resources without CORS headers, so the status is meaningless and we shouldn't report it
+ * https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming/responseStatus#cross-origin_response_status_codes
+ */
+function discardZeroStatus(statusCode: number | undefined): number | undefined {
+  return statusCode === 0 ? undefined : statusCode
+}
diff --git a/packages/rum-core/test/fixtures.ts b/packages/rum-core/test/fixtures.ts
@@ -230,6 +230,7 @@ export function createPerformanceEntry<T extends RumPerformanceEntryType>(
           responseStart: 200 as RelativeTime,
           secureConnectionStart: 200 as RelativeTime,
           startTime: 200 as RelativeTime,
+          responseStatus: 200,
         },
         overrides
       ) as EntryTypeToReturnType[T]