Make Trace ID accessible through Context (#101)

* Make Trace ID accessible through Context

* Change Constructor

---------

Co-authored-by: Mohammed Ehab <moehabe@amazon.com>

Author: M-Elsaeed

.github/workflows/runtime-interface-client_pr.yml

@@ -27,10 +27,6 @@ jobs:
       working-directory: ./aws-lambda-java-core
       run: mvn clean install
 
-    - name: Build and install serialization dependency locally
-      working-directory: ./aws-lambda-java-serialization
-      run: mvn clean install -DskipTests
-
     - name: Build and install serialization dependency locally
       working-directory: ./aws-lambda-java-serialization
       run: mvn clean install
@@ -62,6 +58,10 @@ jobs:
 
     - name: Available buildx platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
+    
+    - name: Build and install core dependency locally
+      working-directory: ./aws-lambda-java-core
+      run: mvn clean install
 
     - name: Build and install serialization dependency locally
       working-directory: ./aws-lambda-java-serialization

aws-lambda-java-core/RELEASE.CHANGELOG.md

@@ -1,3 +1,7 @@
+### September 3, 2025
+`1.4.0`
+- Getter support for x-ray trace ID through the Context object
+
 ### May 26, 2025
 `1.3.0`
 - Adding support for multi tenancy ([#545](https://github.com/aws/aws-lambda-java-libs/pull/545))

aws-lambda-java-core/pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-lambda-java-core</artifactId>
-  <version>1.3.0</version>
+  <version>1.4.0</version>
   <packaging>jar</packaging>
 
   <name>AWS Lambda Java Core Library</name>

aws-lambda-java-core/src/main/java/com/amazonaws/services/lambda/runtime/Context.java

@@ -109,4 +109,14 @@ public interface Context {
 	default String getTenantId() {
 		return null;
 	}
+
+	/**
+	 *
+	 * Returns the X-Ray trace ID associated with the request.
+	 *
+	 * @return null by default
+	 */
+	default String getXrayTraceId() {
+		return null;
+	}
 }

aws-lambda-java-runtime-interface-client/pom.xml

@@ -61,7 +61,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-core</artifactId>
-            <version>1.3.0</version>
+            <version>1.4.0</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>

aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/EventHandlerLoader.java

@@ -583,6 +583,7 @@ public ByteArrayOutputStream call(InvocationRequest request) throws Error, Excep
                         LambdaEnvironment.FUNCTION_VERSION,
                         request.getInvokedFunctionArn(),
                         request.getTenantId(),
+                        request.getXrayTraceId(),
                         clientContext
                 );
 

aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaContext.java

@@ -23,6 +23,7 @@ public class LambdaContext implements Context {
     private final CognitoIdentity cognitoIdentity;
     private final ClientContext clientContext;
     private final String tenantId;
+    private final String xrayTraceId;
     private final LambdaLogger logger;
 
     public LambdaContext(
@@ -36,6 +37,7 @@ public LambdaContext(
             String functionVersion,
             String invokedFunctionArn,
             String tenantId,
+            String xrayTraceId,
             ClientContext clientContext
     ) {
         this.memoryLimit = memoryLimit;
@@ -49,6 +51,7 @@ public LambdaContext(
         this.functionVersion = functionVersion;
         this.invokedFunctionArn = invokedFunctionArn;
         this.tenantId = tenantId;
+        this.xrayTraceId = xrayTraceId;
         this.logger = com.amazonaws.services.lambda.runtime.LambdaRuntime.getLogger();
     }
 
@@ -98,6 +101,10 @@ public String getTenantId() {
         return tenantId;
     }
 
+    public String getXrayTraceId() {
+        return xrayTraceId;
+    }
+
     public LambdaLogger getLogger() {
         return logger;
     }

aws-lambda-java-runtime-interface-client/src/test/java/com/amazonaws/services/lambda/runtime/api/client/api/LambdaContextTest.java

@@ -19,6 +19,7 @@ public class LambdaContextTest {
     private static final LambdaClientContext CLIENT_CONTEXT = new LambdaClientContext();
     public static final int MEMORY_LIMIT = 128;
     public static final String TENANT_ID = "tenant-id";
+    public static final String X_RAY_TRACE_ID = "x-ray-trace-id";
 
     @Test
     public void getRemainingTimeInMillis() {
@@ -55,6 +56,6 @@ public void getRemainingTimeInMillis_Deadline() throws InterruptedException {
 
     private LambdaContext createContextWithDeadline(long deadlineTimeInMs) {
         return new LambdaContext(MEMORY_LIMIT, deadlineTimeInMs, REQUEST_ID, LOG_GROUP_NAME, LOG_STREAM_NAME,
-                FUNCTION_NAME, IDENTITY, FUNCTION_VERSION, INVOKED_FUNCTION_ARN, TENANT_ID, CLIENT_CONTEXT);
+                FUNCTION_NAME, IDENTITY, FUNCTION_VERSION, INVOKED_FUNCTION_ARN, TENANT_ID, X_RAY_TRACE_ID, CLIENT_CONTEXT);
     }
 }

aws-lambda-java-runtime-interface-client/src/test/java/com/amazonaws/services/lambda/runtime/api/client/logging/AbstractLambdaLoggerTest.java

@@ -84,7 +84,7 @@ public void testMultiConcurrentLoggingWithoutLogLevelInJSON() {
         final int nThreads = 5;
         ExecutorService es = Executors.newFixedThreadPool(nThreads);
         for (int i = 0; i < nThreads; i++) {
-            es.submit(() -> logger.setLambdaContext(new LambdaContext(Integer.MAX_VALUE, Long.MAX_VALUE, reqIDPrefix + Thread.currentThread().getName(), "", "", "", null, "", "", "", null)));
+            es.submit(() -> logger.setLambdaContext(new LambdaContext(Integer.MAX_VALUE, Long.MAX_VALUE, reqIDPrefix + Thread.currentThread().getName(), "", "", "", null, "", "", "", null, null)));
         }
 
         final int nMessages = 100_000;

aws-lambda-java-runtime-interface-client/src/test/java/com/amazonaws/services/lambda/runtime/api/client/logging/JsonLogFormatterTest.java

@@ -30,6 +30,7 @@ void testFormattingWithLambdaContext() {
                 null,
                 "function-arn",
                 null,
+                null,
                 null
         );
         assertFormatsString("test log", LogLevel.WARN, context);
@@ -48,6 +49,7 @@ void testFormattingWithTenantIdInLambdaContext() {
                 null,
                 "function-arn",
                 "tenant-id",
+                "xray-trace-id",
                 null
         );
         assertFormatsString("test log", LogLevel.WARN, context);