diff --git a/examples/nodejs/serverless.yml b/examples/nodejs/serverless.yml index 4d1b62a..3bd3e37 100644 --- a/examples/nodejs/serverless.yml +++ b/examples/nodejs/serverless.yml @@ -44,3 +44,25 @@ functions: include: - handler.js runtime: nodejs18.x + + layer-nodejs20x: + events: + - schedule: rate(5 minutes) + handler: handler.handler + package: + exclude: + - ./** + include: + - handler.js + runtime: nodejs20.x + + layer-nodejs22x: + events: + - schedule: rate(5 minutes) + handler: handler.handler + package: + exclude: + - ./** + include: + - handler.js + runtime: nodejs22.x diff --git a/examples/python-requirements/package.json b/examples/python-requirements/package.json index ded984a..48216d6 100644 --- a/examples/python-requirements/package.json +++ b/examples/python-requirements/package.json @@ -13,7 +13,7 @@ "author": "", "license": "ISC", "devDependencies": { - "serverless": "^3.3.0", + "serverless": "^4.9.0", "serverless-python-requirements": "^5.3.1" } } diff --git a/examples/python-requirements/serverless.yml b/examples/python-requirements/serverless.yml index c5b9ed4..4cd58b9 100644 --- a/examples/python-requirements/serverless.yml +++ b/examples/python-requirements/serverless.yml @@ -4,7 +4,7 @@ provider: name: aws stage: test region: us-east-1 - runtime: python3.6 + runtime: python3.13 plugins: - serverless-python-requirements @@ -13,13 +13,14 @@ plugins: custom: newRelic: accountId: ${env:NEW_RELIC_ACCOUNT_ID} + apiKey: ${env:NEW_RELIC_PERSONAL_API_KEY} debug: true pythonRequirements: dockerizePip: true layer: true functions: - layer-python36: + layer-python313: events: - schedule: rate(5 minutes) handler: sample_app.handlers.handler diff --git a/examples/python/serverless.yml b/examples/python/serverless.yml index 78d6f54..8e90610 100644 --- a/examples/python/serverless.yml +++ b/examples/python/serverless.yml @@ -20,10 +20,12 @@ custom: newRelic: accountId: ${env:NEW_RELIC_ACCOUNT_ID} apiKey: ${env:NEW_RELIC_PERSONAL_API_KEY} + debug: true functions: - layer-python36: + + layer-python38: events: - schedule: rate(5 minutes) handler: handler.handler @@ -32,9 +34,9 @@ functions: - ./** include: - handler.py - runtime: python3.6 + runtime: python3.8 - layer-python37: + layer-python39: events: - schedule: rate(5 minutes) handler: handler.handler @@ -43,9 +45,9 @@ functions: - ./** include: - handler.py - runtime: python3.7 + runtime: python3.9 - layer-python38: + layer-python310: events: - schedule: rate(5 minutes) handler: handler.handler @@ -54,9 +56,9 @@ functions: - ./** include: - handler.py - runtime: python3.8 + runtime: python3.10 - layer-python39: + layer-python311: events: - schedule: rate(5 minutes) handler: handler.handler @@ -65,4 +67,26 @@ functions: - ./** include: - handler.py - runtime: python3.9 + runtime: python3.11 + + layer-python312: + events: + - schedule: rate(5 minutes) + handler: handler.handler + package: + exclude: + - ./** + include: + - handler.py + runtime: python3.12 + + layer-python313: + events: + - schedule: rate(5 minutes) + handler: handler.handler + package: + exclude: + - ./** + include: + - handler.py + runtime: python3.13 diff --git a/tests/fixtures/arm64.output.service.json b/tests/fixtures/arm64.output.service.json index 7b1a295..353eb6e 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18XARM64:109" ], "package": { "exclude": [ diff --git a/tests/fixtures/debug-log-level.output.service.json b/tests/fixtures/debug-log-level.output.service.json index df6f2b6..179b266 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"], diff --git a/tests/fixtures/debug.output.service.json b/tests/fixtures/debug.output.service.json index fcead88..238520f 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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 f6ff183..706b919 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"], diff --git a/tests/fixtures/eu.output.service.json b/tests/fixtures/eu.output.service.json index ac29ae1..30bf984 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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 c526cb4..638431a 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ] }, "layer-nodejs18x2": { diff --git a/tests/fixtures/include.output.service.json b/tests/fixtures/include.output.service.json index 9a88488..e334940 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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 77ffe9a..0cca7e1 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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 6a49d84..393b2d4 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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 b53fd24..84b2fac 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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 6b930d3..af17c32 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "package": { "exclude": [ diff --git a/tests/fixtures/log-disabled.output.service.json b/tests/fixtures/log-disabled.output.service.json index 72a30d2..0313c3e 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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 bcf10fe..f56bcbe 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "package": { "exclude": [ diff --git a/tests/fixtures/log-level.output.service.json b/tests/fixtures/log-level.output.service.json index b111892..d38cd00 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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 130f0fe..4ec96ba 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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 e9c7420..f70e8a6 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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:51" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS20X:59" ], "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:7" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS22X:15" ], "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 c334ea7..8888b68 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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 0a52220..77601cc 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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 4ca036e..9927b17 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "name": "aws", "stage": "prod", diff --git a/tests/fixtures/proxy.output.service.json b/tests/fixtures/proxy.output.service.json index dce0515..b61b04d 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "package": { "exclude": [ diff --git a/tests/fixtures/stage-included.output.service.json b/tests/fixtures/stage-included.output.service.json index ecac331..faf416c 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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 9c9bd29..0f135ee 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "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 b17d35f..daa3de1 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:101" + "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:109" ], "package": { "exclude": ["./**", "!newrelic-wrapper-helper.js"],