Revert "Feature/master/utils lite lambda trace (#6404)" (#6431)

This reverts commit 65a5654.

Author: RanVaknin

.brazil.json

@@ -34,7 +34,6 @@
         "sdk-core": { "packageName": "AwsJavaSdk-Core" },
         "url-connection-client": { "packageName": "AwsJavaSdk-HttpClient-UrlConnectionClient" },
         "utils": { "packageName": "AwsJavaSdk-Core-Utils" },
-        "utils-lite": { "packageName": "AwsJavaSdk-Core-UtilsLite" },
         "imds": { "packageName": "AwsJavaSdk-Imds" },
         "crt-core": { "packageName": "AwsJavaSdk-Core-CrtCore" },
         "checksums-spi": { "packageName": "AwsJavaSdk-Core-ChecksumsSpi" },

.changes/next-release/feature-AWSSDKforJavav2-a3984eb.json

@@ -2113,11 +2113,6 @@ Amazon AutoScaling, etc).</description>
             <artifactId>bcmdashboards</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>utils-lite</artifactId>
-            <version>${awsjavasdk.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <finalName>${project.artifactId}-${project.version}</finalName>

aws-sdk-java/pom.xml

@@ -212,11 +212,6 @@
                 <artifactId>utils</artifactId>
                 <version>${awsjavasdk.version}</version>
             </dependency>
-            <dependency>
-                <groupId>software.amazon.awssdk</groupId>
-                <artifactId>utils-lite</artifactId>
-                <version>${awsjavasdk.version}</version>
-            </dependency>
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>cloudwatch-metric-publisher</artifactId>

bom/pom.xml

@@ -113,11 +113,6 @@
             <groupId>software.amazon.eventstream</groupId>
             <artifactId>eventstream</artifactId>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>utils-lite</artifactId>
-            <version>${awsjavasdk.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

core/aws-core/pom.xml

@@ -19,82 +19,40 @@
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.awscore.internal.interceptor.TracingSystemSetting;
 import software.amazon.awssdk.core.interceptor.Context;
-import software.amazon.awssdk.core.interceptor.ExecutionAttribute;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.utils.SystemSetting;
-import software.amazon.awssdk.utilslite.SdkInternalThreadLocal;
 
 /**
  * The {@code TraceIdExecutionInterceptor} copies the trace details to the {@link #TRACE_ID_HEADER} header, assuming we seem to
- * be running in a lambda environment.`
+ * be running in a lambda environment.
  */
 @SdkProtectedApi
 public class TraceIdExecutionInterceptor implements ExecutionInterceptor {
     private static final String TRACE_ID_HEADER = "X-Amzn-Trace-Id";
     private static final String LAMBDA_FUNCTION_NAME_ENVIRONMENT_VARIABLE = "AWS_LAMBDA_FUNCTION_NAME";
-    private static final String CONCURRENT_TRACE_ID_KEY = "AWS_LAMBDA_X_TRACE_ID";
-    private static final ExecutionAttribute<String> TRACE_ID = new ExecutionAttribute<>("TraceId");
-
-    @Override
-    public void beforeExecution(Context.BeforeExecution context, ExecutionAttributes executionAttributes) {
-        if (lambdaFunctionNameEnvironmentVariable().isPresent()) {
-            String traceId = SdkInternalThreadLocal.get(CONCURRENT_TRACE_ID_KEY);
-            if (traceId != null) {
-                executionAttributes.putAttribute(TRACE_ID, traceId);
-            }
-        }
-    }
 
     @Override
     public SdkHttpRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {
         Optional<String> traceIdHeader = traceIdHeader(context);
         if (!traceIdHeader.isPresent()) {
             Optional<String> lambdafunctionName = lambdaFunctionNameEnvironmentVariable();
-            Optional<String> traceId = traceId(executionAttributes);
+            Optional<String> traceId = traceId();
 
             if (lambdafunctionName.isPresent() && traceId.isPresent()) {
                 return context.httpRequest().copy(r -> r.putHeader(TRACE_ID_HEADER, traceId.get()));
             }
         }
-        return context.httpRequest();
-    }
-
-    @Override
-    public void afterExecution(Context.AfterExecution context, ExecutionAttributes executionAttributes) {
-        if (lambdaFunctionNameEnvironmentVariable().isPresent()) {
-            saveTraceId(executionAttributes);
-        }
-    }
 
-    @Override
-    public void onExecutionFailure(Context.FailedExecution context, ExecutionAttributes executionAttributes) {
-        if (lambdaFunctionNameEnvironmentVariable().isPresent()) {
-            saveTraceId(executionAttributes);
-        }
-    }
-
-    /**
-     * Stores the trace ID in thread-local storage to ensure trace propagation across
-     * thread boundaries during retries, or future chaining.
-     */
-    private static void saveTraceId(ExecutionAttributes executionAttributes) {
-        String traceId = executionAttributes.getAttribute(TRACE_ID);
-        if (traceId != null) {
-            SdkInternalThreadLocal.put(CONCURRENT_TRACE_ID_KEY, executionAttributes.getAttribute(TRACE_ID));
-        }
+        return context.httpRequest();
     }
 
     private Optional<String> traceIdHeader(Context.ModifyHttpRequest context) {
         return context.httpRequest().firstMatchingHeader(TRACE_ID_HEADER);
     }
 
-    private Optional<String> traceId(ExecutionAttributes executionAttributes) {
-        Optional<String> traceId = Optional.ofNullable(executionAttributes.getAttribute(TRACE_ID));
-        if (traceId.isPresent()) {
-            return traceId;
-        }
+    private Optional<String> traceId() {
         return TracingSystemSetting._X_AMZN_TRACE_ID.getStringValue();
     }
 
@@ -103,4 +61,4 @@ private Optional<String> lambdaFunctionNameEnvironmentVariable() {
         return SystemSetting.getStringValueFromEnvironmentVariable(LAMBDA_FUNCTION_NAME_ENVIRONMENT_VARIABLE);
         // CHECKSTYLE:ON
     }
-}
+}

core/aws-core/src/main/java/software/amazon/awssdk/awscore/interceptor/TraceIdExecutionInterceptor.java

@@ -28,7 +28,6 @@
 import software.amazon.awssdk.http.SdkHttpMethod;
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
-import software.amazon.awssdk.utilslite.SdkInternalThreadLocal;
 
 public class TraceIdExecutionInterceptorTest {
     @Test
@@ -112,78 +111,6 @@ public void headerNotAddedIfNoTraceIdEnvVar() {
         });
     }
 
-    @Test
-    public void modifyHttpRequest_whenMultiConcurrencyModeWithInternalThreadLocal_shouldAddTraceIdHeader() {
-        EnvironmentVariableHelper.run(env -> {
-            resetRelevantEnvVars(env);
-            env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
-            SdkInternalThreadLocal.put("AWS_LAMBDA_X_TRACE_ID", "SdkInternalThreadLocal-trace-123");
-
-            try {
-                TraceIdExecutionInterceptor interceptor = new TraceIdExecutionInterceptor();
-                ExecutionAttributes executionAttributes = new ExecutionAttributes();
-
-                interceptor.beforeExecution(null, executionAttributes);
-                Context.ModifyHttpRequest context = context();
-
-                SdkHttpRequest request = interceptor.modifyHttpRequest(context, executionAttributes);
-                assertThat(request.firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
-            } finally {
-                SdkInternalThreadLocal.remove("AWS_LAMBDA_X_TRACE_ID");
-            }
-        });
-    }
-
-    @Test
-    public void modifyHttpRequest_whenMultiConcurrencyModeWithBothInternalThreadLocalAndSystemProperty_shouldUseInternalThreadLocalValue() {
-        EnvironmentVariableHelper.run(env -> {
-            resetRelevantEnvVars(env);
-            env.set("AWS_LAMBDA_FUNCTION_NAME", "foo");
-
-            SdkInternalThreadLocal.put("AWS_LAMBDA_X_TRACE_ID", "SdkInternalThreadLocal-trace-123");
-            Properties props = System.getProperties();
-            props.setProperty("com.amazonaws.xray.traceHeader", "sys-prop-345");
-
-            try {
-                TraceIdExecutionInterceptor interceptor = new TraceIdExecutionInterceptor();
-                ExecutionAttributes executionAttributes = new ExecutionAttributes();
-
-                interceptor.beforeExecution(null, executionAttributes);
-
-                Context.ModifyHttpRequest context = context();
-                SdkHttpRequest request = interceptor.modifyHttpRequest(context, executionAttributes);
-
-                assertThat(request.firstMatchingHeader("X-Amzn-Trace-Id")).hasValue("SdkInternalThreadLocal-trace-123");
-            } finally {
-                SdkInternalThreadLocal.remove("AWS_LAMBDA_X_TRACE_ID");
-                props.remove("com.amazonaws.xray.traceHeader");
-            }
-        });
-    }
-
-    @Test
-    public void modifyHttpRequest_whenNotInLambdaEnvironmentWithInternalThreadLocal_shouldNotAddHeader() {
-        EnvironmentVariableHelper.run(env -> {
-            resetRelevantEnvVars(env);
-
-            SdkInternalThreadLocal.put("AWS_LAMBDA_X_TRACE_ID", "should-be-ignored");
-
-            try {
-                TraceIdExecutionInterceptor interceptor = new TraceIdExecutionInterceptor();
-                ExecutionAttributes executionAttributes = new ExecutionAttributes();
-
-                interceptor.beforeExecution(null, executionAttributes);
-
-                Context.ModifyHttpRequest context = context();
-                SdkHttpRequest request = interceptor.modifyHttpRequest(context, executionAttributes);
-
-                assertThat(request.firstMatchingHeader("X-Amzn-Trace-Id")).isEmpty();
-            } finally {
-                SdkInternalThreadLocal.remove("AWS_LAMBDA_X_TRACE_ID");
-            }
-        });
-    }
-
     private Context.ModifyHttpRequest context() {
         return context(SdkHttpRequest.builder()
                                      .uri(URI.create("https://localhost"))

core/aws-core/src/test/java/software/amazon/awssdk/awscore/interceptor/TraceIdExecutionInterceptorTest.java

@@ -67,7 +67,6 @@
         <module>metric-publishers</module>
         <module>release-scripts</module>
         <module>utils</module>
-        <module>utils-lite</module>
         <module>codegen-lite</module>
         <module>codegen-lite-maven-plugin</module>
         <module>archetypes</module>
@@ -665,7 +664,6 @@
                             <includeModule>cloudwatch-metric-publisher</includeModule>
                             <includeModule>emf-metric-logging-publisher</includeModule>
                             <includeModule>utils</includeModule>
-                            <includeModule>utils-lite</includeModule>
                             <includeModule>imds</includeModule>
                             <includeModule>retries</includeModule>
                             <includeModule>retries-spi</includeModule>

pom.xml

@@ -61,11 +61,6 @@
             <groupId>software.amazon.awssdk</groupId>
             <version>${awsjavasdk.version}</version>
         </dependency>
-        <dependency>
-            <artifactId>utils-lite</artifactId>
-            <groupId>software.amazon.awssdk</groupId>
-            <version>${awsjavasdk.version}</version>
-        </dependency>
         <dependency>
             <artifactId>s3</artifactId>
             <groupId>software.amazon.awssdk</groupId>