newrelic-lambda-cli 0.9.5__tar.gz → 0.9.7__tar.gz

{newrelic_lambda_cli-0.9.5 → newrelic_lambda_cli-0.9.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: newrelic-lambda-cli
-Version: 0.9.5
+Version: 0.9.7
 Summary: A CLI to install the New Relic AWS Lambda integration and layers.
 Home-page: https://github.com/newrelic/newrelic-lambda-cli
 Author: New Relic
@@ -14,6 +14,15 @@ Requires-Dist: colorama
 Requires-Dist: gql<3,>=2
 Requires-Dist: requests<3
 Requires-Dist: tabulate
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 [![Community Plus header](https://github.com/newrelic/opensource-website/raw/master/src/images/categories/Community_Plus.png)](https://opensource.newrelic.com/oss-category/#community-plus)
 
@@ -76,6 +85,7 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 * python3.13
 * ruby3.2
 * ruby3.3
+* ruby3.4
 
 **Note:** Automatic handler wrapping is only supported for Node.js, Python, Java, and Ruby. For other runtimes,
 manual function wrapping is required using the runtime specific New Relic agent.
@@ -172,8 +182,8 @@ newrelic-lambda integrations update \
 
 | Option | Required? | Description |
 |--------|-----------|-------------|
-| `--nr-account-id` or `-a` | Yes | The [New Relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) for the integration. Only required if changing the account to which the logs are sent. Can also use the `NEW_RELIC_ACCOUNT_ID` environment variable. |
-| `--nr-api-key` or `-k` | Yes | Your [New Relic User API Key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#user-api-key). Can also use the `NEW_RELIC_API_KEY` environment variable. Only required if changing the account to which the logs are sent. |
+| `--nr-account-id` or `-a` | Yes | The [New Relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) for the integration. Alternatively, you can use the `NEW_RELIC_ACCOUNT_ID` environment variable. |
+| `--nr-api-key` or `-k` | Yes | Your [New Relic User API Key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#user-api-key). Alternatively, you can use the `NEW_RELIC_API_KEY` environment variable. |
 | `--disable-logs` or `-d` | No | Disables forwarding logs to New Relic Logging. Make sure you run `newrelic-lambda subscriptions install --function ...` afterwards. |
 | `--enable-logs` or `-e` | No | Enables forwarding logs to New Relic Logging. Make sure you run `newrelic-lambda subscriptions install --function ... --filter-pattern ""` afterwards. |
 | `--memory-size` or `-m` | No | Memory size (in MiB) for the New Relic log ingestion function. |
@@ -210,6 +220,7 @@ newrelic-lambda layers install \
 | `--nr-api-key` or `-k` | No | Your [New Relic User API Key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#user-api-key). Can also use the `NEW_RELIC_API_KEY` environment variable. Only used if `--enable-extension` is set and there is no New Relic license key in AWS Secrets Manager. |
 | `--nr-region` | No | The New Relic region to use for the integration. Can use the `NEW_RELIC_REGION` environment variable. Can be either `eu` or `us`. Defaults to `us`. Only used if `--enable-extension` is set and there is no New Relic license key in AWS Secrets Manager. |
 | `--java_handler_method` or `-j` | No | For java runtimes only to specify an aws implementation method. Defaults to RequestHandler. Optional inputs are: handleRequest, handleStreamsRequest `--java_handler_method handleStreamsRequest`. |
+| `--esm` | No |  For Node.js functions using ES Modules (ESM), enable the specific ESM wrapper during installation (e.g., using the --esm flag). This sets the Lambda handler to `/opt/nodejs/node_modules/newrelic-esm-lambda-wrapper/index.handler`. |
 
 #### Uninstall Layer
 
@@ -345,11 +356,11 @@ newrelic-lambda subscriptions uninstall --function <name or arn> --otel
 
 ## Docker
 
-Now, you can run newrelic-lambda-cli as a container.
+Now, you can run newrelic-lambda-cli as a [container](https://gallery.ecr.aws/newrelic-lambda-layers-for-docker/newrelic-lambda-cli).
 
 ```bash
-docker build -t newrelic-lambda-cli .
-docker run -e AWS_PROFILE=your_profile -v $HOME/.aws:/home/newrelic-lambda-cli/.aws newrelic-lambda-cli functions list
+docker pull public.ecr.aws/newrelic-lambda-layers-for-docker/newrelic-lambda-cli:0.9.4
+docker run -v $HOME/.aws:/home/newrelic-lambda-cli/.aws "newrelic-lambda-cli" functions list
 ```
 
 ## Contributing

{newrelic_lambda_cli-0.9.5 → newrelic_lambda_cli-0.9.7}/README.md

@@ -59,6 +59,7 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 * python3.13
 * ruby3.2
 * ruby3.3
+* ruby3.4
 
 **Note:** Automatic handler wrapping is only supported for Node.js, Python, Java, and Ruby. For other runtimes,
 manual function wrapping is required using the runtime specific New Relic agent.
@@ -155,8 +156,8 @@ newrelic-lambda integrations update \
 
 | Option | Required? | Description |
 |--------|-----------|-------------|
-| `--nr-account-id` or `-a` | Yes | The [New Relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) for the integration. Only required if changing the account to which the logs are sent. Can also use the `NEW_RELIC_ACCOUNT_ID` environment variable. |
-| `--nr-api-key` or `-k` | Yes | Your [New Relic User API Key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#user-api-key). Can also use the `NEW_RELIC_API_KEY` environment variable. Only required if changing the account to which the logs are sent. |
+| `--nr-account-id` or `-a` | Yes | The [New Relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) for the integration. Alternatively, you can use the `NEW_RELIC_ACCOUNT_ID` environment variable. |
+| `--nr-api-key` or `-k` | Yes | Your [New Relic User API Key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#user-api-key). Alternatively, you can use the `NEW_RELIC_API_KEY` environment variable. |
 | `--disable-logs` or `-d` | No | Disables forwarding logs to New Relic Logging. Make sure you run `newrelic-lambda subscriptions install --function ...` afterwards. |
 | `--enable-logs` or `-e` | No | Enables forwarding logs to New Relic Logging. Make sure you run `newrelic-lambda subscriptions install --function ... --filter-pattern ""` afterwards. |
 | `--memory-size` or `-m` | No | Memory size (in MiB) for the New Relic log ingestion function. |
@@ -193,6 +194,7 @@ newrelic-lambda layers install \
 | `--nr-api-key` or `-k` | No | Your [New Relic User API Key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#user-api-key). Can also use the `NEW_RELIC_API_KEY` environment variable. Only used if `--enable-extension` is set and there is no New Relic license key in AWS Secrets Manager. |
 | `--nr-region` | No | The New Relic region to use for the integration. Can use the `NEW_RELIC_REGION` environment variable. Can be either `eu` or `us`. Defaults to `us`. Only used if `--enable-extension` is set and there is no New Relic license key in AWS Secrets Manager. |
 | `--java_handler_method` or `-j` | No | For java runtimes only to specify an aws implementation method. Defaults to RequestHandler. Optional inputs are: handleRequest, handleStreamsRequest `--java_handler_method handleStreamsRequest`. |
+| `--esm` | No |  For Node.js functions using ES Modules (ESM), enable the specific ESM wrapper during installation (e.g., using the --esm flag). This sets the Lambda handler to `/opt/nodejs/node_modules/newrelic-esm-lambda-wrapper/index.handler`. |
 
 #### Uninstall Layer
 
@@ -328,11 +330,11 @@ newrelic-lambda subscriptions uninstall --function <name or arn> --otel
 
 ## Docker
 
-Now, you can run newrelic-lambda-cli as a container.
+Now, you can run newrelic-lambda-cli as a [container](https://gallery.ecr.aws/newrelic-lambda-layers-for-docker/newrelic-lambda-cli).
 
 ```bash
-docker build -t newrelic-lambda-cli .
-docker run -e AWS_PROFILE=your_profile -v $HOME/.aws:/home/newrelic-lambda-cli/.aws newrelic-lambda-cli functions list
+docker pull public.ecr.aws/newrelic-lambda-layers-for-docker/newrelic-lambda-cli:0.9.4
+docker run -v $HOME/.aws:/home/newrelic-lambda-cli/.aws "newrelic-lambda-cli" functions list
 ```
 
 ## Contributing

{newrelic_lambda_cli-0.9.5 → newrelic_lambda_cli-0.9.7}/newrelic_lambda_cli/cli/layers.py

@@ -103,6 +103,11 @@ def register(group):
     show_default=True,
     type=click.Choice(["handleRequest", "handleStreamsRequest"]),
 )
+@click.option(
+    "--esm",
+    is_flag=True,
+    help="Nodejs runtimes only - nodejs implementation runtime handler to /opt/nodejs/node_modules/newrelic-esm-lambda-wrapper/index.handler",
+)
 @click.pass_context
 def install(ctx, **kwargs):
     """Install New Relic AWS Lambda Layers"""

{newrelic_lambda_cli-0.9.5 → newrelic_lambda_cli-0.9.7}/newrelic_lambda_cli/layers.py

@@ -100,6 +100,13 @@ def _add_new_relic(input, config, nr_license_key):
     if "java" in runtime:
         postfix = input.java_handler_method or "handleRequest"
         runtime_handler = runtime_handler + postfix
+    if "nodejs" in runtime:
+        prefix = (
+            "/opt/nodejs/node_modules/newrelic-esm-lambda-wrapper/index"
+            if input.esm
+            else "newrelic-lambda-wrapper"
+        )
+        runtime_handler = prefix + ".handler"
 
     existing_newrelic_layer = [
         layer["Arn"]
@@ -165,7 +172,18 @@ def _add_new_relic(input, config, nr_license_key):
 
     # Update the NEW_RELIC_LAMBDA_HANDLER envvars only when it's a new install.
     if runtime_handler and handler != runtime_handler:
-        update_kwargs["Environment"]["Variables"]["NEW_RELIC_LAMBDA_HANDLER"] = handler
+        if "nodejs" in runtime:
+            if handler not in [
+                "newrelic-lambda-wrapper.handler",
+                "/opt/nodejs/node_modules/newrelic-esm-lambda-wrapper/index.handler",
+            ]:
+                update_kwargs["Environment"]["Variables"][
+                    "NEW_RELIC_LAMBDA_HANDLER"
+                ] = handler
+        else:
+            update_kwargs["Environment"]["Variables"][
+                "NEW_RELIC_LAMBDA_HANDLER"
+            ] = handler
 
     if input.enable_extension and not utils.supports_lambda_extension(runtime):
         warning(

{newrelic_lambda_cli-0.9.5 → newrelic_lambda_cli-0.9.7}/newrelic_lambda_cli/types.py

@@ -107,6 +107,7 @@ LAYER_INSTALL_KEYS = [
     "enable_extension",
     "enable_extension_function_logs",
     "java_handler_method",
+    "esm",
 ]
 
 LAYER_UNINSTALL_KEYS = [

{newrelic_lambda_cli-0.9.5 → newrelic_lambda_cli-0.9.7}/newrelic_lambda_cli/utils.py

@@ -83,6 +83,10 @@ RUNTIME_CONFIG = {
         "Handler": "newrelic_lambda_wrapper.handler",
         "LambdaExtension": True,
     },
+    "ruby3.4": {
+        "Handler": "newrelic_lambda_wrapper.handler",
+        "LambdaExtension": True,
+    },
 }
 
 

{newrelic_lambda_cli-0.9.5 → newrelic_lambda_cli-0.9.7}/newrelic_lambda_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: newrelic-lambda-cli
-Version: 0.9.5
+Version: 0.9.7
 Summary: A CLI to install the New Relic AWS Lambda integration and layers.
 Home-page: https://github.com/newrelic/newrelic-lambda-cli
 Author: New Relic
@@ -14,6 +14,15 @@ Requires-Dist: colorama
 Requires-Dist: gql<3,>=2
 Requires-Dist: requests<3
 Requires-Dist: tabulate
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 [![Community Plus header](https://github.com/newrelic/opensource-website/raw/master/src/images/categories/Community_Plus.png)](https://opensource.newrelic.com/oss-category/#community-plus)
 
@@ -76,6 +85,7 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 * python3.13
 * ruby3.2
 * ruby3.3
+* ruby3.4
 
 **Note:** Automatic handler wrapping is only supported for Node.js, Python, Java, and Ruby. For other runtimes,
 manual function wrapping is required using the runtime specific New Relic agent.
@@ -172,8 +182,8 @@ newrelic-lambda integrations update \
 
 | Option | Required? | Description |
 |--------|-----------|-------------|
-| `--nr-account-id` or `-a` | Yes | The [New Relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) for the integration. Only required if changing the account to which the logs are sent. Can also use the `NEW_RELIC_ACCOUNT_ID` environment variable. |
-| `--nr-api-key` or `-k` | Yes | Your [New Relic User API Key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#user-api-key). Can also use the `NEW_RELIC_API_KEY` environment variable. Only required if changing the account to which the logs are sent. |
+| `--nr-account-id` or `-a` | Yes | The [New Relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) for the integration. Alternatively, you can use the `NEW_RELIC_ACCOUNT_ID` environment variable. |
+| `--nr-api-key` or `-k` | Yes | Your [New Relic User API Key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#user-api-key). Alternatively, you can use the `NEW_RELIC_API_KEY` environment variable. |
 | `--disable-logs` or `-d` | No | Disables forwarding logs to New Relic Logging. Make sure you run `newrelic-lambda subscriptions install --function ...` afterwards. |
 | `--enable-logs` or `-e` | No | Enables forwarding logs to New Relic Logging. Make sure you run `newrelic-lambda subscriptions install --function ... --filter-pattern ""` afterwards. |
 | `--memory-size` or `-m` | No | Memory size (in MiB) for the New Relic log ingestion function. |
@@ -210,6 +220,7 @@ newrelic-lambda layers install \
 | `--nr-api-key` or `-k` | No | Your [New Relic User API Key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#user-api-key). Can also use the `NEW_RELIC_API_KEY` environment variable. Only used if `--enable-extension` is set and there is no New Relic license key in AWS Secrets Manager. |
 | `--nr-region` | No | The New Relic region to use for the integration. Can use the `NEW_RELIC_REGION` environment variable. Can be either `eu` or `us`. Defaults to `us`. Only used if `--enable-extension` is set and there is no New Relic license key in AWS Secrets Manager. |
 | `--java_handler_method` or `-j` | No | For java runtimes only to specify an aws implementation method. Defaults to RequestHandler. Optional inputs are: handleRequest, handleStreamsRequest `--java_handler_method handleStreamsRequest`. |
+| `--esm` | No |  For Node.js functions using ES Modules (ESM), enable the specific ESM wrapper during installation (e.g., using the --esm flag). This sets the Lambda handler to `/opt/nodejs/node_modules/newrelic-esm-lambda-wrapper/index.handler`. |
 
 #### Uninstall Layer
 
@@ -345,11 +356,11 @@ newrelic-lambda subscriptions uninstall --function <name or arn> --otel
 
 ## Docker
 
-Now, you can run newrelic-lambda-cli as a container.
+Now, you can run newrelic-lambda-cli as a [container](https://gallery.ecr.aws/newrelic-lambda-layers-for-docker/newrelic-lambda-cli).
 
 ```bash
-docker build -t newrelic-lambda-cli .
-docker run -e AWS_PROFILE=your_profile -v $HOME/.aws:/home/newrelic-lambda-cli/.aws newrelic-lambda-cli functions list
+docker pull public.ecr.aws/newrelic-lambda-layers-for-docker/newrelic-lambda-cli:0.9.4
+docker run -v $HOME/.aws:/home/newrelic-lambda-cli/.aws "newrelic-lambda-cli" functions list
 ```
 
 ## Contributing

{newrelic_lambda_cli-0.9.5 → newrelic_lambda_cli-0.9.7}/setup.py

@@ -6,7 +6,7 @@ README = open(os.path.join(os.path.dirname(__file__), "README.md"), "r").read()
 
 setup(
     name="newrelic-lambda-cli",
-    version="0.9.5",
+    version="0.9.7",
     python_requires=">=3.3",
     description="A CLI to install the New Relic AWS Lambda integration and layers.",
     long_description=README,

{newrelic_lambda_cli-0.9.5 → newrelic_lambda_cli-0.9.7}/tests/test_layers.py

@@ -298,6 +298,119 @@ def test_add_new_relic_dotnet(aws_credentials, mock_function_config):
         )
 
 
+@mock_aws
+def test_add_new_relic_nodejs(aws_credentials, mock_function_config):
+    """
+    Tests adding New Relic layer and configuration to Node.js functions,
+    including the standard and ESM wrapper handlers.
+    """
+    session = boto3.Session(region_name="us-east-1")
+    nr_license_key = "test-license-key-nodejs"
+    nr_account_id = 12345
+
+    runtime = "nodejs20.x"
+
+    # --- Scenario 1: Standard Node.js Handler (ESM disabled) ---
+    print(f"\nTesting Node.js ({runtime}) Standard Handler...")
+    original_std_handler = "original_handler"
+    config_std = mock_function_config(runtime)
+
+    install_opts_std = layer_install(
+        session=session,
+        aws_region="us-east-1",
+        nr_account_id=nr_account_id,
+        enable_extension=True,
+        enable_extension_function_logs=True,
+    )
+
+    update_kwargs_std = _add_new_relic(
+        install_opts_std,
+        config_std,
+        nr_license_key=nr_license_key,
+    )
+
+    assert update_kwargs_std is not False, "Expected update_kwargs, not False"
+    assert (
+        update_kwargs_std["FunctionName"] == config_std["Configuration"]["FunctionArn"]
+    )
+    assert update_kwargs_std["Handler"] == "newrelic-lambda-wrapper.handler"
+    assert (
+        update_kwargs_std["Environment"]["Variables"]["NEW_RELIC_LAMBDA_HANDLER"]
+        == original_std_handler
+    )
+    assert update_kwargs_std["Environment"]["Variables"]["NEW_RELIC_ACCOUNT_ID"] == str(
+        nr_account_id
+    )
+    assert (
+        update_kwargs_std["Environment"]["Variables"]["NEW_RELIC_LICENSE_KEY"]
+        == nr_license_key
+    )
+    assert (
+        update_kwargs_std["Environment"]["Variables"][
+            "NEW_RELIC_LAMBDA_EXTENSION_ENABLED"
+        ]
+        == "true"
+    )
+    assert (
+        update_kwargs_std["Environment"]["Variables"][
+            "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+        ]
+        == "true"
+    )
+
+    # --- Scenario 2: ESM Node.js Handler (ESM enabled) ---
+    print(f"\nTesting Node.js ({runtime}) ESM Handler...")
+    original_esm_handler = "original_handler"
+    config_esm = mock_function_config(runtime)
+
+    install_opts_esm = layer_install(
+        session=session,
+        aws_region="us-east-1",
+        nr_account_id=nr_account_id,
+        enable_extension=True,
+        enable_extension_function_logs=True,
+        esm=True,
+    )
+
+    update_kwargs_esm = _add_new_relic(
+        install_opts_esm,
+        config_esm,
+        nr_license_key=nr_license_key,
+    )
+
+    assert update_kwargs_esm is not False, "Expected update_kwargs, not False"
+    assert (
+        update_kwargs_esm["FunctionName"] == config_esm["Configuration"]["FunctionArn"]
+    )
+    assert (
+        update_kwargs_esm["Handler"]
+        == "/opt/nodejs/node_modules/newrelic-esm-lambda-wrapper/index.handler"
+    )
+    assert (
+        update_kwargs_esm["Environment"]["Variables"]["NEW_RELIC_LAMBDA_HANDLER"]
+        == original_esm_handler
+    )
+    assert update_kwargs_esm["Environment"]["Variables"]["NEW_RELIC_ACCOUNT_ID"] == str(
+        nr_account_id
+    )
+    assert (
+        update_kwargs_esm["Environment"]["Variables"]["NEW_RELIC_LICENSE_KEY"]
+        == nr_license_key
+    )
+    assert (
+        update_kwargs_esm["Environment"]["Variables"][
+            "NEW_RELIC_LAMBDA_EXTENSION_ENABLED"
+        ]
+        == "true"
+    )
+    assert (
+        update_kwargs_esm["Environment"]["Variables"][
+            "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+        ]
+        == "true"
+    )
+
+
 @mock_aws
 def test_remove_new_relic(aws_credentials, mock_function_config):
     session = boto3.Session(region_name="us-east-1")