Skip to content

Commit 3aa1c9e

Browse files
committed
Fix regex tests
1 parent c209205 commit 3aa1c9e

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

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

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -812,15 +812,18 @@ describe('ExpressInstrumentation', () => {
812812
});
813813
}
814814

815-
for (const segment of [
816-
'arr/545',
817-
'arr/required',
818-
'arr/required',
819-
'arr/requiredPath',
820-
'arr/required/lastParam',
821-
'arr55/required/lastParam',
822-
'arr/requiredPath/optionalPath/',
823-
'arr/requiredPath/optionalPath/lastParam',
815+
const COMMON_PATH =
816+
'/test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/';
817+
818+
for (const [segment, path] of [
819+
['arr/545', COMMON_PATH],
820+
['arr/required', COMMON_PATH],
821+
['arr/required', COMMON_PATH],
822+
['arr/requiredPath', COMMON_PATH],
823+
['arr/required/lastParam', COMMON_PATH],
824+
['arr55/required/lastParam', COMMON_PATH],
825+
['arr/requiredPath/optionalPath/', '/test,6,/test/'],
826+
['arr/requiredPath/optionalPath/lastParam', '/test,6,/test/'],
824827
]) {
825828
it('should handle more complex regexes in route arrays correctly', async () => {
826829
await testUtils.runTestFixture({
@@ -840,18 +843,12 @@ describe('ExpressInstrumentation', () => {
840843

841844
assert.strictEqual(spans[0].name, 'GET');
842845
assert.strictEqual(spans[0].kind, testUtils.OtlpSpanKind.CLIENT);
843-
// assert.strictEqual(
844-
// spans[1].name,
845-
// 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/'
846-
// );
846+
assert.strictEqual(spans[1].name, `GET ${path}`);
847847
assert.strictEqual(spans[1].kind, testUtils.OtlpSpanKind.SERVER);
848848
assert.strictEqual(spans[2].name, 'middleware - simpleMiddleware');
849849
assert.strictEqual(spans[2].kind, testUtils.OtlpSpanKind.INTERNAL);
850850
assert.strictEqual(spans[2].parentSpanId, spans[1].spanId);
851-
// assert.strictEqual(
852-
// spans[3].name,
853-
// 'request handler - /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/'
854-
// );
851+
assert.strictEqual(spans[3].name, `request handler - ${path}`);
855852
assert.strictEqual(spans[3].kind, testUtils.OtlpSpanKind.INTERNAL);
856853
assert.strictEqual(spans[3].parentSpanId, spans[1].spanId);
857854
},

0 commit comments

Comments
 (0)