newrelic-lambda-cli 0.9.14__tar.gz → 0.9.16__tar.gz

{newrelic_lambda_cli-0.9.14 → newrelic_lambda_cli-0.9.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: newrelic-lambda-cli
-Version: 0.9.14
+Version: 0.9.16
 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
@@ -64,11 +64,11 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 
 | 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`              |
+| Python      | `python3.8`, `python3.9`, `python3.10`, `python3.11`, `python3.12`, `python3.13`, `python3.14` |
+| Node.js     | `nodejs16.x`, `nodejs18.x`, `nodejs20.x`, `nodejs22.x`, `nodejs24.x` |
+| .NET   |  `dotnet6`, `dotnet8`              |
 | Java        | `java8.al2`, `java11`, `java17`, `java21`      |
-| Provided    | `provided`, `provided.al2`, `provided.al2023`         |
+| 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,
@@ -78,6 +78,7 @@ manual function wrapping is required using the runtime specific New Relic agent.
 
 * 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)
+* Retrieve your [New Relic Ingest License Key](https://docs.newrelic.com/docs/apis/intro-apis/new-relic-api-keys/#personal-api-key)
 
 ## Recommendations
 
@@ -199,6 +200,7 @@ newrelic-lambda layers install \
 | `--function` or `-f` | Yes | The AWS Lambda function name or ARN in which to add a layer. Can provide multiple `--function` arguments. Will also accept `all`, `installed` and `not-installed` similar to `newrelic-lambda functions list`. |
 | `--nr-account-id` or `-a` | Yes | The [New Relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) this function should use. Can also use the `NEW_RELIC_ACCOUNT_ID` environment variable. |
 | `--exclude` or `-e` | No | A function name to exclude while installing layers. Can provide multiple `--exclude` arguments. Only checked when `all`, `installed` and `not-installed` are used. See `newrelic-lambda functions list` for function names. |
+| `--slim` | No | The flag `--slim` adds the Node.js layer without OpenTelemetry dependencies, resulting in a lighter size. |
 | `--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). |
@@ -209,6 +211,7 @@ newrelic-lambda layers install \
 | `--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-ingest-key`| No | Your [New Relic Ingest License Key](https://docs.newrelic.com/docs/apis/intro-apis/new-relic-api-keys/#personal-api-key). Can be used without `--enable-extension` configured or 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 |

{newrelic_lambda_cli-0.9.14 → newrelic_lambda_cli-0.9.16}/README.md

@@ -38,11 +38,11 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 
 | 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`              |
+| Python      | `python3.8`, `python3.9`, `python3.10`, `python3.11`, `python3.12`, `python3.13`, `python3.14` |
+| Node.js     | `nodejs16.x`, `nodejs18.x`, `nodejs20.x`, `nodejs22.x`, `nodejs24.x` |
+| .NET   |  `dotnet6`, `dotnet8`              |
 | Java        | `java8.al2`, `java11`, `java17`, `java21`      |
-| Provided    | `provided`, `provided.al2`, `provided.al2023`         |
+| 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,
@@ -52,6 +52,7 @@ manual function wrapping is required using the runtime specific New Relic agent.
 
 * 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)
+* Retrieve your [New Relic Ingest License Key](https://docs.newrelic.com/docs/apis/intro-apis/new-relic-api-keys/#personal-api-key)
 
 ## Recommendations
 
@@ -173,6 +174,7 @@ newrelic-lambda layers install \
 | `--function` or `-f` | Yes | The AWS Lambda function name or ARN in which to add a layer. Can provide multiple `--function` arguments. Will also accept `all`, `installed` and `not-installed` similar to `newrelic-lambda functions list`. |
 | `--nr-account-id` or `-a` | Yes | The [New Relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) this function should use. Can also use the `NEW_RELIC_ACCOUNT_ID` environment variable. |
 | `--exclude` or `-e` | No | A function name to exclude while installing layers. Can provide multiple `--exclude` arguments. Only checked when `all`, `installed` and `not-installed` are used. See `newrelic-lambda functions list` for function names. |
+| `--slim` | No | The flag `--slim` adds the Node.js layer without OpenTelemetry dependencies, resulting in a lighter size. |
 | `--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). |
