Example usage in the demo app

Author: Pankaj Agrawal

example/HelloWorldFunction/pom.xml

@@ -23,6 +23,11 @@
             <artifactId>powertools-logging</artifactId>
             <version>0.2.0-beta</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.lambda</groupId>
+            <artifactId>powertools-metrics</artifactId>
+            <version>0.2.0-beta</version>
+        </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-core</artifactId>
@@ -76,6 +81,10 @@
                          <groupId>software.amazon.lambda</groupId>
                          <artifactId>powertools-logging</artifactId>
                      </aspectLibrary>
+                     <aspectLibrary>
+                         <groupId>software.amazon.lambda</groupId>
+                         <artifactId>powertools-metrics</artifactId>
+                     </aspectLibrary>
                  </aspectLibraries>
              </configuration>
              <executions>

example/HelloWorldFunction/src/main/java/helloworld/App.java

@@ -1,5 +1,13 @@
 package helloworld;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
@@ -8,19 +16,16 @@
 import com.amazonaws.xray.entities.Entity;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
+import software.amazon.cloudwatchlogs.emf.model.Unit;
 import software.amazon.lambda.powertools.logging.PowertoolsLogger;
 import software.amazon.lambda.powertools.logging.PowertoolsLogging;
+import software.amazon.lambda.powertools.metrics.PowertoolsMetrics;
 import software.amazon.lambda.powertools.tracing.PowerTracer;
 import software.amazon.lambda.powertools.tracing.PowertoolsTracing;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import static software.amazon.lambda.powertools.metrics.PowertoolsMetricsLogger.metricsLogger;
+import static software.amazon.lambda.powertools.metrics.PowertoolsMetricsLogger.withSingleMetric;
 import static software.amazon.lambda.powertools.tracing.PowerTracer.putMetadata;
 import static software.amazon.lambda.powertools.tracing.PowerTracer.withEntitySubsegment;
 
@@ -33,12 +38,20 @@ public class App implements RequestHandler<APIGatewayProxyRequestEvent, APIGatew
 
     @PowertoolsLogging(logEvent = true, samplingRate = 0.7)
     @PowertoolsTracing(captureError = false, captureResponse = false)
