fix: enable parameterized routes instrumentations without any Express…

…LayerType spans
open-telemetry · Dec 4, 2020 · b5624cc · b5624cc
1 parent 5a08fbe
commit b5624cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/plugins/node/opentelemetry-plugin-express/src/express.ts b/plugins/node/opentelemetry-plugin-express/src/express.ts
@@ -188,8 +188,11 @@ export class ExpressPlugin extends BasePlugin<typeof express> {
           ExpressLayerType.REQUEST_HANDLER
         ) {
           const parent = plugin._tracer.getCurrentSpan();
-          if (parent) {
-            const parentRoute = parent.name.split(' ')[1];
+          // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+          // @ts-ignore
+          const parentSpanName = parent && parent.name;
+          if (parent && parentSpanName) {
+            const parentRoute = parentSpanName.split(' ')[1];
             if (!route.includes(parentRoute)) {
               parent.updateName(`${req.method} ${route}`);
             }

diff --git a/plugins/node/opentelemetry-plugin-express/test/express.test.ts b/plugins/node/opentelemetry-plugin-express/test/express.test.ts
@@ -102,6 +102,7 @@ describe('Express Plugin', () => {
       await tracer.withSpan(rootSpan, async () => {
         await httpRequest.get(`http://localhost:${port}/toto/tata`);
         rootSpan.end();
+        // @ts-ignore
         assert.strictEqual(rootSpan.name, 'GET /toto/:id');
         assert.notStrictEqual(
           memoryExporter
@@ -240,7 +241,7 @@ describe('Express Plugin', () => {
       await tracer.withSpan(rootSpan, async () => {
         await httpRequest.get(`http://localhost:${port}/toto/tata`);
         rootSpan.end();
-
+        // @ts-ignore
         assert.strictEqual(rootSpan.name, 'GET /toto/:id');
 
         assert.deepStrictEqual(