From 13adc2269d4a0110a0d1145951b9f7ef16eda3d7 Mon Sep 17 00:00:00 2001
From: RanVaknin <50976344+RanVaknin@users.noreply.github.com>
Date: Tue, 2 Sep 2025 14:03:04 -0700
Subject: [PATCH 1/4] Adding thread context package

---
 bom/pom.xml                                   |  5 +++
 pom.xml                                       |  1 +
 thread-context/pom.xml                        | 33 ++++++++++++++
 .../awssdk/threadcontext/ThreadStorage.java   | 45 +++++++++++++++++++
 4 files changed, 84 insertions(+)
 create mode 100644 thread-context/pom.xml
 create mode 100644 thread-context/src/main/java/software/amazon/awssdk/threadcontext/ThreadStorage.java

diff --git a/bom/pom.xml b/bom/pom.xml
index ede5b9251007..51494631af0f 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -252,6 +252,11 @@
                 <artifactId>endpoints-spi</artifactId>
                 <version>${awsjavasdk.version}</version>
             </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>thread-context</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
             <!-- Services -->
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
diff --git a/pom.xml b/pom.xml
index 42dbdbfc01bb..fd1409a27f37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,7 @@
         <module>test/crt-unavailable-tests</module>
         <module>test/architecture-tests</module>
         <module>test/s3-tests</module>
+        <module>thread-context</module>
     </modules>
     <scm>
         <url>${scm.github.url}</url>
diff --git a/thread-context/pom.xml b/thread-context/pom.xml
new file mode 100644
index 000000000000..e942f7e0a335
--- /dev/null
+++ b/thread-context/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License").
+  ~ You may not use this file except in compliance with the License.
+  ~ A copy of the License is located at
+  ~
+  ~  http://aws.amazon.com/apache2.0
+  ~
+  ~ or in the "license" file accompanying this file. This file is distributed
+  ~ on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+  ~ express or implied. See the License for the specific language governing
+  ~ permissions and limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>aws-sdk-java-pom</artifactId>
+        <version>2.33.2-SNAPSHOT</version>
+    </parent>
+    <artifactId>thread-context</artifactId>
+    <name>AWS Java SDK :: Thread Context</name>
+    <description>
+        Provides thread-local context storage utilities for sharing data across components.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+
+</project>
\ No newline at end of file
diff --git a/thread-context/src/main/java/software/amazon/awssdk/threadcontext/ThreadStorage.java b/thread-context/src/main/java/software/amazon/awssdk/threadcontext/ThreadStorage.java
new file mode 100644
index 000000000000..f7223a74f70c
--- /dev/null
+++ b/thread-context/src/main/java/software/amazon/awssdk/threadcontext/ThreadStorage.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.threadcontext;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public final class ThreadStorage {
+    private static final ThreadLocal<Map<String, String>> storage = ThreadLocal.withInitial(HashMap::new);
+
+    private ThreadStorage() {}
+
+    public static void put(String key, String value) {
+        storage.get().put(key, value);
+    }
+
+    public static String get(String key) {
+        return storage.get().get(key);
+    }
+
+    public static String remove(String key) {
+        return storage.get().remove(key);
+    }
+
+    public static void clear() {
+        storage.get().clear();
+    }
+
+    public static boolean containsKey(String key) {
+        return storage.get().containsKey(key);
+    }
+}

From 828dc504b6c255e9e09d3ea62496b926af382b9a Mon Sep 17 00:00:00 2001
From: RanVaknin <50976344+RanVaknin@users.noreply.github.com>
Date: Tue, 2 Sep 2025 14:04:23 -0700
Subject: [PATCH 2/4] Fix ordering in pom

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fd1409a27f37..f5577c128f95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@
         <module>archetypes</module>
         <module>third-party</module>
         <module>v2-migration</module>
+        <module>thread-context</module>
         <module>test/http-client-tests</module>
         <module>test/protocol-tests</module>
         <module>test/protocol-tests-core</module>
@@ -95,7 +96,6 @@
         <module>test/crt-unavailable-tests</module>
         <module>test/architecture-tests</module>
         <module>test/s3-tests</module>
-        <module>thread-context</module>
     </modules>
     <scm>
         <url>${scm.github.url}</url>

From a6d60ec2c25eef7132100495651c0115e3130936 Mon Sep 17 00:00:00 2001
From: RanVaknin <50976344+RanVaknin@users.noreply.github.com>
Date: Tue, 2 Sep 2025 14:17:23 -0700
Subject: [PATCH 3/4] Add changelog

---
 .changes/next-release/feature-AWSSDKforJavav2-2e7c0a3.json | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changes/next-release/feature-AWSSDKforJavav2-2e7c0a3.json

diff --git a/.changes/next-release/feature-AWSSDKforJavav2-2e7c0a3.json b/.changes/next-release/feature-AWSSDKforJavav2-2e7c0a3.json
new file mode 100644
index 000000000000..4b0c2020e6f1
--- /dev/null
+++ b/.changes/next-release/feature-AWSSDKforJavav2-2e7c0a3.json
@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Adding a small utility class to store data on thread local that can be used across components."
+}

From b5bcbc50954a6373e25979a152fb433a81e67523 Mon Sep 17 00:00:00 2001
From: RanVaknin <50976344+RanVaknin@users.noreply.github.com>
Date: Tue, 2 Sep 2025 14:53:12 -0700
Subject: [PATCH 4/4] Add requirements for publishing new package

