newrelic 6.12.1 → 6.13.0

package/NEWS.md

@@ -1,3 +1,7 @@
+### 6.13.0 (2020-08-25):
+
+* Added ability for the agent to write to a named pipe, instead of stdout, when in serverless mode.
+
 ### 6.12.1 (2020-08-20):
 
 * **Security fix:** Resolves an issue where transaction traces will still capture the request URI when the Node.js agent is configured to exclude the 'request.uri' attribute. This can be problematic for certain customers in environments where sensitive information is included in the URI. See security bulletin [NR20-02](https://docs.newrelic.com/docs/security/new-relic-security/security-bulletins/security-bulletin-nr20-02).

package/lib/collector/serverless.js

@@ -14,6 +14,9 @@ const stringify = require('json-stringify-safe')
 const PAYLOAD_VERSION = 1
 const PAYLOAD_MARKER = 'NR_LAMBDA_MONITORING'
 
+const path = require('path')
+const defaultPipePath = path.resolve('/tmp', 'newrelic-telemetry')
+
 class ServerlessCollector {
   /**
    * Constructs a new serverless collector instance with the give agent.
@@ -24,7 +27,7 @@ class ServerlessCollector {
    *
    * @param {Agent} agent - The agent this collector will use
    */
-  constructor(agent) {
+  constructor(agent, pipePath) {
     this._agent = agent
     this.enabled = true
     this.metadata = {
@@ -35,6 +38,8 @@ class ServerlessCollector {
       agent_version: agent.version
     }
     this.payload = {}
+    this.pipePath = pipePath || process.env.NEWRELIC_PIPE_PATH || defaultPipePath
+    this.shouldUsePipe = fs.existsSync(this.pipePath)
   }
 
   /**
@@ -243,6 +248,37 @@ class ServerlessCollector {
     }
   }
 
+  /**
+   * Writes payload to pipe
+   */
+  flushToPipeSync(payload) {
+    try {
+      fs.writeFileSync(this.pipePath, payload)
+      return true
+    } catch (e) {
+      this.shouldUsePipe = false
+      logger.warn('Error attempting to write to pipe, falling back to stdout', e)
+      return false
+    }
+  }
+
+  flushToStdOut(serializedPayload, payloadLength, sync = false) {
+    if (sync) {
+      // Long log lines have been truncated at 65538
+      // 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)
+
+      fs.writeSync(process.stdout.fd, serializedPayload)
+    } else {
+      process.stdout.write(serializedPayload)
+    }
+  }
+
   /**
    * Internal method to handle flushing to stdout.
    *
@@ -258,19 +294,10 @@ class ServerlessCollector {
       payload
     ]) + '\n'
 
-    if (sync) {
-      // Long log lines have been truncated at 65538
-      // Guarantees process.stdout will block, so long logs
-      // won't be truncated if process.exit() is called early.
-      const s = process.stdout
-      payload.length > 65000 &&
-      s._handle &&
-      s._handle.setBlocking &&
-      s._handle.setBlocking(true)
+    const didUsePipe = this.shouldUsePipe && this.flushToPipeSync(serializedPayload)
 
-      fs.writeSync(process.stdout.fd, serializedPayload)
-    } else {
-      process.stdout.write(serializedPayload)
+    if (!didUsePipe) {
+      this.flushToStdOut(serializedPayload, payload.length, sync)
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "6.12.1",
+  "version": "6.13.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [