Skip to content

Removed account ID from metric namespace #293

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

Removed account ID from metric namespace #293

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
7 changes: 3 additions & 4 deletions src/main/java/software/amazon/cloudformation/LambdaWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,7 @@ public LambdaWrapper(final CredentialsProvider providerCredentialsProvider,
private void initialiseRuntime(final String resourceType,
final Credentials providerCredentials,
final String providerLogGroupName,
final Context context,
final String awsAccountId) {
final Context context) {

this.loggerProxy = new LoggerProxy();
this.metricsPublisherProxy = new MetricsPublisherProxy();
Expand All @@ -160,7 +159,7 @@ private void initialiseRuntime(final String resourceType,

if (this.providerMetricsPublisher == null) {
this.providerMetricsPublisher = new MetricsPublisherImpl(this.providerCloudWatchProvider, this.loggerProxy,
awsAccountId, resourceType);
resourceType);
}
this.metricsPublisherProxy.addMetricsPublisher(this.providerMetricsPublisher);
this.providerMetricsPublisher.refreshClient();
Expand Down Expand Up @@ -255,7 +254,7 @@ public void handleRequest(final InputStream inputStream, final OutputStream outp

// initialise dependencies
initialiseRuntime(request.getResourceType(), request.getRequestData().getProviderCredentials(),
request.getRequestData().getProviderLogGroupName(), context, request.getAwsAccountId());
request.getRequestData().getProviderLogGroupName(), context);

// transform the request object to pass to caller
ResourceHandlerRequest<ResourceT> resourceHandlerRequest = transform(request);
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/software/amazon/cloudformation/metrics/MetricsPublisherImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,15 @@ public class MetricsPublisherImpl extends MetricsPublisher {
private final CloudWatchProvider cloudWatchProvider;

private Logger loggerProxy;
private String providerAccountId;

private CloudWatchClient cloudWatchClient;

public MetricsPublisherImpl(final CloudWatchProvider cloudWatchProvider,
final Logger loggerProxy,
final String providerAccountId,
final String resourceTypeName) {
super(resourceTypeName);
this.cloudWatchProvider = cloudWatchProvider;
this.loggerProxy = loggerProxy;
this.providerAccountId = providerAccountId;
}

public void refreshClient() {
Expand Down Expand Up @@ -115,8 +112,7 @@ private void publishMetric(final String metricName,
.timestamp(timestamp).build();

PutMetricDataRequest putMetricDataRequest = PutMetricDataRequest.builder()
.namespace(String.format("%s/%s/%s", Metric.METRIC_NAMESPACE_ROOT, providerAccountId, resourceNamespace))
.metricData(metricDatum).build();
.namespace(String.format("%s/%s", Metric.METRIC_NAMESPACE_ROOT, resourceNamespace)).metricData(metricDatum).build();

try {
this.cloudWatchClient.putMetricData(putMetricDataRequest);
Expand Down
16 changes: 6 additions & 10 deletions src/test/java/software/amazon/cloudformation/metrics/MetricsPublisherImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public class MetricsPublisherImplTest {
@Mock
private CloudWatchClient providerCloudWatchClient;

private String awsAccountId = "77384178834";
private final String resourceTypeName = "AWS::Test::TestModel";

@BeforeEach
Expand All @@ -70,7 +69,7 @@ public void afterEach() {
@Test
public void testPublishDurationMetric() {
final MetricsPublisherImpl providerMetricsPublisher = new MetricsPublisherImpl(providerCloudWatchProvider, loggerProxy,
awsAccountId, resourceTypeName);
resourceTypeName);
providerMetricsPublisher.refreshClient();

final Instant instant = Instant.parse("2019-06-04T17:50:00Z");
Expand All @@ -80,8 +79,7 @@ public void testPublishDurationMetric() {
verify(providerCloudWatchClient).putMetricData(argument1.capture());

final PutMetricDataRequest request = argument1.getValue();
assertThat(request.namespace())
.isEqualTo(String.format("%s/%s/%s", "AWS/CloudFormation", awsAccountId, "AWS/Test/TestModel"));
assertThat(request.namespace()).isEqualTo(String.format("%s/%s", "AWS/CloudFormation", "AWS/Test/TestModel"));

assertThat(request.metricData()).hasSize(1);
final MetricDatum metricDatum = request.metricData().get(0);
Expand All @@ -96,7 +94,7 @@ public void testPublishDurationMetric() {
@Test
public void testPublishExceptionMetric() {
final MetricsPublisherImpl providerMetricsPublisher = new MetricsPublisherImpl(providerCloudWatchProvider, loggerProxy,
awsAccountId, resourceTypeName);
resourceTypeName);
providerMetricsPublisher.refreshClient();

final Instant instant = Instant.parse("2019-06-03T17:50:00Z");
Expand All @@ -107,8 +105,7 @@ public void testPublishExceptionMetric() {
verify(providerCloudWatchClient).putMetricData(argument1.capture());

final PutMetricDataRequest request = argument1.getValue();
assertThat(request.namespace())
.isEqualTo(String.format("%s/%s/%s", "AWS/CloudFormation", awsAccountId, "AWS/Test/TestModel"));
assertThat(request.namespace()).isEqualTo(String.format("%s/%s", "AWS/CloudFormation", "AWS/Test/TestModel"));

assertThat(request.metricData()).hasSize(1);
final MetricDatum metricDatum = request.metricData().get(0);
Expand All @@ -125,7 +122,7 @@ public void testPublishExceptionMetric() {
@Test
public void testPublishInvocationMetric() {
final MetricsPublisherImpl providerMetricsPublisher = new MetricsPublisherImpl(providerCloudWatchProvider, loggerProxy,
awsAccountId, resourceTypeName);
resourceTypeName);
providerMetricsPublisher.refreshClient();

final Instant instant = Instant.parse("2019-06-04T17:50:00Z");
Expand All @@ -135,8 +132,7 @@ public void testPublishInvocationMetric() {
verify(providerCloudWatchClient).putMetricData(argument1.capture());

final PutMetricDataRequest request = argument1.getValue();
assertThat(request.namespace())
.isEqualTo(String.format("%s/%s/%s", "AWS/CloudFormation", awsAccountId, "AWS/Test/TestModel"));
assertThat(request.namespace()).isEqualTo(String.format("%s/%s", "AWS/CloudFormation", "AWS/Test/TestModel"));

assertThat(request.metricData()).hasSize(1);
final MetricDatum metricDatum = request.metricData().get(0);
Expand Down