Merge pull request #251 from newrelic/mrickard/set-log-enabled

Restoring NEW_RELIC_LOG_ENABLED env var
newrelic · Jun 6, 2022 · c5bb6a4 · c5bb6a4
2 parents 1f16e6f + 6163da6
commit c5bb6a4
Show file tree

Hide file tree

Showing 23 changed files with 64 additions and 47 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-newrelic-lambda-layers",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "Serverless plugin for NewRelic APM AWS Lambda layers.",
   "main": "dist/index.js",
   "files": [

diff --git a/src/index.ts b/src/index.ts
@@ -643,6 +643,10 @@ or make sure that you already have Serverless 3.x installed in your project.
   }
 
   private logLevel(environment) {
+    environment.NEW_RELIC_LOG_ENABLED = environment.NEW_RELIC_LOG_ENABLED
+      ? environment.NEW_RELIC_LOG_ENABLED
+      : "true";
+
     environment.NEW_RELIC_LOG = environment.NEW_RELIC_LOG
       ? environment.NEW_RELIC_LOG
       : "stdout";

diff --git a/tests/fixtures/arm64.output.service.json b/tests/fixtures/arm64.output.service.json
@@ -24,7 +24,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12XARM64:30"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12XARM64:31"
       ],
       "package": {
         "exclude": [
@@ -52,7 +52,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14XARM64:29"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14XARM64:30"
       ],
       "package": {
         "exclude": [

diff --git a/tests/fixtures/debug-log-level.output.service.json b/tests/fixtures/debug-log-level.output.service.json
@@ -32,7 +32,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:85"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:86"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -44,16 +44,17 @@
         "NEW_RELIC_APP_NAME": "layer-nodejs12x",
         "NEW_RELIC_LAMBDA_HANDLER": "handler.handler",
         "NEW_RELIC_LOG": "stdout",
+        "NEW_RELIC_LOG_ENABLED": "true",
         "NEW_RELIC_LOG_LEVEL": "error",
-           "NEW_RELIC_NO_CONFIG_FILE": "true",
+        "NEW_RELIC_NO_CONFIG_FILE": "true",
         "NEW_RELIC_TRUSTED_ACCOUNT_KEY": "${env:NEW_RELIC_ACCOUNT_ID}"
       }
     },
     "layer-nodejs14x": {
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:55"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:56"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -65,8 +66,9 @@
         "NEW_RELIC_APP_NAME": "layer-nodejs14x",
         "NEW_RELIC_LAMBDA_HANDLER": "handler.handler",
         "NEW_RELIC_LOG": "stdout",
+        "NEW_RELIC_LOG_ENABLED": "true",
         "NEW_RELIC_LOG_LEVEL": "error",
-           "NEW_RELIC_NO_CONFIG_FILE": "true",
+        "NEW_RELIC_NO_CONFIG_FILE": "true",
         "NEW_RELIC_TRUSTED_ACCOUNT_KEY": "${env:NEW_RELIC_ACCOUNT_ID}"
       }
     }

diff --git a/tests/fixtures/debug.output.service.json b/tests/fixtures/debug.output.service.json
@@ -31,7 +31,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:85"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:86"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -43,6 +43,7 @@
         "NEW_RELIC_APP_NAME": "layer-nodejs12x",
         "NEW_RELIC_LAMBDA_HANDLER": "handler.handler",
         "NEW_RELIC_LOG": "stdout",
+        "NEW_RELIC_LOG_ENABLED": "true",
         "NEW_RELIC_LOG_LEVEL": "debug",
         "NEW_RELIC_NO_CONFIG_FILE": "true",
         "NEW_RELIC_TRUSTED_ACCOUNT_KEY": "${env:NEW_RELIC_ACCOUNT_ID}"
@@ -52,7 +53,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:55"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:56"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -64,6 +65,7 @@
         "NEW_RELIC_APP_NAME": "layer-nodejs14x",
         "NEW_RELIC_LAMBDA_HANDLER": "handler.handler",
         "NEW_RELIC_LOG": "stdout",
