dd-trace - npm Package Compare versions

Comparing version 0.7.0-beta.7 to 0.7.0

lib/version.js

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

package.json

 {
   "name": "dd-trace",
-  "version": "0.7.0-beta.7",
+  "version": "0.7.0",
   "description": "Datadog APM tracing client for JavaScript",
@@ -11,5 +11,9 @@ "main": "index.js",
     "lint": "eslint . && node scripts/check_licenses.js",
-    "tdd": "node ./scripts/install_plugin_modules && mocha --watch",
-    "test": "node ./scripts/install_plugin_modules && nyc --reporter text --reporter lcov mocha --exit 'test/**/*.spec.js'",
-    "leak": "(cd test/leak && yarn) && NODE_PATH=./test/leak/node_modules node --no-warnings ./node_modules/.bin/tape 'test/leak/{,!(node_modules)/**/}/*.js'"
+    "services": "node ./scripts/install_plugin_modules && node test/setup/services",
+    "tdd": "yarn services && mocha --watch 'test/setup/**/*.js'",
+    "test": "yarn services && cov8 --include \"src/**/*.js\" -- mocha --exit 'test/setup/all.js' 'test/**/*.spec.js'",
+    "test:core": "mocha --exit --exclude \"test/plugins/**/*.spec.js\" --file test/setup/core.js \"test/**/*.spec.js\"",
+    "test:plugins": "yarn services && cov8 --include \"src/**/*.js\" -- mocha --exit --file \"test/setup/all.js\" \"test/plugins/@($(echo $PLUGINS)).spec.js\" \"test/plugins/@($(echo $PLUGINS))/**/*.spec.js\"",
+    "leak:core": "node ./scripts/install_plugin_modules && (cd test/leak && yarn) && NODE_PATH=./test/leak/node_modules node --no-warnings ./node_modules/.bin/tape 'test/leak/{,!(node_modules|plugins)/**/}/*.js'",
+    "leak:plugins": "yarn services && (cd test/leak && yarn) && NODE_PATH=./test/leak/node_modules node --no-warnings ./node_modules/.bin/tape \"test/leak/plugins/@($(echo $PLUGINS)).js\""
   },
@@ -59,10 +63,6 @@ "repository": {
   "devDependencies": {
-    "amqp10": "^3.6.0",
-    "amqplib": "^0.5.2",
     "axios": "^0.18.0",
     "benchmark": "^2.1.4",
-    "bluebird": "^3.5.1",
     "body-parser": "^1.18.2",
     "chai": "^4.1.2",
-    "elasticsearch": "^15.0.0",
     "eslint": "^4.15.0",
@@ -77,21 +77,12 @@ "eslint-config-standard": "^11.0.0-beta.0",
     "get-port": "^3.2.0",
-    "graphql": "^0.13.2",
-    "memcached": "^2.2.2",
     "mocha": "^5.2.0",
-    "mongodb-core": "^3.0.7",
-    "mysql": "^2.15.0",
-    "mysql2": "1.5.3",
     "nock": "^9.6.1",
-    "nyc": "^11.4.1",
-    "pg": "^6.4.2",
     "proxyquire": "^1.8.0",
-    "redis": "^2.8.0",
     "require-dir": "^1.0.0",
     "retry": "^0.10.1",
-    "selfsigned": "^1.10.3",
     "sinon": "^4.2.1",
     "sinon-chai": "^2.14.0",
     "tape": "^4.9.1",
-    "ws": "^6.1.0"
+    "v8-coverage": "^1.0.8"
   }
 }

README.md

 # dd-trace-js
 
