Merge branch 'main' into mike/baggage-span-processor

open-telemetry · May 2, 2024 · ae60cae · ae60cae
2 parents b0c35a6 + 525bbba
commit ae60cae
Show file tree

Hide file tree

Showing 14 changed files with 312 additions and 329 deletions.
diff --git a/examples/postgres/README.md b/examples/postgres/README.md
diff --git a/examples/postgres/client.js b/examples/postgres/client.js
diff --git a/examples/postgres/images/jaeger.png b/examples/postgres/images/jaeger.png
diff --git a/examples/postgres/images/zipkin.png b/examples/postgres/images/zipkin.png
diff --git a/examples/postgres/package.json b/examples/postgres/package.json
diff --git a/examples/postgres/server.js b/examples/postgres/server.js
diff --git a/examples/postgres/setupPsql.js b/examples/postgres/setupPsql.js
diff --git a/examples/postgres/tracer.js b/examples/postgres/tracer.js
diff --git a/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts
@@ -29,6 +29,7 @@ import { AttributeNames } from './enums/AttributeNames';
 import {
   asErrorAndMessage,
   getLayerMetadata,
+  getLayerPath,
   isLayerIgnored,
   storeLayerPath,
 } from './utils';
@@ -115,10 +116,7 @@ export class ExpressInstrumentation extends InstrumentationBase {
       ) {
         const route = original.apply(this, args);
         const layer = this.stack[this.stack.length - 1] as ExpressLayer;
-        instrumentation._applyPatch(
-          layer,
-          typeof args[0] === 'string' ? args[0] : undefined
-        );
+        instrumentation._applyPatch(layer, getLayerPath(args));
         return route;
       };
     };
@@ -136,10 +134,7 @@ export class ExpressInstrumentation extends InstrumentationBase {
       ) {
         const route = original.apply(this, args);
         const layer = this.stack[this.stack.length - 1] as ExpressLayer;
-        instrumentation._applyPatch(
-          layer,
-          typeof args[0] === 'string' ? args[0] : undefined
-        );
+        instrumentation._applyPatch(layer, getLayerPath(args));
         return route;
       };
     };
@@ -160,7 +155,7 @@ export class ExpressInstrumentation extends InstrumentationBase {
         instrumentation._applyPatch.call(
           instrumentation,
           layer,
-          typeof args[0] === 'string' ? args[0] : undefined
+          getLayerPath(args)
         );
         return route;
       };

diff --git a/plugins/node/opentelemetry-instrumentation-express/src/types.ts b/plugins/node/opentelemetry-instrumentation-express/src/types.ts
@@ -18,6 +18,8 @@ import { Span } from '@opentelemetry/api';
 import { InstrumentationConfig } from '@opentelemetry/instrumentation';
 import { ExpressLayerType } from './enums/ExpressLayerType';
 
+export type LayerPathSegment = string | RegExp | number;
+
 export type IgnoreMatcher = string | RegExp | ((name: string) => boolean);
 
 export type ExpressRequestInfo<T = any> = {