newrelic-lambda-cli 0.9.2__py2.py3-none-any.whl → 0.9.4__py2.py3-none-any.whl

newrelic_lambda_cli/api.py

@@ -21,6 +21,9 @@ from newrelic_lambda_cli.types import (
     IntegrationInstall,
     IntegrationUpdate,
     LayerInstall,
+    OtelIngestionInstall,
+    OtelIngestionUninstall,
+    OtelIngestionUpdate,
 )
 from newrelic_lambda_cli.utils import parse_arn
 
@@ -333,7 +336,17 @@ class NewRelicGQL(object):
 
 
 def validate_gql_credentials(input):
-    assert isinstance(input, (IntegrationInstall, IntegrationUpdate, LayerInstall))
+
+    assert isinstance(
+        input,
+        (
+            IntegrationInstall,
+            IntegrationUpdate,
+            LayerInstall,
+            OtelIngestionInstall,
+            OtelIngestionUpdate,
+        ),
+    )
 
     try:
         return NewRelicGQL(input.nr_account_id, input.nr_api_key, input.nr_region)

newrelic_lambda_cli/cli/__init__.py

@@ -2,7 +2,13 @@
 
 import click
 
-from newrelic_lambda_cli.cli import functions, integrations, layers, subscriptions
+from newrelic_lambda_cli.cli import (
+    functions,
+    integrations,
+    layers,
+    otel_ingestions,
+    subscriptions,
+)
 
 
 @click.group()
@@ -17,6 +23,7 @@ def cli(ctx, verbose):
 def register_groups(group):
     functions.register(group)
     integrations.register(group)
+    otel_ingestions.register(group)
     layers.register(group)
     subscriptions.register(group)
 

newrelic_lambda_cli/cli/otel_ingestions.py

@@ -0,0 +1,219 @@
+# -*- coding: utf-8 -*-
+
+import boto3
+import click
+
+from newrelic_lambda_cli import api, otel_ingestions, permissions, integrations
+from newrelic_lambda_cli.types import (
+    OtelIngestionInstall,
+    OtelIngestionUninstall,
+    OtelIngestionUpdate,
+)
+from newrelic_lambda_cli.cli.decorators import add_options, AWS_OPTIONS, NR_OPTIONS
+from newrelic_lambda_cli.cliutils import done, failure
+
+
+@click.group(name="otel-ingestions")
+def ingestion_group():
+    """Manage New Relic AWS Lambda Otel Log Ingestion lambda"""
+    pass
+
+
+def register(group):
+    group.add_command(ingestion_group)
+    ingestion_group.add_command(install)
+    ingestion_group.add_command(uninstall)
+    ingestion_group.add_command(update)
+
+
+@click.command(name="install")
+@add_options(AWS_OPTIONS)
+@click.option(
+    "--aws-role-policy",
+    help="Alternative AWS role policy to use for integration",
+    metavar="<arn>",
+)
+@click.option(
+    "--stackname",
+    default=otel_ingestions.OTEL_INGEST_STACK_NAME,
+    help=f"The AWS Cloudformation stack name which contains the {otel_ingestions.OTEL_INGEST_LAMBDA_NAME} lambda function",
+    metavar="<arn>",
+    show_default=False,
+    required=False,
+)
+@click.option(
+    "--memory-size",
+    "-m",
+    default=128,
+    help="Memory size (in MiB) for the log ingestion function",
+    metavar="<size>",
+    show_default=True,
+    type=click.INT,
+)
+@add_options(NR_OPTIONS)
+@click.option(
+    "--timeout",
+    "-t",
+    default=30,
+    help="Timeout (in seconds) for the New Relic log ingestion function",
+    metavar="<secs>",
+    show_default=True,
+    type=click.INT,
+)
+@click.option(
+    "--role-name",
+    default=None,
+    help="The name of a pre-created execution role for the log ingest function",
+    metavar="<role_name>",
+    show_default=False,
+)
+@click.option(
+    "--tag",
+    "tags",
+    default=[],
+    help="A tag to be added to the CloudFormation Stack (can be used multiple times)",
+    metavar="<key> <value>",
+    multiple=True,
+    nargs=2,
+)
+@click.pass_context
+def install(ctx, **kwargs):
+    """Install New Relic AWS OTEL Ingestion Lambda"""
+    input = OtelIngestionInstall(session=None, verbose=ctx.obj["VERBOSE"], **kwargs)
+
+    input = input._replace(
+        session=boto3.Session(
+            profile_name=input.aws_profile, region_name=input.aws_region
+        )
+    )
+
+    if input.aws_permissions_check:
+        permissions.ensure_integration_install_permissions(input)
+
+    click.echo("Validating New Relic credentials")
+    gql_client = api.validate_gql_credentials(input)
+
+    click.echo("Retrieving integration license key")
+    nr_license_key = api.retrieve_license_key(gql_client)
+
+    install_success = True
+
+    click.echo(
+        f"Creating {otel_ingestions.OTEL_INGEST_LAMBDA_NAME} Lambda function in AWS account"
+    )
+    res = otel_ingestions.install_otel_log_ingestion(input, nr_license_key)
+    install_success = res and install_success
+
+
+@click.command(name="uninstall")
+@add_options(AWS_OPTIONS)
+@click.option(
+    "--nr-account-id",
+    "-a",
+    envvar="NEW_RELIC_ACCOUNT_ID",
+    help="New Relic Account ID",
+    metavar="<id>",
+    required=False,
+    type=click.INT,
+)
+@click.option(
+    "--stackname",
+    default=otel_ingestions.OTEL_INGEST_STACK_NAME,
+    help=f"The AWS Cloudformation stack name which contains the {otel_ingestions.OTEL_INGEST_LAMBDA_NAME} lambda function",
+    metavar="<arn>",
+    show_default=False,
+    required=False,
+)
+@click.option("--force", "-f", help="Force uninstall non-interactively", is_flag=True)
+def uninstall(**kwargs):
+    """Uninstall New Relic AWS OTEL Ingestion Lambda"""
+    input = OtelIngestionUninstall(session=None, **kwargs)
+
+    input = input._replace(
+        session=boto3.Session(
+            profile_name=input.aws_profile, region_name=input.aws_region
+        )
+    )
+
+    if input.aws_permissions_check:
+        permissions.ensure_integration_uninstall_permissions(input)
+
+    integrations.remove_log_ingestion_function(input, otel=True)
+
+    done("Uninstall Complete")
+
+
+@click.command(name="update")
+@add_options(AWS_OPTIONS)
+@click.option(
+    "--stackname",
+    default=otel_ingestions.OTEL_INGEST_STACK_NAME,
+    help=f"The AWS Cloudformation stack name which contains the {otel_ingestions.OTEL_INGEST_LAMBDA_NAME} lambda function",
+    metavar="<arn>",
+    show_default=False,
+    required=False,
+)
+@click.option(
+    "--memory-size",
+    "-m",
+    help="Memory size (in MiB) for the log ingestion function",
+    metavar="<size>",
+    type=click.INT,
+)
+@add_options(NR_OPTIONS)
+@click.option(
+    "--timeout",
+    "-t",
+    help="Timeout (in seconds) for the New Relic log ingestion function",
+    metavar="<secs>",
+    type=click.INT,
+)
+@click.option(
+    "--role-name",
+    default=None,
+    help="The name of a new pre-created execution role for the log ingest function",
+    metavar="<role_name>",
+    show_default=False,
+)
+@click.option(
+    "--stackname",
+    default="NewRelicOtelLogIngestion",
+    help="The AWS Cloudformation stack name which contains the newrelic-log-ingestion lambda function",
+    metavar="<arn>",
+    show_default=False,
+    required=False,
+)
+@click.option(
+    "--tag",
+    "tags",
+    default=[],
+    help="A tag to be added to the CloudFormation Stack (can be used multiple times)",
+    metavar="<key> <value>",
+    multiple=True,
+    nargs=2,
+)
+def update(**kwargs):
+    """UpdateNew New Relic AWS OTEL Ingestion Lambda"""
+    input = OtelIngestionUpdate(session=None, **kwargs)
+
+    input = input._replace(
+        session=boto3.Session(
+            profile_name=input.aws_profile, region_name=input.aws_region
+        )
+    )
+
+    if input.aws_permissions_check:
+        permissions.ensure_integration_install_permissions(input)
+
+    update_success = True
+
+    click.echo(
+        f"Updating {otel_ingestions.OTEL_INGEST_LAMBDA_NAME} Lambda function in AWS account"
+    )
+    res = otel_ingestions.update_otel_log_ingestion(input)
+    update_success = res and update_success
+
+    if update_success:
+        done("Update Complete")
+    else:
+        failure("Update Incomplete. See messages above for details.", exit=True)

