Merge from Public Repo (#83)

* Merge from Public Repo

* Fix Failing Tests

---------

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

Author: M-Elsaeed

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

@@ -28,7 +28,7 @@ jobs:
       contents: read
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v4
 
     - name: Set up JDK 1.8
       uses: actions/setup-java@v4
@@ -47,10 +47,6 @@ jobs:
     - name: Available buildx platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
 
-    - name: Build and install serialization dependency locally
-      working-directory: ./aws-lambda-java-serialization
-      run: mvn clean install -DskipTests
-
     - name: Test Runtime Interface Client xplatform build - Run 'build' target
       working-directory: ./aws-lambda-java-runtime-interface-client
       run: make build

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

@@ -582,7 +582,6 @@ 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,7 +23,6 @@ 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(
@@ -37,7 +36,6 @@ public LambdaContext(
             String functionVersion,
             String invokedFunctionArn,
             String tenantId,
-            String xrayTraceId,
             ClientContext clientContext
     ) {
         this.memoryLimit = memoryLimit;
@@ -51,7 +49,6 @@ public LambdaContext(
         this.functionVersion = functionVersion;
         this.invokedFunctionArn = invokedFunctionArn;
         this.tenantId = tenantId;
-        this.xrayTraceId = xrayTraceId;
         this.logger = com.amazonaws.services.lambda.runtime.LambdaRuntime.getLogger();
     }
 
@@ -101,10 +98,6 @@ public String getTenantId() {
         return tenantId;
     }
 
-    public String getXrayTraceId() {
-        return xrayTraceId;
-    }
-
     public LambdaLogger getLogger() {
         return logger;
     }

aws-lambda-java-runtime-interface-client/src/main/jni/deps/aws-lambda-cpp-0.2.7/src/runtime.cpp

@@ -40,6 +40,7 @@ static constexpr auto CLIENT_CONTEXT_HEADER = "lambda-runtime-client-context";
 static constexpr auto COGNITO_IDENTITY_HEADER = "lambda-runtime-cognito-identity";
 static constexpr auto DEADLINE_MS_HEADER = "lambda-runtime-deadline-ms";
 static constexpr auto FUNCTION_ARN_HEADER = "lambda-runtime-invoked-function-arn";
+static constexpr auto TENANT_ID_HEADER = "lambda-runtime-aws-tenant-id";
 thread_local static CURL* m_curl_handle = curl_easy_init();
 
 enum Endpoints {

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

@@ -8,6 +8,7 @@
 import com.amazonaws.services.lambda.runtime.CustomPojoSerializer;
 import com.amazonaws.services.lambda.runtime.serialization.PojoSerializer;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -31,6 +32,7 @@ class PojoSerializerLoaderTest {
     @Mock
     private CustomPojoSerializer mockSerializer;
 
+    @AfterEach
     @BeforeEach
     void setUp() throws Exception {
         resetStaticFields();

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

@@ -19,7 +19,6 @@ 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() {
@@ -56,6 +55,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, X_RAY_TRACE_ID, CLIENT_CONTEXT);
+                FUNCTION_NAME, IDENTITY, FUNCTION_VERSION, INVOKED_FUNCTION_ARN, TENANT_ID, CLIENT_CONTEXT);
     }
 }

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

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