+        "NEW_RELIC_LOG_ENABLED": "true",
         "NEW_RELIC_LOG_LEVEL": "debug",
         "NEW_RELIC_NO_CONFIG_FILE": "true",
         "NEW_RELIC_TRUSTED_ACCOUNT_KEY": "${env:NEW_RELIC_ACCOUNT_ID}"
@@ -73,7 +75,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:2"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:3"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -85,6 +87,7 @@
         "NEW_RELIC_APP_NAME": "layer-nodejs16x",
         "NEW_RELIC_LAMBDA_HANDLER": "handler.handler",
         "NEW_RELIC_LOG": "stdout",
+        "NEW_RELIC_LOG_ENABLED": "true",
         "NEW_RELIC_LOG_LEVEL": "debug",
         "NEW_RELIC_NO_CONFIG_FILE": "true",
         "NEW_RELIC_TRUSTED_ACCOUNT_KEY": "${env:NEW_RELIC_ACCOUNT_ID}"

diff --git a/tests/fixtures/distributed-tracing-enabled.output.service.json b/tests/fixtures/distributed-tracing-enabled.output.service.json
@@ -35,7 +35,7 @@
   "plugins": ["serverless-newrelic-lambda-layers"],
   "provider": {
     "layers": [
-      "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:85"
+      "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:86"
     ],
     "name": "aws",
     "region": "us-east-1",

diff --git a/tests/fixtures/eu.output.service.json b/tests/fixtures/eu.output.service.json
@@ -17,7 +17,8 @@
         "NEW_RELIC_APP_NAME": "layer-nodejs12x",
         "NEW_RELIC_LAMBDA_HANDLER": "handler.handler",
         "NEW_RELIC_LOG": "stdout",
-           "NEW_RELIC_LOG_LEVEL": "debug",
+        "NEW_RELIC_LOG_ENABLED": "true",
+        "NEW_RELIC_LOG_LEVEL": "debug",
         "NEW_RELIC_NO_CONFIG_FILE": "true",
         "NEW_RELIC_TRUSTED_ACCOUNT_KEY": "${env:NEW_RELIC_ACCOUNT_ID}"
       },
@@ -28,7 +29,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:85"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:86"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -42,7 +43,8 @@
         "NEW_RELIC_APP_NAME": "layer-nodejs14x",
         "NEW_RELIC_LAMBDA_HANDLER": "handler.handler",
         "NEW_RELIC_LOG": "stdout",
-           "NEW_RELIC_LOG_LEVEL": "debug",
+        "NEW_RELIC_LOG_ENABLED": "true",
+        "NEW_RELIC_LOG_LEVEL": "debug",
         "NEW_RELIC_NO_CONFIG_FILE": "true",
         "NEW_RELIC_TRUSTED_ACCOUNT_KEY": "${env:NEW_RELIC_ACCOUNT_ID}"
       },
