Merge pull request #1 from carbon3d/trace-id

attach trace id to express req
carbon3d · Nov 19, 2019 · 0459f1f · 0459f1f
2 parents 85ba4a6 + f27b8d5
commit 0459f1f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/instrumentation/express.js b/src/instrumentation/express.js
@@ -38,7 +38,9 @@ function patch (express, tracers) {
         [Tags.HTTP_URL]: url,
         [Tags.HTTP_METHOD]: req.method
       })
-
+      if (spans[0] && spans[0].context()) {
+        req.traceId = spans[0].context().traceIdStr
+      }
       if (req.connection.remoteAddress) {
         spans.forEach((span) => span.log({ peerRemoteAddress: req.connection.remoteAddress }))
       }

diff --git a/src/instrumentation/express.spec.js b/src/instrumentation/express.spec.js
@@ -16,7 +16,8 @@ describe('instrumentation: express', () => {
     mockSpan = {
       setTag: this.sandbox.spy(),
       log: this.sandbox.spy(),
-      finish: this.sandbox.spy()
+      finish: this.sandbox.spy(),
+      context: () => {return {traceIdStr: 'cd085dc813af7cb1'}}
     }
 
     this.sandbox.stub(cls, 'startRootSpan').callsFake(() => mockSpan)

diff --git a/src/instrumentation/expressError.spec.js b/src/instrumentation/expressError.spec.js
@@ -15,12 +15,14 @@ describe('instrumentation: expressError', () => {
   beforeEach(function () {
     tracer = new Tracer()
     mockRootSpan = {
-      setTag: this.sandbox.spy()
+      setTag: this.sandbox.spy(),
+      context: () => {return {traceIdStr: 'cd085dc813af7cb1'}}
     }
     mockChildSpan = {
       setTag: this.sandbox.spy(),
       log: this.sandbox.spy(),
-      finish: this.sandbox.spy()
+      finish: this.sandbox.spy(),
+      context: () => {return {traceIdStr: 'cd085dc813af7cb1'}}
     }
 
     this.sandbox.stub(cls, 'getRootSpan').callsFake(() => mockRootSpan)