Merge pull request #176 from gecgooden/express-rename-http-span

open-telemetry · Oct 30, 2020 · 7f96aba · 7f96aba
2 parents 8ca9f6f + dcf2405
commit 7f96aba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/plugins/node/opentelemetry-plugin-express/src/express.ts b/plugins/node/opentelemetry-plugin-express/src/express.ts
@@ -187,6 +187,16 @@ export class ExpressPlugin extends BasePlugin<typeof express> {
         if (plugin._tracer.getCurrentSpan() === undefined) {
           return original.apply(this, arguments);
         }
+        // Rename the root http span once we reach the request handler
+        if (
+          metadata.attributes[AttributeNames.EXPRESS_TYPE] ===
+          ExpressLayerType.REQUEST_HANDLER
+        ) {
+          const parent = plugin._tracer.getCurrentSpan();
+          if (parent) {
+            parent.updateName(`${req.method} ${route}`);
+          }
+        }
         const span = plugin._tracer.startSpan(metadata.name, {
           attributes: Object.assign(attributes, metadata.attributes),
         });

diff --git a/plugins/node/opentelemetry-plugin-express/test/express.test.ts b/plugins/node/opentelemetry-plugin-express/test/express.test.ts
@@ -132,7 +132,7 @@ describe('Express Plugin', () => {
         );
         const exportedRootSpan = memoryExporter
           .getFinishedSpans()
-          .find(span => span.name === 'rootSpan');
+          .find(span => span.name === 'GET /toto/:id');
         assert.notStrictEqual(exportedRootSpan, undefined);
       });
       server.close();