update example and e2e test

Author: jeromevdl

examples/powertools-examples-core/src/main/java/helloworld/App.java

@@ -34,6 +34,9 @@
 import java.util.stream.Collectors;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import software.amazon.cloudwatchlogs.emf.exception.DimensionSetExceededException;
+import software.amazon.cloudwatchlogs.emf.exception.InvalidDimensionException;
+import software.amazon.cloudwatchlogs.emf.exception.InvalidMetricException;
 import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
 import software.amazon.cloudwatchlogs.emf.model.Unit;
 import software.amazon.lambda.powertools.logging.Logging;
@@ -47,7 +50,7 @@
  * Handler for requests to Lambda function.
  */
 public class App implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
-    private final static Logger log = LogManager.getLogger(App.class);
+    private static final Logger log = LogManager.getLogger(App.class);
 
     @Logging(logEvent = true, samplingRate = 0.7)
     @Tracing(captureMode = CaptureMode.RESPONSE_AND_ERROR)
@@ -58,12 +61,20 @@ public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEv
         headers.put("Content-Type", "application/json");
         headers.put("X-Custom-Header", "application/json");
 
-        metricsLogger().putMetric("CustomMetric1", 1, Unit.COUNT);
+        try {
+            metricsLogger().putMetric("CustomMetric1", 1, Unit.COUNT);
+        } catch (InvalidMetricException e) {
+            log.error(e);
+        }
 
-        withSingleMetric("CustomMetrics2", 1, Unit.COUNT, "Another", (metric) ->
+        withSingleMetric("CustomMetrics2", 1, Unit.COUNT, "Another", metric ->
         {
-            metric.setDimensions(DimensionSet.of("AnotherService", "CustomService"));
-            metric.setDimensions(DimensionSet.of("AnotherService1", "CustomService1"));
+            try {
+                metric.setDimensions(DimensionSet.of("AnotherService", "CustomService"));
+                metric.setDimensions(DimensionSet.of("AnotherService1", "CustomService1"));
+            } catch (InvalidDimensionException | DimensionSetExceededException e) {
+                log.error(e);
+            }
         });
 
         LoggingUtils.appendKey("test", "willBeLogged");

powertools-e2e-tests/handlers/metrics/src/main/java/software/amazon/lambda/powertools/e2e/Function.java

@@ -16,6 +16,9 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
+import software.amazon.cloudwatchlogs.emf.exception.DimensionSetExceededException;
+import software.amazon.cloudwatchlogs.emf.exception.InvalidDimensionException;
+import software.amazon.cloudwatchlogs.emf.exception.InvalidMetricException;
 import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger;
 import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
 import software.amazon.cloudwatchlogs.emf.model.Unit;
@@ -30,10 +33,21 @@ public class Function implements RequestHandler<Input, String> {
     public String handleRequest(Input input, Context context) {
 
         DimensionSet dimensionSet = new DimensionSet();
-        input.getDimensions().forEach((key, value) -> dimensionSet.addDimension(key, value));
+        input.getDimensions().forEach((key, value) -> {
+            try {
+                dimensionSet.addDimension(key, value);
+            } catch (InvalidDimensionException | DimensionSetExceededException e) {
+                // log or something
+            }
+        });
         metricsLogger.putDimensions(dimensionSet);
-
-        input.getMetrics().forEach((key, value) -> metricsLogger.putMetric(key, value, Unit.COUNT));
+        input.getMetrics().forEach((key, value) -> {
+            try {
+                metricsLogger.putMetric(key, value, Unit.COUNT);
+            } catch (InvalidMetricException e) {
+                // log or something
+            }
+        });
 
         return "OK";
     }