chore(node): Bump @opentelemetry/instrumentation-express to 0.43.0 (

#13948)
getsentry · Oct 15, 2024 · b8d0f2f · b8d0f2f
1 parent 5f68d4d
commit b8d0f2f
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 79 deletions.
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/test.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/test.ts
@@ -1,31 +1,17 @@
-import { conditionalTest } from '../../../../utils';
 import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';
 
 afterAll(() => {
   cleanupChildProcesses();
 });
 
-// Before Node 16, parametrization is not working properly here
-conditionalTest({ min: 16 })('complex-router', () => {
+describe('complex-router', () => {
   test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route', done => {
-    // parse node.js major version
-    const [major = 0] = process.versions.node.split('.').map(Number);
-    // Split test result base on major node version because regex d flag is support from node 16+
-
-    const EXPECTED_TRANSACTION =
-      major >= 16
-        ? {
-            transaction: 'GET /api/api/v1/sub-router/users/:userId/posts/:postId',
-            transaction_info: {
-              source: 'route',
-            },
-          }
-        : {
-            transaction: 'GET /api/api/v1/sub-router/users/123/posts/:postId',
-            transaction_info: {
-              source: 'route',
-            },
-          };
+    const EXPECTED_TRANSACTION = {
+      transaction: 'GET /api/api/v1/sub-router/users/:userId/posts/:postId',
+      transaction_info: {
+        source: 'route',
+      },
+    };
 
     createRunner(__dirname, 'server.ts')
       .ignore('event')
@@ -35,23 +21,12 @@ conditionalTest({ min: 16 })('complex-router', () => {
   });
 
   test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url has query params', done => {
-    // parse node.js major version
-    const [major = 0] = process.versions.node.split('.').map(Number);
-    // Split test result base on major node version because regex d flag is support from node 16+
-    const EXPECTED_TRANSACTION =
-      major >= 16
-        ? {
-            transaction: 'GET /api/api/v1/sub-router/users/:userId/posts/:postId',
-            transaction_info: {
-              source: 'route',
-            },
-          }
-        : {
-            transaction: 'GET /api/api/v1/sub-router/users/123/posts/:postId',
-            transaction_info: {
-              source: 'route',
-            },
-          };
+    const EXPECTED_TRANSACTION = {
+      transaction: 'GET /api/api/v1/sub-router/users/:userId/posts/:postId',
+      transaction_info: {
+        source: 'route',
+      },
+    };
 
     createRunner(__dirname, 'server.ts')
       .ignore('event')
@@ -61,23 +36,12 @@ conditionalTest({ min: 16 })('complex-router', () => {
   });
 
   test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url ends with trailing slash and has query params', done => {
-    // parse node.js major version
-    const [major = 0] = process.versions.node.split('.').map(Number);
-    // Split test result base on major node version because regex d flag is support from node 16+
-    const EXPECTED_TRANSACTION =
-      major >= 16
-        ? {
-            transaction: 'GET /api/api/v1/sub-router/users/:userId/posts/:postId',
-            transaction_info: {
-              source: 'route',
-            },
-          }
-        : {
-            transaction: 'GET /api/api/v1/sub-router/users/123/posts/:postId',
-            transaction_info: {
-              source: 'route',
-            },
-          };
+    const EXPECTED_TRANSACTION = {
+      transaction: 'GET /api/api/v1/sub-router/users/:userId/posts/:postId',
+      transaction_info: {
+        source: 'route',
+      },
+    };
 
     createRunner(__dirname, 'server.ts')
       .ignore('event')

diff --git a/...node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/test.ts b/...node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/test.ts
@@ -1,30 +1,18 @@
-import { conditionalTest } from '../../../../utils';
 import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';
 
 afterAll(() => {
   cleanupChildProcesses();
 });
 
 // Before Node 16, parametrization is not working properly here
-conditionalTest({ min: 16 })('middle-layer-parameterized', () => {
+describe('middle-layer-parameterized', () => {
   test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route', done => {
-    // parse node.js major version
-    const [major = 0] = process.versions.node.split('.').map(Number);
-    // Split test result base on major node version because regex d flag is support from node 16+
-    const EXPECTED_TRANSACTION =
-      major >= 16
-        ? {
-            transaction: 'GET /api/v1/users/:userId/posts/:postId',
-            transaction_info: {
-              source: 'route',
-            },
-          }
-        : {
-            transaction: 'GET /api/v1/users/123/posts/:postId',
-            transaction_info: {
-              source: 'route',
-            },
-          };
+    const EXPECTED_TRANSACTION = {
+      transaction: 'GET /api/v1/users/:userId/posts/:postId',
+      transaction_info: {
+        source: 'route',
+      },
+    };
 
     createRunner(__dirname, 'server.ts')
       .ignore('event')

diff --git a/packages/node/package.json b/packages/node/package.json
@@ -72,7 +72,7 @@
     "@opentelemetry/instrumentation-amqplib": "^0.42.0",
     "@opentelemetry/instrumentation-connect": "0.39.0",
     "@opentelemetry/instrumentation-dataloader": "0.12.0",
-    "@opentelemetry/instrumentation-express": "0.42.0",
+    "@opentelemetry/instrumentation-express": "0.43.0",
     "@opentelemetry/instrumentation-fastify": "0.39.0",
     "@opentelemetry/instrumentation-fs": "0.15.0",
     "@opentelemetry/instrumentation-generic-pool": "0.39.0",

diff --git a/yarn.lock b/yarn.lock
@@ -7326,10 +7326,10 @@
   dependencies:
     "@opentelemetry/instrumentation" "^0.53.0"
 
-"@opentelemetry/instrumentation-express@0.42.0":
-  version "0.42.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-express/-/instrumentation-express-0.42.0.tgz#279f195aa66baee2b98623a16666c6229c8e7564"
-  integrity sha512-YNcy7ZfGnLsVEqGXQPT+S0G1AE46N21ORY7i7yUQyfhGAL4RBjnZUqefMI0NwqIl6nGbr1IpF0rZGoN8Q7x12Q==
+"@opentelemetry/instrumentation-express@0.43.0":
+  version "0.43.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-express/-/instrumentation-express-0.43.0.tgz#35ff5bcf40b816d9a9159d5f7814ed7e5d83f69b"
+  integrity sha512-bxTIlzn9qPXJgrhz8/Do5Q3jIlqfpoJrSUtVGqH+90eM1v2PkPHc+SdE+zSqe4q9Y1UQJosmZ4N4bm7Zj/++MA==
   dependencies:
     "@opentelemetry/core" "^1.8.0"
     "@opentelemetry/instrumentation" "^0.53.0"