@@ -53,7 +55,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:55"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:56"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/include.output.service.json b/tests/fixtures/include.output.service.json
@@ -43,7 +43,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers":  [
-           "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:55"
+           "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:56"
        ],
       "package": { "exclude": [
         "./**",

diff --git a/tests/fixtures/includes-all-provider-layer.output.service.json b/tests/fixtures/includes-all-provider-layer.output.service.json
@@ -2,7 +2,7 @@
   "service": "newrelic-lambda-layers-nodejs-example",
   "provider": {
     "layers": [
-      "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:85"
+      "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:86"
     ],
     "name": "aws",
     "stage": "prod",

diff --git a/tests/fixtures/lambda-extension-disabled.output.service.json b/tests/fixtures/lambda-extension-disabled.output.service.json
@@ -25,7 +25,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:85"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:86"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -49,7 +49,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:55"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:56"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/lambda-extension-enabled.output.service.json b/tests/fixtures/lambda-extension-enabled.output.service.json
@@ -24,7 +24,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:85"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:86"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -47,7 +47,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:55"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:56"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/license-key-secret-disabled.output.service.json b/tests/fixtures/license-key-secret-disabled.output.service.json
@@ -25,7 +25,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:85"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:86"
       ],
       "package": {
         "exclude": [
@@ -53,7 +53,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:55"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:56"
       ],
       "package": {
         "exclude": [

diff --git a/tests/fixtures/log-disabled.output.service.json b/tests/fixtures/log-disabled.output.service.json
@@ -31,7 +31,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:85"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:86"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -50,7 +50,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:55"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:56"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/log-ingestion-via-extension.output.service.json b/tests/fixtures/log-ingestion-via-extension.output.service.json
@@ -28,7 +28,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:85"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:86"
       ],
       "package": {
         "exclude": [
@@ -57,7 +57,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:55"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:56"
       ],
       "package": {
         "exclude": [

diff --git a/tests/fixtures/log-level.output.service.json b/tests/fixtures/log-level.output.service.json
@@ -31,7 +31,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:85"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:86"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -43,6 +43,7 @@
         "NEW_RELIC_APP_NAME": "layer-nodejs12x",
         "NEW_RELIC_LAMBDA_HANDLER": "handler.handler",
         "NEW_RELIC_LOG": "stdout",
+        "NEW_RELIC_LOG_ENABLED": "true",
         "NEW_RELIC_LOG_LEVEL": "error",
         "NEW_RELIC_NO_CONFIG_FILE": "true",
         "NEW_RELIC_TRUSTED_ACCOUNT_KEY": "${env:NEW_RELIC_ACCOUNT_ID}"
@@ -52,7 +53,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:55"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:56"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -64,6 +65,7 @@
         "NEW_RELIC_APP_NAME": "layer-nodejs14x",
         "NEW_RELIC_LAMBDA_HANDLER": "handler.handler",
         "NEW_RELIC_LOG": "stdout",
+        "NEW_RELIC_LOG_ENABLED": "true",
         "NEW_RELIC_LOG_LEVEL": "error",
         "NEW_RELIC_NO_CONFIG_FILE": "true",
         "NEW_RELIC_TRUSTED_ACCOUNT_KEY": "${env:NEW_RELIC_ACCOUNT_ID}"

diff --git a/tests/fixtures/provider-environment-log-level.output.service.json b/tests/fixtures/provider-environment-log-level.output.service.json
@@ -34,7 +34,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:85"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:86"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -46,16 +46,17 @@
         "NEW_RELIC_APP_NAME": "layer-nodejs12x",
         "NEW_RELIC_LAMBDA_HANDLER": "handler.handler",
         "NEW_RELIC_LOG": "stdout",
+        "NEW_RELIC_LOG_ENABLED": "true",
         "NEW_RELIC_LOG_LEVEL": "error",
-           "NEW_RELIC_NO_CONFIG_FILE": "true",
+        "NEW_RELIC_NO_CONFIG_FILE": "true",
         "NEW_RELIC_TRUSTED_ACCOUNT_KEY": "${env:NEW_RELIC_ACCOUNT_ID}"
       }
     },
     "layer-nodejs14x": {
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:55"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:56"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -67,8 +68,9 @@
         "NEW_RELIC_APP_NAME": "layer-nodejs14x",
         "NEW_RELIC_LAMBDA_HANDLER": "handler.handler",
         "NEW_RELIC_LOG": "stdout",
+        "NEW_RELIC_LOG_ENABLED": "true",
         "NEW_RELIC_LOG_LEVEL": "error",
-           "NEW_RELIC_NO_CONFIG_FILE": "true",
+        "NEW_RELIC_NO_CONFIG_FILE": "true",
         "NEW_RELIC_TRUSTED_ACCOUNT_KEY": "${env:NEW_RELIC_ACCOUNT_ID}"
       }
     }