newrelic-lambda-cli 0.9.8__tar.gz → 0.9.10__tar.gz

{newrelic_lambda_cli-0.9.8 → newrelic_lambda_cli-0.9.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: newrelic-lambda-cli
-Version: 0.9.8
+Version: 0.9.10
 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
@@ -62,37 +62,21 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 
 ## Runtimes Supported
 
-* dotnetcore3.1
-* dotnet6
-* dotnet8
-* java8.al2
-* java11
-* java17
-* java21
-* nodejs16.x
-* nodejs18.x
-* nodejs20.x
-* nodejs22.x
-* provided
-* provided.al2
-* provided.al2023
-* python3.7
-* python3.8
-* python3.9
-* python3.10
-* python3.11
-* python3.12
-* python3.13
-* ruby3.2
-* ruby3.3
-* ruby3.4
+| Runtime     | Versions               |
+|-------------|------------------------|
+| Python      | `python3.7`, `python3.8`, `python3.9`, `python3.10`, `python3.11`, `python3.12`, `python3.13` |
+| Node.js     | `nodejs16.x`, `nodejs18.x`, `nodejs20.x`, `nodejs22.x` |
+| .NET   | `dotnet3.1`, `dotnet6`, `dotnet8`              |
+| Java        | `java8.al2`, `java11`, `java17`, `java21`      |
+| Provided    | `provided`, `provided.al2`, `provided.al2023`         |
+| Ruby        | `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.
 
 ## Requirements
 
-* Python >= 3.3 <= 3.12
+* Python >= 3.7 <= 3.13
 * Retrieve your [New relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) and [User API Key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#user-api-key)
 
 ## Recommendations
@@ -142,6 +126,9 @@ newrelic-lambda integrations install \
 | `--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. |
 | `--linked-account-name` or `-n` | No | A label for the New Relic Linked Account. This is how this integration will appear in New Relic. Defaults to "New Relic Lambda Integration - <AWS Account ID>". |
 | `--enable-logs` or `-e` | No | Enables forwarding logs to New Relic Logging. This is disabled by default. Make sure you run `newrelic-lambda subscriptions install --function ... --filter-pattern ""` afterwards. |
+| `--enable-license-key-secret` | No | Securely manages and store your New Relic license key in `AWS Secrets Manager` |
+| `--enable-cw-ingest` | No | Enable the CloudWatch `log ingest` function |
+| `--disable-cw-ingest` | No | Disable the CloudWatch `log ingest` function |
 | `--memory-size` or `-m` | No | Memory size (in MiB) for the New Relic log ingestion function. Default to 128MB. |
 | `--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`. |
 | `--timeout` or `-t` | No | Timeout (in seconds) for the New Relic log ingestion function. Defaults to 30 seconds. |
@@ -187,6 +174,7 @@ newrelic-lambda integrations update \
 | `--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. |
+| `--enable-license-key-secret` | No | Securely manages and store your 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`. |
 | `--timeout` or `-t` | No | Timeout (in seconds) for the New Relic log ingestion function. |
 | `--role-name` | No | Role name for the ingestion function. If you prefer to create and manage an IAM role for the function to assume out of band, do so and specify that role's name here. This avoids needing CAPABILITY_IAM. |
@@ -214,11 +202,16 @@ newrelic-lambda layers install \
 | `--layer-arn` or `-l` | No | Specify a specific layer version ARN to use. This is auto detected by default. |
 | `--upgrade` or `-u` | No | Permit upgrade to the latest layer version for this region and runtime. |
 | `--disable-extension` | No | Disable the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension). |
-| `--enable-extension-function-logs` | No | Enable forwarding logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension). Disabled by default. |
+| `--enable-extension-function-logs` or `--send-function-logs` | No | Enable sending Lambda function logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension). Disabled by default. |
+| `--disable-extension-function-logs` or `--disable-function-logs` | No | Disable sending Lambda function logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension).|
+| `--send-extension-logs` | No | Enable forwarding logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension). Disabled by default. |
+| `--disable-extension-logs` | No | Disable forwarding logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension).|
 | `--aws-profile` or `-p` | No | The AWS profile to use for this command. Can also use `AWS_PROFILE`. Will also check `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables if not using AWS CLI. |
 | `--aws-region` or `-r` | No | The AWS region this function is located. Can use `AWS_DEFAULT_REGION` environment variable. Defaults to AWS session region. |
 | `--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. |
