clean

Signed-off-by: sezen.leblay <[email protected]>

Author: sezen-datadog

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java

@@ -36,7 +36,6 @@
 import datadog.trace.bootstrap.instrumentation.api.URIUtils;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.http.ClientIpAddressResolver;
-import java.io.OutputStream;
 import java.net.InetAddress;
 import java.util.BitSet;
 import java.util.LinkedHashMap;
@@ -403,10 +402,17 @@ public AgentSpan onResponse(final AgentSpan span, final RESPONSE response) {
     return span;
   }
 
-  // TODO this should be abstract by the end of developments
-  protected OutputStream responseBody(RESPONSE response) {
-    return null;
-  }
+  //  @Override
+  //  public Span onError(final Span span, final Throwable throwable) {
+  //    assert span != null;
+  //    // FIXME
+  //    final Object status = span.getTag("http.status");
+  //    if (status == null || status.equals(200)) {
+  //      // Ensure status set correctly
+  //      span.setTag("http.status", 500);
+  //    }
+  //    return super.onError(span, throwable);
+  //  }
 
   private AgentSpanContext.Extracted callIGCallbackStart(AgentSpanContext.Extracted context) {
     AgentTracer.TracerAPI tracer = tracer();

dd-java-agent/appsec/src/main/java/com/datadog/appsec/event/data/KnownAddresses.java

@@ -48,7 +48,7 @@ public interface KnownAddresses {
   Address<Object> RESPONSE_BODY_OBJECT = new Address<>("server.response.body");
 
   /** First chars of HTTP response body */
-  Address<CharSequence> RESPONSE_BODY_RAW = new Address<>("server.response.body.raw");
+  Address<String> RESPONSE_BODY_RAW = new Address<>("server.response.body.raw");
 
   /** Reponse headers excluding cookies */
   Address<Map<String, List<String>>> RESPONSE_HEADERS_NO_COOKIES =

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/GatewayBridgeSpecification.groovy

@@ -936,7 +936,7 @@ class GatewayBridgeSpecification extends DDSpecification {
         }
 
         @Override
-        <T> T getOrCreateMetaStructTop(String key, Function<String, T> defaultValue) {
+        def <T> T getOrCreateMetaStructTop(String key, Function<String, T> defaultValue) {
           return null
         }
 

dd-java-agent/instrumentation/tomcat-5.5-common/src/main/java/datadog/trace/instrumentation/tomcat/TomcatDecorator.java

@@ -11,7 +11,6 @@
 import datadog.trace.bootstrap.instrumentation.api.URIDataAdapter;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator;
-import java.io.OutputStream;
 import java.util.Map;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
@@ -144,10 +143,6 @@ protected BlockResponseFunction createBlockResponseFunction(
     return new TomcatBlockResponseFunction(request);
   }
 
-  protected OutputStream responseBody(Response response) {
-    return response.getStream();
-  }
-
   public static class TomcatBlockResponseFunction implements BlockResponseFunction {
     private final Request request;