newrelic 7.5.2 → 8.3.0

package/lib/config/merge-server-config.js

@@ -31,17 +31,19 @@ class MergeServerConfig {
   }
 
   updateArray(value, local, localKey) {
-    value.forEach( (element) => {
-      if (local[localKey].indexOf(element) === -1) local[localKey].push(element)
+    value.forEach((element) => {
+      if (local[localKey].indexOf(element) === -1) {
+        local[localKey].push(element)
+      }
     })
   }
 
   updateObject(value, local, localKey) {
     // go through each key of the object and update it
-    Object.keys(value).forEach( (element) => {
+    Object.keys(value).forEach((element) => {
       if (Array.isArray(local[localKey][element]) && Array.isArray(value[element])) {
         // if both key-values are arrays, push the remote value onto the local array
-        value[element].forEach( (elementValue) => {
+        value[element].forEach((elementValue) => {
           if (-1 === local[localKey][element].indexOf(elementValue)) {
             local[localKey][element].push(elementValue)
           }
@@ -54,7 +56,7 @@ class MergeServerConfig {
   }
 
   isSimpleObject(thing) {
-    return 'object' === (typeof thing) && thing !== null
+    return 'object' === typeof thing && thing !== null
   }
 }
 

package/lib/custom-events/custom-event-aggregator.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-const logger = require('../logger').child({component: 'custom-event-aggregator'})
+const logger = require('../logger').child({ component: 'custom-event-aggregator' })
 const EventAggregator = require('../aggregators/event-aggregator')
 
 const NAMES = require('../metrics/names')

package/lib/db/parse-sql.js

@@ -8,12 +8,11 @@
 // TODO: remove in favor of /lib/db/query-parsers/sql.js
 // This module is currently used only in the Oracle instrumentation
 
-var logger = require('../logger').child({component: 'parse_sql'})
+var logger = require('../logger').child({ component: 'parse_sql' })
 var StatementMatcher = require('./statement-matcher')
 var ParsedStatement = require('./parsed-statement')
 var stringify = require('json-stringify-safe')
 
-
 var OPERATIONS = [
   new StatementMatcher('select', /^\s*select[\S\s]*from[\s\[]+([^\]\s,)(;]*).*/gi),
   new StatementMatcher('update', /^\s*update\s+([^\s,;]*).*/gi),
@@ -29,14 +28,13 @@ module.exports = function parseSql(type, sql) {
   // Sometimes we get an object here from MySQL. We have been unable to
   // reproduce it, so we'll just log what that object is and return a statement
   // type of `other`.
-  if (typeof sql === 'object' && sql.sql !== undefined) sql = sql.sql
+  if (typeof sql === 'object' && sql.sql !== undefined) {
+    sql = sql.sql
+  }
   if (typeof sql !== 'string') {
-    if (logger.traceEnabled()) {  
+    if (logger.traceEnabled()) {
       try {
-        logger.trace(
-          'parseSQL got an a non-string sql that looks like: %s',
-          stringify(sql)
-        )
+        logger.trace('parseSQL got an a non-string sql that looks like: %s', stringify(sql))
       } catch (err) {
         logger.debug(err, 'Unabled to stringify SQL')
       }
@@ -46,7 +44,6 @@ module.exports = function parseSql(type, sql) {
 
   sql = sql.replace(COMMENT_PATTERN, '').trim()
 
-
   var parsedStatement
 
   for (var i = 0, l = OPERATIONS.length; i < l; i++) {

package/lib/db/parsed-statement.js

@@ -5,9 +5,8 @@
 
 'use strict'
 
-const {DB, ALL} = require('../metrics/names')
-const {DESTINATIONS} = require('../config/attribute-filter')
-
+const { DB, ALL } = require('../metrics/names')
+const { DESTINATIONS } = require('../config/attribute-filter')
 
 function ParsedStatement(type, operation, collection, raw) {
   this.type = type
@@ -45,8 +44,7 @@ ParsedStatement.prototype.recordMetrics = function recordMetrics(segment, scope)
   // 'statement' metric and use the 'operation' metric as the scoped metric for
   // transaction breakdowns.
   if (this.collection) {
-    var collection =
-      DB.STATEMENT + '/' + thisTypeSlash + this.collection + '/' + this.operation
+    var collection = DB.STATEMENT + '/' + thisTypeSlash + this.collection + '/' + this.operation
     transaction.measure(collection, null, duration, exclusive)
     if (scope) {
       transaction.measure(collection, scope, duration, exclusive)
@@ -63,18 +61,13 @@ ParsedStatement.prototype.recordMetrics = function recordMetrics(segment, scope)
   // Datastore instance metrics.
   const attributes = segment.attributes.get(DESTINATIONS.TRANS_SEGMENT)
   if (attributes.host && attributes.port_path_or_id) {
-    var instanceName = DB.INSTANCE + '/' + thisTypeSlash + attributes.host +
-      '/' + attributes.port_path_or_id
+    var instanceName =
+      DB.INSTANCE + '/' + thisTypeSlash + attributes.host + '/' + attributes.port_path_or_id
     transaction.measure(instanceName, null, duration, exclusive)
   }
 
   if (this.raw) {
-    transaction.agent.queries.add(
-      segment,
-      this.type.toLowerCase(),
-      this.raw,
-      this.trace
-    )
+    transaction.agent.queries.add(segment, this.type.toLowerCase(), this.raw, this.trace)
   }
 }
 

package/lib/db/query-parsers/sql.js

@@ -5,11 +5,10 @@
 
 'use strict'
 
-var logger = require('../../logger').child({component: 'sql_query_parser'})
+var logger = require('../../logger').child({ component: 'sql_query_parser' })
 var StatementMatcher = require('../statement-matcher')
 var stringify = require('json-stringify-safe')
 
-
 var OPERATIONS = [
   new StatementMatcher(
     'select',
@@ -31,14 +30,13 @@ module.exports = function parseSql(sql) {
   // Sometimes we get an object here from MySQL. We have been unable to
   // reproduce it, so we'll just log what that object is and return a statement
   // type of `other`.
-  if (typeof sql === 'object' && sql.sql !== undefined) sql = sql.sql
+  if (typeof sql === 'object' && sql.sql !== undefined) {
+    sql = sql.sql
+  }
   if (typeof sql !== 'string') {
-    if (logger.traceEnabled()) {  
+    if (logger.traceEnabled()) {
       try {
-        logger.trace(
-          'parseSQL got an a non-string sql that looks like: %s',
-          stringify(sql)
-        )
+        logger.trace('parseSQL got an a non-string sql that looks like: %s', stringify(sql))
       } catch (err) {
         logger.debug(err, 'Unabler to stringify SQL')
       }
@@ -52,7 +50,6 @@ module.exports = function parseSql(sql) {
 
   sql = sql.replace(COMMENT_PATTERN, '').trim()
 
-
   var parsedStatement
 
   for (var i = 0, l = OPERATIONS.length; i < l; i++) {

package/lib/db/query-sample.js

@@ -20,7 +20,9 @@ util.inherits(QuerySample, Stats)
 
 QuerySample.prototype.aggregate = function aggregate(slowQuery) {
   this.recordValue(slowQuery.duration)
-  if (this.trace && this.trace.duration >= slowQuery.duration) return
+  if (this.trace && this.trace.duration >= slowQuery.duration) {
+    return
+  }
   this.trace = slowQuery
 }
 
@@ -45,7 +47,9 @@ QuerySample.prototype.prepareJSON = function prepareJSON(done) {
   }
 
   function respond(err, data) {
-    if (err) return done(err)
+    if (err) {
+      return done(err)
+    }
 
     done(null, _getJSON(sample, trace, transaction, data))
   }
@@ -79,7 +83,7 @@ function _getJSON(sample, trace, transaction, data) {
 QuerySample.prototype.getParams = function getParams() {
   var segmentAttrs = this.trace.segment.getAttributes()
   var params = {
-    backtrace: this.trace.trace,
+    backtrace: this.trace.trace
   }
 
   if (segmentAttrs.host) {

package/lib/db/query-trace-aggregator.js

@@ -6,7 +6,7 @@
 'use strict'
 
 const a = require('async')
-const logger = require('../logger').child({component: 'query_tracer'})
+const logger = require('../logger').child({ component: 'query_tracer' })
 const Aggregator = require('../aggregators/base-aggregator')
 const SlowQuery = require('./slow-query')
 const QuerySample = require('./query-sample')
@@ -19,10 +19,10 @@ class QueryTraceAggregator extends Aggregator {
       throw new Error('config required by query trace aggregator')
     }
     super(opts, collector)
-    
+
     const config = opts.config
     this.samples = new Map()
-    
+
     this.config = config
   }
 
@@ -34,7 +34,7 @@ class QueryTraceAggregator extends Aggregator {
         shortest = trace
       }
     }
-  
+
     this.samples.delete(shortest.normalized)
   }
 
@@ -74,32 +74,32 @@ class QueryTraceAggregator extends Aggregator {
         )
         return
     }
-  
+
     if (segment.getDurationInMillis() < ttConfig.explain_threshold) {
       return
     }
-  
+
     slowQuery = slowQuery || new SlowQuery(segment, type, query, trace)
-  
+
     segment.addAttribute('backtrace', slowQuery.trace)
-  
+
     if (!this.config.slow_sql.enabled) {
       return
     }
-  
+
     const ownSample = this.samples.get(slowQuery.normalized)
     if (ownSample) {
       return ownSample.aggregate(slowQuery)
     }
-  
+
     this.samples.set(slowQuery.normalized, new QuerySample(this, slowQuery))
-  
+
     // Do not remove the shortest sample when in serverless mode, since
     // sampling is disabled.
     if (this.config.serverless_mode.enabled) {
       return
     }
-  
+
     if (this.samples.size > this.config.slow_sql.max_samples) {
       this.removeShortest()
     }

package/lib/db/utils.js

@@ -11,5 +11,5 @@ function extractDatabaseChangeFromUse(sql) {
   // The character ranges for this were pulled from
   // http://dev.mysql.com/doc/refman/5.7/en/identifiers.html
   var match = /^\s*use[^\w`]+([\w$_\u0080-\uFFFF]+|`[^`]+`)[\s;]*$/i.exec(sql)
-  return match && match[1] || null
+  return (match && match[1]) || null
 }