From 23d8e299c79e888ce7c59028df23a89f6b44837f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 12:38:58 +0530 Subject: [PATCH 1/3] chore(deps): bump axios from 1.6.2 to 1.7.7 in /examples/python-requirements (#472) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Chodavarapu Naga Viswanadha Avinash --- examples/python-requirements/package-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/python-requirements/package-lock.json b/examples/python-requirements/package-lock.json index f937b052..ffbb1615 100644 --- a/examples/python-requirements/package-lock.json +++ b/examples/python-requirements/package-lock.json @@ -567,12 +567,12 @@ } }, "node_modules/axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", "dev": true, "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -5331,12 +5331,12 @@ } }, "axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", "dev": true, "requires": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" }, From 05560943de66746d8df7ee12b58ea1a1deb1c781 Mon Sep 17 00:00:00 2001 From: Saket Chaudhary <118331906+chaudharysaket@users.noreply.github.com> Date: Mon, 14 Apr 2025 13:41:51 +0530 Subject: [PATCH 2/3] feat: add sendFunctionLogs & sendExtensionLogs config params (#497) --- README.md | 20 ++++++++++++++++++++ src/index.ts | 16 ++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/README.md b/README.md index 48042189..5d59d05c 100644 --- a/README.md +++ b/README.md @@ -150,6 +150,26 @@ custom: newRelic: enableExtension: true ``` + +#### `sendFunctionLogs` (optional) + +Allows your function to deliver all of your function logs to New Relic via AWS Lambda Extension. The `sendFunctionLogs` config works identically to the older `enableFunctionLogs`. This new config has been introduced for consistency with `sendExtensionLogs`. While the new naming provides improved clarity, `enableFunctionLogs` remains available to ensure backward compatibility. + +```yaml +custom: + newRelic: + sendFunctionLogs: true +``` + +#### `sendExtensionLogs` (optional) +Allows your function to deliver all of your `extension logs` to New Relic via AWS Lambda Extension. + +```yaml +custom: + newRelic: + sendExtensionLogs: true +``` + #### `enableFunctionLogs` (optional) Allows your function to deliver all of your function logs to New Relic via AWS Lambda Extension. This would eliminate the need for a CloudWatch log subscription + the NR log ingestion Lambda function. This method of log ingestion is lower-cost, and offers faster time to glass. diff --git a/src/index.ts b/src/index.ts index 75543eca..3d78ae54 100644 --- a/src/index.ts +++ b/src/index.ts @@ -580,6 +580,22 @@ or make sure that you already have Serverless 3.x installed in your project. this.config.disableAutoSubscription = true; } + if ( + this.config.sendFunctionLogs && + this.config.sendFunctionLogs !== "false" + ) { + environment.NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS = "true"; + this.config.disableAutoSubscription = true; + } + + if ( + this.config.sendExtensionLogs && + this.config.sendExtensionLogs !== "false" + ) { + environment.NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS = "true"; + this.config.disableAutoSubscription = true; + } + if ( !_.isUndefined(this.config.enableExtensionLogs) && (this.config.enableExtensionLogs === "false" || From 2474fe6f707279e3c7a2b38d188c375d8861b5aa Mon Sep 17 00:00:00 2001 From: Chodavarapu Naga Viswanadha Avinash Date: Tue, 15 Apr 2025 13:00:13 +0530 Subject: [PATCH 3/3] chore: updating test-fixtures with latest versions (#501) --- tests/fixtures/arm64.output.service.json | 2 +- tests/fixtures/debug-log-level.output.service.json | 2 +- tests/fixtures/debug.output.service.json | 2 +- .../distributed-tracing-enabled.output.service.json | 2 +- tests/fixtures/eu.output.service.json | 2 +- tests/fixtures/function-has-layers.output.service.json | 4 ++-- tests/fixtures/include.output.service.json | 2 +- .../includes-all-provider-layer.output.service.json | 2 +- .../fixtures/lambda-extension-disabled.output.service.json | 2 +- tests/fixtures/lambda-extension-enabled.output.service.json | 2 +- .../license-key-secret-disabled.output.service.json | 2 +- tests/fixtures/log-disabled.output.service.json | 2 +- .../log-ingestion-via-extension.output.service.json | 2 +- tests/fixtures/log-level.output.service.json | 2 +- tests/fixtures/manual-wrapping.output.service.json | 2 +- tests/fixtures/node-versions.output.service.json | 6 +++--- .../provider-environment-log-level.output.service.json | 2 +- tests/fixtures/provider-environment.output.service.json | 2 +- tests/fixtures/provider-layer.output.service.json | 2 +- tests/fixtures/proxy.output.service.json | 2 +- tests/fixtures/stage-included.output.service.json | 2 +- .../trusted-account-key-excluded.output.service.json | 2 +- .../trusted-account-key-included.output.service.json | 2 +- 23 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tests/fixtures/arm64.output.service.json b/tests/fixtures/arm64.output.service.json index f327865a..be177176 100644 --- a/tests/fixtures/arm64.output.service.json +++ b/tests/fixtures/arm64.output.service.json @@ -52,7 +52,7 @@ ], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18XARM64:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18XARM64:113" ], "package": { "exclude": [ diff --git a/tests/fixtures/debug-log-level.output.service.json b/tests/fixtures/debug-log-level.output.service.json index b100c098..e7d006b1 100644 --- a/tests/fixtures/debug-log-level.output.service.json +++ b/tests/fixtures/debug-log-level.output.service.json @@ -54,7 +54,7 @@ "events": [{ "schedule": "rate(5 minutes)" }], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"], diff --git a/tests/fixtures/debug.output.service.json b/tests/fixtures/debug.output.service.json index d98e74f9..99d543ee 100644 --- a/tests/fixtures/debug.output.service.json +++ b/tests/fixtures/debug.output.service.json @@ -53,7 +53,7 @@ "events": [{ "schedule": "rate(5 minutes)" }], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"], diff --git a/tests/fixtures/distributed-tracing-enabled.output.service.json b/tests/fixtures/distributed-tracing-enabled.output.service.json index ab055dce..d6788ee7 100644 --- a/tests/fixtures/distributed-tracing-enabled.output.service.json +++ b/tests/fixtures/distributed-tracing-enabled.output.service.json @@ -50,7 +50,7 @@ ], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"], diff --git a/tests/fixtures/eu.output.service.json b/tests/fixtures/eu.output.service.json index acd1b683..7c83882a 100644 --- a/tests/fixtures/eu.output.service.json +++ b/tests/fixtures/eu.output.service.json @@ -55,7 +55,7 @@ ], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"], diff --git a/tests/fixtures/function-has-layers.output.service.json b/tests/fixtures/function-has-layers.output.service.json index 08f72c52..817cd7ba 100644 --- a/tests/fixtures/function-has-layers.output.service.json +++ b/tests/fixtures/function-has-layers.output.service.json @@ -2,7 +2,7 @@ "service": "newrelic-lambda-layers-nodejs-example", "provider": { "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "name": "aws", "stage": "prod", @@ -46,7 +46,7 @@ "runtime": "nodejs18.x", "layers": [ "arn:aws:lambda:us-east-1:123456789012:layer:SomeOtherLayer:1", - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ] }, "layer-nodejs18x2": { diff --git a/tests/fixtures/include.output.service.json b/tests/fixtures/include.output.service.json index 4d62f18f..aca5fba7 100644 --- 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:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": [ "./**", diff --git a/tests/fixtures/includes-all-provider-layer.output.service.json b/tests/fixtures/includes-all-provider-layer.output.service.json index cfd05140..5944fdfd 100644 --- 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:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "name": "aws", "stage": "prod", diff --git a/tests/fixtures/lambda-extension-disabled.output.service.json b/tests/fixtures/lambda-extension-disabled.output.service.json index 0cbe22f0..2cc43a7f 100644 --- a/tests/fixtures/lambda-extension-disabled.output.service.json +++ b/tests/fixtures/lambda-extension-disabled.output.service.json @@ -49,7 +49,7 @@ ], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "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 index cac06e09..8536bee8 100644 --- a/tests/fixtures/lambda-extension-enabled.output.service.json +++ b/tests/fixtures/lambda-extension-enabled.output.service.json @@ -47,7 +47,7 @@ ], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "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 index f1f48ba3..a9af3869 100644 --- a/tests/fixtures/license-key-secret-disabled.output.service.json +++ b/tests/fixtures/license-key-secret-disabled.output.service.json @@ -53,7 +53,7 @@ ], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": [ diff --git a/tests/fixtures/log-disabled.output.service.json b/tests/fixtures/log-disabled.output.service.json index 2aa5d8ab..1df53479 100644 --- a/tests/fixtures/log-disabled.output.service.json +++ b/tests/fixtures/log-disabled.output.service.json @@ -50,7 +50,7 @@ "events": [{ "schedule": "rate(5 minutes)" }], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "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 index 1466cf2e..d1db56c5 100644 --- a/tests/fixtures/log-ingestion-via-extension.output.service.json +++ b/tests/fixtures/log-ingestion-via-extension.output.service.json @@ -57,7 +57,7 @@ ], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": [ diff --git a/tests/fixtures/log-level.output.service.json b/tests/fixtures/log-level.output.service.json index 994fedd7..ff217910 100644 --- a/tests/fixtures/log-level.output.service.json +++ b/tests/fixtures/log-level.output.service.json @@ -53,7 +53,7 @@ "events": [{ "schedule": "rate(5 minutes)" }], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"], diff --git a/tests/fixtures/manual-wrapping.output.service.json b/tests/fixtures/manual-wrapping.output.service.json index b943e062..3af2b8ff 100644 --- a/tests/fixtures/manual-wrapping.output.service.json +++ b/tests/fixtures/manual-wrapping.output.service.json @@ -40,7 +40,7 @@ ], "provider": { "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "name": "aws", "region": "us-east-1", diff --git a/tests/fixtures/node-versions.output.service.json b/tests/fixtures/node-versions.output.service.json index 22d5151f..340e1139 100644 --- a/tests/fixtures/node-versions.output.service.json +++ b/tests/fixtures/node-versions.output.service.json @@ -48,7 +48,7 @@ "events": [{ "schedule": "rate(5 minutes)" }], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"], @@ -67,7 +67,7 @@ "events": [{ "schedule": "rate(5 minutes)" }], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS20X:62" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS20X:63" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"], @@ -86,7 +86,7 @@ "events": [{ "schedule": "rate(5 minutes)" }], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS22X:18" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS22X:19" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"], diff --git a/tests/fixtures/provider-environment-log-level.output.service.json b/tests/fixtures/provider-environment-log-level.output.service.json index 54d4ebef..e111df0c 100644 --- a/tests/fixtures/provider-environment-log-level.output.service.json +++ b/tests/fixtures/provider-environment-log-level.output.service.json @@ -56,7 +56,7 @@ "events": [{ "schedule": "rate(5 minutes)" }], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"], diff --git a/tests/fixtures/provider-environment.output.service.json b/tests/fixtures/provider-environment.output.service.json index a4167c21..52d90ac0 100644 --- a/tests/fixtures/provider-environment.output.service.json +++ b/tests/fixtures/provider-environment.output.service.json @@ -55,7 +55,7 @@ "events": [{ "schedule": "rate(5 minutes)" }], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"], diff --git a/tests/fixtures/provider-layer.output.service.json b/tests/fixtures/provider-layer.output.service.json index 79f53f01..bebdb44d 100644 --- a/tests/fixtures/provider-layer.output.service.json +++ b/tests/fixtures/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:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "name": "aws", "stage": "prod", diff --git a/tests/fixtures/proxy.output.service.json b/tests/fixtures/proxy.output.service.json index 0600b3ad..7e6e1267 100644 --- a/tests/fixtures/proxy.output.service.json +++ b/tests/fixtures/proxy.output.service.json @@ -52,7 +52,7 @@ ], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": [ diff --git a/tests/fixtures/stage-included.output.service.json b/tests/fixtures/stage-included.output.service.json index e1848d71..33a6a855 100644 --- a/tests/fixtures/stage-included.output.service.json +++ b/tests/fixtures/stage-included.output.service.json @@ -49,7 +49,7 @@ "events": [{ "schedule": "rate(5 minutes)" }], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"], diff --git a/tests/fixtures/trusted-account-key-excluded.output.service.json b/tests/fixtures/trusted-account-key-excluded.output.service.json index 16324a23..d2e90bb7 100644 --- a/tests/fixtures/trusted-account-key-excluded.output.service.json +++ b/tests/fixtures/trusted-account-key-excluded.output.service.json @@ -48,7 +48,7 @@ "events": [{ "schedule": "rate(5 minutes)" }], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"], diff --git a/tests/fixtures/trusted-account-key-included.output.service.json b/tests/fixtures/trusted-account-key-included.output.service.json index 3b89400b..6c843b80 100644 --- a/tests/fixtures/trusted-account-key-included.output.service.json +++ b/tests/fixtures/trusted-account-key-included.output.service.json @@ -49,7 +49,7 @@ "events": [{ "schedule": "rate(5 minutes)" }], "handler": "newrelic-lambda-wrapper.handler", "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:112" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:113" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"],