+| `--nr-env-delimite` | No | Set `NR_ENV_DELIMITER` environment variable for your Lambda Function |
+| `--nr-tags` | No | Set `NR_TAGS` environment variable for your Lambda Function |
 | `--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`. |
 

{newrelic_lambda_cli-0.9.8 → newrelic_lambda_cli-0.9.10}/README.md

@@ -36,37 +36,21 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 
 ## Runtimes Supported
 
-* dotnetcore3.1
-* dotnet6
-* dotnet8
-* java8.al2
-* java11
-* java17
-* java21
-* nodejs16.x
-* nodejs18.x
-* nodejs20.x
-* nodejs22.x
-* provided
-* provided.al2
-* provided.al2023
-* python3.7
-* python3.8
-* python3.9
-* python3.10
-* python3.11
-* python3.12
-* python3.13
-* ruby3.2
-* ruby3.3
-* ruby3.4
+| Runtime     | Versions               |
+|-------------|------------------------|
+| Python      | `python3.7`, `python3.8`, `python3.9`, `python3.10`, `python3.11`, `python3.12`, `python3.13` |
+| Node.js     | `nodejs16.x`, `nodejs18.x`, `nodejs20.x`, `nodejs22.x` |
+| .NET   | `dotnet3.1`, `dotnet6`, `dotnet8`              |
+| Java        | `java8.al2`, `java11`, `java17`, `java21`      |
+| Provided    | `provided`, `provided.al2`, `provided.al2023`         |
+| Ruby        | `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.
 
 ## Requirements
 
-* Python >= 3.3 <= 3.12
+* Python >= 3.7 <= 3.13
 * Retrieve your [New relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) and [User API Key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#user-api-key)
 
 ## Recommendations
@@ -116,6 +100,9 @@ newrelic-lambda integrations install \
 | `--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. |
 | `--linked-account-name` or `-n` | No | A label for the New Relic Linked Account. This is how this integration will appear in New Relic. Defaults to "New Relic Lambda Integration - <AWS Account ID>". |
 | `--enable-logs` or `-e` | No | Enables forwarding logs to New Relic Logging. This is disabled by default. Make sure you run `newrelic-lambda subscriptions install --function ... --filter-pattern ""` afterwards. |
+| `--enable-license-key-secret` | No | Securely manages and store your New Relic license key in `AWS Secrets Manager` |
+| `--enable-cw-ingest` | No | Enable the CloudWatch `log ingest` function |
+| `--disable-cw-ingest` | No | Disable the CloudWatch `log ingest` function |
 | `--memory-size` or `-m` | No | Memory size (in MiB) for the New Relic log ingestion function. Default to 128MB. |
 | `--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`. |
 | `--timeout` or `-t` | No | Timeout (in seconds) for the New Relic log ingestion function. Defaults to 30 seconds. |
@@ -161,6 +148,7 @@ newrelic-lambda integrations update \
 | `--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. |
+| `--enable-license-key-secret` | No | Securely manages and store your 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`. |
 | `--timeout` or `-t` | No | Timeout (in seconds) for the New Relic log ingestion function. |
 | `--role-name` | No | Role name for the ingestion function. If you prefer to create and manage an IAM role for the function to assume out of band, do so and specify that role's name here. This avoids needing CAPABILITY_IAM. |
@@ -188,11 +176,16 @@ newrelic-lambda layers install \
 | `--layer-arn` or `-l` | No | Specify a specific layer version ARN to use. This is auto detected by default. |
 | `--upgrade` or `-u` | No | Permit upgrade to the latest layer version for this region and runtime. |
 | `--disable-extension` | No | Disable the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension). |
