Skip to content

cloudwatch: fix functionality of metrics for multi-accounts and region #9945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 2, 2024
Merged

cloudwatch: fix functionality of metrics for multi-accounts and region #9945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5e43d5
cloudwatch: fix functionality of metrics for multi-accounts and region
sannya-singal Dec 27, 2023
3e99042
fix test_lambda_invoke_error
sannya-singal Dec 27, 2023
83c43cc
fix reviews
sannya-singal Jan 30, 2024
268a20d
remove function_arn from record_cw_metric_invocation
sannya-singal Jan 31, 2024
2b2d7e8
fix lint
sannya-singal Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions localstack/services/lambda_/invocation/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,33 @@
LOG = logging.getLogger(__name__)


def record_cw_metric_invocation(function_name: str, region_name: str):
def record_cw_metric_invocation(function_name: str, account_id: str, region_name: str):
try:
publish_lambda_metric(
"Invocations",
1,
{"func_name": function_name},
region_name=region_name,
account_id=account_id,
)
except Exception as e:
LOG.debug("Failed to send CloudWatch metric for Lambda invocation: %s", e)


def record_cw_metric_error(function_name: str, region_name: str):
def record_cw_metric_error(function_name: str, account_id: str, region_name: str):
try:
publish_lambda_metric(
"Invocations",
1,
{"func_name": function_name},
region_name=region_name,
account_id=account_id,
)
publish_lambda_metric(
"Errors",
1,
{"func_name": function_name},
account_id=account_id,
region_name=region_name,
)
except Exception as e:
Expand Down
2 changes: 2 additions & 0 deletions localstack/services/lambda_/invocation/version_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ def invoke(self, *, invocation: Invocation) -> InvocationResult:
start_thread(
lambda *args, **kwargs: record_cw_metric_error(
function_name=self.function.function_name,
account_id=self.function_version.id.account,
region_name=self.function_version.id.region,
),
name=f"record-cloudwatch-metric-error-{function_id.function_name}:{function_id.qualifier}",
Expand All @@ -237,6 +238,7 @@ def invoke(self, *, invocation: Invocation) -> InvocationResult:
start_thread(
lambda *args, **kwargs: record_cw_metric_invocation(
function_name=self.function.function_name,
account_id=self.function_version.id.account,
region_name=self.function_version.id.region,
),
name=f"record-cloudwatch-metric-{function_id.function_name}:{function_id.qualifier}",
Expand Down
6 changes: 4 additions & 2 deletions localstack/utils/cloudwatch/cloudwatch_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ def dimension_lambda(kwargs):
return [{"Name": "FunctionName", "Value": func_name}]


def publish_lambda_metric(metric, value, kwargs, region_name: Optional[str] = None):
def publish_lambda_metric(
metric, value, kwargs, account_id: Optional[str] = None, region_name: Optional[str] = None
):
# publish metric only if CloudWatch service is available
if not is_api_enabled("cloudwatch"):
return
cw_client = connect_to(region_name=region_name).cloudwatch
cw_client = connect_to(aws_access_key_id=account_id, region_name=region_name).cloudwatch
try:
cw_client.put_metric_data(
Namespace="AWS/Lambda",
Expand Down