some cleanup

Author: srprash

sample-apps/apigateway-lambda/build.gradle.kts

@@ -16,8 +16,6 @@ java {
 dependencies {
   implementation("com.amazonaws:aws-lambda-java-core:1.2.2")
   implementation("com.squareup.okhttp3:okhttp:4.11.0")
-  implementation("software.amazon.awssdk:s3:2.20.0")
-  implementation("org.slf4j:jcl-over-slf4j:2.0.16")
   implementation("org.json:json:20240303")
   testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
 }

sample-apps/apigateway-lambda/src/main/java/com/amazon/sampleapp/LambdaHandler.java

@@ -2,38 +2,49 @@
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
+import java.io.IOException;
 import java.util.Map;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import org.json.JSONObject;
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.ListBucketsResponse;
 
 public class LambdaHandler implements RequestHandler<Object, Map<String, Object>> {
-  private final OkHttpClient httpClient;
-  private final S3Client s3Client;
 
-  public LambdaHandler() {
-    this.httpClient = new OkHttpClient();
-    this.s3Client = S3Client.create();
-  }
+  private final OkHttpClient client = new OkHttpClient();
 
   @Override
-  public Map<String, Object> handleRequest(Object o, Context context) {
-    makeRemoteCall();
-    listS3Buckets();
+  public Map<String, Object> handleRequest(Object input, Context context) {
+    System.out.println("Executing LambdaHandler");
 
-    // Get the trace id from system property
     // https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html#configuration-envvars-runtime
-    String traceId = System.getProperty("com.amazonaws.xray.traceHeader");
+    // try and get the trace id from environment variable _X_AMZN_TRACE_ID. If it's not present
+    // there
+    // then try the system property.
+    String traceId =
+        System.getenv("_X_AMZN_TRACE_ID") != null
+            ? System.getenv("_X_AMZN_TRACE_ID")
+            : System.getProperty("com.amazonaws.xray.traceHeader");
+
+    System.out.println("Trace ID: " + traceId);
+
+    // Make a remote call using OkHttp
+    System.out.println("Making a remote call using OkHttp");
+    String url = "https://www.amazon.com";
+    Request request = new Request.Builder().url(url).build();
 
-    // Construct the response body
     JSONObject responseBody = new JSONObject();
-    responseBody.put("message", "Request successful");
     responseBody.put("traceId", traceId);
 
-    // Return the API Gateway-compatible response
+    try (Response response = client.newCall(request).execute()) {
+      responseBody.put("httpRequest", "Request successful");
+    } catch (IOException e) {
+      context.getLogger().log("Error: " + e.getMessage());
+      responseBody.put("httpRequest", "Request failed");
+    }
+    System.out.println("Remote call done");
+
+    // return a response in the ApiGateway proxy format
     return Map.of(
         "isBase64Encoded",
         false,
@@ -44,22 +55,4 @@ public Map<String, Object> handleRequest(Object o, Context context) {
         "headers",
         Map.of("Content-Type", "application/json"));
   }
-
-  private void makeRemoteCall() {
-    try {
-      Request request = new Request.Builder().url("https://aws.amazon.com/").build();
-      Response response = httpClient.newCall(request).execute();
-      response.close();
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  private void listS3Buckets() {
-    ListBucketsResponse response = s3Client.listBuckets();
-    int bucketCount = response.buckets().size();
-
-    // Print bucket count
-    System.out.println("Number of S3 buckets: " + bucketCount);
-  }
 }

sample-apps/apigateway-lambda/terraform/main.tf

@@ -28,7 +28,7 @@ resource "aws_iam_policy" "s3_access" {
   })
 }
 
-resource "aws_iam_role_policy_attachment" "attachBasicExecutionRolePolicy" {
+resource "aws_iam_role_policy_attachment" "attach_execution_role_policy" {
   role       = aws_iam_role.lambda_role.name
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
 }
@@ -51,9 +51,17 @@ resource "aws_lambda_function" "sampleLambdaFunction" {
   role             = aws_iam_role.lambda_role.arn
   filename         = "${path.module}/../build/distributions/lambda-function.zip"
   source_code_hash = filebase64sha256("${path.module}/../build/distributions/lambda-function.zip")
+  architectures    = [var.architecture]
+  memory_size      = 512
   tracing_config {
     mode = var.lambda_tracing_mode
   }
+  layers = var.adot_layer_arn != null && var.adot_layer_arn != "" ? [var.adot_layer_arn] : []
+  environment {
+    variables = var.adot_layer_arn != null && var.adot_layer_arn != "" ? {
+      AWS_LAMBDA_EXEC_WRAPPER = "/opt/otel-instrument"
+    } : {}
+  }
 }
 
 ### API Gateway proxy to Lambda function
@@ -83,23 +91,6 @@ resource "aws_api_gateway_integration" "apigw_lambda_integration" {
   uri                     = aws_lambda_function.sampleLambdaFunction.invoke_arn
 }
 
-# resource "aws_api_gateway_method" "lambda_api_proxy_root_nodejs" {
-#   rest_api_id   = aws_api_gateway_rest_api.lambda_api_proxy.id
-#   resource_id   = aws_api_gateway_rest_api.lambda_api_proxy.root_resource_id
-#   http_method   = "ANY"
-#   authorization = "NONE"
-# }
-#
-# resource "aws_api_gateway_integration" "lambda_api_root_nodejs" {
-#   rest_api_id = aws_api_gateway_rest_api.lambda_api_proxy.id
-#   resource_id = aws_api_gateway_method.lambda_api_proxy_root_nodejs.resource_id
-#   http_method = aws_api_gateway_method.lambda_api_proxy_root_nodejs.http_method
-#
-#   integration_http_method = "POST"
-#   type                    = "AWS_PROXY"
-#   uri                     = var.function_invoke_arn
-# }
-
 resource "aws_api_gateway_deployment" "apigw_lambda_deployment" {
   depends_on = [
     aws_api_gateway_integration.apigw_lambda_integration

sample-apps/apigateway-lambda/terraform/variables.tf

@@ -1,3 +1,4 @@
+## Lambda function related configurations
 variable "function_name" {
   type        = string
   description = "Name of sample app function"
@@ -22,6 +23,13 @@ variable "lambda_tracing_mode" {
   default     = "Active"
 }
 
+variable "adot_layer_arn" {
+  type        = string
+  description = "ARN of the ADOT JAVA layer"
+  default     = null
+}
+
+## API Gateway related configurations
 variable "api_gateway_name" {
   type        = string
   description = "Name of API gateway to create"