-| `--enable-extension-function-logs` | No | Enable forwarding logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension). Disabled by default. |
+| `--enable-extension-function-logs` or `--send-function-logs` | No | Enable sending Lambda function logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension). Disabled by default. |
+| `--disable-extension-function-logs` or `--disable-function-logs` | No | Disable sending Lambda function logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension).|
+| `--send-extension-logs` | No | Enable forwarding logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension). Disabled by default. |
+| `--disable-extension-logs` | No | Disable forwarding logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension).|
 | `--aws-profile` or `-p` | No | The AWS profile to use for this command. Can also use `AWS_PROFILE`. Will also check `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables if not using AWS CLI. |
 | `--aws-region` or `-r` | No | The AWS region this function is located. Can use `AWS_DEFAULT_REGION` environment variable. Defaults to AWS session region. |
 | `--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. |
+| `--nr-env-delimite` | No | Set `NR_ENV_DELIMITER` environment variable for your Lambda Function |
+| `--nr-tags` | No | Set `NR_TAGS` environment variable for your Lambda Function |
 | `--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`. |
 

{newrelic_lambda_cli-0.9.8 → newrelic_lambda_cli-0.9.10}/newrelic_lambda_cli/api.py

@@ -370,11 +370,12 @@ def retrieve_license_key(gql):
         return __cached_license_key
     except Exception:
         raise click.BadParameter(
-            "Could not retrieve license key from New Relic. Check that your New Relic "
-            "Account ID is valid and try again.",
+            f"For New Relic Account ID: {gql.account_id}. "
+            "Could not retrieve INGEST - LICENSE key from New Relic. "
+            "Check that your New Relic Account ID and USER key are valid and try again.",
             ctx=None,
-            param="nr_account_id",
-            param_hint="New Relic Account ID",
+            param="nr_api_key",
+            param_hint="API Key",
         )
 
 

{newrelic_lambda_cli-0.9.8 → newrelic_lambda_cli-0.9.10}/newrelic_lambda_cli/cli/layers.py

@@ -94,10 +94,42 @@ def register(group):
     help="Enable/disable the New Relic Lambda Extension",
 )
 @click.option(
-    "--enable-extension-function-logs/--disable-extension-function-logs",
-    default=False,
-    show_default=True,
-    help="Enable/disable sending Lambda function logs via the Extension",
+    "--send-extension-logs",
+    is_flag=True,
+    help="Enable sending extension logs via the New Relic Lambda Extension",
+)
+@click.option(
+    "--disable-extension-logs",
+    is_flag=True,
+    help="Disable sending extension logs via the New Relic Lambda Extension",
+)
+@click.option(
+    "--enable-extension-function-logs",
+    is_flag=True,
+    help="Enable sending Lambda function logs via the New Relic Lambda Extension",
+)
+@click.option(
+    "--disable-extension-function-logs",
+    is_flag=True,
+    help="Disable sending Lambda function logs via the New Relic Lambda Extension",
+)
+@click.option(
+    "--nr-tags",
+    help="Set NR_TAGS environment variable for Lambda (e.g. key1:value1;key2:value2)",
+)
+@click.option(
+    "--nr-env-delimiter",
+    help="Set NR_ENV_DELIMITER environment variable for Lambda (e.g. ',' for comma)",
+)
+@click.option(
+    "--send-function-logs",
+    is_flag=True,
+    help="Enable sending Lambda function logs via the New Relic Lambda Extension",
+)
+@click.option(
+    "--disable-function-logs",
+    is_flag=True,
+    help="Disable sending Lambda function logs via the New Relic Lambda Extension",
 )
 @click.option(
     "--java_handler_method",

{newrelic_lambda_cli-0.9.8 → newrelic_lambda_cli-0.9.10}/newrelic_lambda_cli/layers.py

@@ -18,12 +18,16 @@ from newrelic_lambda_cli.utils import catch_boto_errors
 
 NEW_RELIC_ENV_VARS = (
     "NEW_RELIC_ACCOUNT_ID",
+    "NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS",
     "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS",
     "NEW_RELIC_LAMBDA_EXTENSION_ENABLED",
     "NEW_RELIC_LAMBDA_HANDLER",
     "NEW_RELIC_LICENSE_KEY",
     "NEW_RELIC_LOG_ENDPOINT",
     "NEW_RELIC_TELEMETRY_ENDPOINT",
+    "NEW_RELIC_APM_LAMBDA_MODE",
+    "NR_TAGS",
+    "NR_ENV_DELIMITER",
 )
 
 
@@ -200,10 +204,52 @@ def _add_new_relic(input, config, nr_license_key):
             "NEW_RELIC_LAMBDA_EXTENSION_ENABLED"
         ] = "true"
 
