Fix error mark on http status for IBM liberty

Author: amarziali

dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/LibertyDecorator.java

@@ -100,7 +100,7 @@ public AgentSpan onResponseStatus(AgentSpan span, int status) {
     // we may have the status during response blocking, but in that case
     // the status code is not propagated to the servlet layer
     if (currentStatus == null || !span.isError()) {
-      span.setHttpStatusCode(status);
+      super.onResponseStatus(span, status);
     }
     return span;
   }

dd-java-agent/instrumentation/liberty-20/src/test/groovy/datadog/trace/instrumentation/liberty20/Liberty20Test.groovy

@@ -127,15 +127,6 @@ abstract class Liberty20Test extends HttpServerTest<Server> {
     true
   }
 
-  @Override
-  String expectedResourceName(ServerEndpoint endpoint, String method, URI address) {
-    if (endpoint.path == '/not-found') {
-      'GET /testapp/not-found'
-    } else {
-      super.expectedResourceName(endpoint, method, address)
-    }
-  }
-
   def 'test blocking on response with commit during the response'() {
     setup:
     assumeTrue(testBlockingOnResponse())
@@ -218,7 +209,7 @@ class Liberty20AsyncForkedTest extends Liberty20Test implements TestingGenericHt
   // instrumented while on the the global ignores list
   System.getProperty('java.vm.name') == 'IBM J9 VM' &&
   System.getProperty('java.specification.version') == '1.8' })
-class LibertyServletClassloaderNamingForkedTest extends Liberty20V0ForkedTest {
+class LibertyServletClassloaderNamingForkedTest extends Liberty20V0Test {
   @Override
   protected void configurePreAgent() {
     super.configurePreAgent()
@@ -232,7 +223,7 @@ class LibertyServletClassloaderNamingForkedTest extends Liberty20V0ForkedTest {
   // instrumented while on the the global ignores list
   System.getProperty('java.vm.name') == 'IBM J9 VM' &&
   System.getProperty('java.specification.version') == '1.8' })
-class Liberty20V0ForkedTest extends Liberty20Test implements TestingGenericHttpNamingConventions.ServerV0 {
+class Liberty20V0Test extends Liberty20Test implements TestingGenericHttpNamingConventions.ServerV0 {
 }
 
 @IgnoreIf({

dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/LibertyDecorator.java

@@ -100,7 +100,7 @@ public AgentSpan onResponseStatus(AgentSpan span, int status) {
     // we may have the status during response blocking, but in that case
     // the status code is not propagated to the servlet layer
     if (currentStatus == null || !span.isError()) {
-      span.setHttpStatusCode(status);
+      super.onResponseStatus(span, status);
     }
     return span;
   }

dd-java-agent/instrumentation/liberty-23/src/test/groovy/datadog/trace/instrumentation/liberty23/Liberty23Test.groovy

@@ -117,15 +117,6 @@ abstract class Liberty23Test extends HttpServerTest<Server> {
     true
   }
 
-  @Override
-  String expectedResourceName(ServerEndpoint endpoint, String method, URI address) {
-    if (endpoint.path == '/not-found') {
-      'GET /testapp/not-found'
-    } else {
-      super.expectedResourceName(endpoint, method, address)
-    }
-  }
-
   def 'test blocking on response with commit during the response'() {
     setup:
     assumeTrue(testBlockingOnResponse())
@@ -160,7 +151,7 @@ abstract class Liberty23Test extends HttpServerTest<Server> {
   // instrumented while on the the global ignores list
   System.getProperty('java.vm.name') == 'IBM J9 VM' &&
   System.getProperty('java.specification.version') == '1.8' })
-class Liberty23V0ForkedTest extends Liberty23Test implements TestingGenericHttpNamingConventions.ServerV0 {
+class Liberty23V0Test extends Liberty23Test implements TestingGenericHttpNamingConventions.ServerV0 {
 }
 
 @IgnoreIf({
@@ -176,7 +167,7 @@ class Liberty23V1ForkedTest extends Liberty23Test implements TestingGenericHttpN
   // instrumented while on the the global ignores list
   System.getProperty('java.vm.name') == 'IBM J9 VM' &&
   System.getProperty('java.specification.version') == '1.8' })
-class LibertyServletClassloaderNamingForkedTest extends Liberty23V0ForkedTest {
+class LibertyServletClassloaderNamingForkedTest extends Liberty23V0Test {
   @Override
   protected void configurePreAgent() {
     super.configurePreAgent()