newrelic_lambda_cli/cli/subscriptions.py

@@ -61,9 +61,23 @@ def register(group):
     metavar="<pattern>",
     show_default=False,
 )
+@click.option(
+    "--otel",
+    "-o",
+    help="Subscribe to OTEL log ingestion function",
+    is_flag=True,
+)
 def install(**kwargs):
     """Install New Relic AWS Lambda Log Subscriptions"""
     input = SubscriptionInstall(session=None, **kwargs)
+    if input.otel and input.filter_pattern == DEFAULT_FILTER_PATTERN:
+        input = input._replace(
+            filter_pattern="",
+        )
+    if input.otel and input.stackname == "NewRelicLogIngestion":
+        input = input._replace(
+            stackname="NewRelicOtelLogIngestion",
+        )
     input = input._replace(
         session=boto3.Session(
             profile_name=input.aws_profile, region_name=input.aws_region
@@ -75,18 +89,32 @@ def install(**kwargs):
     functions = get_aliased_functions(input)
 
     with ThreadPoolExecutor() as executor:
-        futures = [
-            executor.submit(
-                subscriptions.create_log_subscription,
-                input._replace(
-                    session=boto3.Session(
-                        profile_name=input.aws_profile, region_name=input.aws_region
-                    )
-                ),
-                function,
-            )
-            for function in functions
-        ]
+        if input.otel:
+            futures = [
+                executor.submit(
+                    subscriptions.create_otel_log_subscription,
+                    input._replace(
+                        session=boto3.Session(
+                            profile_name=input.aws_profile, region_name=input.aws_region
+                        )
+                    ),
+                    function,
+                )
+                for function in functions
+            ]
+        else:
+            futures = [
+                executor.submit(
+                    subscriptions.create_log_subscription,
+                    input._replace(
+                        session=boto3.Session(
+                            profile_name=input.aws_profile, region_name=input.aws_region
+                        )
+                    ),
+                    function,
+                )
+                for function in functions
+            ]
         install_success = all(future.result() for future in as_completed(futures))
 
     if install_success:
@@ -106,14 +134,6 @@ def install(**kwargs):
     multiple=True,
     required=True,
 )
-@click.option(
-    "--stackname",
-    default="NewRelicLogIngestion",
-    help="The AWS Cloudformation stack name which contains the newrelic-log-ingestion lambda function",
-    metavar="<arn>",
-    show_default=False,
-    required=False,
-)
 @click.option(
     "excludes",
     "--exclude",
@@ -122,6 +142,12 @@ def install(**kwargs):
     metavar="<name>",
     multiple=True,
 )
+@click.option(
+    "--otel",
+    "-o",
+    help="Subscribe to OTEL log ingestion function",
+    is_flag=True,
+)
 def uninstall(**kwargs):
     """Uninstall New Relic AWS Lambda Log Subscriptions"""
     input = SubscriptionUninstall(session=None, **kwargs)
@@ -136,18 +162,32 @@ def uninstall(**kwargs):
     functions = get_aliased_functions(input)
 
     with ThreadPoolExecutor() as executor:
-        futures = [
-            executor.submit(
-                subscriptions.remove_log_subscription,
-                input._replace(
-                    session=boto3.Session(
-                        profile_name=input.aws_profile, region_name=input.aws_region
-                    )
-                ),
-                function,
-            )
-            for function in functions
-        ]
+        if input.otel:
+            futures = [
+                executor.submit(
+                    subscriptions.remove_otel_log_subscription,
+                    input._replace(
+                        session=boto3.Session(
+                            profile_name=input.aws_profile, region_name=input.aws_region
+                        )
+                    ),
+                    function,
+                )
+                for function in functions
+            ]
+        else:
+            futures = [
+                executor.submit(
+                    subscriptions.remove_log_subscription,
+                    input._replace(
+                        session=boto3.Session(
+                            profile_name=input.aws_profile, region_name=input.aws_region
+                        )
+                    ),
+                    function,
+                )
+                for function in functions
+            ]
         uninstall_success = all(future.result() for future in as_completed(futures))
 
     if uninstall_success:

newrelic_lambda_cli/cliutils.py

@@ -1,21 +1,20 @@
 # -*- coding: utf-8 -*-
 
 import click
-import emoji
 
 from click.exceptions import Exit
 
 
 def done(message):
     """Prints a done message to the terminal"""
-    click.echo(emoji.emojize(":sparkles: %s :sparkles:" % message, language="alias"))
+    click.echo(f"✔️ {message} ✔️")
 
 
 def failure(message, exit=False):
     """Prints a failure message to the terminal"""
-    click.echo(
-        emoji.emojize(":heavy_multiplication_x: %s" % message, language="alias"),
-        color="red",
+    click.secho(
+        f"✘ {message}",
+        fg="red",
         err=True,
     )
     if exit:
@@ -24,15 +23,15 @@ def failure(message, exit=False):
 
 def success(message):
     """Prints a success message to the terminal"""
-    click.echo(
-        emoji.emojize(":heavy_check_mark: %s" % message, language="alias"),
-        color="green",
+    click.secho(
+        f"✔️ {message}",
+        fg="green",
     )
 
 
 def warning(message):
-    """Prints a warningmessage to the terminal"""
-    click.echo(
-        emoji.emojize(":heavy_exclamation_mark: %s" % message, language="alias"),
-        color="blue",
+    """Prints a warning message to the terminal"""
+    click.secho(
+        f"⚠️ {message}",
+        fg="blue",
     )

newrelic_lambda_cli/integrations.py

@@ -14,6 +14,7 @@ from newrelic_lambda_cli.types import (
     IntegrationInstall,
     IntegrationUninstall,
     IntegrationUpdate,
+    OtelIngestionUninstall,
 )
 from newrelic_lambda_cli.utils import catch_boto_errors, NR_DOCS_ACT_LINKING_URL
 
@@ -165,9 +166,11 @@ def _create_role(input):
                 {"ParameterKey": "PolicyName", "ParameterValue": role_policy_name},
             ],
             Capabilities=["CAPABILITY_NAMED_IAM"],
-            Tags=[{"Key": key, "Value": value} for key, value in input.tags]
-            if input.tags
-            else [],
+            Tags=(
+                [{"Key": key, "Value": value} for key, value in input.tags]
+                if input.tags
+                else []
+            ),
         )
 
         click.echo("Waiting for stack creation to complete... ", nl=False)
@@ -268,9 +271,11 @@ def _import_log_ingestion_function(input, nr_license_key):
                 TemplateBody=template.read(),
                 Parameters=parameters,
                 Capabilities=capabilities,
-                Tags=[{"Key": key, "Value": value} for key, value in input.tags]
-                if input.tags
-                else [],
+                Tags=(
+                    [{"Key": key, "Value": value} for key, value in input.tags]
+                    if input.tags
+                    else []
+                ),
                 ChangeSetType="IMPORT",
                 ChangeSetName=change_set_name,
                 ResourcesToImport=[
@@ -311,9 +316,11 @@ def _create_log_ingestion_function(
         TemplateURL=template_url,
         Parameters=parameters,
         Capabilities=capabilities,
-        Tags=[{"Key": key, "Value": value} for key, value in input.tags]
-        if input.tags
-        else [],
+        Tags=(
+            [{"Key": key, "Value": value} for key, value in input.tags]
+            if input.tags
+            else []
+        ),
         ChangeSetType=mode,
         ChangeSetName=change_set_name,
     )
@@ -444,9 +451,11 @@ def update_log_ingestion_function(input):
             TemplateBody=json.dumps(template_body),
             Parameters=params,
             Capabilities=["CAPABILITY_IAM"],
-            Tags=[{"Key": key, "Value": value} for key, value in input.tags]
-            if input.tags
-            else [],
+            Tags=(
+                [{"Key": key, "Value": value} for key, value in input.tags]
+                if input.tags
+                else []
+            ),
         )
 
         try:
@@ -496,18 +505,20 @@ def update_log_ingestion_function(input):
 
 
 @catch_boto_errors
-def remove_log_ingestion_function(input):
-    assert isinstance(input, IntegrationUninstall)
-
+def remove_log_ingestion_function(input, otel: bool = False):
+    assert isinstance(input, (IntegrationUninstall, OtelIngestionUninstall))
+    log_ingestion_lambda = "log ingestion" if not otel else "OTEL log ingestion"
     client = input.session.client("cloudformation")
     stack_status = _check_for_ingest_stack(input.session, input.stackname)
     if stack_status is None:
         click.echo(
-            "No New Relic AWS Lambda log ingestion found in region %s, skipping"
-            % input.session.region_name
+            "No New Relic AWS Lambda %s found in region %s, skipping"
+            % (log_ingestion_lambda, input.session.region_name)
         )
         return
-    click.echo("Deleting New Relic log ingestion stack '%s'" % input.stackname)
+    click.echo(
+        "Deleting New Relic %s stack '%s'" % (log_ingestion_lambda, input.stackname)
+    )
     client.delete_stack(StackName=input.stackname)
     click.echo(
         "Waiting for stack deletion to complete, this may take a minute... ", nl=False
@@ -755,9 +766,11 @@ def install_license_key(input, nr_license_key, policy_name=None):
                 TemplateBody=template.read(),
                 Parameters=parameters,
                 Capabilities=["CAPABILITY_NAMED_IAM"],
-                Tags=[{"Key": key, "Value": value} for key, value in input.tags]
-                if input.tags
-                else [],
+                Tags=(
+                    [{"Key": key, "Value": value} for key, value in input.tags]
+                    if input.tags
+                    else []
+                ),
                 ChangeSetType=mode,
                 ChangeSetName=change_set_name,
             )

newrelic_lambda_cli/otel_ingestions.py

@@ -0,0 +1,276 @@
+# -*- coding: utf-8 -*-
+
+import json
+import os
+import time
+
+import botocore
+import click
+import json
+
+from newrelic_lambda_cli.cliutils import failure, success, warning
+from newrelic_lambda_cli.functions import get_function
+from newrelic_lambda_cli.integrations import _exec_change_set
+from newrelic_lambda_cli.types import (
+    OtelIngestionInstall,
+    OtelIngestionUpdate,
+)
+from newrelic_lambda_cli.utils import catch_boto_errors, NR_DOCS_ACT_LINKING_URL
+
+OTEL_INGEST_STACK_NAME = "NewRelicOtelLogIngestion"
+OTEL_INGEST_LAMBDA_NAME = "newrelic-aws-otel-log-ingestion"
+OTEL_SAR_APP_ID = (
+    "arn:aws:serverlessrepo:us-east-1:451483290750:applications/"
+    + OTEL_INGEST_LAMBDA_NAME
+)
+
+
+def _check_for_ingest_stack(session, stack_name):
+    return _get_cf_stack_status(session, stack_name)
+
+
+def _get_cf_stack_status(session, stack_name, nr_account_id=None):
+    """Returns the status of the CloudFormation stack if it exists"""
+    try:
+        res = session.client("cloudformation").describe_stacks(StackName=stack_name)
+    except botocore.exceptions.ClientError as e:
+        if (
+            e.response
+            and "ResponseMetadata" in e.response
+            and "HTTPStatusCode" in e.response["ResponseMetadata"]
+            and e.response["ResponseMetadata"]["HTTPStatusCode"] in (400, 404)
+        ):
+            return None
+        raise click.UsageError(str(e))
+    else:
+        return res["Stacks"][0]["StackStatus"]
+
+
+def get_unique_newrelic_otel_log_ingestion_name(session, stackname=None):
+    if not stackname:
+        stackname = OTEL_INGEST_STACK_NAME
+    stack_id = _get_otel_cf_stack_id(session, stack_name=stackname)
+    if stack_id:
+        return "%s-%s" % (OTEL_INGEST_LAMBDA_NAME, stack_id.split("/")[2].split("-")[4])
+
+
+def get_newrelic_otel_log_ingestion_function(session, stackname=None):
+    unique_log_ingestion_name = get_unique_newrelic_otel_log_ingestion_name(
+        session, stackname
+    )
+    if unique_log_ingestion_name:
+        function = get_function(session, unique_log_ingestion_name)
+        return function
+
+
+def _get_otel_cf_stack_id(session, stack_name, nr_account_id=None):
+    """Returns the StackId of the CloudFormation stack if it exists"""
+    try:
+        res = session.client("cloudformation").describe_stacks(StackName=stack_name)
+    except botocore.exceptions.ClientError as e:
+        if (
+            e.response
+            and "ResponseMetadata" in e.response
+            and "HTTPStatusCode" in e.response["ResponseMetadata"]
+            and e.response["ResponseMetadata"]["HTTPStatusCode"] in (400, 404)
+        ):
+            return None
+        raise click.UsageError(str(e))
+    else:
+        return res["Stacks"][0]["StackId"]
+
+
+def _get_otel_sar_template_url(session):
+    sar_client = session.client("serverlessrepo")
+    template_details = sar_client.create_cloud_formation_template(
+        ApplicationId=OTEL_SAR_APP_ID
+    )
+    return template_details["TemplateUrl"]
+
+
+def _create_otel_log_ingest_parameters(input, nr_license_key, mode="CREATE"):
+    assert isinstance(input, (OtelIngestionInstall, OtelIngestionUpdate))
+
+    update_mode = mode == "UPDATE"
+    parameters = []
+
+    if input.memory_size is not None:
+        parameters.append(
+            {"ParameterKey": "MemorySize", "ParameterValue": str(input.memory_size)}
+        )
+    elif update_mode:
+        parameters.append({"ParameterKey": "MemorySize", "UsePreviousValue": True})
+
+    if nr_license_key is not None:
+        parameters.append(
+            {"ParameterKey": "NRLicenseKey", "ParameterValue": nr_license_key}
+        )
+    elif update_mode:
+        parameters.append({"ParameterKey": "NRLicenseKey", "UsePreviousValue": True})
+
+    if input.timeout is not None:
+        parameters.append(
+            {"ParameterKey": "Timeout", "ParameterValue": str(input.timeout)}
+        )
+    elif update_mode:
+        parameters.append({"ParameterKey": "Timeout", "UsePreviousValue": True})
+
+    capabilities = ["CAPABILITY_IAM"]
+    if input.role_name is not None:
+        parameters.append(
+            {"ParameterKey": "FunctionRole", "ParameterValue": input.role_name}
+        )
+        capabilities = []
+    elif mode != "CREATE":
+        parameters.append({"ParameterKey": "FunctionRole", "UsePreviousValue": True})
+        capabilities = []
+
+    return parameters, capabilities
+
+
+def _create_otel_log_ingestion_function(
+    input,
+    nr_license_key,
+    mode="CREATE",
+):
+    assert isinstance(input, (OtelIngestionInstall, OtelIngestionUpdate))
+
+    parameters, capabilities = _create_otel_log_ingest_parameters(
+        input, nr_license_key, mode
+    )
+
+    client = input.session.client("cloudformation")
+
+    click.echo("Fetching new CloudFormation template url for OTEL log ingestion")
+    template_url = _get_otel_sar_template_url(input.session)
+    change_set_name = "%s-%s-%d" % (input.stackname, mode, int(time.time()))
+    click.echo("Creating change set: %s" % change_set_name)
+    try:
+        change_set = client.create_change_set(
+            StackName=input.stackname,
+            TemplateURL=template_url,
+            Parameters=parameters,
+            Capabilities=capabilities,
+            Tags=(
+                [{"Key": key, "Value": value} for key, value in input.tags]
+                if input.tags
+                else []
+            ),
+            ChangeSetType=mode,
+            ChangeSetName=change_set_name,
+        )
+    except Exception as e:
+        print(f"Error: {e}")
+    _exec_change_set(client, change_set, mode, input.stackname)
+
+
+@catch_boto_errors
+def update_otel_log_ingestion_function(input):
+    assert isinstance(input, OtelIngestionUpdate)
+
+    client = input.session.client("cloudformation")
+
+    _create_otel_log_ingestion_function(
+        input,
+        nr_license_key=None,
+        mode="UPDATE",
+    )
+
+
+@catch_boto_errors
+def install_otel_log_ingestion(
+    input,
+    nr_license_key,
+):
+    """
+    Installs the New Relic AWS Lambda log ingestion function and role.
+
+    Returns True for success and False for failure.
+    """
+    assert isinstance(input, OtelIngestionInstall)
+    function = get_function(input.session, OTEL_INGEST_LAMBDA_NAME)
+    if function:
+        warning(
+            "It looks like an old log ingestion function is present in this region. "
+            "Consider manually deleting this as it is no longer used and "
+            "has been replaced by a log ingestion function specific to the stack."
+        )
+    stack_status = _check_for_ingest_stack(input.session, input.stackname)
+    if stack_status is None:
+        click.echo(
+            "Setting up CloudFormation Stack %s in region: %s"
+            % (input.stackname, input.session.region_name)
+        )
+        try:
+            _create_otel_log_ingestion_function(
+                input,
+                nr_license_key,
+            )
+            return True
+        except Exception as e:
+            failure(
+                "CloudFormation Stack %s exists (status: %s).\n"
+                "Please manually delete the stack and re-run this command."
+                % (input.stackname, stack_status)
+            )
+            return False
+    else:
+        function = get_newrelic_otel_log_ingestion_function(
+            input.session, input.stackname
+        )
+
+        if function is None:
+            failure(
+                "CloudFormation Stack %s exists (status: %s), but "
+                "%s Lambda function does not.\n"
+                "Please manually delete the stack and re-run this command."
+                % (input.stackname, stack_status, OTEL_INGEST_LAMBDA_NAME)
+            )
+            return False
+        else:
+            success(
+                "The CloudFormation Stack %s and "
+                "%s function already exists in region %s, "
+                "skipping"
+                % (input.stackname, OTEL_INGEST_LAMBDA_NAME, input.session.region_name)
+            )
+            return True
+
+
+@catch_boto_errors
+def update_otel_log_ingestion(input):
+    """
+    Updates the New Relic AWS Lambda log ingestion function and role.
+
+    Returns True for success and False for failure.
+    """
+    assert isinstance(input, OtelIngestionUpdate)
+
+    stack_status = _check_for_ingest_stack(input.session, input.stackname)
+    if stack_status is None:
+        failure(
+            "No '%s' stack in region '%s'. "
+            "This likely means the New Relic otel log ingestion function was "
+            "installed manually. "
+            "In order to install via the CLI, please delete this function and "
+            "run 'newrelic-lambda otel-ingestion install'."
+            % (OTEL_INGEST_STACK_NAME, input.session.region_name)
+        )
+        return False
+
+    function = get_newrelic_otel_log_ingestion_function(input.session, input.stackname)
+    if function is None:
+        failure(
+            "No %s function in region '%s'. "
+            "Run 'newrelic-lambda otel-ingestion install' to install it."
+            % (OTEL_INGEST_LAMBDA_NAME, input.session.region_name)
+        )
+        return False
+
+    try:
+        update_otel_log_ingestion_function(input)
+    except Exception as e:
+        failure("Failed to update newrelic-log-ingestion function: %s" % e)
+        return False
+    else:
+        return True

newrelic_lambda_cli/subscriptions.py

@@ -7,6 +7,7 @@ from newrelic_lambda_cli.cliutils import failure, success, warning
 from newrelic_lambda_cli.functions import get_function
 from newrelic_lambda_cli.integrations import get_unique_newrelic_log_ingestion_name
 from newrelic_lambda_cli.integrations import get_newrelic_log_ingestion_function
+from newrelic_lambda_cli.otel_ingestions import get_newrelic_otel_log_ingestion_function
 from newrelic_lambda_cli.types import (
     LayerInstall,
     SubscriptionInstall,
@@ -48,12 +49,16 @@ def _get_subscription_filters(session, function_name):
 
 
 def _create_subscription_filter(
-    session, function_name, destination_arn, filter_pattern
+    session,
+    function_name,
+    destination_arn,
+    filter_pattern,
+    filter_name="NewRelicLogStreaming",
 ):
     try:
         session.client("logs").put_subscription_filter(
             logGroupName=_get_log_group_name(function_name),
-            filterName="NewRelicLogStreaming",
+            filterName=filter_name,
             filterPattern=filter_pattern,
             destinationArn=destination_arn,
         )
@@ -95,8 +100,8 @@ def create_log_subscription(input, function_name):
     destination = get_newrelic_log_ingestion_function(input.session, input.stackname)
     if destination is None:
         failure(
-            "Could not find newrelic-log-ingestion function. Is the New Relic AWS "
-            "integration installed?"
+            "Could not find newrelic-log-ingestion function in stack: %s. Is the New Relic AWS "
+            "integration installed?" % input.stackname
         )
         return False
     destination_arn = destination["Configuration"]["FunctionArn"]
@@ -137,6 +142,66 @@ def create_log_subscription(input, function_name):
         return True
 
 
+@catch_boto_errors
+def create_otel_log_subscription(input, function_name):
+    assert isinstance(input, SubscriptionInstall)
+
+    destination = get_newrelic_otel_log_ingestion_function(
+        input.session, input.stackname
+    )
+    if destination is None:
+        failure(
+            "Could not find newrelic-otel-log-ingestion function. Is the New Relic AWS "
+            "integration installed?"
+        )
+        return False
+    destination_arn = destination["Configuration"]["FunctionArn"]
+
+    subscription_filters = _get_subscription_filters(input.session, function_name)
+    if subscription_filters is None:
+        return False
+    newrelic_filters = [
+        filter
+        for filter in subscription_filters
+        if "NewRelicOtelLogStreaming" in filter["filterName"]
+    ]
+    if len(subscription_filters) > len(newrelic_filters):
+        warning(
+            "WARNING: Found otel log subscription filter that was not installed by New "
+            "Relic. This may prevent the New Relic log subscription filter from being "
+            "installed. If you know you don't need this log subscription filter, you "
+            "should first remove it and rerun this command. If your organization "
+            "requires this log subscription filter, please contact New Relic at "
+            "serverless@newrelic.com for assistance with getting the AWS log "
+            "subscription filter limit increased."
+        )
+    if not newrelic_filters:
+        click.echo("Adding New Relic otel log subscription to '%s'" % function_name)
+        return _create_subscription_filter(
+            input.session,
+            function_name,
+            destination_arn,
+            input.filter_pattern,
+            "NewRelicOtelLogStreaming",
+        )
+    else:
+        click.echo(
+            "Found log subscription for '%s', verifying configuration" % function_name
+        )
+        newrelic_filter = newrelic_filters[0]
+        if newrelic_filter["filterPattern"] != input.filter_pattern:
+            return _remove_subscription_filter(
+                input.session, function_name, newrelic_filter["filterName"]
+            ) and _create_subscription_filter(
+                input.session,
+                function_name,
+                destination_arn,
+                input.filter_pattern,
+                "NewRelicOtelLogStreaming",
+            )
+        return True
+
+
 @catch_boto_errors
 def remove_log_subscription(input, function_name):
     assert isinstance(input, (LayerInstall, SubscriptionUninstall))
@@ -158,3 +223,27 @@ def remove_log_subscription(input, function_name):
     return _remove_subscription_filter(
         input.session, function_name, newrelic_filter["filterName"]
     )
+
+
+@catch_boto_errors
+def remove_otel_log_subscription(input, function_name):
+    assert isinstance(input, (SubscriptionUninstall))
+    subscription_filters = _get_subscription_filters(input.session, function_name)
+    if subscription_filters is None:
+        return False
+    newrelic_filters = [
+        filter
+        for filter in subscription_filters
+        if "NewRelicOtelLogStreaming" in filter["filterName"]
+    ]
+    if not newrelic_filters:
+        click.echo(
+            "No New Relic otel subscription filters found for '%s', skipping"
+            % function_name
+        )
+        return True
+    newrelic_filter = newrelic_filters[0]
+    click.echo("Removing New Relic otel log subscription from '%s'" % function_name)
+    return _remove_subscription_filter(
+        input.session, function_name, newrelic_filter["filterName"]
+    )

newrelic_lambda_cli/types.py

@@ -49,6 +49,48 @@ INTEGRATION_UPDATE_KEYS = [
     "tags",
 ]
 
+OTEL_INGESTION_INSTALL_KEYS = [
+    "session",
+    "verbose",
+    "aws_profile",
+    "aws_region",
+    "aws_permissions_check",
+    "aws_role_policy",
+    "stackname",
+    "memory_size",
+    "nr_account_id",
+    "nr_api_key",
+    "nr_region",
+    "timeout",
+    "role_name",
+    "tags",
+]
+
+OTEL_INGESTION_UNINSTALL_KEYS = [
+    "session",
+    "aws_profile",
+    "aws_region",
+    "aws_permissions_check",
+    "stackname",
+    "nr_account_id",
+    "force",
+]
+
+OTEL_INGESTION_UPDATE_KEYS = [
+    "session",
+    "aws_profile",
+    "aws_region",
+    "aws_permissions_check",
+    "stackname",
+    "memory_size",
+    "nr_account_id",
+    "nr_api_key",
+    "nr_region",
+    "timeout",
+    "role_name",
+    "tags",
+]
+
 LAYER_INSTALL_KEYS = [
     "session",
     "verbose",
@@ -86,6 +128,7 @@ SUBSCRIPTION_INSTALL_KEYS = [
     "stackname",
     "excludes",
     "filter_pattern",
+    "otel",
 ]
 
 SUBSCRIPTION_UNINSTALL_KEYS = [
@@ -94,8 +137,8 @@ SUBSCRIPTION_UNINSTALL_KEYS = [
     "aws_region",
     "aws_permissions_check",
     "functions",
-    "stackname",
     "excludes",
+    "otel",
 ]
 
 
@@ -103,6 +146,13 @@ IntegrationInstall = namedtuple("IntegrationInstall", INTEGRATION_INSTALL_KEYS)
 IntegrationUninstall = namedtuple("IntegrationUninstall", INTEGRATION_UNINSTALL_KEYS)
 IntegrationUpdate = namedtuple("IntegrationUpdate", INTEGRATION_UPDATE_KEYS)
 
+OtelIngestionInstall = namedtuple("OtelIngestionInstall", OTEL_INGESTION_INSTALL_KEYS)
+OtelIngestionUninstall = namedtuple(
+    "OtelIngestionUninstall", OTEL_INGESTION_UNINSTALL_KEYS
+)
+OtelIngestionUpdate = namedtuple("OtelIngestionUpdate", OTEL_INGESTION_UPDATE_KEYS)
+
+
 LayerInstall = namedtuple("LayerInstall", LAYER_INSTALL_KEYS)
 LayerUninstall = namedtuple("LayerUninstall", LAYER_UNINSTALL_KEYS)
 

{newrelic_lambda_cli-0.9.2.dist-info → newrelic_lambda_cli-0.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: newrelic-lambda-cli
-Version: 0.9.2
+Version: 0.9.4
 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
@@ -8,12 +8,11 @@ Author-email: serverless-dev@newrelic.com
 Requires-Python: >=3.3
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: boto3 <5
-Requires-Dist: click >=7.1.2
+Requires-Dist: boto3<5
+Requires-Dist: click>=7.1.2
 Requires-Dist: colorama
-Requires-Dist: emoji <3,>=2
-Requires-Dist: gql <3,>=2
-Requires-Dist: requests <3
+Requires-Dist: gql<3,>=2
+Requires-Dist: requests<3
 Requires-Dist: tabulate
 
 [![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)
@@ -34,6 +33,9 @@ A CLI to install the New Relic AWS Lambda integration and layers.
     * [AWS Lambda Layers](#aws-lambda-layers)
     * [AWS Lambda Functions](#aws-lambda-functions)
     * [NewRelic Log Subscription](#newRelic-log-subscription)
+    * [NewRelic Otel Log Ingestions](#newRelic-otel-ingestions-install)
+    * [NewRelic Otel Log Subscription](#newRelic-otel-log-subscription)
+
 * **[Docker](#docker)**
 * **[Contributing](#contributing)**
 * **[Code Style](#code-style)**
@@ -63,6 +65,7 @@ A CLI to install the New Relic AWS Lambda integration and layers.
 * nodejs20.x
 * provided
 * provided.al2
+* provided.al2023
 * python3.7
 * python3.8
 * python3.9
@@ -272,6 +275,72 @@ newrelic-lambda subscriptions uninstall --function <name or arn>
 | `--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. |
 
+### NewRelic Otel Ingestions Install
+
+#### Install Otel Log Ingestion
+
+```bash
+newrelic-lambda otel-ingestions install \
+    --nr-account-id <account id> \
+    --nr-api-key <api key>
+```
+
+| 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 this integration. 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. |
+| `--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. |
+| `--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. |
+| `--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 for the integration. Can use `AWS_DEFAULT_REGION` environment variable. Defaults to AWS session region. |
+| `--aws-role-policy` | No | Specify an alternative IAM role policy ARN for this integration. |
+| `--tag <key> <value>` | No | Sets tags on the CloudFormation Stacks this CLI creates. Can be used multiple times, example: `--tag key1 value1 --tag key2 value2`. |
+| `--stackname` | No | The AWS Cloudformation stack name which contains the newrelic-aws-otel-log-ingestion lambda function. If no value is provided, the command searches for the NewRelicOtelLogIngestion stack |
+
+
+#### Uninstall Otel Log Ingestion
+
+```bash
+newrelic-lambda otel-ingestions uninstall
+```
+
+| Option | Required? | Description |
+|--------|-----------|-------------|
+| `--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 for the integration. Can use `AWS_DEFAULT_REGION` environment variable. Defaults to AWS session region. |
+| `--force` or `-f` | No | Forces uninstall non-interactively |
+| `--nr-account-id` or `-a` | No | The [New Relic Account ID](https://docs.newrelic.com/docs/accounts/install-new-relic/account-setup/account-id) for the integration. Only required if also uninstalling the New Relic AWS Lambda integration. Can also use the `NEW_RELIC_ACCOUNT_ID` environment variable. |
+| `--stackname` | No | The AWS Cloudformation stack name which contains the newrelic-aws-otel-log-ingestion lambda function. If no value is provided, the command searches for the NewRelicOtelLogIngestion stack |
+
+### NewRelic Otel Log Subscription
+
+#### Install Otel Log Subscription
+
+```bash
+newrelic-lambda subscriptions install --function <name or arn> --otel
+```
+
+| Option | Required? | Description |
+|--------|-----------|-------------|
+| `--function` or `-f` | Yes | The AWS Lambda function name or ARN in which to remove a log subscription. Can provide multiple `--function` arguments. Will also accept `all`, `installed` and `not-installed` similar to `newrelic-lambda functions list`. |
+| `--otel` or `-o` | Yes | Use this flag to install subscription filters for Lambdas that are instrumented with OpenTelemetry (Otel) |
+| `--stackname` | No | The AWS Cloudformation stack name which contains the newrelic-aws-otel-log-ingestion lambda function. If no value is provided, the command searches for the NewRelicOtelLogIngestion stack |
+
+
+#### Uninstall Otel Log Subscription
+
+```bash
+newrelic-lambda subscriptions uninstall --function <name or arn> --otel
+```
+
+| Option | Required? | Description |
+|--------|-----------|-------------|
+| `--function` or `-f` | Yes | The AWS Lambda function name or ARN in which to remove a log subscription. Can provide multiple `--function` arguments. Will also accept `all`, `installed` and `not-installed` similar to `newrelic-lambda functions list`. |
+| `--otel` or `-o` | Yes | Use this flag to install subscription filters for Lambdas that are instrumented with OpenTelemetry (Otel) |
+| `--stackname` | No | The AWS Cloudformation stack name which contains the newrelic-aws-otel-log-ingestion lambda function. If no value is provided, the command searches for the NewRelicOtelLogIngestion stack |
+
 ## Docker
 
 Now, you can run newrelic-lambda-cli as a container.
@@ -307,7 +376,7 @@ Using these together will auto format your git commits.
 ## Running Tests
 
 ```bash
-python setup.py test
+pytest tests
 ```
 
 ## Troubleshooting

{newrelic_lambda_cli-0.9.2.dist-info → newrelic_lambda_cli-0.9.4.dist-info}/RECORD

@@ -1,25 +1,27 @@
 newrelic_lambda_cli/__init__.py,sha256=u4cy7hwbrNjK3xtldGQD_51aoNgSqGQ3IzFYsuvaIM4,149
-newrelic_lambda_cli/api.py,sha256=tkjuR_qkD2uZgXfXPFR6YKnmRiNYkrEmqQEeUgDtNn8,14848
-newrelic_lambda_cli/cliutils.py,sha256=x2pWlL3DJ9t98QNElp_rhawNQoIZ0vd55R2jpo3_oI0,902
+newrelic_lambda_cli/api.py,sha256=b75XwylRhW9pcA6aZ9EjBW1yIFOGHhhULDD5hNhMyes,15065
+newrelic_lambda_cli/cliutils.py,sha256=XDtvTlgbf2uVg01yCJrfJmmgxbF0nIL9x58ETyvefk8,685
 newrelic_lambda_cli/functions.py,sha256=p57ZUw424BaSUA_Gw8DrYsJOYKROEHEaXgARadqwcP0,2800
-newrelic_lambda_cli/integrations.py,sha256=X9OuBK_sNfjb1cjbZ1dctd_YTVyEeCCGsPaJp0Bni1U,30864
+newrelic_lambda_cli/integrations.py,sha256=r0gxfEqVHTGu3xbr4dOCDwm0-Yhoz3KntfeQRWvoWrQ,31266
 newrelic_lambda_cli/layers.py,sha256=7ntl48RVEoRO4iiD3yzsxgqNkx013vXO5wQuoP6M0-I,14805
+newrelic_lambda_cli/otel_ingestions.py,sha256=vi1Mlfc9nRvRWV7STwK7fDXZGozG8ufKohmpHcaWGic,9250
 newrelic_lambda_cli/permissions.py,sha256=H7v5IMpKaJIWC4Dff2YcTis4BKAAFIJr9IHWUj1LnF4,9093
-newrelic_lambda_cli/subscriptions.py,sha256=wh6vroU8RfSEwqAMObjPNVPb0TbBxUYYPO_c3mY7miA,6166
-newrelic_lambda_cli/types.py,sha256=kzubT5cGiI-k6h_8b_iTaj3bnsNwolhjgSbpFJT9iBk,2304
+newrelic_lambda_cli/subscriptions.py,sha256=-BYkltqiDLdmhUB_Ot4w-5vvrKcQC6aHcTBLl1mlUlI,9564
+newrelic_lambda_cli/types.py,sha256=z4K_ALDhF-iOKpyQUekbzETa586mr9bMpK9RCuffVQ8,3293
 newrelic_lambda_cli/utils.py,sha256=dYcSFZj7Mpgr5f8YSaAjt80N1q9akcOj1_puL8iRHak,5324
-newrelic_lambda_cli/cli/__init__.py,sha256=n_QPd3oJqkFxryy-pJ-Y_AsqsmgbTb3dlQCjPJueaYQ,544
+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=3CTukG79vM2Gzx3NFXsqUEjy5mNQ4rawIh53oQeCyCI,6180
-newrelic_lambda_cli/cli/subscriptions.py,sha256=fmFkGq8AGExOaHzQxMhYfOCmpxhnCwUWbeJUOuTWi60,4545
+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.2.dist-info/LICENSE,sha256=uuxDzQm0yfq_tNZX0tQYzsZUVRIF0jm3dBLZUojSYzI,11345
-newrelic_lambda_cli-0.9.2.dist-info/METADATA,sha256=jkaZoQkVvvW6PWth1X6xRGrjMNUjK0VvH1IDU2hyBwI,21723
-newrelic_lambda_cli-0.9.2.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-newrelic_lambda_cli-0.9.2.dist-info/entry_points.txt,sha256=iks2k9Y4WNgIecsDzreIvMV9pGCjwwKTf33LKKvl2A8,65
-newrelic_lambda_cli-0.9.2.dist-info/top_level.txt,sha256=dxX2w58VgSUFiPD8C_lFuY-T2C1kjfeY0xi8iTh0r44,20
-newrelic_lambda_cli-0.9.2.dist-info/RECORD,,
+newrelic_lambda_cli-0.9.4.dist-info/LICENSE,sha256=uuxDzQm0yfq_tNZX0tQYzsZUVRIF0jm3dBLZUojSYzI,11345
+newrelic_lambda_cli-0.9.4.dist-info/METADATA,sha256=K1KLdhwr6VrkOIyaGBIoJkNcwKV4QSkXj-fbRYx8EvI,26780
+newrelic_lambda_cli-0.9.4.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
+newrelic_lambda_cli-0.9.4.dist-info/entry_points.txt,sha256=iks2k9Y4WNgIecsDzreIvMV9pGCjwwKTf33LKKvl2A8,65
+newrelic_lambda_cli-0.9.4.dist-info/top_level.txt,sha256=dxX2w58VgSUFiPD8C_lFuY-T2C1kjfeY0xi8iTh0r44,20
+newrelic_lambda_cli-0.9.4.dist-info/RECORD,,

{newrelic_lambda_cli-0.9.2.dist-info → newrelic_lambda_cli-0.9.4.dist-info}/WHEEL

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