-        update_kwargs["Environment"]["Variables"][
-            "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
-        ] = ("true" if input.enable_extension_function_logs else "false")
+        if not input.upgrade:
+            update_kwargs["Environment"]["Variables"][
+                "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+            ] = "false"
+        elif input.enable_extension_function_logs or input.send_function_logs:
+            update_kwargs["Environment"]["Variables"][
+                "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+            ] = "true"
+            success(
+                "Successfully enabled NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS tag to the function"
+            )
+        elif input.disable_extension_function_logs or input.disable_function_logs:
+            update_kwargs["Environment"]["Variables"][
+                "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+            ] = "false"
+            success(
+                "Successfully disabled NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS tag to the function"
+            )
+
+        if not input.upgrade:
+            update_kwargs["Environment"]["Variables"][
+                "NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS"
+            ] = "false"
+        elif input.send_extension_logs:
+            update_kwargs["Environment"]["Variables"][
+                "NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS"
+            ] = "true"
+            success(
+                "Successfully enabled NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS tag to the function"
+            )
+        elif input.disable_extension_logs:
+            update_kwargs["Environment"]["Variables"][
+                "NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS"
+            ] = "false"
+            success(
+                "Successfully disabled NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS tag to the function"
+            )
 
+        if input.nr_tags:
+            update_kwargs["Environment"]["Variables"]["NR_TAGS"] = input.nr_tags
+            success("Successfully added NR_TAGS tag to the function")
+        if input.nr_env_delimiter:
+            update_kwargs["Environment"]["Variables"][
+                "NR_ENV_DELIMITER"
+            ] = input.nr_env_delimiter
+            success("Successfully added NR_ENV_DELIMITER tag to the function")
         if input.nr_region == "staging":
             update_kwargs["Environment"]["Variables"][
                 "NEW_RELIC_TELEMETRY_ENDPOINT"
@@ -303,6 +349,14 @@ def install(input, function_arn):
 
     try:
         res = client.update_function_configuration(**update_kwargs)
+        if input.apm:
+            client.tag_resource(
+                Resource=config["Configuration"]["FunctionArn"],
+                Tags={
+                    "NR.Apm.Lambda.Mode": "true",
+                },
+            )
+            success("Successfully added APM tag to the function")
     except botocore.exceptions.ClientError as e:
         failure(
             "Failed to update configuration for '%s': %s"

{newrelic_lambda_cli-0.9.8 → newrelic_lambda_cli-0.9.10}/newrelic_lambda_cli/types.py

@@ -107,6 +107,13 @@ LAYER_INSTALL_KEYS = [
     "apm",
     "enable_extension",
     "enable_extension_function_logs",
+    "disable_extension_function_logs",
+    "nr_tags",
+    "nr_env_delimiter",
+    "send_function_logs",
+    "disable_function_logs",
+    "send_extension_logs",
+    "disable_extension_logs",
     "java_handler_method",
     "esm",
 ]

{newrelic_lambda_cli-0.9.8 → newrelic_lambda_cli-0.9.10}/newrelic_lambda_cli/utils.py

@@ -187,7 +187,9 @@ def parse_arn(arn):
         result["resource"] = elements[5]
         result["resourcetype"] = None
     else:
-        result["resourcetype"], result["resource"] = elements[5].split("/")
+        splitted_arn = elements[5].split("/")
+        result["resourcetype"] = splitted_arn[0]
+        result["resource"] = "/".join(splitted_arn[1:])
     return result
 
 

{newrelic_lambda_cli-0.9.8 → newrelic_lambda_cli-0.9.10}/newrelic_lambda_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: newrelic-lambda-cli
-Version: 0.9.8
+Version: 0.9.10
 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
@@ -62,37 +62,21 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 
 ## Runtimes Supported
 
-* dotnetcore3.1
-* dotnet6
-* dotnet8
-* java8.al2
-* java11
-* java17
-* java21
-* nodejs16.x
-* nodejs18.x
-* nodejs20.x
-* nodejs22.x
-* provided
-* provided.al2
-* provided.al2023
-* python3.7
-* python3.8
-* python3.9
-* python3.10
-* python3.11
-* python3.12
-* python3.13
-* ruby3.2
-* ruby3.3
-* ruby3.4
+| Runtime     | Versions               |
+|-------------|------------------------|
+| Python      | `python3.7`, `python3.8`, `python3.9`, `python3.10`, `python3.11`, `python3.12`, `python3.13` |
+| Node.js     | `nodejs16.x`, `nodejs18.x`, `nodejs20.x`, `nodejs22.x` |
+| .NET   | `dotnet3.1`, `dotnet6`, `dotnet8`              |
+| Java        | `java8.al2`, `java11`, `java17`, `java21`      |
+| Provided    | `provided`, `provided.al2`, `provided.al2023`         |
+| Ruby        | `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.
 
 ## Requirements
 
-* Python >= 3.3 <= 3.12
+* Python >= 3.7 <= 3.13
 * Retrieve your [New relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) and [User API Key](https://docs.newrelic.com/docs/apis/get-started/intro-apis/types-new-relic-api-keys#user-api-key)
 
 ## Recommendations
@@ -142,6 +126,9 @@ newrelic-lambda integrations install \
 | `--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. |
 | `--linked-account-name` or `-n` | No | A label for the New Relic Linked Account. This is how this integration will appear in New Relic. Defaults to "New Relic Lambda Integration - <AWS Account ID>". |
 | `--enable-logs` or `-e` | No | Enables forwarding logs to New Relic Logging. This is disabled by default. Make sure you run `newrelic-lambda subscriptions install --function ... --filter-pattern ""` afterwards. |
+| `--enable-license-key-secret` | No | Securely manages and store your New Relic license key in `AWS Secrets Manager` |
+| `--enable-cw-ingest` | No | Enable the CloudWatch `log ingest` function |
+| `--disable-cw-ingest` | No | Disable the CloudWatch `log ingest` function |
 | `--memory-size` or `-m` | No | Memory size (in MiB) for the New Relic log ingestion function. Default to 128MB. |
 | `--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`. |
 | `--timeout` or `-t` | No | Timeout (in seconds) for the New Relic log ingestion function. Defaults to 30 seconds. |
@@ -187,6 +174,7 @@ newrelic-lambda integrations update \
 | `--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. |
+| `--enable-license-key-secret` | No | Securely manages and store your 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`. |
 | `--timeout` or `-t` | No | Timeout (in seconds) for the New Relic log ingestion function. |
 | `--role-name` | No | Role name for the ingestion function. If you prefer to create and manage an IAM role for the function to assume out of band, do so and specify that role's name here. This avoids needing CAPABILITY_IAM. |
@@ -214,11 +202,16 @@ newrelic-lambda layers install \
 | `--layer-arn` or `-l` | No | Specify a specific layer version ARN to use. This is auto detected by default. |
 | `--upgrade` or `-u` | No | Permit upgrade to the latest layer version for this region and runtime. |
 | `--disable-extension` | No | Disable the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension). |
-| `--enable-extension-function-logs` | No | Enable forwarding logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension). Disabled by default. |
+| `--enable-extension-function-logs` or `--send-function-logs` | No | Enable sending Lambda function logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension). Disabled by default. |
+| `--disable-extension-function-logs` or `--disable-function-logs` | No | Disable sending Lambda function logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension).|
+| `--send-extension-logs` | No | Enable forwarding logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension). Disabled by default. |
+| `--disable-extension-logs` | No | Disable forwarding logs via the [New Relic Lambda Extension](https://github.com/newrelic/newrelic-lambda-extension).|
 | `--aws-profile` or `-p` | No | The AWS profile to use for this command. Can also use `AWS_PROFILE`. Will also check `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables if not using AWS CLI. |
 | `--aws-region` or `-r` | No | The AWS region this function is located. Can use `AWS_DEFAULT_REGION` environment variable. Defaults to AWS session region. |
 | `--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. |
+| `--nr-env-delimite` | No | Set `NR_ENV_DELIMITER` environment variable for your Lambda Function |
+| `--nr-tags` | No | Set `NR_TAGS` environment variable for your Lambda Function |
 | `--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`. |
 

{newrelic_lambda_cli-0.9.8 → newrelic_lambda_cli-0.9.10}/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.8",
+    version="0.9.10",
     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.8 → newrelic_lambda_cli-0.9.10}/tests/test_layers.py