@@ -183,6 +185,7 @@ newrelic-lambda layers install \
 | `--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-ingest-key`| No | Your [New Relic Ingest License Key](https://docs.newrelic.com/docs/apis/intro-apis/new-relic-api-keys/#personal-api-key). Can be used without `--enable-extension` configured or 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 |

{newrelic_lambda_cli-0.9.14 → newrelic_lambda_cli-0.9.16}/newrelic_lambda_cli/api.py

@@ -96,24 +96,23 @@ class NewRelicGQL(object):
         """
         res = self.query(
             """
-            query ($accountId: Int!) {
-              requestContext {
-                apiKey
-              }
-              actor {
-                account(id: $accountId) {
-                  licenseKey
-                  id
-                  name
+                query ($accountId: Int!) {
+                    actor {
+                        apiAccess {
+                            keySearch(query: {types: INGEST, scope: {accountIds: [$accountId]}}) {
+                                keys {
+                                    key
+                                }
+                            }
+                        }
+                    }
                 }
-              }
-            }
             """,
             accountId=self.account_id,
         )
         try:
-            return res["actor"]["account"]["licenseKey"]
-        except KeyError:
+            return res["actor"]["apiAccess"]["keySearch"]["keys"][0]["key"]
+        except (KeyError, IndexError):
             return None
 
     def get_linked_account_by_id(self, id):

{newrelic_lambda_cli-0.9.14 → newrelic_lambda_cli-0.9.16}/newrelic_lambda_cli/cli/layers.py

@@ -133,6 +133,12 @@ def register(group):
     is_flag=True,
     help="Enable sending Lambda function logs via the New Relic Lambda Extension",
 )
+@click.option(
+    "--slim",
+    is_flag=True,
+    default=False,
+    help="New Relic slim Layer without opentelemetry for Node.js",
+)
 @click.option(
     "--disable-function-logs",
     is_flag=True,

{newrelic_lambda_cli-0.9.14 → newrelic_lambda_cli-0.9.16}/newrelic_lambda_cli/layers.py

@@ -48,7 +48,12 @@ def index(region, runtime, architecture):
 
 
 def layer_selection(
-    available_layers, runtime, architecture, upgrade=False, existing_layer_arn=None
+    available_layers,
+    runtime,
+    architecture,
+    upgrade=False,
+    existing_layer_arn=None,
+    slim=False,
 ):
     if upgrade and existing_layer_arn:
         base_arn = existing_layer_arn.rsplit(":", 1)[0]
@@ -65,7 +70,11 @@ def layer_selection(
     layer_options = [
         layer["LatestMatchingVersion"]["LayerVersionArn"] for layer in available_layers
     ]
-
+    if slim:
+        for arn in layer_options:
+            if "-slim:" in arn:
+                success("Layer %s selected (slim)" % arn)
+                return arn
     if sys.stdout.isatty():
         output = "\n".join(
             [
@@ -86,11 +95,14 @@ def layer_selection(
             except IndexError:
                 failure("Invalid layer selection")
     else:
-        raise click.UsageError(
+        click.echo(
             "Discovered multiple layers for runtime %s (%s):\n%s\n"
-            "Pass --layer-arn to specify a layer ARN"
+            "To add a particular Layer ARN use --layer-arn"
             % (runtime, architecture, "\n".join(layer_options))
         )
+        selected = layer_options[0]
+        success("Layer %s selected (auto)" % selected)
+        return selected
 
 
 def _add_new_relic(input, config, nr_license_key):
@@ -167,6 +179,7 @@ def _add_new_relic(input, config, nr_license_key):
             architecture,
             upgrade=input.upgrade,
             existing_layer_arn=existing_layer_arn,
+            slim=input.slim,
         )
 
     update_kwargs = {

{newrelic_lambda_cli-0.9.14 → newrelic_lambda_cli-0.9.16}/newrelic_lambda_cli/types.py

@@ -117,6 +117,7 @@ LAYER_INSTALL_KEYS = [
     "disable_extension_logs",
     "java_handler_method",
     "esm",
+    "slim",
 ]
 
 LAYER_UNINSTALL_KEYS = [

{newrelic_lambda_cli-0.9.14 → newrelic_lambda_cli-0.9.16}/newrelic_lambda_cli/utils.py

@@ -44,6 +44,10 @@ RUNTIME_CONFIG = {
         "Handler": "newrelic-lambda-wrapper.handler",
         "LambdaExtension": True,
     },
+    "nodejs24.x": {
+        "Handler": "newrelic-lambda-wrapper.handler",
+        "LambdaExtension": True,
+    },
     "provided": {"LambdaExtension": True},
     "provided.al2": {"LambdaExtension": True},
     "provided.al2023": {"LambdaExtension": True},
@@ -75,6 +79,10 @@ RUNTIME_CONFIG = {
         "Handler": "newrelic_lambda_wrapper.handler",
         "LambdaExtension": True,
     },
+    "python3.14": {
+        "Handler": "newrelic_lambda_wrapper.handler",
+        "LambdaExtension": True,
+    },
     "ruby3.2": {
         "Handler": "newrelic_lambda_wrapper.handler",
         "LambdaExtension": True,

{newrelic_lambda_cli-0.9.14 → newrelic_lambda_cli-0.9.16}/newrelic_lambda_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: newrelic-lambda-cli
-Version: 0.9.14
+Version: 0.9.16
 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
@@ -64,11 +64,11 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 
 | 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`              |
+| Python      | `python3.8`, `python3.9`, `python3.10`, `python3.11`, `python3.12`, `python3.13`, `python3.14` |
+| Node.js     | `nodejs16.x`, `nodejs18.x`, `nodejs20.x`, `nodejs22.x`, `nodejs24.x` |
+| .NET   |  `dotnet6`, `dotnet8`              |
 | Java        | `java8.al2`, `java11`, `java17`, `java21`      |
-| Provided    | `provided`, `provided.al2`, `provided.al2023`         |
+| 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,
@@ -78,6 +78,7 @@ manual function wrapping is required using the runtime specific New Relic agent.
 
 * 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)
+* Retrieve your [New Relic Ingest License Key](https://docs.newrelic.com/docs/apis/intro-apis/new-relic-api-keys/#personal-api-key)
 
 ## Recommendations
 
@@ -199,6 +200,7 @@ newrelic-lambda layers install \
 | `--function` or `-f` | Yes | The AWS Lambda function name or ARN in which to add a layer. Can provide multiple `--function` arguments. Will also accept `all`, `installed` and `not-installed` similar to `newrelic-lambda functions list`. |
 | `--nr-account-id` or `-a` | Yes | The [New Relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) this function should use. Can also use the `NEW_RELIC_ACCOUNT_ID` environment variable. |
 | `--exclude` or `-e` | No | A function name to exclude while installing layers. Can provide multiple `--exclude` arguments. Only checked when `all`, `installed` and `not-installed` are used. See `newrelic-lambda functions list` for function names. |
+| `--slim` | No | The flag `--slim` adds the Node.js layer without OpenTelemetry dependencies, resulting in a lighter size. |
 | `--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). |
@@ -209,6 +211,7 @@ newrelic-lambda layers install \
 | `--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-ingest-key`| No | Your [New Relic Ingest License Key](https://docs.newrelic.com/docs/apis/intro-apis/new-relic-api-keys/#personal-api-key). Can be used without `--enable-extension` configured or 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 |

{newrelic_lambda_cli-0.9.14 → newrelic_lambda_cli-0.9.16}/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.14",
+    version="0.9.16",
     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.14 → newrelic_lambda_cli-0.9.16}/tests/test_layers.py

@@ -148,6 +148,7 @@ def test_add_new_relic(aws_credentials, mock_function_config):
                 "x86_64",
                 upgrade=None,
                 existing_layer_arn=None,
+                slim=ANY,
             )
             assert "original_handler" in config["Configuration"]["Handler"]
 
@@ -199,8 +200,9 @@ def test_add_new_relic(aws_credentials, mock_function_config):
 
     with patch("sys.stdout.isatty") as mock_isatty:
         mock_isatty.return_value = False
-        with pytest.raises(UsageError):
-            layer_selection(mock_layers, "python3.12", "x86_64")
+
+        selected = layer_selection(mock_layers, "python3.12", "x86_64")
+        assert selected == "arn:aws:lambda:us-east-1:123456789:layer/javajava"
 
     config = mock_function_config("python3.12")
     _add_new_relic(