handling mixture of string and regex routing

packages/datadog-plugin-express/test/index.spec.js

@@ -705,7 +705,7 @@ describe('Plugin', () => {
           })
         })
 
-        it('should not lose the current path when route handler preceeded by a longer middleware resource', done => {
+        it('long regex should not steal path', done => {
           const app = express()
 
           try {
@@ -741,6 +741,44 @@ describe('Plugin', () => {
           })
         })
 
+        it('long regex child of string router should not steal path', done => {
+          const app = express()
+          const router = express.Router()
+
+          try {
+            router.use(/\/(bar|baz|bez)/, (req, res, next) => {
+              next()
+            })
+            app.use('/foo', router)
+          } catch (err) {
+            // eslint-disable-next-line no-console
+            console.log('This version of Express (>4.0 <4.6) has broken support for regex routing. Skipping this test.')
+            this.skip && this.skip() // mocha allows dynamic skipping, tap does not
+            return done()
+          }
+
+          app.get('/foo/bar', (req, res) => {
+            res.status(200).send('')
+          })
+
+          getPort().then(port => {
+            agent
+              .use(traces => {
+                const spans = sort(traces[0])
+
+                expect(spans[0]).to.have.property('resource', 'GET /foo/bar')
+              })
+              .then(done)
+              .catch(done)
+
+            appListener = app.listen(port, 'localhost', () => {
+              axios
+                .get(`http://localhost:${port}/foo/bar`)
+                .catch(done)
+            })
+          })
+        })
+
         it('should not lose the current path on next', done => {
           const app = express()
           const Router = express.Router

packages/datadog-plugin-router/src/index.js

@@ -158,7 +158,7 @@ function isMoreSpecificThan (routeA, routeB) {
 function routeIsRegex (route) {
   // console.log('ROUTE', typeof route, route)
   // return route instanceof RegExp
-  return route.startsWith('(/') && route.endsWith('/)')
+  return route.includes('(/') && route.includes('/)')
 }
 
 module.exports = RouterPlugin