@@ -55,7 +55,7 @@ def test_add_new_relic(aws_credentials, mock_function_config):
         update_kwargs["Environment"]["Variables"][
             "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
         ]
-        == "true"
+        == "false"
     )
 
     config = mock_function_config("not.a.runtime")
@@ -263,6 +263,85 @@ def test_add_new_relic_apm_lambda_mode(aws_credentials, mock_function_config):
     )
 
 
+def test_install_apm(aws_credentials, mock_function_config):
+    mock_session = MagicMock()
+    mock_session.region_name = "us-east-1"
+    expected_tags_after_tagging = {
+        "NR.Apm.Lambda.Mode": "true",
+    }
+
+    with patch(
+        "newrelic_lambda_cli.layers._get_license_key_outputs"
+    ) as mock_get_license_key_outputs:
+        mock_client = mock_session.client.return_value
+
+        mock_client.get_function.reset_mock(return_value=True)
+
+        config = mock_function_config("python3.12")
+        mock_client.get_function.return_value = config
+
+        mock_get_license_key_outputs.return_value = ("license_arn", "12345", "policy")
+
+        try:
+            install(
+                layer_install(
+                    session=mock_session,
+                    aws_region="us-east-1",
+                    nr_account_id=12345,
+                    apm=True,
+                ),
+                "APMLambda",
+            )
+        except UsageError as e:
+            print(f"UsageError: {e}")
+
+        mock_client.get_function.reset_mock()
+        config = mock_function_config("python3.12")
+        mock_client.get_function.return_value = config
+        mock_client.list_tags.return_value = {"Tags": expected_tags_after_tagging}
+        assert (
+            install(
+                layer_install(nr_account_id=12345, session=mock_session), "APMLambda"
+            )
+            is True
+        )
+
+        mock_client.assert_has_calls([call.get_function(FunctionName="APMLambda")])
+        mock_client.assert_has_calls(
+            [
+                call.update_function_configuration(
+                    FunctionName="arn:aws:lambda:us-east-1:5558675309:function:aws-python3-dev-hello",  # noqa
+                    Environment={
+                        "Variables": {
+                            "EXISTING_ENV_VAR": "Hello World",
+                            "NEW_RELIC_ACCOUNT_ID": "12345",
+                            "NEW_RELIC_LAMBDA_HANDLER": "original_handler",
+                            "NEW_RELIC_LAMBDA_EXTENSION_ENABLED": "false",
+                            "NEW_RELIC_APM_LAMBDA_MODE": "True",
+                        }
+                    },
+                    Layers=ANY,
+                    Handler="newrelic_lambda_wrapper.handler",
+                )
+            ]
+        )
+
+        mock_client.assert_has_calls(
+            [
+                call.tag_resource(
+                    Resource="arn:aws:lambda:us-east-1:5558675309:function:aws-python3-dev-hello",
+                    Tags={
+                        "NR.Apm.Lambda.Mode": "true",
+                    },
+                )
+            ]
+        )
+
+        tags_from_list_tags = mock_client.list_tags(Resource="APMLambda")["Tags"]
+
+        assert tags_from_list_tags == expected_tags_after_tagging
+
+
 @mock_aws
 def test_add_new_relic_dotnet(aws_credentials, mock_function_config):
     session = boto3.Session(region_name="us-east-1")
