Skip to content

Removed account ID from metric namespace #108

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
nina-ctrlv merged 1 commit into from
Jul 30, 2020
Merged

Removed account ID from metric namespace #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/cloudformation_cli_python_lib/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ def publish_metric( # pylint: disable-msg=too-many-arguments

class MetricsPublisherProxy:
@staticmethod
def _make_namespace(account_id: str, resource_type: str) -> str:
def _make_namespace(resource_type: str) -> str:
suffix = resource_type.replace("::", "/")
return f"{METRIC_NAMESPACE_ROOT}/{account_id}/{suffix}"
return f"{METRIC_NAMESPACE_ROOT}/{suffix}"

def __init__(self, account_id: str, resource_type: str) -> None:
self.namespace = self._make_namespace(account_id, resource_type)
def __init__(self, resource_type: str) -> None:
self.namespace = self._make_namespace(resource_type)
self.resource_type = resource_type
self._publishers: List[MetricPublisher] = []

Expand Down
2 changes: 1 addition & 1 deletion src/cloudformation_cli_python_lib/resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def print_or_log(message: str) -> None:

request = self._cast_resource_request(event)

metrics = MetricsPublisherProxy(event.awsAccountId, event.resourceType)
metrics = MetricsPublisherProxy(event.resourceType)
metrics.add_metrics_publisher(provider_sess)

metrics.publish_invocation_metric(datetime.utcnow(), action)
Expand Down
21 changes: 10 additions & 11 deletions tests/lib/metrics_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@

from botocore.stub import Stubber

ACCOUNT_ID = "123412341234"
RESOURCE_TYPE = "Aa::Bb::Cc"
NAMESPACE = MetricsPublisherProxy._make_namespace( # pylint: disable=protected-access
ACCOUNT_ID, RESOURCE_TYPE
RESOURCE_TYPE
)


Expand Down Expand Up @@ -74,13 +73,13 @@ def test_put_metric_catches_error(mock_session):

def test_publish_exception_metric(mock_session):
fake_datetime = datetime(2019, 1, 1)
proxy = MetricsPublisherProxy(ACCOUNT_ID, RESOURCE_TYPE)
proxy = MetricsPublisherProxy(RESOURCE_TYPE)
proxy.add_metrics_publisher(mock_session)
proxy.publish_exception_metric(fake_datetime, Action.CREATE, Exception("fake-err"))
expected_calls = [
call.client("cloudwatch"),
call.client().put_metric_data(
Namespace="AWS/CloudFormation/123412341234/Aa/Bb/Cc",
Namespace="AWS/CloudFormation/Aa/Bb/Cc",
MetricData=[
{
"MetricName": MetricTypes.HandlerException.name,
Expand All @@ -104,14 +103,14 @@ def test_publish_exception_metric(mock_session):

def test_publish_invocation_metric(mock_session):
fake_datetime = datetime(2019, 1, 1)
proxy = MetricsPublisherProxy(ACCOUNT_ID, RESOURCE_TYPE)
proxy = MetricsPublisherProxy(RESOURCE_TYPE)
proxy.add_metrics_publisher(mock_session)
proxy.publish_invocation_metric(fake_datetime, Action.CREATE)

expected_calls = [
call.client("cloudwatch"),
call.client().put_metric_data(
Namespace="AWS/CloudFormation/123412341234/Aa/Bb/Cc",
Namespace="AWS/CloudFormation/Aa/Bb/Cc",
MetricData=[
{
"MetricName": MetricTypes.HandlerInvocationCount.name,
Expand All @@ -131,14 +130,14 @@ def test_publish_invocation_metric(mock_session):

def test_publish_duration_metric(mock_session):
fake_datetime = datetime(2019, 1, 1)
proxy = MetricsPublisherProxy(ACCOUNT_ID, RESOURCE_TYPE)
proxy = MetricsPublisherProxy(RESOURCE_TYPE)
proxy.add_metrics_publisher(mock_session)
proxy.publish_duration_metric(fake_datetime, Action.CREATE, 100)

expected_calls = [
call.client("cloudwatch"),
call.client().put_metric_data(
Namespace="AWS/CloudFormation/123412341234/Aa/Bb/Cc",
Namespace="AWS/CloudFormation/Aa/Bb/Cc",
MetricData=[
{
"MetricName": MetricTypes.HandlerInvocationDuration.name,
Expand All @@ -158,14 +157,14 @@ def test_publish_duration_metric(mock_session):

def test_publish_log_delivery_exception_metric(mock_session):
fake_datetime = datetime(2019, 1, 1)
proxy = MetricsPublisherProxy(ACCOUNT_ID, RESOURCE_TYPE)
proxy = MetricsPublisherProxy(RESOURCE_TYPE)
proxy.add_metrics_publisher(mock_session)
proxy.publish_log_delivery_exception_metric(fake_datetime, TypeError("test"))

expected_calls = [
call.client("cloudwatch"),
call.client().put_metric_data(
Namespace="AWS/CloudFormation/123412341234/Aa/Bb/Cc",
Namespace="AWS/CloudFormation/Aa/Bb/Cc",
MetricData=[
{
"MetricName": MetricTypes.HandlerException.name,
Expand All @@ -191,6 +190,6 @@ def test_publish_log_delivery_exception_metric(mock_session):


def test_metrics_publisher_proxy_add_metrics_publisher_none_safe():
proxy = MetricsPublisherProxy(ACCOUNT_ID, RESOURCE_TYPE)
proxy = MetricsPublisherProxy(RESOURCE_TYPE)
proxy.add_metrics_publisher(None)
assert proxy._publishers == [] # pylint: disable=protected-access