newrelic-lambda-cli 0.9.7__py2.py3-none-any.whl → 0.9.9__py2.py3-none-any.whl

newrelic_lambda_cli/cli/layers.py

@@ -81,6 +81,11 @@ def register(group):
     help="Permit upgrade of function layers to new version.",
     is_flag=True,
 )
+@click.option(
+    "--apm",
+    help="Enable APM Lambda mode",
+    is_flag=True,
+)
 @click.option(
     "--enable-extension/--disable-extension",
     "-x",

newrelic_lambda_cli/layers.py

@@ -24,6 +24,7 @@ NEW_RELIC_ENV_VARS = (
     "NEW_RELIC_LICENSE_KEY",
     "NEW_RELIC_LOG_ENDPOINT",
     "NEW_RELIC_TELEMETRY_ENDPOINT",
+    "NEW_RELIC_APM_LAMBDA_MODE",
 )
 
 
@@ -118,6 +119,7 @@ def _add_new_relic(input, config, nr_license_key):
         success(
             "Already installed on function '%s'. Pass --upgrade (or -u) to allow "
             "upgrade or reinstall to latest layer version."
+            "Additionally pass --apm to enable APM Lambda mode."
             % config["Configuration"]["FunctionArn"]
         )
         return True
@@ -232,6 +234,13 @@ def _add_new_relic(input, config, nr_license_key):
             "CORECLR_PROFILER_PATH"
         ] = "/opt/lib/newrelic-dotnet-agent/libNewRelicProfiler.so"
 
+    if input.apm:
+        success(
+            "Enabling APM Lambda mode for function '%s' "
+            % config["Configuration"]["FunctionArn"]
+        )
+        update_kwargs["Environment"]["Variables"]["NEW_RELIC_APM_LAMBDA_MODE"] = "True"
+
     return update_kwargs
 
 
@@ -295,6 +304,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"
@@ -313,7 +330,25 @@ def install(input, function_arn):
         if input.verbose:
             click.echo(json.dumps(res, indent=2))
 
-        success("Successfully installed layer on %s" % function_arn)
+        old_layers = config["Configuration"].get("Layers", [])
+        old_layer_arn = old_layers[0]["Arn"].rsplit(":", 1)[0] if old_layers else "None"
+        old_layer_version = (
+            old_layers[0]["Arn"].split(":")[-1] if old_layers else "None"
+        )
+        new_layer = update_kwargs["Layers"][0]
+        new_layer_arn = update_kwargs["Layers"][0].rsplit(":", 1)[0]
+        new_layer_version = update_kwargs["Layers"][0].split(":")[-1]
+
+        if old_layer_arn == "None":
+            success(
+                "Successfully installed Layer ARN %s for the function: %s"
+                % (new_layer, function_arn)
+            )
+        else:
+            success(
+                "Successfully upgraded Layer ARN %s from version: %s to version: %s for the function: %s"
+                % (new_layer_arn, old_layer_version, new_layer_version, function_arn)
+            )
         return True
 
 
@@ -412,7 +447,11 @@ def uninstall(input, function_arn):
         if input.verbose:
             click.echo(json.dumps(res, indent=2))
 
-        success("Successfully uninstalled layer on %s" % function_arn)
+        old_layers = config["Configuration"].get("Layers", [])
+        old_layer_arn = old_layers[0]["Arn"] if old_layers else "None"
+        success(
+            "Successfully uninstalled Layer %s from %s" % (old_layer_arn, function_arn)
+        )
         return True
 
 

newrelic_lambda_cli/types.py

