Switch deregister/clearContext order, add JSON logging for examples

Author: maschnetwork

examples/pom.xml

@@ -47,6 +47,11 @@
             <artifactId>log4j-core</artifactId>
             <version>2.25.3</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-layout-template-json</artifactId>
+            <version>2.25.3</version>
+        </dependency>
 
         <!-- Testing -->
         <dependency>

examples/src/main/resources/log4j2.xml

@@ -1,27 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="WARN">
     <Appenders>
-        <!-- Default appender without MDC -->
         <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n"/>
-        </Console>
-        
-        <!-- Appender with MDC for DurableContext logs -->
-        <Console name="Durable" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%notEmpty{ | arn=%X{durableExecutionArn}}%notEmpty{ id=%X{operationId}}%notEmpty{ op=%X{operationName}}%notEmpty{ attempt=%X{attempt}}%n"/>
+            <JsonTemplateLayout eventTemplateUri="classpath:EcsLayout.json"/>
         </Console>
     </Appenders>
 
     <Loggers>
-        <!-- DurableContext uses the MDC appender -->
-        <Logger name="com.amazonaws.lambda.durable.DurableContext" level="DEBUG" additivity="false">
-            <AppenderRef ref="Durable"/>
-        </Logger>
-        
-        <!-- SDK logs at DEBUG -->
+        <!-- SDK internal logs at WARN -->
         <Logger name="com.amazonaws.lambda.durable" level="WARN"/>
 
-        <!-- AWS SDK logs at WARN (suppress verbose debug) -->
+        <!-- AWS SDK logs at WARN -->
         <Logger name="software.amazon.awssdk" level="WARN"/>
 
         <!-- Everything else at INFO -->

examples/src/test/resources/log4j2-test.xml

@@ -1,27 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="WARN">
     <Appenders>
-        <!-- Default appender without MDC -->
         <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n"/>
-        </Console>
-        
-        <!-- Appender with MDC for DurableContext logs -->
-        <Console name="Durable" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%notEmpty{ | arn=%X{durableExecutionArn}}%notEmpty{ id=%X{operationId}}%notEmpty{ op=%X{operationName}}%notEmpty{ attempt=%X{attempt}}%n"/>
+            <JsonTemplateLayout eventTemplateUri="classpath:EcsLayout.json"/>
         </Console>
     </Appenders>
 
     <Loggers>
-        <!-- DurableContext uses the MDC appender -->
-        <Logger name="com.amazonaws.lambda.durable.DurableContext" level="DEBUG" additivity="false">
-            <AppenderRef ref="Durable"/>
-        </Logger>
-        
-        <!-- SDK logs at DEBUG -->
+        <!-- SDK internal logs at DEBUG for testing -->
         <Logger name="com.amazonaws.lambda.durable" level="DEBUG"/>
 
-        <!-- AWS SDK logs at WARN (suppress verbose debug) -->
+        <!-- AWS SDK logs at WARN -->
         <Logger name="software.amazon.awssdk" level="WARN"/>
 
         <!-- Everything else at INFO -->

sdk/src/main/java/com/amazonaws/lambda/durable/operation/StepOperation.java

@@ -208,8 +208,8 @@ private void executeStepLogic(int attempt) {
             } catch (Throwable e) {
                 handleStepError(e, attempt);
             } finally {
-                durableLogger.clearOperationContext();
                 executionManager.deregisterActiveThread(stepThreadId);
+                durableLogger.clearOperationContext();
             }
         });
     }