Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-contrib

Author: sudarshan12s

metapackages/auto-instrumentations-node/README.md

@@ -198,6 +198,7 @@ registerInstrumentations({
 - [@opentelemetry/instrumentation-pino](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pino)
 - [@opentelemetry/instrumentation-redis](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis)
 - [@opentelemetry/instrumentation-restify](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-restify)
+- [@opentelemetry/instrumentation-runtime-node](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-runtime-node)
 - [@opentelemetry/instrumentation-socket.io](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io)
 - [@opentelemetry/instrumentation-undici](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-undici)
 - [@opentelemetry/instrumentation-winston](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-winston)

metapackages/auto-instrumentations-node/package.json

@@ -85,6 +85,7 @@
     "@opentelemetry/instrumentation-redis-4": "^0.47.0",
     "@opentelemetry/instrumentation-restify": "^0.46.0",
     "@opentelemetry/instrumentation-router": "^0.45.0",
+    "@opentelemetry/instrumentation-runtime-node": "^0.13.0",
     "@opentelemetry/instrumentation-socket.io": "^0.47.0",
     "@opentelemetry/instrumentation-tedious": "^0.19.0",
     "@opentelemetry/instrumentation-undici": "^0.11.0",

metapackages/auto-instrumentations-node/src/utils.ts

@@ -53,6 +53,7 @@ import { RedisInstrumentation as RedisInstrumentationV2 } from '@opentelemetry/i
 import { RedisInstrumentation as RedisInstrumentationV4 } from '@opentelemetry/instrumentation-redis-4';
 import { RestifyInstrumentation } from '@opentelemetry/instrumentation-restify';
 import { RouterInstrumentation } from '@opentelemetry/instrumentation-router';
+import { RuntimeNodeInstrumentation } from '@opentelemetry/instrumentation-runtime-node';
 import { SocketIoInstrumentation } from '@opentelemetry/instrumentation-socket.io';
 import { TediousInstrumentation } from '@opentelemetry/instrumentation-tedious';
 import { UndiciInstrumentation } from '@opentelemetry/instrumentation-undici';
@@ -131,6 +132,7 @@ const InstrumentationMap = {
   '@opentelemetry/instrumentation-redis-4': RedisInstrumentationV4,
   '@opentelemetry/instrumentation-restify': RestifyInstrumentation,
   '@opentelemetry/instrumentation-router': RouterInstrumentation,
+  '@opentelemetry/instrumentation-runtime-node': RuntimeNodeInstrumentation,
   '@opentelemetry/instrumentation-socket.io': SocketIoInstrumentation,
   '@opentelemetry/instrumentation-tedious': TediousInstrumentation,
   '@opentelemetry/instrumentation-undici': UndiciInstrumentation,

package-lock.json

@@ -77,5 +77,5 @@ Apache 2.0 - See [LICENSE][license-url] for more information.
 [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions
 [license-url]: https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/LICENSE
 [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat
-[npm-url]: https://www.npmjs.com/package/@opentelemetry/instrumentation-pg
-[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Finstrumentation-pg.svg
+[npm-url]: https://www.npmjs.com/package/@opentelemetry/instrumentation-runtime-node
+[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Finstrumentation-runtime-node.svg

plugins/node/instrumentation-runtime-node/README.md

@@ -171,7 +171,7 @@ export class ExpressInstrumentation extends InstrumentationBase<ExpressInstrumen
         req: PatchedRequest,
         res: express.Response
       ) {
-        storeLayerPath(req, layerPath);
+        const { isLayerPathStored } = storeLayerPath(req, layerPath);
         const route = (req[_LAYERS_STORE_PROPERTY] as string[])
           .filter(path => path !== '/' && path !== '/*')
           .join('')
@@ -280,7 +280,7 @@ export class ExpressInstrumentation extends InstrumentationBase<ExpressInstrumen
               req.res?.removeListener('finish', onResponseFinish);
               span.end();
             }
-            if (!(req.route && isError)) {
+            if (!(req.route && isError) && isLayerPathStored) {
               (req[_LAYERS_STORE_PROPERTY] as string[]).pop();
             }
             const callback = args[callbackIdx] as Function;

plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts

@@ -33,15 +33,21 @@ import {
  * @param request The request where
  * @param [value] the value to push into the array
  */
-export const storeLayerPath = (request: PatchedRequest, value?: string) => {
+export const storeLayerPath = (
+  request: PatchedRequest,
+  value?: string
+): { isLayerPathStored: boolean } => {
   if (Array.isArray(request[_LAYERS_STORE_PROPERTY]) === false) {
     Object.defineProperty(request, _LAYERS_STORE_PROPERTY, {
       enumerable: false,
       value: [],
     });
   }
-  if (value === undefined) return;
+  if (value === undefined) return { isLayerPathStored: false };
+
   (request[_LAYERS_STORE_PROPERTY] as string[]).push(value);
+
+  return { isLayerPathStored: true };
 };
 
 /**

plugins/node/opentelemetry-instrumentation-express/src/utils.ts

@@ -709,15 +709,18 @@ describe('ExpressInstrumentation', () => {
         assert.strictEqual(spans[5].name, 'router - /api/user/:id');
         assert.strictEqual(spans[5].kind, testUtils.OtlpSpanKind.INTERNAL);
         assert.strictEqual(spans[5].parentSpanId, spans[1].spanId);
-        assert.strictEqual(spans[6].name, 'router - /:postId');
+        assert.strictEqual(spans[6].name, 'router - /api/user/:id/posts');
         assert.strictEqual(spans[6].kind, testUtils.OtlpSpanKind.INTERNAL);
         assert.strictEqual(spans[6].parentSpanId, spans[1].spanId);
+        assert.strictEqual(spans[7].name, 'middleware - simpleMiddleware2');
+        assert.strictEqual(spans[7].kind, testUtils.OtlpSpanKind.INTERNAL);
+        assert.strictEqual(spans[7].parentSpanId, spans[1].spanId);
         assert.strictEqual(
-          spans[7].name,
+          spans[8].name,
           'request handler - /api/user/:id/posts/:postId'
         );
-        assert.strictEqual(spans[7].kind, testUtils.OtlpSpanKind.INTERNAL);
-        assert.strictEqual(spans[7].parentSpanId, spans[1].spanId);
+        assert.strictEqual(spans[8].kind, testUtils.OtlpSpanKind.INTERNAL);
+        assert.strictEqual(spans[8].parentSpanId, spans[1].spanId);
       },
     });
   });

plugins/node/opentelemetry-instrumentation-express/test/express.test.ts

@@ -46,6 +46,14 @@ app.use(async function simpleMiddleware(req, res, next) {
 
 const userRouter = express.Router();
 const postsRouter = express.Router();
+postsRouter.use(async function simpleMiddleware2(req, res, next) {
+  // Wait a short delay to ensure this "middleware - ..." span clearly starts
+  // before the "router - ..." span. The test rely on a start-time-based sort
+  // of the produced spans. If they start in the same millisecond, then tests
+  // can be flaky.
+  await promisify(setTimeout)(10);
+  next();
+});
 
 postsRouter.get('/:postId', (req, res, next) => {
   res.json({ hello: 'yes' });
@@ -74,7 +82,7 @@ await new Promise(resolve => {
     res.on('end', data => {
       resolve(data);
     });
-  })
+  });
 });
 
 await new Promise(resolve => server.close(resolve));

plugins/node/opentelemetry-instrumentation-express/test/fixtures/use-express-nested-router.mjs

@@ -17,7 +17,7 @@ npm install --save @opentelemetry/instrumentation-nestjs-core
 
 ### Supported Versions
 
-- [`@nestjs/core`](https://www.npmjs.com/package/@nestjs/core) versions `>=4.0.0 <11`
+- [`@nestjs/core`](https://www.npmjs.com/package/@nestjs/core) versions `>=4.0.0 <12`
 
 ## Usage