newrelic 8.0.0 → 8.4.0

package/lib/collector/remote-method.js

@@ -5,16 +5,16 @@
 
 'use strict'
 
-var util = require('util')
-var url = require('url')
-var https = require('https')
-var zlib = require('zlib')
-var logger = require('../logger').child({component: 'remote_method'})
-var parse = require('./parse-response')
-var stringify = require('json-stringify-safe')
-var Sink = require('../util/stream-sink')
-var agents = require('./http-agents')
-var certificates = require('./ssl/certificates')
+const util = require('util')
+const url = require('url')
+const https = require('https')
+const zlib = require('zlib')
+const logger = require('../logger').child({ component: 'remote_method' })
+const parse = require('./parse-response')
+const stringify = require('json-stringify-safe')
+const Sink = require('../util/stream-sink')
+const agents = require('./http-agents')
+const certificates = require('./ssl/certificates')
 const isValidLength = require('../util/byte-limit').isValidLength
 
 /*
@@ -50,8 +50,9 @@ RemoteMethod.prototype.updateEndpoint = function updateEndpoint(endpoint) {
 }
 
 RemoteMethod.prototype.serialize = function serialize(payload, callback) {
+  let res
   try {
-    var res = stringify(payload)
+    res = stringify(payload)
   } catch (error) {
     logger.error(error, 'Unable to serialize payload for method %s.', this.name)
     return process.nextTick(function onNextTick() {
@@ -76,13 +77,20 @@ RemoteMethod.prototype.invoke = function invoke(payload, nrHeaders, callback) {
     nrHeaders = null
   }
 
-  if (!payload) payload = []
+  if (!payload) {
+    payload = []
+  }
   logger.trace('Invoking remote method %s', this.name)
 
-  this.serialize(payload, function onSerialize(err, serialized) {
-    if (err) return callback(err)
-    this._post(serialized, nrHeaders, callback)
-  }.bind(this))
+  this.serialize(
+    payload,
+    function onSerialize(err, serialized) {
+      if (err) {
+        return callback(err)
+      }
+      this._post(serialized, nrHeaders, callback)
+    }.bind(this)
+  )
 }
 
 /**
@@ -95,8 +103,8 @@ RemoteMethod.prototype.invoke = function invoke(payload, nrHeaders, callback) {
  * @param {Function} callback   What to do next. Gets passed any error.
  */
 RemoteMethod.prototype._post = function _post(data, nrHeaders, callback) {
-  var method = this
-  var options = {
+  const method = this
+  const options = {
     port: this.endpoint.port,
     host: this.endpoint.host,
     compressed: this._shouldCompress(data),
@@ -108,18 +116,14 @@ RemoteMethod.prototype._post = function _post(data, nrHeaders, callback) {
 
   // Check trace enabled first since we're creating an object for this log message.
   if (logger.traceEnabled()) {
-    logger.trace(
-      {data, compressed: options.compressed},
-      'Calling %s on collector API',
-      this.name
-    )
+    logger.trace({ data, compressed: options.compressed }, 'Calling %s on collector API', this.name)
   }
 
   if (options.compressed) {
     // NOTE: gzip and deflate throw immediately in Node 14+ with an invalid argument
     try {
-      var useGzip = this._config.compressed_content_encoding === 'gzip'
-      var compressor = useGzip ? zlib.gzip : zlib.deflate
+      const useGzip = this._config.compressed_content_encoding === 'gzip'
+      const compressor = useGzip ? zlib.gzip : zlib.deflate
       compressor(data, function onCompress(err, compressed) {
         if (err) {
           logger.warn(err, 'Error compressing JSON for delivery. Not sending.')
@@ -150,10 +154,7 @@ RemoteMethod.prototype._post = function _post(data, nrHeaders, callback) {
   // set up standard response handling
   function onResponse(response) {
     response.on('end', function onEnd() {
-      logger.debug(
-        'Finished receiving data back from the collector for %s.',
-        method.name
-      )
+      logger.debug('Finished receiving data back from the collector for %s.', method.name)
     })
 
     response.setEncoding('utf8')
@@ -175,19 +176,33 @@ RemoteMethod.prototype._post = function _post(data, nrHeaders, callback) {
  * @param {object} options A dictionary of request parameters.
  */
 RemoteMethod.prototype._safeRequest = function _safeRequest(options) {
-  if (!options) throw new Error('Must include options to make request!')
-  if (!options.host) throw new Error('Must include collector hostname!')
-  if (!options.port) throw new Error('Must include collector port!')
-  if (!options.onError) throw new Error('Must include error handler!')
-  if (!options.onResponse) throw new Error('Must include response handler!')
-  if (!options.body) throw new Error('Must include body to send to collector!')
-  if (!options.path) throw new Error('Must include URL to request!')
-
-  var protocol = 'https'
-  var logConfig = this._config.logging
-  var auditLog = this._config.audit_log
+  if (!options) {
+    throw new Error('Must include options to make request!')
+  }
+  if (!options.host) {
+    throw new Error('Must include collector hostname!')
+  }
+  if (!options.port) {
+    throw new Error('Must include collector port!')
+  }
+  if (!options.onError) {
+    throw new Error('Must include error handler!')
+  }
+  if (!options.onResponse) {
+    throw new Error('Must include response handler!')
+  }
+  if (!options.body) {
+    throw new Error('Must include body to send to collector!')
+  }
+  if (!options.path) {
+    throw new Error('Must include URL to request!')
+  }
+
+  const protocol = 'https'
+  const logConfig = this._config.logging
+  const auditLog = this._config.audit_log
   const maxPayloadSize = this._config.max_payload_size_in_bytes
-  var level = 'trace'
+  let level = 'trace'
 
   if (!isValidLength(options.body, maxPayloadSize)) {
     logger.warn(
@@ -209,10 +224,9 @@ RemoteMethod.prototype._safeRequest = function _safeRequest(options) {
     }
   }
 
-  const logBody =
-    Buffer.isBuffer(options.body) ? 'Buffer ' + options.body.length : options.body
+  const logBody = Buffer.isBuffer(options.body) ? 'Buffer ' + options.body.length : options.body
   logger[level](
-    {body: logBody},
+    { body: logBody },
     'Posting to %s://%s:%s%s',
     protocol,
     options.host,
@@ -239,23 +253,19 @@ RemoteMethod.prototype._safeRequest = function _safeRequest(options) {
  *                                      ._post).
  */
 RemoteMethod.prototype._request = function _request(options) {
-  var requestOptions = {
+  const requestOptions = {
     method: this._config.put_for_data_send ? 'PUT' : 'POST',
-    setHost: false,         // See below
-    host: options.host,     // Set explicitly in the headers
+    setHost: false, // See below
+    host: options.host, // Set explicitly in the headers
     port: options.port,
     path: options.path,
     headers: this._headers(options),
     agent: agents.keepAliveAgent(),
-    __NR__connection: true,  // Who measures the metrics measurer?
+    __NR__connection: true // Who measures the metrics measurer?
   }
-  var request
+  let request
 
-  var isProxy = !!(
-    this._config.proxy ||
-    this._config.proxy_port ||
-    this._config.proxy_host
-  )
+  const isProxy = !!(this._config.proxy || this._config.proxy_port || this._config.proxy_host)
 
   if (isProxy) {
     // proxy
@@ -266,9 +276,7 @@ RemoteMethod.prototype._request = function _request(options) {
       requestOptions.ca = this._config.certificates
 
       if (this._config.feature_flag.certificate_bundle) {
-        logger.debug(
-          'Adding custom certificate to the cert bundle.'
-        )
+        logger.debug('Adding custom certificate to the cert bundle.')
 
         const certWarningMessage = [
           'Deprecation Warning: The certificate bundle included by New Relic will be ',
@@ -310,7 +318,7 @@ RemoteMethod.prototype._userAgent = function _userAgent() {
  * @returns {string} The URL path to be POSTed to.
  */
 RemoteMethod.prototype._path = function _path() {
-  var query = {
+  const query = {
     marshal_format: 'json',
     protocol_version: this._protocolVersion,
     license_key: this._config.license_key,
@@ -321,7 +329,7 @@ RemoteMethod.prototype._path = function _path() {
     query[RUN_ID_NAME] = this._config.run_id
   }
 
-  var formatted = url.format({
+  const formatted = url.format({
     pathname: RAW_METHOD_PATH,
     query: query
   })
@@ -336,9 +344,9 @@ RemoteMethod.prototype._path = function _path() {
  * @param {bool}   options.compressed - The compression method used, if any.
  */
 RemoteMethod.prototype._headers = function _headers(options) {
-  var agent = this._userAgent()
+  const agent = this._userAgent()
 
-  var headers = {
+  const headers = {
     // select the virtual host on the server end
     'Host': this.endpoint.host,
     'User-Agent': agent,

package/lib/collector/serverless.js

@@ -6,7 +6,7 @@
 'use strict'
 
 const CollectorResponse = require('./response')
-const logger = require('../logger').child({component: 'serverless_collector'})
+const logger = require('../logger').child({ component: 'serverless_collector' })
 const zlib = require('zlib')
 const fs = require('fs')
 const stringify = require('json-stringify-safe')
@@ -17,6 +17,7 @@ const PAYLOAD_MARKER = 'NR_LAMBDA_MONITORING'
 const path = require('path')
 const defaultPipePath = path.resolve('/tmp', 'newrelic-telemetry')
 
+/* eslint-disable camelcase */
 class ServerlessCollector {
   /**
    * Constructs a new serverless collector instance with the give agent.
@@ -94,7 +95,7 @@ class ServerlessCollector {
       this.payload.metric_data = payload
     }
 
-    cb(null, {retainData: false})
+    cb(null, { retainData: false })
   }
 
   /**
@@ -108,7 +109,7 @@ class ServerlessCollector {
       this.payload.error_data = payload
     }
 
-    cb(null, {retainData: false})
+    cb(null, { retainData: false })
   }
 
   /**
@@ -122,7 +123,7 @@ class ServerlessCollector {
       this.payload.error_event_data = payload
     }
 
-    cb(null, {retainData: false})
+    cb(null, { retainData: false })
   }
 
   /**
@@ -135,7 +136,7 @@ class ServerlessCollector {
     if (this.enabled) {
       this.payload.transaction_sample_data = payload
     }
-    cb(null, {retainData: false})
+    cb(null, { retainData: false })
   }
 
   /**
@@ -149,7 +150,7 @@ class ServerlessCollector {
       this.payload.analytic_event_data = payload
     }
 
-    cb(null, {retainData: false})
+    cb(null, { retainData: false })
   }
 
   /**
@@ -163,7 +164,7 @@ class ServerlessCollector {
       this.payload.custom_event_data = payload
     }
 
-    cb(null, {retainData: false})
+    cb(null, { retainData: false })
   }
 
   /**
@@ -176,7 +177,7 @@ class ServerlessCollector {
     if (this.enabled) {
       this.payload.sql_trace_data = payload
     }
-    cb(null, {retainData: false})
+    cb(null, { retainData: false })
   }
 
   /**
@@ -189,7 +190,7 @@ class ServerlessCollector {
     if (this.enabled) {
       this.payload.span_event_data = payload
     }
-    cb(null, {retainData: false})
+    cb(null, { retainData: false })
   }
 
   /**
@@ -266,10 +267,7 @@ class ServerlessCollector {
       // Guarantees process.stdout will block, so long logs
       // won't be truncated if process.exit() is called early.
       const s = process.stdout
-      payloadLength > 65000 &&
-      s._handle &&
-      s._handle.setBlocking &&
-      s._handle.setBlocking(true)
+      payloadLength > 65000 && s._handle && s._handle.setBlocking && s._handle.setBlocking(true)
 
       fs.writeSync(process.stdout.fd, serializedPayload)
     } else {
@@ -286,11 +284,7 @@ class ServerlessCollector {
    * @param {boolean} sync Whether to write to stdout synchronously.
    */
   _doFlush(payload, sync = false) {
-    const serializedPayload = JSON.stringify([
-      PAYLOAD_VERSION,
-      PAYLOAD_MARKER,
-      payload
-    ]) + '\n'
+    const serializedPayload = JSON.stringify([PAYLOAD_VERSION, PAYLOAD_MARKER, payload]) + '\n'
 
     const didUsePipe = fs.existsSync(this.pipePath) && this.flushToPipeSync(serializedPayload)
 
@@ -301,3 +295,4 @@ class ServerlessCollector {
 }
 
 module.exports = ServerlessCollector
+/* eslint-enable camelcase */