dd-trace - npm Package Compare versions

Comparing version 0.6.1-beta.0 to 0.6.1-beta.1

lib/version.js

@@ -1,1 +0,1 @@
-module.exports = '0.6.1-beta.0'
+module.exports = '0.6.1-beta.1'

package.json

 {
   "name": "dd-trace",
-  "version": "0.6.1-beta.0",
+  "version": "0.6.1-beta.1",
   "description": "Datadog APM tracing client for JavaScript",
@@ -5,0 +5,0 @@ "main": "index.js",

scripts/install_plugin_modules.js

@@ -99,3 +99,3 @@ 'use strict'
   const basename = [name, version].filter(val => val).join('@')
-  return path.join(__dirname, '..', 'test', 'plugins', 'versions', basename)
+  return path.join(__dirname, '..', 'versions', basename)
 }
@@ -102,0 +102,0 @@

src/plugins/koa.js

@@ -14,7 +14,2 @@ 'use strict'
     return next()
-      .then(() => extractRoute(ctx))
-      .catch(e => {
-        extractRoute(ctx)
-        return Promise.reject(e)
-      })
   }
@@ -37,9 +32,20 @@
 
-function extractRoute (ctx) {
-  if (ctx.matched) {
-    ctx.matched
-      .filter(layer => layer.methods.length > 0)
-      .forEach(layer => {
-        web.enterRoute(ctx.req, layer.path)
+function createWrapRegister (tracer, config) {
+  return function wrapRegister (register) {
+    return function registerWithTrace (path, methods, middleware, opts) {
+      const route = register.apply(this, arguments)
+
+      if (Array.isArray(path)) return route
+
+      route.stack = route.stack.map(middleware => {
+        return function (ctx, next) {
+          web.exitRoute(ctx.req)
+          web.enterRoute(ctx.req, route.path)
+
+          return middleware.apply(this, arguments)
+        }
       })
+
+      return route
+    }
   }
@@ -58,3 +64,13 @@ }
     }
+  },
+  {
+    name: 'koa-router',
+    versions: ['7.x'],
+    patch (Router, tracer, config) {
+      this.wrap(Router.prototype, 'register', createWrapRegister(tracer, config))
+    },
+    unpatch (Router) {
+      this.unwrap(Router.prototype, 'register')
+    }
   }
 ]

test/plugins/agent.js

@@ -139,3 +139,3 @@ 'use strict'
   wipe () {
-    const basedir = path.join(__dirname, 'versions')
+    const basedir = path.join(__dirname, '..', '..', 'versions')
 
@@ -142,0 +142,0 @@ Object.keys(require.cache)

test/plugins/amqp10.spec.js

@@ -39,3 +39,3 @@ 'use strict'
             .then(() => {
-              const amqp = require(`./versions/amqp10@${version}`).get()
+              const amqp = require(`../../versions/amqp10@${version}`).get()
               const None = amqp.Policy.Utils.SenderCallbackPolicies.None
@@ -169,3 +169,3 @@ const OnSettle = amqp.Policy.Utils.SenderCallbackPolicies.OnSettle
             .then(() => {
-              const amqp = require(`./versions/amqp10@${version}`).get()
+              const amqp = require(`../../versions/amqp10@${version}`).get()
 
@@ -172,0 +172,0 @@ client = new amqp.Client()

test/plugins/amqplib.spec.js

@@ -34,3 +34,3 @@ 'use strict'
           beforeEach(done => {
-            require(`./versions/amqplib@${version}`).get('amqplib/callback_api')
+            require(`../../versions/amqplib@${version}`).get('amqplib/callback_api')
               .connect((err, conn) => {
@@ -221,3 +221,3 @@ connection = conn
           beforeEach(() => {
-            return require(`./versions/amqplib@${version}`).get().connect()
+            return require(`../../versions/amqplib@${version}`).get().connect()
               .then(conn => (connection = conn))
@@ -251,3 +251,3 @@ .then(conn => conn.createChannel())
         beforeEach(done => {
-          require(`./versions/amqplib@${version}`).get('amqplib/callback_api')
+          require(`../../versions/amqplib@${version}`).get('amqplib/callback_api')
             .connect((err, conn) => {
@@ -254,0 +254,0 @@ connection = conn

test/plugins/elasticsearch.spec.js

@@ -30,3 +30,3 @@ 'use strict'
         beforeEach(() => {
-          elasticsearch = require(`./versions/elasticsearch@${version}`).get()
+          elasticsearch = require(`../../versions/elasticsearch@${version}`).get()
           client = new elasticsearch.Client({
@@ -235,3 +235,3 @@ host: 'localhost:9200'
         beforeEach(() => {
-          elasticsearch = require(`./versions/elasticsearch@${version}`).get()
+          elasticsearch = require(`../../versions/elasticsearch@${version}`).get()
           client = new elasticsearch.Client({
@@ -238,0 +238,0 @@ host: 'localhost:9200'

test/plugins/express.spec.js

@@ -35,3 +35,3 @@ 'use strict'
         beforeEach(() => {
-          express = require(`./versions/express@${version}`).get()
+          express = require(`../../versions/express@${version}`).get()
         })
@@ -563,3 +563,3 @@
         beforeEach(() => {
-          express = require(`./versions/express@${version}`).get()
+          express = require(`../../versions/express@${version}`).get()
         })
@@ -566,0 +566,0 @@

test/plugins/externals.json

@@ -1,6 +0,1 @@
-[
-  {
-    "name": "koa-router",
-    "versions": ["7.x"]
-  }
-]
+[]

test/plugins/graphql.spec.js

@@ -153,3 +153,3 @@ 'use strict'
             .then(() => {
-              graphql = require(`./versions/graphql@${version}`).get()
+              graphql = require(`../../versions/graphql@${version}`).get()
               buildSchema()
@@ -792,3 +792,3 @@ })
         beforeEach(() => {
-          graphql = require(`./versions/graphql@${version}`).get()
+          graphql = require(`../../versions/graphql@${version}`).get()
           buildSchema()
@@ -846,3 +846,3 @@ })
         beforeEach(() => {
-          graphql = require(`./versions/graphql@${version}`).get()
+          graphql = require(`../../versions/graphql@${version}`).get()
           buildSchema()
@@ -893,3 +893,3 @@ })
         beforeEach(() => {
-          graphql = require(`./versions/graphql@${version}`).get()
+          graphql = require(`../../versions/graphql@${version}`).get()
           buildSchema()
@@ -896,0 +896,0 @@ })

test/plugins/hapi.spec.js

@@ -32,3 +32,3 @@ 'use strict'
           .then(() => {
-            Hapi = require(`./versions/hapi@${version}`).get()
+            Hapi = require(`../../versions/hapi@${version}`).get()
           })
@@ -35,0 +35,0 @@ })

test/plugins/ioredis.spec.js

@@ -17,3 +17,3 @@ 'use strict'
         tracer = require('../..')
-        Redis = require(`./versions/ioredis@${version}`).get()
+        Redis = require(`../../versions/ioredis@${version}`).get()
         redis = new Redis()
@@ -20,0 +20,0 @@ })

test/plugins/koa.spec.js

@@ -21,3 +21,3 @@ 'use strict'
         tracer = require('../..')
-        Koa = require(`./versions/koa@${version}`).get()
+        Koa = require(`../../versions/koa@${version}`).get()
         return getPort().then(newPort => {
@@ -128,3 +128,3 @@ port = newPort
           beforeEach(() => {
-            Router = require(`./versions/koa-router@${routerVersion}`).get()
+            Router = require(`../../versions/koa-router@${routerVersion}`).get()
           })
@@ -159,2 +159,29 @@
 
+          it('should not lose the route if next() is called', done => {
+            const app = new Koa()
+            const router = new Router()
+
+            router.get('/user/:id', (ctx, next) => {
+              ctx.body = ''
+              return next()
+            })
+
+            app
+              .use(router.routes())
+              .use(router.allowedMethods())
+
+            agent
+              .use(traces => {
+                expect(traces[0][0]).to.have.property('resource', 'GET /user/:id')
+              })
+              .then(done)
+              .catch(done)
+
+            appListener = app.listen(port, 'localhost', (e) => {
+              axios
+                .get(`http://localhost:${port}/user/123`)
+                .catch(done)
+            })
+          })
+
           it('should support nested routers', done => {
@@ -188,2 +215,33 @@ const app = new Koa()
 
+          it('should only match the current HTTP method', done => {
+            const app = new Koa()
+            const forums = new Router()
+            const posts = new Router()
+
+            posts.get('/:pid', (ctx, next) => {
+              ctx.body = ''
+            })
+            posts.post('/:pid', (ctx, next) => {
+              ctx.body = ''
+            })
+
+            forums.use('/forums/:fid/posts', posts.routes(), posts.allowedMethods())
+
+            app.use(forums.routes())
+
+            agent
+              .use(traces => {
+                expect(traces[0][0]).to.have.property('resource', 'GET /forums/:fid/posts/:pid')
+                expect(traces[0][0].meta).to.have.property('http.url', `http://localhost:${port}/forums/123/posts/456`)
+              })
+              .then(done)
+              .catch(done)
+
+            appListener = app.listen(port, 'localhost', () => {
+              axios
+                .get(`http://localhost:${port}/forums/123/posts/456`)
+                .catch(done)
+            })
+          })
+
           it('should support a router prefix', done => {
@@ -190,0 +248,0 @@ const app = new Koa()

test/plugins/memcached.spec.js

@@ -17,3 +17,3 @@ 'use strict'
         tracer = require('../..')
-        Memcached = require(`./versions/memcached@${version}`).get()
+        Memcached = require(`../../versions/memcached@${version}`).get()
       })
@@ -20,0 +20,0 @@

test/plugins/mongodb-core.spec.js

@@ -39,3 +39,3 @@ 'use strict'
         beforeEach(done => {
-          mongo = require(`./versions/mongodb-core@${version}`).get()
+          mongo = require(`../../versions/mongodb-core@${version}`).get()
 
@@ -301,3 +301,3 @@ server = new mongo.Server({
         beforeEach(done => {
-          mongo = require(`./versions/mongodb-core@${version}`).get()
+          mongo = require(`../../versions/mongodb-core@${version}`).get()
 
@@ -304,0 +304,0 @@ server = new mongo.Server({

test/plugins/mysql.spec.js

@@ -30,3 +30,3 @@ 'use strict'
         beforeEach(() => {
-          mysql = require(`./versions/mysql@${version}`).get()
+          mysql = require(`../../versions/mysql@${version}`).get()
 
@@ -136,3 +136,3 @@ connection = mysql.createConnection({
         beforeEach(() => {
-          mysql = require(`./versions/mysql@${version}`).get()
+          mysql = require(`../../versions/mysql@${version}`).get()
 
@@ -174,3 +174,3 @@ connection = mysql.createConnection({
         beforeEach(() => {
-          mysql = require(`./versions/mysql@${version}`).get()
+          mysql = require(`../../versions/mysql@${version}`).get()
 
@@ -177,0 +177,0 @@ pool = mysql.createPool({

test/plugins/mysql2.spec.js

@@ -30,3 +30,3 @@ 'use strict'
         beforeEach(() => {
-          mysql2 = require(`./versions/mysql2@${version}`).get()
+          mysql2 = require(`../../versions/mysql2@${version}`).get()
 
@@ -139,3 +139,3 @@ connection = mysql2.createConnection({
         beforeEach(() => {
-          mysql2 = require(`./versions/mysql2@${version}`).get()
+          mysql2 = require(`../../versions/mysql2@${version}`).get()
 
@@ -179,3 +179,3 @@ connection = mysql2.createConnection({
         beforeEach(() => {
-          mysql2 = require(`./versions/mysql2@${version}`).get()
+          mysql2 = require(`../../versions/mysql2@${version}`).get()
 
@@ -182,0 +182,0 @@ pool = mysql2.createPool({

test/plugins/pg.spec.js

@@ -29,3 +29,3 @@ 'use strict'
         beforeEach(done => {
-          pg = require(`./versions/pg@${version}`).get()
+          pg = require(`../../versions/pg@${version}`).get()
 
@@ -32,0 +32,0 @@ client = new pg.Client({

test/plugins/redis.spec.js

@@ -33,3 +33,3 @@ 'use strict'
         beforeEach(() => {
-          redis = require(`./versions/redis@${version}`).get()
+          redis = require(`../../versions/redis@${version}`).get()
           client = redis.createClient()
@@ -125,3 +125,3 @@ })
         beforeEach(() => {
-          redis = require(`./versions/redis@${version}`).get()
+          redis = require(`../../versions/redis@${version}`).get()
           client = redis.createClient()
@@ -128,0 +128,0 @@ })

test/plugins/restify.spec.js

@@ -19,3 +19,3 @@ 'use strict'
         tracer = require('../..')
-        restify = require(`./versions/restify@${version}`).get()
+        restify = require(`../../versions/restify@${version}`).get()
       })
@@ -22,0 +22,0 @@

test/setup.js

@@ -304,3 +304,3 @@ 'use strict'
             const min = semver.coerce(version).version
-            require(`./plugins/versions/${moduleName}@${min}`).get()
+            require(`../versions/${moduleName}@${min}`).get()
             testVersions.set(min, { range: version, test: min })
@@ -314,4 +314,4 @@ } catch (e) {
           try {
-            const max = require(`./plugins/versions/${moduleName}@${version}`).version()
-            require(`./plugins/versions/${moduleName}@${version}`).get()
+            const max = require(`../versions/${moduleName}@${version}`).version()
+            require(`../versions/${moduleName}@${version}`).get()
             testVersions.set(max, { range: version, test: version })
@@ -318,0 +318,0 @@ } catch (e) {

New alerts

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Fixed alerts

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

2427534

increased by0.1%

Number of package files

251

increased by0.4%

Lines of code

12217

increased by0.44%

No dependency changes