+    @PowertoolsMetrics(namespace = "EMF", captureColdStart = true)
     public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent input, final Context context) {
         Map<String, String> headers = new HashMap<>();
 
         headers.put("Content-Type", "application/json");
         headers.put("X-Custom-Header", "application/json");
 
+        metricsLogger().putMetric("CustomMetric1", 1, Unit.COUNT);
+
+        withSingleMetric("CustomMetrics2", 1, Unit.COUNT, "Another", (logger) -> {
+            logger.setDimensions(DimensionSet.of("AnotherService", "CustomService"));
+            logger.setDimensions(DimensionSet.of("AnotherService1", "CustomService1"));
+        });
+
         PowertoolsLogger.appendKey("test", "willBeLogged");
 
         APIGatewayProxyResponseEvent response = new APIGatewayProxyResponseEvent()

example/HelloWorldFunction/src/main/java/helloworld/AppStream.java

@@ -1,20 +1,22 @@
 package helloworld;
 
-import com.amazonaws.services.lambda.runtime.Context;
-import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import software.amazon.lambda.powertools.logging.PowertoolsLogging;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Map;
 
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestStreamHandler;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import software.amazon.lambda.powertools.logging.PowertoolsLogging;
+import software.amazon.lambda.powertools.metrics.PowertoolsMetrics;
+
 public class AppStream implements RequestStreamHandler {
     private static final ObjectMapper mapper = new ObjectMapper();
 
     @Override
     @PowertoolsLogging(logEvent = true)
+    @PowertoolsMetrics(namespace = "EMF", captureColdStart = true)
     public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException {
         Map map = mapper.readValue(input, Map.class);
 

powertools-core/src/main/java/software/amazon/lambda/powertools/core/internal/LambdaHandlerProcessor.java

@@ -71,8 +71,8 @@ public static String serviceName() {
         return SERVICE_NAME;
     }
 
-    public static Boolean isColdStart() {
-        return IS_COLD_START;
+    public static boolean isColdStart() {
+        return IS_COLD_START == null;
     }
 
     public static void coldStartDone() {

powertools-logging/src/main/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspect.java

@@ -79,7 +79,7 @@ public Object around(ProceedingJoinPoint pjp,
         extractContext(pjp)
                 .ifPresent(context -> {
                     appendKeys(DefaultLambdaFields.values(context));
-                    appendKey("coldStart", null == isColdStart() ? "true" : "false");
+                    appendKey("coldStart", isColdStart() ? "true" : "false");
                     appendKey("service", serviceName());
                 });
 

powertools-metrics/pom.xml

@@ -80,6 +80,11 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>

powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/PowertoolsMetricsLogger.java

@@ -8,7 +8,7 @@
 public final class PowertoolsMetricsLogger {
     private static MetricsLogger metricsLogger = new MetricsLogger();
 
-    public static MetricsLogger logger() {
+    public static MetricsLogger metricsLogger() {
         return metricsLogger;
     }
 

powertools-metrics/src/main/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspect.java

@@ -19,7 +19,7 @@
 import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.placedOnRequestHandler;
 import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.placedOnStreamHandler;
 import static software.amazon.lambda.powertools.core.internal.LambdaHandlerProcessor.serviceName;
-import static software.amazon.lambda.powertools.metrics.PowertoolsMetricsLogger.logger;
+import static software.amazon.lambda.powertools.metrics.PowertoolsMetricsLogger.metricsLogger;
 
 @Aspect
 public class LambdaMetricsAspect {
@@ -39,7 +39,7 @@ public Object around(ProceedingJoinPoint pjp,
                 && (placedOnRequestHandler(pjp)
                 || placedOnStreamHandler(pjp))) {
 
-            MetricsLogger logger = logger();
+            MetricsLogger logger = metricsLogger();
 
             logger.setNamespace(namespace(powertoolsMetrics))
                     .setDimensions(DimensionSet.of("service", service(powertoolsMetrics)));
@@ -57,7 +57,7 @@ && isColdStart()) {
                     coldStartLogger = new MetricsLogger();
 
                     coldStartLogger.putDimensions(DimensionSet.of("function_name", context.getFunctionName()))
-                            .putDimensions(DimensionSet.of("service", service(powertoolsMetrics)))
+                            .setDimensions(DimensionSet.of("service", service(powertoolsMetrics)))
                             .setNamespace(namespace(powertoolsMetrics))
                             .putMetric("ColdStart", 1, Unit.COUNT);
                 }

powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/handlers/PowertoolsMetricsEnabledHandler.java

@@ -5,14 +5,15 @@
 import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger;
 import software.amazon.cloudwatchlogs.emf.model.Unit;
 import software.amazon.lambda.powertools.metrics.PowertoolsMetrics;
-import software.amazon.lambda.powertools.metrics.PowertoolsMetricsLogger;
+
+import static software.amazon.lambda.powertools.metrics.PowertoolsMetricsLogger.metricsLogger;
 
 public class PowertoolsMetricsEnabledHandler implements RequestHandler<Object, Object> {
 
     @Override
     @PowertoolsMetrics(namespace = "ExampleApplication", service = "booking")
     public Object handleRequest(Object input, Context context) {
-        MetricsLogger metricsLogger = PowertoolsMetricsLogger.logger();
+        MetricsLogger metricsLogger = metricsLogger();
         metricsLogger.putMetric("Metric1", 1, Unit.BYTES);
 
         return null;

powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspectTest.java

@@ -17,6 +17,7 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.openMocks;
 import static software.amazon.cloudwatchlogs.emf.model.Unit.BYTES;
+import static software.amazon.lambda.powertools.metrics.PowertoolsMetricsLogger.metricsLogger;
 
 public class LambdaMetricsAspectTest {
 
@@ -40,7 +41,7 @@ void setUp() throws IllegalAccessException {
     public void testHandler() {
         requestHandler.handleRequest("input", context);
 
-        MetricsLogger logger = PowertoolsMetricsLogger.logger();
+        MetricsLogger logger = metricsLogger();
 
         verify(logger).setDimensions(any(DimensionSet.class));
         verify(logger).setNamespace("ExampleApplication");

powertools-tracing/src/main/java/software/amazon/lambda/powertools/tracing/internal/LambdaTracingAspect.java

@@ -31,7 +31,7 @@
 @Aspect
 public final class LambdaTracingAspect {
 
-    @SuppressWarnings({"EmptyMethod", "unused"})
+    @SuppressWarnings({"EmptyMethod"})
     @Pointcut("@annotation(powerToolsTracing)")
     public void callAt(PowertoolsTracing powerToolsTracing) {
     }
@@ -45,7 +45,7 @@ public Object around(ProceedingJoinPoint pjp,
         segment.setNamespace(namespace(powerToolsTracing));
 
         if (placedOnHandlerMethod(pjp)) {
-            segment.putAnnotation("ColdStart", isColdStart() == null);
+            segment.putAnnotation("ColdStart", isColdStart());
         }
 
         try {