Restore original example.

Author: phipag

examples/powertools-examples-core-utilities/sam/pom.xml

@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
-            <artifactId>powertools-logging-logback</artifactId>
+            <artifactId>powertools-logging-log4j</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -99,10 +99,19 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <transformers>
+                                <transformer implementation="org.apache.logging.log4j.maven.plugins.shade.transformer.Log4j2PluginCacheFileTransformer"/>
+                            </transformers>
                         </configuration>
                     </execution>
                 </executions>
-
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.logging.log4j</groupId>
+                        <artifactId>log4j-transform-maven-shade-plugin-extensions</artifactId>
+                        <version>0.2.0</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <!-- Don't deploy the example -->
             <plugin>

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

@@ -14,8 +14,16 @@
 
 package helloworld;
 
+import static software.amazon.lambda.powertools.logging.argument.StructuredArguments.entry;
+import static software.amazon.lambda.powertools.tracing.TracingUtils.putMetadata;
+
+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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,53 +35,74 @@
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 
 import software.amazon.lambda.powertools.logging.Logging;
-import software.amazon.lambda.powertools.logging.PowertoolsLogging;
+import software.amazon.lambda.powertools.metrics.FlushMetrics;
+import software.amazon.lambda.powertools.metrics.Metrics;
+import software.amazon.lambda.powertools.metrics.MetricsFactory;
+import software.amazon.lambda.powertools.metrics.model.DimensionSet;
+import software.amazon.lambda.powertools.metrics.model.MetricResolution;
+import software.amazon.lambda.powertools.metrics.model.MetricUnit;
+import software.amazon.lambda.powertools.tracing.CaptureMode;
+import software.amazon.lambda.powertools.tracing.Tracing;
+import software.amazon.lambda.powertools.tracing.TracingUtils;
 
 /**
  * Handler for requests to Lambda function.
  */
 public class App implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
     private static final Logger log = LoggerFactory.getLogger(App.class);
+    private static final Metrics metrics = MetricsFactory.getMetricsInstance();
 
-    public App() {
-        // Flush immediately because no trace ID is set yet
-        log.debug("Constructor DEBUG - should not be buffered (no trace ID)");
-        log.info("Constructor INFO - should not be buffered (no trace ID)");
-    }
-
-    @Logging(logEvent = false)
+    @Logging(logEvent = true, samplingRate = 0.7)
+    @Tracing(captureMode = CaptureMode.RESPONSE_AND_ERROR)
+    @FlushMetrics(namespace = "ServerlessAirline", service = "payment", captureColdStart = true)
     public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent input, final Context context) {
-        // Manually set trace ID for testing in SAM local
-        System.setProperty("com.amazonaws.xray.traceHeader",
-                "Root=1-63441c4a-abcdef012345678912345678;Parent=0123456789abcdef;Sampled=1");
-
         Map<String, String> headers = new HashMap<>();
 
         headers.put("Content-Type", "application/json");
         headers.put("X-Custom-Header", "application/json");
 
-        log.debug("DEBUG 1");
-        MDC.put("test", "willBeLogged");
-        log.debug("DEBUG 2");
-        log.info("INFO 1");
+        metrics.addMetric("CustomMetric1", 1, MetricUnit.COUNT);
+
+        DimensionSet dimensionSet = new DimensionSet();
+        dimensionSet.addDimension("AnotherService", "CustomService");
+        dimensionSet.addDimension("AnotherService1", "CustomService1");
+        metrics.flushSingleMetric("CustomMetric2", 1, MetricUnit.COUNT, "Another", dimensionSet);
 
-        // Manually flush buffer to show buffered debug logs
-        // PowertoolsLogging.flushBuffer();
-        log.error("Some error happened");
+        metrics.addMetric("CustomMetric3", 1, MetricUnit.COUNT, MetricResolution.HIGH);
+
+        MDC.put("test", "willBeLogged");
 
         APIGatewayProxyResponseEvent response = new APIGatewayProxyResponseEvent()
                 .withHeaders(headers);
         try {
-            String output = String.format("{ \"message\": \"hello world\", \"location\": \"%s\" }", "Test");
+            final String pageContents = this.getPageContents("https://checkip.amazonaws.com");
+            log.info("", entry("ip", pageContents));
+            TracingUtils.putAnnotation("Test", "New");
+            String output = String.format("{ \"message\": \"hello world\", \"location\": \"%s\" }", pageContents);
+
+            TracingUtils.withSubsegment("loggingResponse", subsegment -> {
+                String sampled = "log something out";
+                log.info(sampled);
+                log.info(output);
+            });
 
+            log.info("After output");
             return response
                     .withStatusCode(200)
                     .withBody(output);
-        } catch (RuntimeException e) {
+        } catch (RuntimeException | IOException e) {
             return response
                     .withBody("{}")
                     .withStatusCode(500);
         }
     }
 
+    @Tracing(namespace = "getPageContents", captureMode = CaptureMode.DISABLED)
+    private String getPageContents(String address) throws IOException {
+        URL url = new URL(address);
+        putMetadata("getPageContents", address);
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()))) {
+            return br.lines().collect(Collectors.joining(System.lineSeparator()));
+        }
+    }
 }

examples/powertools-examples-core-utilities/sam/src/main/java/helloworld/AppStream.java

@@ -56,7 +56,6 @@ public void handleRequest(InputStream input, OutputStream output, Context contex
 
             writer.write("{\"body\": \"" + System.currentTimeMillis() + "\"} ");
         } catch (IOException e) {
-            log.error("Exception caught in handler", e);
             log.error("Something has gone wrong: ", e);
         }
     }

examples/powertools-examples-core-utilities/sam/src/main/resources/log4j2.xml

@@ -4,7 +4,7 @@
         <Console name="JsonAppender" target="SYSTEM_OUT">
             <JsonTemplateLayout eventTemplateUri="classpath:LambdaJsonLayout.json" />
         </Console>
-        <BufferingAppender name="BufferedAppender" bufferAtVerbosity="DEBUG" maxBytes="8">
+        <BufferingAppender name="BufferedAppender" bufferAtVerbosity="DEBUG">
             <AppenderRef ref="JsonAppender" />
         </BufferingAppender>
     </Appenders>