🐛[request] do not consider opaque response as error (#197)

https://fetch.spec.whatwg.org/#concept-filtered-response-opaque then, we don't know if the request is a success or an error
DataDog · Dec 10, 2019 · 700cd5f · 700cd5f
1 parent 1178b3f
commit 700cd5f
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/packages/core/src/requestCollection.ts b/packages/core/src/requestCollection.ts
@@ -17,6 +17,7 @@ export interface RequestDetails {
   url: string
   status: number
   response?: string
+  responseType?: string
   startTime: number
   duration: number
   traceId?: number
@@ -100,7 +101,7 @@ export function trackFetch(observable: RequestObservable) {
   window.fetch = monitor(function(this: GlobalFetch['fetch'], input: RequestInfo, init?: RequestInit) {
     const method = (init && init.method) || (typeof input === 'object' && input.method) || 'GET'
     const startTime = performance.now()
-    const reportFetchError = async (response: Response | Error) => {
+    const reportFetch = async (response: Response | Error) => {
       const duration = performance.now() - startTime
       const url = normalizeUrl((typeof input === 'object' && input.url) || (input as string))
       if ('stack' in response || response instanceof Error) {
@@ -122,13 +123,14 @@ export function trackFetch(observable: RequestObservable) {
           startTime,
           url,
           response: text,
+          responseType: response.type,
           status: response.status,
           type: RequestType.FETCH,
         })
       }
     }
     const responsePromise = originalFetch.call(this, input, init)
-    responsePromise.then(monitor(reportFetchError), monitor(reportFetchError))
+    responsePromise.then(monitor(reportFetch), monitor(reportFetch))
     return responsePromise
   })
 }
@@ -138,7 +140,7 @@ export function normalizeUrl(url: string) {
 }
 
 export function isRejected(request: RequestDetails) {
-  return request.status === 0
+  return request.status === 0 && request.responseType !== 'opaque'
 }
 
 export function isServerError(request: RequestDetails) {

diff --git a/packages/core/test/requestCollection.spec.ts b/packages/core/test/requestCollection.spec.ts
@@ -1,5 +1,12 @@
 import { Observable } from '../src/observable'
-import { normalizeUrl, RequestDetails, RequestType, trackFetch } from '../src/requestCollection'
+import {
+  isRejected,
+  isServerError,
+  normalizeUrl,
+  RequestDetails,
+  RequestType,
+  trackFetch,
+} from '../src/requestCollection'
 import { FetchStub, FetchStubBuilder, FetchStubPromise, isFirefox, isIE } from '../src/specHelper'
 
 describe('fetch tracker', () => {
@@ -41,6 +48,8 @@ describe('fetch tracker', () => {
       expect(request.url).toEqual(FAKE_URL)
       expect(request.status).toEqual(500)
       expect(request.response).toEqual('fetch error')
+      expect(isRejected(request)).toBe(false)
+      expect(isServerError(request)).toBe(true)
       done()
     })
   })
@@ -55,6 +64,24 @@ describe('fetch tracker', () => {
       expect(request.url).toEqual(FAKE_URL)
       expect(request.status).toEqual(0)
       expect(request.response).toMatch(/Error: fetch error/)
+      expect(isRejected(request)).toBe(true)
+      expect(isServerError(request)).toBe(false)
+      done()
+    })
+  })
+
+  it('should track opaque fetch', (done) => {
+    // https://fetch.spec.whatwg.org/#concept-filtered-response-opaque
+    fetchStub(FAKE_URL).resolveWith({ status: 0, type: 'opaque' })
+
+    fetchStubBuilder.whenAllComplete((requests: RequestDetails[]) => {
+      const request = requests[0]
+      expect(request.type).toEqual(RequestType.FETCH)
+      expect(request.method).toEqual('GET')
+      expect(request.url).toEqual(FAKE_URL)
+      expect(request.status).toEqual(0)
+      expect(isRejected(request)).toBe(false)
+      expect(isServerError(request)).toBe(false)
       done()
     })
   })
@@ -69,6 +96,8 @@ describe('fetch tracker', () => {
       expect(request.url).toEqual(FAKE_URL)
       expect(request.status).toEqual(400)
       expect(request.response).toEqual('Not found')
+      expect(isRejected(request)).toBe(false)
+      expect(isServerError(request)).toBe(false)
       done()
     })
   })