@@ -305,7 +384,7 @@ def test_add_new_relic_dotnet(aws_credentials, mock_function_config):
             update_kwargs["Environment"]["Variables"][
                 "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
             ]
-            == "true"
+            == "false"
         )
 
         # .NET specific environment variables
@@ -383,7 +462,7 @@ def test_add_new_relic_nodejs(aws_credentials, mock_function_config):
         update_kwargs_std["Environment"]["Variables"][
             "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
         ]
-        == "true"
+        == "false"
     )
 
     # --- Scenario 2: ESM Node.js Handler (ESM enabled) ---
@@ -435,7 +514,7 @@ def test_add_new_relic_nodejs(aws_credentials, mock_function_config):
         update_kwargs_esm["Environment"]["Variables"][
             "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
         ]
-        == "true"
+        == "false"
     )
 
 
@@ -702,3 +781,372 @@ def test_install_success_message_new_layer(aws_credentials, mock_function_config
                 "Successfully installed Layer ARN %s for the function: %s"
                 % (new_layer_arn, function_arn)
             )
+
+
+@mock_aws
+def test_extension_logs_flags(aws_credentials, mock_function_config):
+    """Test that --send-extension-logs and --disable-extension-logs flags work correctly"""
+    session = boto3.Session(region_name="us-east-1")
+    nr_account_id = 12345
+
+    # Test 1: Fresh install with default settings - logs should be disabled by default
+    config = mock_function_config("python3.12")
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=nr_account_id,
+            enable_extension=True,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    assert (
+        update_kwargs["Environment"]["Variables"][
+            "NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS"
+        ]
+        == "false"
+    )
+
+    # Test 2: Fresh install with --send-extension-logs
+    config = mock_function_config("python3.12")
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=nr_account_id,
+            enable_extension=True,
+            send_extension_logs=True,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    assert (
+        update_kwargs["Environment"]["Variables"][
+            "NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS"
+        ]
+        == "false"
+    )
+
+    # Test 3: Upgrade with --send-extension-logs - should set to true
+    config = mock_function_config("python3.12")
+    config["Configuration"]["Environment"]["Variables"][
+        "NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS"
+    ] = "false"
+
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=nr_account_id,
+            enable_extension=True,
+            send_extension_logs=True,
+            upgrade=True,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    assert (
+        update_kwargs["Environment"]["Variables"][
+            "NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS"
+        ]
+        == "true"
+    )
+
+    # Test 4: Upgrade with --disable-extension-logs - should set to false
+    config = mock_function_config("python3.12")
+    config["Configuration"]["Environment"]["Variables"][
+        "NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS"
+    ] = "true"
+
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=nr_account_id,
+            enable_extension=True,
+            disable_extension_logs=True,
+            upgrade=True,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    assert (
+        update_kwargs["Environment"]["Variables"][
+            "NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS"
+        ]
+        == "false"
+    )
+
+    # Test 5: Upgrade without flags - should preserve existing value
+    config = mock_function_config("python3.12")
+    config["Configuration"]["Environment"]["Variables"][
+        "NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS"
+    ] = "true"
+
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=nr_account_id,
+            enable_extension=True,
+            upgrade=True,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    assert (
+        update_kwargs["Environment"]["Variables"][
+            "NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS"
+        ]
+        == "true"
+    )
+
+
+@mock_aws
+def test_function_logs_flags(aws_credentials, mock_function_config):
+    """Test that --send-function-logs and --disable-function-logs flags work correctly"""
+    session = boto3.Session(region_name="us-east-1")
+    nr_account_id = 12345
+
+    # Test 1: Fresh install with default settings - logs should be disabled by default
+    config = mock_function_config("python3.12")
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=nr_account_id,
+            enable_extension=True,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    assert (
+        update_kwargs["Environment"]["Variables"][
+            "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+        ]
+        == "false"
+    )
+
+    # Test 2: Fresh install with --send-function-logs - should still be false
+    config = mock_function_config("python3.12")
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=nr_account_id,
+            enable_extension=True,
+            send_function_logs=True,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    assert (
+        update_kwargs["Environment"]["Variables"][
+            "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+        ]
+        == "false"
+    )
+
+    # Test 3: Upgrade with --send-function-logs - should set to true
+    config = mock_function_config("python3.12")
+    config["Configuration"]["Environment"]["Variables"][
+        "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+    ] = "false"
+
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=nr_account_id,
+            enable_extension=True,
+            send_function_logs=True,
+            upgrade=True,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    assert (
+        update_kwargs["Environment"]["Variables"][
+            "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+        ]
+        == "true"
+    )
+
+    # Test 4: Upgrade with --disable-function-logs - should set to false
+    config = mock_function_config("python3.12")
+    config["Configuration"]["Environment"]["Variables"][
+        "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+    ] = "true"
+
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=nr_account_id,
+            enable_extension=True,
+            disable_function_logs=True,
+            upgrade=True,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    assert (
+        update_kwargs["Environment"]["Variables"][
+            "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+        ]
+        == "false"
+    )
+
+    # Test 5: Upgrade without flags - should preserve existing value
+    config = mock_function_config("python3.12")
+    config["Configuration"]["Environment"]["Variables"][
+        "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+    ] = "true"
+
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=nr_account_id,
+            enable_extension=True,
+            upgrade=True,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    assert (
+        update_kwargs["Environment"]["Variables"][
+            "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+        ]
+        == "true"
+    )
+
+
+@mock_aws
+def test_independent_log_settings(aws_credentials, mock_function_config):
+    """Test that function logs and extension logs are independent settings"""
+    session = boto3.Session(region_name="us-east-1")
+    nr_account_id = 12345
+
+    # Test: Upgrade with one flag should not affect the other setting
+    config = mock_function_config("python3.12")
+    config["Configuration"]["Environment"]["Variables"][
+        "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+    ] = "true"
+    config["Configuration"]["Environment"]["Variables"][
+        "NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS"
+    ] = "true"
+
+    # Set only function logs to false
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=nr_account_id,
+            enable_extension=True,
+            disable_function_logs=True,
+            upgrade=True,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    # Function logs should be set to false, extension logs should be preserved
+    assert (
+        update_kwargs["Environment"]["Variables"][
+            "NEW_RELIC_EXTENSION_SEND_FUNCTION_LOGS"
+        ]
+        == "false"
+    )
+    assert (
+        update_kwargs["Environment"]["Variables"][
+            "NEW_RELIC_EXTENSION_SEND_EXTENSION_LOGS"
+        ]
+        == "true"
+    )
+
+
+@mock_aws
+def test_add_new_relic_sets_nr_tags(aws_credentials, mock_function_config):
+    session = boto3.Session(region_name="us-east-1")
+    config = mock_function_config("python3.12")
+    tags_value = "foo:bar;baz:qux"
+
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=12345,
+            enable_extension=True,
+            enable_extension_function_logs=True,
+            nr_tags=tags_value,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    assert update_kwargs["Environment"]["Variables"]["NR_TAGS"] == tags_value
+
+
+@mock_aws
+def test_add_new_relic_sets_nr_env_delimiter(aws_credentials, mock_function_config):
+    session = boto3.Session(region_name="us-east-1")
+    config = mock_function_config("python3.12")
+    delimiter_value = "|"
+
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=12345,
+            enable_extension=True,
+            enable_extension_function_logs=True,
+            nr_env_delimiter=delimiter_value,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    assert (
+        update_kwargs["Environment"]["Variables"]["NR_ENV_DELIMITER"] == delimiter_value
+    )
+
+
+@mock_aws
+def test_add_new_relic_sets_both_nr_tags_and_env_delimiter(
+    aws_credentials, mock_function_config
+):
+    session = boto3.Session(region_name="us-east-1")
+    config = mock_function_config("python3.12")
+    tags_value = "foo:bar|baz:qux"
+    delimiter_value = "|"
+
+    update_kwargs = _add_new_relic(
+        layer_install(
+            session=session,
+            aws_region="us-east-1",
+            nr_account_id=12345,
+            enable_extension=True,
+            enable_extension_function_logs=True,
+            nr_tags=tags_value,
+            nr_env_delimiter=delimiter_value,
+        ),
+        config,
+        nr_license_key=None,
+    )
+
+    assert update_kwargs["Environment"]["Variables"]["NR_TAGS"] == tags_value
+    assert (
+        update_kwargs["Environment"]["Variables"]["NR_ENV_DELIMITER"] == delimiter_value
+    )