chore lint auto fixes

Author: jmetev1

dev-utils/bitrot.js

@@ -82,7 +82,7 @@ function saveCache () {
 // - Bad: blue (not visible on cmd.exe), grey (same color as background on
 //   Solarized Dark theme from <https://github.com/altercation/solarized>, see
 //   issue #160)
-var colors = {
+const colors = {
   bold: [1, 22],
   italic: [3, 23],
   underline: [4, 24],
@@ -100,7 +100,7 @@ var colors = {
 
 function stylizeWithColor (str, color) {
   if (!str) { return '' }
-  var codes = colors[color]
+  const codes = colors[color]
   if (codes) {
     return '\x1B[' + codes[0] + 'm' + str + '\x1B[' + codes[1] + 'm'
   } else {
@@ -131,9 +131,9 @@ function rot (moduleName, s) {
 // I see in supported-technologies.asciidoc.
 function loadSupportedDoc () {
   const docPath = 'docs/supported-technologies.asciidoc'
-  var html = fs.readFileSync(docPath, 'utf8')
-  var rows = []
-  var state = null // null | 'thead' | 'tbody'
+  const html = fs.readFileSync(docPath, 'utf8')
+  const rows = []
+  let state = null // null | 'thead' | 'tbody'
   html.split(/\n/g).forEach(function (line) {
     if (!line.startsWith('|')) {
       // no op
@@ -150,8 +150,8 @@ function loadSupportedDoc () {
         // Examples:
         //      |https://www.npmjs.com/package/generic-pool[generic-pool] | ^2.0.0 \|\| ^3.1.0 |Used by a lot of ...
         //      |https://www.npmjs.com/package/bluebird[bluebird] |>=2.0.0 <4.0.0 |
-        var escapePlaceholder = '6B1EC7E1-B273-40E9-94C4-197A59B55E24'
-        var cells = line
+        const escapePlaceholder = '6B1EC7E1-B273-40E9-94C4-197A59B55E24'
+        const cells = line
           .trim()
           .slice(1) // remove leading '|'
           .replace(/\\\|/g, escapePlaceholder)
@@ -177,7 +177,7 @@ function loadSupportedDoc () {
   // The entries in the "Frameworks" table use the names of internal links in
   // these docs. The anchor name is *sometimes* the same name as the npm
   // module, but sometimes not.
-  var results = []
+  const results = []
   let match
   rows.forEach(function (row) {
     if (row[1] === 'N/A') {
@@ -187,7 +187,7 @@ function loadSupportedDoc () {
       if (!match) {
         throw new Error(`could not parse this table cell text from docs/supported-technologies.asciidoc: ${JSON.stringify(row[0])}`)
       }
-      var moduleNames
+      let moduleNames
       if (match[1] === 'nextjs') {
         moduleNames = ['next']
       } else if (match[2] === '@hapi/hapi') {
@@ -246,24 +246,24 @@ function getNpmInfo (name) {
 
 function bitrot (moduleNames) {
   log.debug({ moduleNames }, 'bitrot')
-  var tavYmls = [
+  const tavYmls = [
     yaml.load(fs.readFileSync('.tav.yml', 'utf8')),
     yaml.load(fs.readFileSync('./test/opentelemetry-bridge/.tav.yml', 'utf8')),
     yaml.load(fs.readFileSync('./test/opentelemetry-metrics/fixtures/.tav.yml', 'utf8')),
     yaml.load(fs.readFileSync('test/instrumentation/modules/next/a-nextjs-app/.tav.yml', 'utf8'))
   ]
-  var supported = loadSupportedDoc()
+  const supported = loadSupportedDoc()
 
   // Merge into one data structure we can iterate through.
-  var rangesFromName = {}
-  var ensureKey = (name) => {
+  const rangesFromName = {}
+  const ensureKey = (name) => {
     if (!(name in rangesFromName)) {
       rangesFromName[name] = { tavRanges: [], supRanges: [] }
     }
   }
   tavYmls.forEach(tavYml => {
     for (const [label, tavInfo] of Object.entries(tavYml)) {
-      var name = tavInfo.name || label
+      const name = tavInfo.name || label
       ensureKey(name)
       rangesFromName[name].tavRanges.push(tavInfo.versions)
     }
@@ -275,7 +275,7 @@ function bitrot (moduleNames) {
 
   // Reduce to `moduleNames` if given.
   if (moduleNames && moduleNames.length > 0) {
-    var allNames = Object.keys(rangesFromName)
+    const allNames = Object.keys(rangesFromName)
     moduleNames.forEach(name => {
       if (!(name in rangesFromName)) {
         throw new Error(`unknown module name: ${name} (known module names: ${allNames.join(', ')})`)
@@ -290,15 +290,15 @@ function bitrot (moduleNames) {
   log.debug({ rangesFromName }, 'rangesFromName')
 
   // Check each module name.
-  var namesToCheck = Object.keys(rangesFromName).sort()
+  const namesToCheck = Object.keys(rangesFromName).sort()
   namesToCheck.forEach(name => {
-    var npmInfo = getNpmInfo(name)
+    const npmInfo = getNpmInfo(name)
     log.trace({ name, 'dist-tags': npmInfo['dist-tags'], time: npmInfo.time }, 'npmInfo')
 
     // If the current latest version is in the supported and
     // tav ranges, then all is good.
-    var latest = npmInfo['dist-tags'].latest
-    var tavGood = false
+    const latest = npmInfo['dist-tags'].latest
+    let tavGood = false
     if (EXCUSE_FROM_TAV[name]) {
       tavGood = true
     } else {
@@ -309,7 +309,7 @@ function bitrot (moduleNames) {
         }
       }
     }
-    var supGood = false
+    let supGood = false
     if (EXCUSE_FROM_SUPPORTED_TECHNOLOGIES_DOC[name]) {
       supGood = true
     } else {
@@ -324,7 +324,7 @@ function bitrot (moduleNames) {
       log.debug(`latest ${name}@${latest} is in tav and supported ranges (a good thing)`)
       return
     }
-    var issues = []
+    const issues = []
     if (!tavGood) {
       issues.push(`is not in .tav.yml ranges (${rangesFromName[name].tavRanges.join(', ')})`)
     }
@@ -351,15 +351,15 @@ const options = [
 ]
 
 function main (argv) {
-  var parser = dashdash.createParser({ options: options })
+  const parser = dashdash.createParser({ options: options })
   try {
     var opts = parser.parse(argv)
   } catch (e) {
     console.error('help: error: %s', e.message)
     process.exit(1)
   }
   if (opts.help) {
-    var help = parser.help().trimRight()
+    const help = parser.help().trimRight()
     process.stdout.write(`Synopsis:
     dev-utils/bitrot.js [OPTIONS]
 

examples/trace-graphql.js

@@ -10,18 +10,18 @@
 const apm = require('../').start({ // elastic-apm-node
   serviceName: 'example-trace-graphql'
 })
-var { graphql, buildSchema } = require('graphql')
+const { graphql, buildSchema } = require('graphql')
 
 // Construct a schema, using GraphQL schema language
-var schema = buildSchema(`
+const schema = buildSchema(`
   type Query {
     hello: String
     bye: String
   }
 `)
 
 // The root provides a resolver function for each API endpoint
-var root = {
+const root = {
   hello: () => {
     return 'Hello world!'
   },

examples/trace-handlebars.js

@@ -21,7 +21,7 @@ const handlebars = require('handlebars')
 // https://www.elastic.co/guide/en/apm/agent/nodejs/current/custom-transactions.html
 const t1 = apm.startTransaction('t1')
 
-var template = handlebars.compile('Hello, {{name}}!')
+const template = handlebars.compile('Hello, {{name}}!')
 console.log(template({ name: 'world' }))
 console.log(template({ name: 'Bob' }))
 

examples/trace-pg.js

@@ -43,7 +43,7 @@ client.query('SELECT $1::text as message', ['bye'], (err, res) => {
 
 // 2. Using streaming style, i.e. using a `Submittable` as node-postgres calls it.
 const t2 = apm.startTransaction('t2')
-var q = client.query(new Query('select 1 + 1 as solution'))
+const q = client.query(new Query('select 1 + 1 as solution'))
 q.on('error', (err) => {
   console.log('[t2] Failure: err is', err)
   t2.end()

examples/trace-pug.js

@@ -21,7 +21,7 @@ const pug = require('pug')
 // https://www.elastic.co/guide/en/apm/agent/nodejs/current/custom-transactions.html
 const t1 = apm.startTransaction('t1')
 
-var template = pug.compile('p Hello, #{name}!')
+const template = pug.compile('p Hello, #{name}!')
 console.log(template({ name: 'world' }))
 console.log(template({ name: 'Bob' }))
 

examples/trace-tedious.js

@@ -65,7 +65,7 @@ const conn2 = new tedious.Connection(connOpts)
 conn2.on('connect', onConnect2)
 conn2.connect()
 function onConnect2 () {
-  var req = new tedious.Request("select @mynum=42, @mystr='qaz'", function (err, rowCount) {
+  const req = new tedious.Request("select @mynum=42, @mystr='qaz'", function (err, rowCount) {
     console.log('select @mynum ...: err=%s rowCount=%s', err && err.message, rowCount)
     conn2.close()
   })

examples/trace-ws.js

@@ -20,8 +20,8 @@ const apm = require('../').start({ // elastic-apm-node
   serviceName: 'example-trace-ws'
 })
 
-var WebSocket = require('ws')
-var PORT = 4567
+const WebSocket = require('ws')
+const PORT = 4567
 
 // Server
 const wss = new WebSocket.Server({ port: PORT })

index.js

@@ -6,6 +6,6 @@
 
 'use strict'
 
-var Agent = require('./lib/agent')
+const Agent = require('./lib/agent')
 
 module.exports = new Agent()

lib/activation-method.js

@@ -11,7 +11,7 @@ const path = require('path')
 const errorStackParser = require('error-stack-parser')
 const semver = require('semver')
 
-var { isLambdaExecutionEnvironment } = require('./lambda')
+const { isLambdaExecutionEnvironment } = require('./lambda')
 
 const CONTAINS_R_ELASTIC_APM_NODE_START = /(-r\s+|--require\s*=?\s*).*elastic-apm-node\/start/
 

lib/agent.js

@@ -251,7 +251,7 @@ Agent.prototype.start = function (opts) {
       // Attempt to load package.json from process.argv.
       let pkg = null
       try {
-        var basedir = path.dirname(process.argv[1] || '.')
+        const basedir = path.dirname(process.argv[1] || '.')
         pkg = require(path.join(basedir, 'package.json'))
       } catch (e) {}
 
@@ -343,14 +343,14 @@ Agent.prototype.setFramework = function ({ name, version, overwrite = true }) {
 }
 
 Agent.prototype.setUserContext = function (context) {
-  var trans = this._instrumentation.currTransaction()
+  const trans = this._instrumentation.currTransaction()
   if (!trans) return false
   trans.setUserContext(context)
   return true
 }
 
 Agent.prototype.setCustomContext = function (context) {
-  var trans = this._instrumentation.currTransaction()
+  const trans = this._instrumentation.currTransaction()
   if (!trans) return false
   trans.setCustomContext(context)
   return true
@@ -373,13 +373,13 @@ Agent.prototype.setGlobalLabel = function (key, value) {
 }
 
 Agent.prototype.setLabel = function (key, value, stringify) {
-  var trans = this._instrumentation.currTransaction()
+  const trans = this._instrumentation.currTransaction()
   if (!trans) return false
   return trans.setLabel(key, value, stringify)
 }
 
 Agent.prototype.addLabels = function (labels, stringify) {
-  var trans = this._instrumentation.currTransaction()
+  const trans = this._instrumentation.currTransaction()
   if (!trans) return false
   return trans.addLabels(labels, stringify)
 }
@@ -661,7 +661,7 @@ Agent.prototype.captureError = function (err, opts, cb) {
 // automatically terminate the process, so if you provide a callback you must
 // remember to terminate the process manually.
 Agent.prototype.handleUncaughtExceptions = function (cb) {
-  var agent = this
+  const agent = this
 
   if (this._uncaughtExceptionListener) {
     process.removeListener('uncaughtException', this._uncaughtExceptionListener)
@@ -793,7 +793,7 @@ Agent.prototype._flush = function (opts, cb) {
 }
 
 Agent.prototype.registerMetric = function (name, labelsOrCallback, callback) {
-  var labels
+  let labels
   if (typeof labelsOrCallback === 'function') {
     callback = labelsOrCallback
   } else {
@@ -816,7 +816,7 @@ Agent.prototype.registerMetric = function (name, labelsOrCallback, callback) {
  */
 Agent.prototype._isMetricNameDisabled = function (name) {
   const regexps = this._conf.disableMetricsRegExp
-  for (var i = 0; i < regexps.length; i++) {
+  for (let i = 0; i < regexps.length; i++) {
     if (regexps[i].test(name)) {
       return true
     }