Wider exception check in AWS sdk v1 tests

vandonr · vandonr · commit d332072632ac · 2025-09-08T14:56:53.000+02:00
added the error that caused the flake as an acceptable error for the test
also relaxed the check on the text of the SdkClientException on AI suggestion.
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/test/groovy/LegacyAWS1ClientForkedTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/test/groovy/LegacyAWS1ClientForkedTest.groovy
@@ -35,7 +35,6 @@ import com.amazonaws.services.sqs.model.SendMessageRequest
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.bootstrap.instrumentation.api.Tags
-import datadog.trace.test.util.Flaky
 import org.apache.http.conn.HttpHostConnectException
 import org.apache.http.impl.execchain.RequestAbortedException
 import org.json.XML
@@ -364,7 +363,6 @@ class LegacyAWS1ClientForkedTest extends AgentTestRunner {
     }
   }
 
-  @Flaky("assertTraces sometimes fails")
   def "timeout and retry errors captured"() {
     setup:
     def server = httpServer {
@@ -413,7 +411,7 @@ class LegacyAWS1ClientForkedTest extends AgentTestRunner {
             try {
               errorTags AmazonClientException, ~/Unable to execute HTTP request/
             } catch (AssertionError e) {
-              errorTags SdkClientException, "Unable to execute HTTP request: Request did not complete before the request timeout configuration."
+              errorTags SdkClientException, ~/Unable to execute HTTP request.*(?:interrupted|timeout).*/
             }
             defaultTags()
           }
@@ -436,7 +434,11 @@ class LegacyAWS1ClientForkedTest extends AgentTestRunner {
               try {
                 errorTags SocketException, "Socket closed"
               } catch (AssertionError e) {
-                errorTags RequestAbortedException, "Request aborted"
+                try {
+                  errorTags RequestAbortedException, "Request aborted"
+                } catch (AssertionError e2) {
+                  errorTags InterruptedIOException, ~/.*(?:interrupted|timeout).*/
+                }
               }
               defaultTags()
             }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ import com.amazonaws.services.sqs.model.SendMessageRequest`
`35`	`35`	`import datadog.trace.agent.test.AgentTestRunner`
`36`	`36`	`import datadog.trace.api.DDSpanTypes`
`37`	`37`	`import datadog.trace.bootstrap.instrumentation.api.Tags`
`38`		`-import datadog.trace.test.util.Flaky`
`39`	`38`	`import org.apache.http.conn.HttpHostConnectException`
`40`	`39`	`import org.apache.http.impl.execchain.RequestAbortedException`
`41`	`40`	`import org.json.XML`
`@@ -364,7 +363,6 @@ class LegacyAWS1ClientForkedTest extends AgentTestRunner {`
`364`	`363`	`}`
`365`	`364`	`}`
`366`	`365`
`367`		`- @Flaky("assertTraces sometimes fails")`
`368`	`366`	`def "timeout and retry errors captured"() {`
`369`	`367`	`setup:`
`370`	`368`	`def server = httpServer {`
`@@ -413,7 +411,7 @@ class LegacyAWS1ClientForkedTest extends AgentTestRunner {`
`413`	`411`	`try {`
`414`	`412`	`errorTags AmazonClientException, ~/Unable to execute HTTP request/`
`415`	`413`	`} catch (AssertionError e) {`
`416`		`- errorTags SdkClientException, "Unable to execute HTTP request: Request did not complete before the request timeout configuration."`
	`414`	`+ errorTags SdkClientException, ~/Unable to execute HTTP request.(?:interrupted\|timeout)./`
`417`	`415`	`}`
`418`	`416`	`defaultTags()`
`419`	`417`	`}`
`@@ -436,7 +434,11 @@ class LegacyAWS1ClientForkedTest extends AgentTestRunner {`
`436`	`434`	`try {`
`437`	`435`	`errorTags SocketException, "Socket closed"`
`438`	`436`	`} catch (AssertionError e) {`
`439`		`- errorTags RequestAbortedException, "Request aborted"`
	`437`	`+ try {`
	`438`	`+ errorTags RequestAbortedException, "Request aborted"`
	`439`	`+ } catch (AssertionError e2) {`
	`440`	`+ errorTags InterruptedIOException, ~/.(?:interrupted\|timeout)./`
	`441`	`+ }`
`440`	`442`	`}`
`441`	`443`	`defaultTags()`
`442`	`444`	`}`