ignore client error and server error tests that fail in child test class HttpUrlErrorReportingTest

Author: jordan-wong

dd-java-agent/instrumentation/http-url-connection/src/test/groovy/HttpUrlConnectionErrorReportingTest.groovy

@@ -17,6 +17,11 @@ class HttpUrlConnectionErrorReportingTest extends HttpUrlConnectionTest implemen
   }
 
 
+  @Override
+  boolean hasExtraErrorInformation(){
+    true
+  }
+
   def "client error request with parent with error reporting"() {
     setup:
     def uri = server.address.resolve("/secured")

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpClientTest.groovy

@@ -30,7 +30,6 @@ import static datadog.trace.api.config.TracerConfig.REQUEST_HEADER_TAGS
 import static datadog.trace.api.config.TracerConfig.RESPONSE_HEADER_TAGS
 import static datadog.trace.bootstrap.instrumentation.decorator.HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS
 import static org.junit.Assume.assumeTrue
-
 abstract class HttpClientTest extends VersionedNamingTestBase {
   protected static final BODY_METHODS = ["POST", "PUT"]
   protected static final int CONNECT_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(3) as int
@@ -107,6 +106,10 @@ abstract class HttpClientTest extends VersionedNamingTestBase {
     true
   }
 
+  boolean hasExtraErrorInformation() {
+    false
+  }
+
   @Override
   protected void configurePreAgent() {
     super.configurePreAgent()
@@ -315,7 +318,6 @@ abstract class HttpClientTest extends VersionedNamingTestBase {
   }
 
   @Flaky(suites = ["ApacheHttpAsyncClient5Test"])
-  @IgnoreIf({true})
   def "server error request with parent"() {
     setup:
     def uri = server.address.resolve("/error")
@@ -329,17 +331,18 @@ abstract class HttpClientTest extends VersionedNamingTestBase {
     }
 
     then:
-    status == 500
-    assertTraces(2) {
-      trace(size(2)) {
-        basicSpan(it, "parent")
-        clientSpan(it, span(0), method, false, false, uri, 500, false) // not an error.
+    if (!hasExtraErrorInformation()) {
+      status == 500
+      assertTraces(2) {
+        trace(size(2)) {
+          basicSpan(it, "parent")
+          clientSpan(it, span(0), method, false, false, uri, 500, false) // not an error.
+        }
+        server.distributedRequestTrace(it, trace(0).last())
       }
-      server.distributedRequestTrace(it, trace(0).last())
     }
-
     and:
-    if (isDataStreamsEnabled()) {
+    if (isDataStreamsEnabled() && !hasExtraErrorInformation()) {
       StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 }
       verifyAll(first) {
         edgeTags.containsAll(DSM_EDGE_TAGS)
@@ -354,7 +357,6 @@ abstract class HttpClientTest extends VersionedNamingTestBase {
   }
 
   @Flaky(suites = ["ApacheHttpAsyncClient5Test"])
-  @IgnoreIf({true})
   def "client error request with parent"() {
     setup:
     def uri = server.address.resolve("/secured")
@@ -368,17 +370,19 @@ abstract class HttpClientTest extends VersionedNamingTestBase {
     }
 
     then:
-    status == 401
-    assertTraces(2) {
-      trace(size(2)) {
-        basicSpan(it, "parent")
-        clientSpan(it, span(0), method, false, false, uri, 401, true)
+    if (!hasExtraErrorInformation()) {
+      status == 401
+      assertTraces(2) {
+        trace(size(2)) {
+          basicSpan(it, "parent")
+          clientSpan(it, span(0), method, false, false, uri, 401, true)
+        }
+        server.distributedRequestTrace(it, trace(0).last())
       }
-      server.distributedRequestTrace(it, trace(0).last())
     }
 
     and:
-    if (isDataStreamsEnabled()) {
+    if (isDataStreamsEnabled() && !hasExtraErrorInformation()) {
       StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 }
       verifyAll(first) {
         edgeTags.containsAll(DSM_EDGE_TAGS)