add protocol for xhr and fetch request

DataDog · Oct 24, 2024 · 10cc941 · 10cc941
1 parent 86cfedc
commit 10cc941
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/packages/rum-core/src/domain/requestCollection.ts b/packages/rum-core/src/domain/requestCollection.ts
@@ -44,7 +44,6 @@ export interface RequestCompleteEvent {
   method: string
   url: string
   status: number
-  protocol?: string
   responseType?: string
   startClocks: ClocksState
   duration: Duration

diff --git a/packages/rum-core/src/domain/resource/resourceCollection.spec.ts b/packages/rum-core/src/domain/resource/resourceCollection.spec.ts
@@ -102,7 +102,6 @@ describe('resourceCollection', () => {
         method: 'GET',
         startClocks: { relative: 1234 as RelativeTime, timeStamp: 123456789 as TimeStamp },
         status: 200,
-        protocol: 'HTTP/1.0',
         type: RequestType.XHR,
         url: 'https://resource.com/valid',
         xhr,
@@ -118,7 +117,7 @@ describe('resourceCollection', () => {
         duration: (100 * 1e6) as ServerDuration,
         method: 'GET',
         status_code: 200,
-        protocol: 'HTTP/1.0',
+        protocol: undefined,
         type: ResourceType.XHR,
         url: 'https://resource.com/valid',
       },
@@ -215,7 +214,6 @@ describe('resourceCollection', () => {
         method: 'GET',
         startClocks: { relative: 1234 as RelativeTime, timeStamp: 123456789 as TimeStamp },
         status: 200,
-        protocol: 'HTTP/1.0',
         type: RequestType.FETCH,
         url: 'https://resource.com/valid',
         response,
@@ -233,7 +231,7 @@ describe('resourceCollection', () => {
         duration: (100 * 1e6) as ServerDuration,
         method: 'GET',
         status_code: 200,
-        protocol: 'HTTP/1.0',
+        protocol: undefined,
         type: ResourceType.FETCH,
         url: 'https://resource.com/valid',
       },

diff --git a/packages/rum-core/src/domain/resource/resourceCollection.ts b/packages/rum-core/src/domain/resource/resourceCollection.ts
@@ -30,6 +30,7 @@ import {
   computeResourceEntryDuration,
   computeResourceEntryType,
   computeResourceEntrySize,
+  computeResourceEntryProtocol,
   isResourceEntryRequestType,
   isLongDataUrl,
   sanitizeDataUrl,
@@ -104,7 +105,7 @@ function processRequest(
         duration,
         method: request.method,
         status_code: request.status,
-        protocol: request.protocol,
+        protocol: matchingTiming && computeResourceEntryProtocol(matchingTiming),
         url: isLongDataUrl(request.url) ? sanitizeDataUrl(request.url) : request.url,
       },
       type: RumEventType.RESOURCE as const,
@@ -153,7 +154,7 @@ function processResourceEntry(
         type,
         url: entry.name,
         status_code: discardZeroStatus(entry.responseStatus),
-        protocol: discardEmptyProtocol(entry.nextHopProtocol),
+        protocol: computeResourceEntryProtocol(entry),
       },
       type: RumEventType.RESOURCE as const,
       _dd: {
@@ -234,12 +235,3 @@ function computeRequestDuration(pageStateHistory: PageStateHistory, startClocks:
 function discardZeroStatus(statusCode: number | undefined): number | undefined {
   return statusCode === 0 ? undefined : statusCode
 }
-
-/**
- * The 'nextHopProtocol' is an empty string for cross-origin resources without CORS headers,
- * meaning the protocol is unknown, and we shouldn't report it.
- * https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming/nextHopProtocol#cross-origin_resources
- */
-function discardEmptyProtocol(requestProtocol: string | undefined): string | undefined {
-  return requestProtocol === '' ? undefined : requestProtocol
-}
diff --git a/packages/rum-core/src/domain/resource/resourceUtils.ts b/packages/rum-core/src/domain/resource/resourceUtils.ts
@@ -177,6 +177,15 @@ function formatTiming(origin: RelativeTime, start: RelativeTime, end: RelativeTi
   }
 }
 
+/**
+ * The 'nextHopProtocol' is an empty string for cross-origin resources without CORS headers,
+ * meaning the protocol is unknown, and we shouldn't report it.
+ * https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming/nextHopProtocol#cross-origin_resources
+ */
+export function computeResourceEntryProtocol(entry: RumPerformanceResourceTiming) {
+  return entry.nextHopProtocol === '' ? undefined : entry.nextHopProtocol
+}
+
 export function computeResourceEntrySize(entry: RumPerformanceResourceTiming) {
   // Make sure a request actually occurred
   if (entry.startTime < entry.responseStart) {