Modify threadLocal to InheritableThreadLocal

Author: RanVaknin

test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/TraceIdTest.java

@@ -241,4 +241,38 @@ public void beforeMarshalling(Context.BeforeMarshalling context, ExecutionAttrib
             }
         });
     }
+
+    @Test
+    public void traceIdInterceptorWithNewThreadInheritsTraceId() throws Exception {
+        EnvironmentVariableHelper.run(env -> {
+            env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
+
+            SdkInternalThreadLocal.put("AWS_LAMBDA_X_TRACE_ID", "SdkInternalThreadLocal-trace-123");
+
+            try (MockSyncHttpClient mockHttpClient = new MockSyncHttpClient();
+                 ProtocolRestJsonClient client = ProtocolRestJsonClient.builder()
+                                                                       .region(Region.US_WEST_2)
+                                                                       .credentialsProvider(AnonymousCredentialsProvider.create())
+                                                                       .httpClient(mockHttpClient)
+                                                                       .build()) {
+
+                mockHttpClient.stubNextResponse(HttpExecuteResponse.builder()
+                                                                   .response(SdkHttpResponse.builder().statusCode(200).build())
+                                                                   .responseBody(AbortableInputStream.create(new StringInputStream("{}")))
+                                                                   .build());
+
+                Thread childThread = new Thread(client::allTypes);
+                childThread.start();
+                childThread.join();
+
+                List<SdkHttpRequest> requests = mockHttpClient.getRequests();
+                assertThat(requests.get(0).firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
+
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            } finally {
+                SdkInternalThreadLocal.clear();
+            }
+        });
+    }
 }

utils-lite/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.33.8-SNAPSHOT</version>
+        <version>2.33.9-SNAPSHOT</version>
     </parent>
     <artifactId>utils-lite</artifactId>
     <name>AWS Java SDK :: Utils Lite</name>

utils-lite/src/main/java/software/amazon/awssdk/utilslite/SdkInternalThreadLocal.java

@@ -26,7 +26,7 @@
 @ThreadSafe
 @SdkProtectedApi
 public final class SdkInternalThreadLocal {
-    private static final ThreadLocal<Map<String, String>> STORAGE = new ThreadLocal<>();
+    private static final ThreadLocal<Map<String, String>> STORAGE = new InheritableThreadLocal<>();
 
     private SdkInternalThreadLocal() {
     }