---
 .brazil.json                                  |  1 +
 aws-sdk-java/pom.xml                          |  5 ++
 pom.xml                                       |  1 +
 test/architecture-tests/pom.xml               |  5 ++
 test/tests-coverage-reporting/pom.xml         |  5 ++
 thread-context/pom.xml                        | 41 +++++++++++
 .../threadcontext/ThreadStorageTest.java      | 70 +++++++++++++++++++
 7 files changed, 128 insertions(+)
 create mode 100644 thread-context/src/test/java/software/amazon/awssdk/threadcontext/ThreadStorageTest.java

diff --git a/.brazil.json b/.brazil.json
index 7d240cb9bf5c..6acd1ba723b6 100644
--- a/.brazil.json
+++ b/.brazil.json
@@ -32,6 +32,7 @@
         "s3-transfer-manager": { "packageName": "AwsJavaSdk-S3-TransferManager" },
         "s3-event-notifications": { "packageName": "AwsJavaSdk-S3-EventNotifications" },
         "sdk-core": { "packageName": "AwsJavaSdk-Core" },
+        "thread-context": { "packageName": "AwsJavaSdk-ThreadContext" },
         "url-connection-client": { "packageName": "AwsJavaSdk-HttpClient-UrlConnectionClient" },
         "utils": { "packageName": "AwsJavaSdk-Core-Utils" },
         "imds": { "packageName": "AwsJavaSdk-Imds" },
diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml
index 81f8e827a9ff..ac745e71fead 100644
--- a/aws-sdk-java/pom.xml
+++ b/aws-sdk-java/pom.xml
@@ -813,6 +813,11 @@ Amazon AutoScaling, etc).</description>
             <artifactId>swf</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>thread-context</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>textract</artifactId>
diff --git a/pom.xml b/pom.xml
index f5577c128f95..2e942d5f56e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -659,6 +659,7 @@
                             <includeModule>protocols</includeModule>
                             <includeModule>regions</includeModule>
                             <includeModule>sdk-core</includeModule>
+                            <includeModule>thread-context</includeModule>
                             <includeModule>http-client-spi</includeModule>
                             <includeModule>apache-client</includeModule>
                             <includeModule>netty-nio-client</includeModule>
diff --git a/test/architecture-tests/pom.xml b/test/architecture-tests/pom.xml
index 7b255deff4d5..ac97eb8cbc38 100644
--- a/test/architecture-tests/pom.xml
+++ b/test/architecture-tests/pom.xml
@@ -61,6 +61,11 @@
             <groupId>software.amazon.awssdk</groupId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <artifactId>thread-context</artifactId>
+            <groupId>software.amazon.awssdk</groupId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <artifactId>s3</artifactId>
             <groupId>software.amazon.awssdk</groupId>
diff --git a/test/tests-coverage-reporting/pom.xml b/test/tests-coverage-reporting/pom.xml
index 39e84897ced9..d730618895a0 100644
--- a/test/tests-coverage-reporting/pom.xml
+++ b/test/tests-coverage-reporting/pom.xml
@@ -242,6 +242,11 @@
             <groupId>software.amazon.awssdk</groupId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <artifactId>thread-context</artifactId>
+            <groupId>software.amazon.awssdk</groupId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
 
         <!-- Need to explicitly add service modules to aggregate the tests coverage
         and a few services that we know with more tests should be sufficient
diff --git a/thread-context/pom.xml b/thread-context/pom.xml
index e942f7e0a335..8f9ed61112af 100644
--- a/thread-context/pom.xml
+++ b/thread-context/pom.xml
@@ -30,4 +30,45 @@
     </description>
     <url>https://aws.amazon.com/sdkforjava</url>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>bom-internal</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.threadcontext</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file
diff --git a/thread-context/src/test/java/software/amazon/awssdk/threadcontext/ThreadStorageTest.java b/thread-context/src/test/java/software/amazon/awssdk/threadcontext/ThreadStorageTest.java
new file mode 100644
index 000000000000..01e4f046408a
--- /dev/null
+++ b/thread-context/src/test/java/software/amazon/awssdk/threadcontext/ThreadStorageTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.threadcontext;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ThreadStorageTest {
+
+    @AfterEach
+    void cleanup() {
+        ThreadStorage.clear();
+    }
+
+    @Test
+    void putAndGet_shouldStoreAndRetrieveValue() {
+        ThreadStorage.put("test-key", "test-value");
+        
+        assertThat(ThreadStorage.get("test-key")).isEqualTo("test-value");
+    }
+
+    @Test
+    void get_withNonExistentKey_shouldReturnNull() {
+        assertThat(ThreadStorage.get("non-existent")).isNull();
+    }
+
+    @Test
+    void put_withValidKeyValue_shouldStoreValue() {
+        ThreadStorage.put("test-key", "test-value");
+        
+        String removed = ThreadStorage.remove("test-key");
+        
+        assertThat(removed).isEqualTo("test-value");
+        assertThat(ThreadStorage.get("test-key")).isNull();
+    }
+
+    @Test
+    void remove_withExistingKey_shouldRemoveAndReturnValue() {
+        ThreadStorage.put("test-key", "test-value");
+        ThreadStorage.put("test-key", null);
+        
+        assertThat(ThreadStorage.get("test-key")).isNull();
+    }
+
+    @Test
+    void clear_withMultipleValues_shouldRemoveAllValues() {
+        ThreadStorage.put("key1", "value1");
+        ThreadStorage.put("key2", "value2");
+        
+        ThreadStorage.clear();
+        
+        assertThat(ThreadStorage.get("key1")).isNull();
+        assertThat(ThreadStorage.get("key2")).isNull();
+    }
+}
\ No newline at end of file