Use the newrelic-lambda module (#7)

Author: kolanos

python/newrelic_lambda_wrapper.py

@@ -9,9 +9,10 @@
 os.environ.setdefault("NEW_RELIC_DISTRIBUTED_TRACING_ENABLED", "true")
 os.environ.setdefault("NEW_RELIC_SERVERLESS_MODE_ENABLED", "true")
 
-# The agent will load some environment variables on module import so we need to perform
-# the import after setting the necessary environment variables.
-import newrelic.agent  # noqa
+# The agent will load some environment variables on module import so we need
+# to perform the import after setting the necessary environment variables.
+import newrelic.agent
+from newrelic_lambda.lambda_handler import lambda_handler
 
 newrelic.agent.initialize()
 
@@ -82,7 +83,7 @@ def get_handler():
 wrapped_handler = get_handler()
 
 
-@newrelic.agent.lambda_handler()
+@lambda_handler()
 def handler(event, context):
     context.iopipe = IOpipeNoOp()
     return wrapped_handler(event, context)

python/publish-layers.sh

@@ -34,7 +34,7 @@ function build-python27 {
     echo "Building New Relic layer for python2.7"
     rm -rf $BUILD_DIR $PY27_DIST
     mkdir -p $DIST_DIR
-    pip install --no-cache-dir -qU newrelic -t $BUILD_DIR/lib/python2.7/site-packages
+    pip install --no-cache-dir -qU newrelic-lambda -t $BUILD_DIR/lib/python2.7/site-packages
     cp newrelic_lambda_wrapper.py $BUILD_DIR/lib/python2.7/site-packages/newrelic_lambda_wrapper.py
     find $BUILD_DIR -name '*.pyc' -exec rm -f {} +
     zip -rq $PY27_DIST $BUILD_DIR
@@ -84,7 +84,7 @@ function build-python36 {
     echo "Building New Relic layer for python3.6"
     rm -rf $BUILD_DIR $PY36_DIST
     mkdir -p $DIST_DIR
-    pip install --no-cache-dir -qU newrelic -t $BUILD_DIR/lib/python3.6/site-packages
+    pip install --no-cache-dir -qU newrelic-lambda -t $BUILD_DIR/lib/python3.6/site-packages
     cp newrelic_lambda_wrapper.py $BUILD_DIR/lib/python3.6/site-packages/newrelic_lambda_wrapper.py
     find $BUILD_DIR -name '__pycache__' -exec rm -rf {} +
     zip -rq $PY36_DIST $BUILD_DIR
@@ -134,7 +134,7 @@ function build-python37 {
     echo "Building New Relic layer for python3.7"
     rm -rf $BUILD_DIR $PY37_DIST
     mkdir -p $DIST_DIR
-    pip install --no-cache-dir -qU newrelic -t $BUILD_DIR/lib/python3.7/site-packages
+    pip install --no-cache-dir -qU newrelic-lambda -t $BUILD_DIR/lib/python3.7/site-packages
     cp newrelic_lambda_wrapper.py $BUILD_DIR/lib/python3.7/site-packages/newrelic_lambda_wrapper.py
     find $BUILD_DIR -name '__pycache__' -exec rm -rf {} +
     zip -rq $PY37_DIST $BUILD_DIR
@@ -184,7 +184,7 @@ function build-python38 {
     echo "Building New Relic layer for python3.8"
     rm -rf $BUILD_DIR $PY38_DIST
     mkdir -p $DIST_DIR
-    pip install --no-cache-dir -qU newrelic -t $BUILD_DIR/lib/python3.8/site-packages
+    pip install --no-cache-dir -qU newrelic-lambda -t $BUILD_DIR/lib/python3.8/site-packages
     cp newrelic_lambda_wrapper.py $BUILD_DIR/lib/python3.8/site-packages/newrelic_lambda_wrapper.py
     find $BUILD_DIR -name '__pycache__' -exec rm -rf {} +
     zip -rq $PY38_DIST $BUILD_DIR