[aws] Fix various bugs for C++ benchmarks, as pointed out during review

Author: mcopik

benchmarks/wrappers/aws/cpp/handler.cpp

@@ -1,3 +1,5 @@
+#include <chrono>
+#include <cstdlib>
 
 #include <aws/core/Aws.h>
 #include <aws/lambda-runtime/runtime.h>
@@ -36,10 +38,6 @@ aws::lambda_runtime::invocation_response handler(aws::lambda_runtime::invocation
   Aws::Utils::Json::JsonValue body;
   body.WithObject("result", ret);
 
-  // Switch cold execution after the first one.
-  if(cold_execution)
-    cold_execution = false;
-
   auto b = std::chrono::duration_cast<std::chrono::microseconds>(begin.time_since_epoch()).count() / 1000.0 / 1000.0;
   auto e = std::chrono::duration_cast<std::chrono::microseconds>(end.time_since_epoch()).count() / 1000.0 / 1000.0;
   body.WithDouble("begin", b);
@@ -50,6 +48,10 @@ aws::lambda_runtime::invocation_response handler(aws::lambda_runtime::invocation
   body.WithString("container_id", container_id);
   body.WithString("cold_start_var", cold_start_var);
 
+  // Switch cold execution after the first one.
+  if(cold_execution)
+    cold_execution = false;
+
   Aws::Utils::Json::JsonValue final_result;
   final_result.WithObject("body", body);
   return aws::lambda_runtime::invocation_response::success(final_result.View().WriteReadable(), "application/json");

benchmarks/wrappers/aws/cpp/key-value.cpp

@@ -1,5 +1,6 @@
 
-#include <memory>
+#include <chrono>
+#include <thread>
 
 #include <aws/core/auth/AWSCredentialsProvider.h>
 #include <aws/core/client/ClientConfiguration.h>

benchmarks/wrappers/aws/cpp/redis.cpp

@@ -1,5 +1,8 @@
 
+#include <chrono>
+#include <iostream>
 #include <string>
+#include <thread>
 
 #include <aws/core/Aws.h>
 

benchmarks/wrappers/aws/cpp/storage.cpp

@@ -1,5 +1,7 @@
 
 #include <memory>
+#include <iostream>
+#include <sstream>
 
 #include <aws/core/auth/AWSCredentialsProvider.h>
 #include <aws/core/client/ClientConfiguration.h>
@@ -13,11 +15,8 @@
 
 Storage Storage::get_client() {
   Aws::Client::ClientConfiguration config;
-  // config.region = "eu-central-1";
   config.caFile = "/etc/pki/tls/certs/ca-bundle.crt";
 
-  std::cout << std::getenv("AWS_REGION") << std::endl;
-
   char const TAG[] = "LAMBDA_ALLOC";
   auto credentialsProvider =
       Aws::MakeShared<Aws::Auth::EnvironmentAWSCredentialsProvider>(TAG);

dockerfiles/aws/cpp/Dockerfile.dependencies-runtime

@@ -5,7 +5,7 @@ ENV WORKERS=${WORKERS}
 
 
 RUN yum install -y cmake3 curl libcurl libcurl-devel git gcc gcc-c++ make tar gzip 
-RUN   git clone https://github.com/awslabs/aws-lambda-cpp.git\
+RUN   git clone --branch v0.2.10 https://github.com/awslabs/aws-lambda-cpp.git\
       && cmake3 -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=/opt -B aws-lambda-cpp/build -S aws-lambda-cpp\
       && cmake3 --build aws-lambda-cpp/build --parallel ${WORKERS} --target install
 

dockerfiles/aws/cpp/Dockerfile.dependencies-sdk

@@ -4,7 +4,7 @@ ARG WORKERS
 ENV WORKERS=${WORKERS}
 
 RUN yum install -y cmake3 curl libcurl libcurl-devel git gcc gcc-c++ make zlib-devel openssl-devel
-RUN   git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp.git\
+RUN   git clone --recurse-submodules --branch 1.11.590 https://github.com/aws/aws-sdk-cpp.git\
       && cd aws-sdk-cpp && mkdir build && cd build\
       && cmake3 -DCMAKE_BUILD_TYPE=Release -DBUILD_ONLY="s3;dynamodb;sqs" -DENABLE_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/opt/ ..\
       && cmake3 --build . --parallel ${WORKERS} --target install

dockerfiles/cpp_installer.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 
 mkdir -p /mnt/function/build
-cmake3 -DCMAKE_BUILD_TYPE=Release -S /mnt/function/ -B /mnt/function/build > /mnt/function/build/configuration.log
-VERBOSE=1 cmake3 --build /mnt/function/build --target aws-lambda-package-benchmark > /mnt/function/build/compilation.log
-
+cmake3 -DCMAKE_BUILD_TYPE=Release -S /mnt/function/ -B /mnt/function/build >/mnt/function/build/configuration.log || {
+  echo "CMake configuration failed. Check configuration.log for details." >&2
+  exit 1
+}
+VERBOSE=1 cmake3 --build /mnt/function/build --target aws-lambda-package-benchmark >/mnt/function/build/compilation.log || {
+  echo "CMake build failed. Check compilation.log for details." >&2
+  exit 1
+}

sebs/types.py

@@ -32,7 +32,7 @@ def deserialize(val: str) -> Language:
         for member in Language:
             if member.value == val:
                 return member
-        raise Exception(f"Unknown language type {member}")
+        raise Exception(f"Unknown language type {val}")
 
 
 class NoSQLStorage(str, Enum):