Added support for logging

Author: burkat

src/main/java/Handler.java

@@ -10,7 +10,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
@@ -21,10 +20,11 @@ public class Handler {
     private static final String TMP_PATH = "/tmp/";
     private static final String BUCKET_KEY = "bucket";
     private static final String PREFIX_KEY = "prefix";
+    private static final Metrics metrics = new Metrics();
 
     public Response handleRequest(Event event, Context context) {
 
-        Instant instant1 = Instant.now();
+        metrics.lambdaStart = Instant.now();
         LambdaLogger logger = context.getLogger();
         logger.log("body:       " + event.getBody());
 
@@ -44,15 +44,25 @@ public Response handleRequest(Event event, Context context) {
             execute(createCommand(request), logger);
             uploadData(request, logger);
         } catch (Exception e) {
+            context.getLogger().log("Execution failed.");
             return handleException(e, request);
         }
+        metrics.lambdaEnd = Instant.now();
+        final String metricsString = "lambda start: " + metrics.lambdaStart.toEpochMilli() + " lambda end: " + metrics.lambdaEnd.toEpochMilli() +
+                " download start: " + metrics.downloadStart.toEpochMilli() + " download end: " + metrics.downloadEnd.toEpochMilli() +
+                " execution start: " + metrics.executionStart.toEpochMilli() + " execution end: " + metrics.executionEnd.toEpochMilli() +
+                " upload start: " + metrics.uploadStart.toEpochMilli() + " upload end: " + metrics.uploadEnd.toEpochMilli();
+        if (request.getLogName() != null) {
+            S3Utils.S3.putObject(request.getOptions().get(BUCKET_KEY), "logs/" + request.getLogName(), metricsString);
+        }
         Response response = new Response();
         response.setStatusCode(HttpURLConnection.HTTP_OK);
-        response.setBody("Execution of " + request.getExecutable() + " successful, duration: " + Duration.between(instant1, Instant.now()).getSeconds() + " seconds");
+        response.setBody(metricsString);
         return response;
     }
 
     private void downloadData(Request request, LambdaLogger logger) throws IOException {
+        metrics.downloadStart = Instant.now();
         for (Map<String, Object> input : request.getInputs()) {
             String fileName = input.get("name").toString();
             String key = request.getOptions().get(PREFIX_KEY) + "/" + fileName;
@@ -67,6 +77,7 @@ private void downloadExecutable(Request request, LambdaLogger logger) throws IOE
         String key = request.getOptions().get(PREFIX_KEY) + "/" + request.getExecutable();
         S3Object s3Object = S3Utils.getObject(request.getOptions().get(BUCKET_KEY), key);
         S3Utils.saveToFile(s3Object, TMP_PATH + request.getExecutable());
+        metrics.downloadEnd = Instant.now();
     }
 
     private List<String> createCommand(Request request) {
@@ -77,6 +88,7 @@ private List<String> createCommand(Request request) {
     }
 
     private void execute(List<String> command, LambdaLogger logger) throws Exception {
+        metrics.executionStart = Instant.now();
         logger.log("Executing: " + String.join(" ", command));
 
         Process chmod = Runtime.getRuntime().exec("chmod -R 777 " + TMP_PATH);
@@ -91,16 +103,19 @@ private void execute(List<String> command, LambdaLogger logger) throws Exception
 
         logger.log("Stdout: " + outputMsg);
         logger.log("Stderr: " + errorMsg);
+        metrics.executionEnd = Instant.now();
     }
 
     private void uploadData(Request request, LambdaLogger logger) {
+        metrics.uploadStart = Instant.now();
         for (Map<String, String> input : request.getOutputs()) {
             String fileName = input.get("name");
             String filePath = TMP_PATH + fileName;
             String key = request.getOptions().get(PREFIX_KEY) + "/" + fileName;
             logger.log("Uploading to " + request.getOptions().get(BUCKET_KEY) + "/" + key + " from " + filePath);
             S3Utils.putObject(request.getOptions().get(BUCKET_KEY), key, filePath);
         }
+        metrics.uploadEnd = Instant.now();
     }
 
     private Response handleException(Exception e, Request request) {

src/main/java/Metrics.java

@@ -0,0 +1,14 @@
+import java.time.Instant;
+
+class Metrics {
+
+    Instant lambdaStart;
+    Instant lambdaEnd;
+    Instant downloadStart;
+    Instant downloadEnd;
+    Instant executionStart;
+    Instant executionEnd;
+    Instant uploadStart;
+    Instant uploadEnd;
+
+}

src/main/java/S3Utils.java

@@ -12,15 +12,15 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class S3Utils {
+class S3Utils {
 
     private static final Logger logger = Logger.getGlobal();
-    private static final AmazonS3 S3 = AmazonS3ClientBuilder.defaultClient();
+    static final AmazonS3 S3 = AmazonS3ClientBuilder.defaultClient();
 
     private S3Utils() {
     }
 
-    public static S3Object getObject(String bucketName, String key) {
+    static S3Object getObject(String bucketName, String key) {
         S3Object s3Object;
         try {
             s3Object = S3.getObject(bucketName, key);
@@ -31,7 +31,7 @@ public static S3Object getObject(String bucketName, String key) {
         return s3Object;
     }
 
-    public static void putObject(String bucketName, String key, String filePath) {
+    static void putObject(String bucketName, String key, String filePath) {
         File file = new File(filePath);
         try {
             S3.putObject(bucketName, key, file);
@@ -41,7 +41,7 @@ public static void putObject(String bucketName, String key, String filePath) {
         }
     }
 
-    public static void saveToFile(S3Object s3Object, String fileName) throws IOException {
+    static void saveToFile(S3Object s3Object, String fileName) throws IOException {
         try (InputStream in = s3Object.getObjectContent()) {
             Objects.requireNonNull(s3Object);
             Files.copy(in, Paths.get(fileName), StandardCopyOption.REPLACE_EXISTING);

src/main/java/payloads/Request.java

@@ -6,6 +6,7 @@
 public class Request {
 
     private String executable;
+    private String logName;
     private List<String> args;
     private Map<String, String> env;
     private List<Map<String, Object>> inputs;
@@ -58,6 +59,14 @@ public List<Map<String, String>> getOutputs() {
 
     public Map<String, String> getOptions() {
         return options;
+    }
+
+    public void setLogName(String logName) {
+        this.logName = logName;
+    }
 
+    public String getLogName() {
+        return this.logName;
     }
+
 }