Greedily load module/handler in Node.js layer (#3)

newrelic · Dec 17, 2019 · 2a4ba32 · 2a4ba32
1 parent 7beafc4
commit 2a4ba32
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/nodejs/index.js b/nodejs/index.js
@@ -1,6 +1,7 @@
 'use strict'
 
 process.env.NEW_RELIC_APP_NAME = process.env.NEW_RELIC_APP_NAME || process.env.AWS_LAMBDA_FUNCTION_NAME
+process.env.NEW_RELIC_DISTRIBUTED_TRACING_ENABLED = process.env.NEW_RELIC_DISTRIBUTED_TRACING_ENABLED || 'true'
 process.env.NEW_RELIC_NO_CONFIG_FILE = process.env.NEW_RELIC_NO_CONFIG_FILE || 'true'
 process.env.NEW_RELIC_LOG_ENABLED = process.env.NEW_RELIC_LOG_ENABLED || 'true'
 process.env.NEW_RELIC_LOG = process.env.NEW_RELIC_LOG || 'stdout'
@@ -13,8 +14,6 @@ if (process.env.LAMBDA_TASK_ROOT && typeof process.env.NEW_RELIC_SERVERLESS_MODE
 const newrelic = require('newrelic')
 require('@newrelic/aws-sdk')
 
-let wrappedHandler
-
 
 function getHandler() {
   let handler
@@ -64,6 +63,8 @@ function getHandler() {
   return userHandler
 }
 
+const wrappedHandler = newrelic.setLambdaHandler(getHandler())
+
 const ioMarks = {}
 
 function patchIO(method, payload) {
@@ -113,20 +114,14 @@ const wrapPatch = () => {
   }
 }
 
-function wrapHandler() {
-  const ctx = this
+function patchedHandler() {
   const args = Array.prototype.slice.call(arguments)
 
-  if (!wrappedHandler) {
-    if (args[1] && typeof args[1] === 'object' && !args[1].iopipe) { // process.env.IOPIPE_TOKEN &&
-      args[1].iopipe = wrapPatch()
-    }
-    const userHandler = getHandler()
-    wrappedHandler = newrelic.setLambdaHandler(
-      (...wrapperArgs) => userHandler.apply(ctx, wrapperArgs)
-    )
+  if (args[1] && typeof args[1] === 'object' && !args[1].iopipe) {
+    args[1].iopipe = wrapPatch()
   }
-  return wrappedHandler.apply(ctx, args)
+
+  return wrappedHandler.apply(this, args)
 }
 
-module.exports.handler = wrapHandler
+module.exports.handler = patchedHandler
diff --git a/python/newrelic_lambda_wrapper.py b/python/newrelic_lambda_wrapper.py
@@ -89,4 +89,3 @@ def get_handler():
 def handler(event, context):
     context.iopipe = IOpipeNoOp()
     return wrapped_handler(event, context)
-