elastic-apm-node - npm Package Compare versions

Comparing version 2.15.0 to 2.16.0

CHANGELOG.md

@@ -0,1 +1,8 @@
+# 2.16.0 - 2019/8/26
+  * feat(memcached): instrument memcached v2.2.0 and above ([#1144](https://github.com/elastic/apm-agent-nodejs/pull/1144))
+  * feat(config): add configFile config option ([#1303](https://github.com/elastic/apm-agent-nodejs/pull/1303))
+  * fix: bug where spans sometimes wouldn't have stack traces ([#1299](https://github.com/elastic/apm-agent-nodejs/pull/1299))
+  * fix(async\_hooks): properly update sync flag ([#1306](https://github.com/elastic/apm-agent-nodejs/pull/1306))
+  * fix: change agent active status log message to debug level ([#1300](https://github.com/elastic/apm-agent-nodejs/pull/1300))
+
 # 2.15.0 - 2019/8/15
@@ -2,0 +9,0 @@ * feat(express-graphql): add support for v0.9 ([#1255](https://github.com/elastic/apm-agent-nodejs/pull/1255))

lib/agent.js

@@ -131,3 +131,3 @@ 'use strict'
   if (!this._conf.active) {
-    this.logger.info('Elastic APM agent is inactive due to configuration')
+    this.logger.debug('Elastic APM agent disabled (`active` is false)')
     return this
@@ -134,0 +134,0 @@ } else if (!this._conf.serviceName) {

lib/config.js

@@ -27,11 +27,3 @@ 'use strict'
 
-var confPath = path.resolve(process.env.ELASTIC_APM_CONFIG_FILE || 'elastic-apm-node.js')
-if (fs.existsSync(confPath)) {
-  try {
-    var confFile = require(confPath)
-  } catch (err) {
-    console.error('Elastic APM initialization error: Can\'t read config file %s', confPath)
-    console.error(err.stack)
-  }
-}
+let confFile = loadConfigFile()
 
@@ -205,6 +197,12 @@ let serviceName, serviceVersion
 
+    // If we didn't find a config file on process boot, but a path to one is
+    // provided as a config option, let's instead try to load that
+    if (confFile === null && opts && opts.configFile) {
+      confFile = loadConfigFile(opts.configFile)
+    }
+
     Object.assign(
       this,
       DEFAULTS, // default options
-      confFile, // options read from elastic-apm-node.js config file
+      confFile, // options read from config file
       opts, // options passed in to agent.start()
@@ -530,1 +528,16 @@ readEnv() // options read from environment variables
 }
+
+function loadConfigFile (configFile) {
+  const confPath = path.resolve(configFile || process.env.ELASTIC_APM_CONFIG_FILE || 'elastic-apm-node.js')
+
+  if (fs.existsSync(confPath)) {
+    try {
+      return require(confPath)
+    } catch (err) {
+      console.error('Elastic APM initialization error: Can\'t read config file %s', confPath)
+      console.error(err.stack)
+    }
+  }
+
+  return null
+}

lib/instrumentation/async-hooks.js

@@ -83,2 +83,10 @@ 'use strict'
   function before (asyncId) {
+    const span = activeSpans.get(asyncId)
+    if (span) {
+      span.sync = false
+    }
+    const transaction = span ? span.transaction : activeTransactions.get(asyncId)
+    if (transaction) {
+      transaction.sync = false
+    }
     ins.bindingSpan = null
@@ -85,0 +93,0 @@ }

lib/instrumentation/index.js

@@ -35,2 +35,3 @@ 'use strict'
   'koa-router',
+  'memcached',
   'mimic-response',
@@ -37,0 +38,0 @@ 'mongodb-core',

package.json

 {
   "name": "elastic-apm-node",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "description": "The official Elastic APM agent for Node.js",
@@ -18,3 +18,3 @@ "main": "index.js",
     "test:cli": "node test/script/cli.js",
-    "test:deps": "dependency-check . -i async_hooks -i parseurl -i perf_hooks && dependency-check . --unused --no-dev --entry lib/instrumentation/modules/*",
+    "test:deps": "dependency-check *.js 'lib/**/*.js' 'test/**/*.js' --no-dev -i async_hooks -i perf_hooks -i parseurl",
     "test:tav": "tav --quiet",
@@ -102,3 +102,3 @@ "test:docs": "./test/script/docker/run_docs.sh",
     "sql-summary": "^1.0.1",
-    "stackman": "^3.0.2",
+    "stackman": "^4.0.0",
     "traceparent": "^1.0.0",
@@ -114,2 +114,3 @@ "unicode-byte-truncate": "^1.0.0"
     "@commitlint/travis-cli": "^8.0.0",
+    "@hapi/hapi": "^18.2.0",
     "@types/node": "^12.0.8",
@@ -123,3 +124,3 @@ "apollo-server-express": "^2.6.3",
     "container-info": "^1.0.1",
-    "dependency-check": "^3.2.1",
+    "dependency-check": "^4.1.0",
     "elasticsearch": "^16.1.1",
@@ -137,3 +138,2 @@ "express": "^4.16.4",
     "hapi": "^18.1.0",
-    "@hapi/hapi": "^18.2.0",
     "https-pem": "^2.0.0",
@@ -149,2 +149,3 @@ "inquirer": "^0.12.0",
     "lambda-local": "^1.5.2",
+    "memcached": "^2.2.2",
     "mimic-response": "^1.0.1",
@@ -165,3 +166,3 @@ "mkdirp": "^0.5.1",
     "restify-clients": "^2.6.6",
-    "rimraf": "^2.6.2",
+    "rimraf": "^3.0.0",
     "send": "^0.17.0",
@@ -196,5 +197,5 @@ "standard": "^12.0.1",
   "coordinates": [
-    55.778255,
-    12.593137
+    55.6819147,
+    12.554504
   ]
 }

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

248060

increased by1.18%

Number of package files

72

increased by1.41%

Lines of code

5747

increased by1.07%

Worsened metrics

Dev dependency count

66

increased by1.54%

Dependency changes

• + Addederror-callsites@2.0.4(transitive)

• + Addedstackman@4.0.1(transitive)

• - Removeddebug@2.6.9(transitive)

• - Removederror-callsites@1.0.1(transitive)

• - Removedms@2.0.0(transitive)

• - Removedpath-is-absolute@1.0.1(transitive)

• - Removedstackman@3.0.2(transitive)

• Updatedstackman@^4.0.0