fix(fastify): Use plugin name for middleware span name

open-telemetry · Sep 13, 2023 · 061da0c · 061da0c
1 parent b10224b
commit 061da0c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts
@@ -116,9 +116,8 @@ export class FastifyInstrumentation extends InstrumentationBase {
         return original.apply(this, args);
       }
 
-      const spanName = `${FastifyNames.MIDDLEWARE} - ${
-        original.name || ANONYMOUS_NAME
-      }`;
+      const name = original.name || pluginName || ANONYMOUS_NAME;
+      const spanName = `${FastifyNames.MIDDLEWARE} - ${name}`;
 
       const reply = args[1] as PluginFastifyReply;
 
@@ -263,7 +262,7 @@ export class FastifyInstrumentation extends InstrumentationBase {
       const requestContext = (request as any).context || {};
       const handlerName = (requestContext.handler?.name || '').substr(6);
       const spanName = `${FastifyNames.REQUEST_HANDLER} - ${
-        handlerName || ANONYMOUS_NAME
+        handlerName || this.pluginName || ANONYMOUS_NAME
       }`;
 
       const spanAttributes: SpanAttributes = {

diff --git a/plugins/node/opentelemetry-instrumentation-fastify/test/instrumentation.test.ts b/plugins/node/opentelemetry-instrumentation-fastify/test/instrumentation.test.ts
@@ -27,7 +27,6 @@ import {
 import { Span } from '@opentelemetry/api';
 import * as http from 'http';
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
-import { ANONYMOUS_NAME } from '../src/instrumentation';
 import { AttributeNames, FastifyInstrumentation } from '../src';
 import { FastifyRequestInfo } from '../src/types';
 
@@ -152,7 +151,10 @@ describe('fastify', () => {
         'plugin.name': 'fastify -> @fastify/express',
         [SemanticAttributes.HTTP_ROUTE]: '/test',
       });
-      assert.strictEqual(span.name, `request handler - ${ANONYMOUS_NAME}`);
+      assert.strictEqual(
+        span.name,
+        'request handler - fastify -> @fastify/express'
+      );
       const baseSpan = spans[1];
       assert.strictEqual(span.parentSpanId, baseSpan.spanContext().spanId);
     });
@@ -290,7 +292,7 @@ describe('fastify', () => {
         assert.strictEqual(spans.length, 6);
         const baseSpan = spans[1];
         const span = spans[2];
-        assert.strictEqual(span.name, `middleware - ${ANONYMOUS_NAME}`);
+        assert.strictEqual(span.name, 'middleware - subsystem');
         assert.deepStrictEqual(span.attributes, {
           'fastify.type': 'middleware',
           'plugin.name': 'subsystem',
@@ -307,7 +309,7 @@ describe('fastify', () => {
 
         assert.strictEqual(spans.length, 6);
         const span = spans[3];
-        assert.strictEqual(span.name, 'request handler - anonymous');
+        assert.strictEqual(span.name, 'request handler - subsystem');
         assert.deepStrictEqual(span.status, {
           code: SpanStatusCode.ERROR,
           message: 'foo',