@@ -104,6 +104,7 @@ LAYER_INSTALL_KEYS = [
     "excludes",
     "layer_arn",
     "upgrade",
+    "apm",
     "enable_extension",
     "enable_extension_function_logs",
     "java_handler_method",

newrelic_lambda_cli/utils.py

@@ -131,6 +131,12 @@ def all_lambda_regions():
 
 def is_valid_handler(runtime, handler):
     runtime_handler = RUNTIME_CONFIG.get(runtime, {}).get("Handler", None)
+    if (
+        "nodejs" in runtime
+        and handler
+        == "/opt/nodejs/node_modules/newrelic-esm-lambda-wrapper/index.handler"
+    ):
+        return True
     if isinstance(runtime_handler, dict):
         for _, valid_handler in runtime_handler.items():
             if handler == valid_handler:

{newrelic_lambda_cli-0.9.7.dist-info → newrelic_lambda_cli-0.9.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: newrelic-lambda-cli
-Version: 0.9.7
+Version: 0.9.9
 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

{newrelic_lambda_cli-0.9.7.dist-info → newrelic_lambda_cli-0.9.9.dist-info}/RECORD

@@ -3,25 +3,25 @@ newrelic_lambda_cli/api.py,sha256=b75XwylRhW9pcA6aZ9EjBW1yIFOGHhhULDD5hNhMyes,15
 newrelic_lambda_cli/cliutils.py,sha256=XDtvTlgbf2uVg01yCJrfJmmgxbF0nIL9x58ETyvefk8,685
 newrelic_lambda_cli/functions.py,sha256=p57ZUw424BaSUA_Gw8DrYsJOYKROEHEaXgARadqwcP0,2800
 newrelic_lambda_cli/integrations.py,sha256=r0gxfEqVHTGu3xbr4dOCDwm0-Yhoz3KntfeQRWvoWrQ,31266
-newrelic_lambda_cli/layers.py,sha256=0Kiwx8h_sHcKAxSuwVCWbplAoE4jGiYXcHbS6xmLzP4,15447
+newrelic_lambda_cli/layers.py,sha256=h-oZu8LiKmc6DXNhP2LlP6Uy9mxY_eHlIKUNQqx1IZ0,17075
 newrelic_lambda_cli/otel_ingestions.py,sha256=vi1Mlfc9nRvRWV7STwK7fDXZGozG8ufKohmpHcaWGic,9250
 newrelic_lambda_cli/permissions.py,sha256=H7v5IMpKaJIWC4Dff2YcTis4BKAAFIJr9IHWUj1LnF4,9093
 newrelic_lambda_cli/subscriptions.py,sha256=-BYkltqiDLdmhUB_Ot4w-5vvrKcQC6aHcTBLl1mlUlI,9564
-newrelic_lambda_cli/types.py,sha256=q5m6T027sYWFFCzO_6ADRBZrGG0tIoiROvq9jdEV6G4,3304
-newrelic_lambda_cli/utils.py,sha256=98Y0gvJtQk4RfQUrwnrq_tXm9b_0Agg__F5AKvHYqzQ,5663
+newrelic_lambda_cli/types.py,sha256=7c9YIkOlU0ZDgs6yZLHVDEdOeeV-fk3EkuuqRKqqAp8,3315
+newrelic_lambda_cli/utils.py,sha256=mtjhu0DEWOugS6-dS2u9cTSb6oC1TaQze_hFTrbi4Nk,5827
 newrelic_lambda_cli/cli/__init__.py,sha256=FciF2RVqQbpMKqEiN8qjO6qmdLB6Yv8LyyyPYcfJNrc,622
 newrelic_lambda_cli/cli/decorators.py,sha256=a3agkVfy8omkUSL4aKblwSX95xtxYOGASULDYcJDPHk,1786
 newrelic_lambda_cli/cli/functions.py,sha256=RSh2Cowe1_oQup8q5YRidp03z-BITo2uzvDh4zvLr4I,2601
 newrelic_lambda_cli/cli/integrations.py,sha256=aQAWcCCU2kBmbF8fLKwKB9bzSY0uipvnojajjTkhqEs,10461
-newrelic_lambda_cli/cli/layers.py,sha256=O9QPutKfdMrDV9xk-IvF25hWdGJY7yFQA-6b3WbBWx8,6371
+newrelic_lambda_cli/cli/layers.py,sha256=6eWN9yYaL8aZAWXn10MoPe6mH1_hPt8Q5fJ8Zc9oEYM,6454
 newrelic_lambda_cli/cli/otel_ingestions.py,sha256=4rTm9iYUo2qdMeqxJSrYLCA6ZXHy5bJnjDn9x54pCYc,6096
 newrelic_lambda_cli/cli/subscriptions.py,sha256=bUupv5iv3mUkC8t31nnI3BahoKxDnUJ8Rgq4QHJcFNU,5890
 newrelic_lambda_cli/templates/import-template.yaml,sha256=0r1yeoqpnqtEMggWomALkPG10NiANPWWBqz03rChch8,3771
 newrelic_lambda_cli/templates/license-key-secret.yaml,sha256=ZldQaLXsyF1K2I4X_AsLdH7kRmLkPUYI3talmhqQyHg,1849
 newrelic_lambda_cli/templates/nr-lambda-integration-role.yaml,sha256=s7T73B_k-mAwgzJrD2xn8YGUNgn2E1V7Exifrl81ViU,2874
-newrelic_lambda_cli-0.9.7.dist-info/licenses/LICENSE,sha256=uuxDzQm0yfq_tNZX0tQYzsZUVRIF0jm3dBLZUojSYzI,11345
-newrelic_lambda_cli-0.9.7.dist-info/METADATA,sha256=dVHarIKajyveA4EnJ-SWZWltzYsCpeUvqmiBexxrUkQ,27333
-newrelic_lambda_cli-0.9.7.dist-info/WHEEL,sha256=_z0Kb-VmhLeNt2nZ-PsoQBjD25rP0tBwgAyRYD7oTKI,109
-newrelic_lambda_cli-0.9.7.dist-info/entry_points.txt,sha256=iks2k9Y4WNgIecsDzreIvMV9pGCjwwKTf33LKKvl2A8,65
-newrelic_lambda_cli-0.9.7.dist-info/top_level.txt,sha256=dxX2w58VgSUFiPD8C_lFuY-T2C1kjfeY0xi8iTh0r44,20
-newrelic_lambda_cli-0.9.7.dist-info/RECORD,,
+newrelic_lambda_cli-0.9.9.dist-info/licenses/LICENSE,sha256=uuxDzQm0yfq_tNZX0tQYzsZUVRIF0jm3dBLZUojSYzI,11345
+newrelic_lambda_cli-0.9.9.dist-info/METADATA,sha256=6kP-GPMt67xGNPbjVtAPHp01HJOB_8xFgCMiW4Pp7no,27567
+newrelic_lambda_cli-0.9.9.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+newrelic_lambda_cli-0.9.9.dist-info/entry_points.txt,sha256=iks2k9Y4WNgIecsDzreIvMV9pGCjwwKTf33LKKvl2A8,65
+newrelic_lambda_cli-0.9.9.dist-info/top_level.txt,sha256=dxX2w58VgSUFiPD8C_lFuY-T2C1kjfeY0xi8iTh0r44,20
+newrelic_lambda_cli-0.9.9.dist-info/RECORD,,

{newrelic_lambda_cli-0.9.7.dist-info → newrelic_lambda_cli-0.9.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any