Skip to content

added zero-events on untriggered codes #301

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
ammokhov merged 1 commit into from
Aug 21, 2020
Merged

added zero-events on untriggered codes #301

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: 2 additions & 5 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 @@ -487,11 +487,8 @@ private void publishExceptionMetric(final Action action, final Throwable ex, fin
private void
publishExceptionCodeAndCountMetric(final Action action, final HandlerErrorCode handlerErrorCode, final boolean thrown) {
if (this.metricsPublisherProxy != null) {
EnumSet.allOf(HandlerErrorCode.class).stream()
// publishing 0 value for all (if not thrown) otherwise filtered
.filter(errorCode -> errorCode.equals(handlerErrorCode) || !thrown)
.forEach(errorCode -> this.metricsPublisherProxy.publishExceptionByErrorCodeMetric(Instant.now(), action,
errorCode, thrown));
EnumSet.allOf(HandlerErrorCode.class).forEach(errorCode -> this.metricsPublisherProxy
.publishExceptionByErrorCodeMetric(Instant.now(), action, errorCode, thrown && errorCode == handlerErrorCode));
Copy link

@wbingli wbingli Aug 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should publish all those ErrorCode metrics in one PutMetric call, which can support multiple metrics in one request.. Otherwise it will consume large number of TPS, and may cause throttling.

this.metricsPublisherProxy.publishExceptionCountMetric(Instant.now(), action, thrown);
}
}
Expand Down
21 changes: 10 additions & 11 deletions src/test/java/software/amazon/cloudformation/LambdaWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,31 +392,30 @@ public void invokeHandler_InProgress_returnsInProgress(final String requestDataP
verifyInitialiseRuntime();

// all metrics should be published, once for a single invocation
verify(providerMetricsPublisher, times(1)).publishInvocationMetric(any(Instant.class), eq(action));
verify(providerMetricsPublisher, times(1)).publishDurationMetric(any(Instant.class), eq(action), anyLong());
verify(providerMetricsPublisher).publishInvocationMetric(any(Instant.class), eq(action));
verify(providerMetricsPublisher).publishDurationMetric(any(Instant.class), eq(action), anyLong());

// verify that model validation occurred for CREATE/UPDATE/DELETE
if (action == Action.CREATE || action == Action.UPDATE || action == Action.DELETE) {
verify(validator, times(1)).validateObject(any(JSONObject.class), any(JSONObject.class));
verify(validator).validateObject(any(JSONObject.class), any(JSONObject.class));

// verify output response
verifyHandlerResponse(out, ProgressEvent.<TestModel, TestContext>builder().status(OperationStatus.IN_PROGRESS)
.resourceModel(TestModel.builder().property1("abc").property2(123).build()).build());
verify(providerMetricsPublisher, atLeastOnce()).publishExceptionByErrorCodeMetric(any(Instant.class), eq(action),
any(), eq(Boolean.FALSE));
verify(providerMetricsPublisher).publishExceptionCountMetric(any(Instant.class), eq(action), eq(Boolean.FALSE));
} else {
verifyHandlerResponse(out,
ProgressEvent.<TestModel, TestContext>builder().status(OperationStatus.FAILED)
.errorCode(HandlerErrorCode.InternalFailure).message("READ and LIST handlers must return synchronously.")
.build());
verify(providerMetricsPublisher).publishExceptionMetric(any(Instant.class), eq(action),
any(TerminalException.class), eq(HandlerErrorCode.InternalFailure));
verify(providerMetricsPublisher).publishExceptionByErrorCodeMetric(any(Instant.class), eq(action),
eq(HandlerErrorCode.InternalFailure), eq(Boolean.TRUE));
verify(providerMetricsPublisher).publishExceptionCountMetric(any(Instant.class), eq(action), eq(Boolean.TRUE));

}

verify(providerMetricsPublisher, atLeastOnce()).publishExceptionByErrorCodeMetric(any(Instant.class), eq(action),
any(), any(Boolean.class));
verify(providerMetricsPublisher).publishExceptionCountMetric(any(Instant.class), any(), any(Boolean.class));

// validation failure metric should not be published
verifyNoMoreInteractions(providerMetricsPublisher);

Expand Down Expand Up @@ -811,8 +810,8 @@ public void invokeHandler_metricPublisherThrowable_returnsFailureResponse() thro
// verify initialiseRuntime was called and initialised dependencies
verifyInitialiseRuntime();

verify(providerMetricsPublisher).publishExceptionByErrorCodeMetric(any(Instant.class), any(Action.class),
any(HandlerErrorCode.class), any(Boolean.class));
verify(providerMetricsPublisher, atLeastOnce()).publishExceptionByErrorCodeMetric(any(Instant.class),
any(Action.class), any(HandlerErrorCode.class), any(Boolean.class));

verify(providerMetricsPublisher).publishExceptionCountMetric(any(Instant.class), any(Action.class),
any(Boolean.class));
Expand Down