-[![npm](https://img.shields.io/npm/v/dd-trace.svg)](https://www.npmjs.com/package/dd-trace)
-[![CircleCI](https://img.shields.io/circleci/project/github/DataDog/dd-trace-js.svg)](https://circleci.com/gh/DataDog/dd-trace-js/tree/master)
+[![npm](https://img.shields.io/npm/v/dd-trace.svg?colorB=blue)](https://www.npmjs.com/package/dd-trace)
+[![npm (tag)](https://img.shields.io/npm/v/dd-trace/dev.svg)](https://www.npmjs.com/package/dd-trace/v/dev)
+[![CircleCI](https://circleci.com/gh/DataDog/dd-trace-js.svg?style=shield)](https://circleci.com/gh/DataDog/dd-trace-js)
+[![Build Status](https://dev.azure.com/datadog-apm/dd-trace-js/_apis/build/status/build-node-core-windows)](https://dev.azure.com/datadog-apm/dd-trace-js/_build/latest)
 
@@ -90,7 +92,7 @@ **JavaScript APM Tracer**
 $ circleci build --job lint
-$ circleci build --job test-memory-leaks
-$ circleci build --job build-node-4
-$ circleci build --job build-node-6
-$ circleci build --job build-node-8
-$ circleci build --job build-node-latest
+$ circleci build --job test-node-leaks
+$ circleci build --job test-node-core-4
+$ circleci build --job test-node-core-6
+$ circleci build --job test-node-core-8
+$ circleci build --job test-node-core-latest
 ```
@@ -97,0 +99,0 @@

src/config.js

@@ -15,3 +15,8 @@ 'use strict'
     const protocol = 'http'
-    const hostname = coalesce(options.hostname, platform.env('DD_TRACE_AGENT_HOSTNAME'), 'localhost')
+    const hostname = coalesce(
+      options.hostname,
+      platform.env('DD_AGENT_HOST'),
+      platform.env('DD_TRACE_AGENT_HOSTNAME'),
+      'localhost'
+    )
     const port = coalesce(options.port, platform.env('DD_TRACE_AGENT_PORT'), 8126)
@@ -18,0 +23,0 @@ const sampleRate = coalesce(Math.min(Math.max(options.sampleRate, 0), 1), 1)

src/instrumenter.js

@@ -5,2 +5,3 @@ 'use strict'
 const hook = require('require-in-the-middle')
+const path = require('path')
 const shimmer = require('shimmer')
@@ -10,2 +11,4 @@ const uniq = require('lodash.uniq')
 
+const pathSepExpr = new RegExp(`\\${path.sep}`, 'g')
+
 shimmer({ logger: () => {} })
@@ -92,2 +95,4 @@
   hookModule (moduleExports, moduleName, moduleBaseDir) {
+    moduleName = moduleName.replace(pathSepExpr, '/')
+
     if (!this._names.has(moduleName)) {
@@ -97,2 +102,6 @@ return moduleExports
 
+    if (moduleBaseDir) {
+      moduleBaseDir = moduleBaseDir.replace(pathSepExpr, '/')
+    }
+
     const moduleVersion = getVersion(moduleBaseDir)
@@ -99,0 +108,0 @@

src/plugins/index.js

@@ -6,2 +6,3 @@ 'use strict'
   'amqplib': require('./amqplib'),
+  'bluebird': require('./bluebird'),
   'elasticsearch': require('./elasticsearch'),
@@ -19,4 +20,6 @@ 'express': require('./express'),
   'pg': require('./pg'),
+  'q': require('./q'),
   'redis': require('./redis'),
-  'restify': require('./restify')
+  'restify': require('./restify'),
+  'when': require('./when')
 }

src/plugins/ioredis.js

@@ -21,3 +21,3 @@ 'use strict'
   name: 'ioredis',
-  versions: ['4.x'],
+  versions: ['>=2 <=4'],
   patch (Redis, tracer, config) {
@@ -24,0 +24,0 @@ this.wrap(Redis.prototype, 'sendCommand', createWrapSendCommand(tracer, config))

src/scope/scope_manager.js

@@ -52,4 +52,6 @@ 'use strict'
     while (execution !== null) {
-      if (execution.scope()) {
-        return execution.scope()
+      const scope = execution.scope()
+
+      if (scope) {
+        return scope.span() ? scope : null
       }
@@ -56,0 +58,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

128575

increased by1.69%

Dev dependency count

22

decreased by-37.14%

Number of package files

80

increased by5.26%

Lines of code

3649

increased by2.3%

Number of lines in readme file

108

increased by1.89%

No dependency changes