Skip to content

chore: updating with main #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aavinash-nr merged 3 commits into from
Apr 15, 2025
Merged

chore: updating with main #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23d8e29
chore(deps): bump axios from 1.6.2 to 1.7.7 in /examples/python-requi…
dependabot[bot] Apr 14, 2025
0556094
feat: add sendFunctionLogs & sendExtensionLogs config params (#497)
chaudharysaket Apr 14, 2025
2474fe6
chore: updating test-fixtures with latest versions (#501)
aavinash-nr Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
16 changes: 8 additions & 8 deletions examples/python-requirements/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ||
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/arm64.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/debug-log-level.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/debug.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/distributed-tracing-enabled.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/eu.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/function-has-layers.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/include.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
"./**",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/includes-all-provider-layer.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/lambda-extension-disabled.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/lambda-extension-enabled.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/license-key-secret-disabled.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/log-disabled.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/log-ingestion-via-extension.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/log-level.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/manual-wrapping.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions tests/fixtures/node-versions.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -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"],
Expand All @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/provider-environment-log-level.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/provider-environment.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/provider-layer.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/proxy.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/stage-included.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/trusted-account-key-excluded.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/trusted-account-key-included.output.service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down