chore: address pr comments

open-telemetry · Sep 13, 2020 · 200f457 · 200f457
1 parent 2e2e421
commit 200f457
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/plugins/node/opentelemetry-plugin-express/src/express.ts b/plugins/node/opentelemetry-plugin-express/src/express.ts
@@ -214,9 +214,9 @@ export class ExpressPlugin extends BasePlugin<typeof express> {
         if (callbackIdx >= 0) {
           arguments[callbackIdx] = function () {
             if (spanHasEnded === false) {
-              span.end();
               spanHasEnded = true;
               req.res?.removeListener('finish', onResponseFinish);
+              span.end();
             }
             if (!(req.route && arguments[0] instanceof Error)) {
               (req[_LAYERS_STORE_PROPERTY] as string[]).pop();

diff --git a/plugins/node/opentelemetry-plugin-express/test/express.test.ts b/plugins/node/opentelemetry-plugin-express/test/express.test.ts
@@ -91,9 +91,9 @@ describe('Express Plugin', () => {
       const router = express.Router();
       app.use('/toto', router);
       router.get('/:id', (req, res) => {
-        setTimeout(() => {
-          return res.status(200).end();
-        }, 5);
+        setImmediate(() => {
+          res.status(200).end();
+        });
       });
       const server = http.createServer(app);
       await new Promise(resolve => server.listen(0, resolve));