fix web framework plugins error with http2 requests (#688)

DataDog · Sep 23, 2019 · 71114f9 · 71114f9
1 parent ce466c1
commit 71114f9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/packages/dd-trace/src/plugins/util/web.js b/packages/dd-trace/src/plugins/util/web.js
@@ -129,7 +129,7 @@ const web = {
   patch (req) {
     if (req._datadog) return
 
-    if (req.stream) {
+    if (req.stream && req.stream._datadog) {
       req._datadog = req.stream._datadog
       return
     }

diff --git a/packages/dd-trace/test/plugins/util/web.spec.js b/packages/dd-trace/test/plugins/util/web.spec.js
@@ -247,6 +247,31 @@ describe('plugins/util/web', () => {
           })
         })
       })
+
+      it('should support HTTP2 compatibility API', () => {
+        req.stream = {}
+        req.method = 'GET'
+        req.headers = {
+          ':scheme': 'https',
+          ':authority': 'localhost',
+          ':method': 'GET',
+          ':path': '/user/123'
+        }
+        res.statusCode = '200'
+
+        web.instrument(tracer, config, req, res, 'test.request', span => {
+          const tags = span.context()._tags
+
+          res.end()
+
+          expect(tags).to.include({
+            [SPAN_TYPE]: WEB,
+            [HTTP_URL]: 'https://localhost/user/123',
+            [HTTP_METHOD]: 'GET',
+            [SPAN_KIND]: SERVER
+          })
+        })
+      })
     })
 
     describe('on request end', () => {