feat(@opentelemetry-instrumentation-fetch): support reading response …

…body from the hook applyCustomAttributesOnSpan
open-telemetry · Sep 26, 2021 · 3fe7175 · 3fe7175
1 parent 6a78db1
commit 3fe7175
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts b/experimental/packages/opentelemetry-instrumentation-fetch/src/fetch.ts
@@ -331,14 +331,15 @@ export class FetchInstrumentation extends InstrumentationBase<
         ): void {
           try {
             const resClone = response.clone();
+            const resClone4Hook = response.clone();
             const body = resClone.body;
             if (body) {
               const reader = body.getReader();
               const read = (): void => {
                 reader.read().then(
                   ({ done }) => {
                     if (done) {
-                      endSpanOnSuccess(span, response);
+                      endSpanOnSuccess(span, resClone4Hook);
                     } else {
                       read();
                     }

diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts b/experimental/packages/opentelemetry-instrumentation-fetch/test/fetch.test.ts
@@ -683,6 +683,22 @@ describe('fetch', () => {
 
       prepare(url, applyCustomAttributes);
     });
+
+    it('get response body from callback arguments response', done => {
+      const applyCustomAttributes: FetchCustomAttributeFunction = async (
+        span,
+        request,
+        response
+      ) => {
+        if(response instanceof Response ){
+          const rsp = await response.json();
+          assert.deepStrictEqual(rsp.args, {});
+          done();
+        };
+      };
+
+      prepare(url, applyCustomAttributes);
+    });
   });
 
   describe('when url is ignored', () => {