delete:response body

GuanceCloud · Jun 14, 2024 · 17f251c · 17f251c
1 parent a7dd577
commit 17f251c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 43 deletions.
diff --git a/...c/main/java/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilter.java b/...c/main/java/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilter.java
@@ -3,7 +3,6 @@
 import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_SPAN_ATTRIBUTE;
 import static datadog.trace.instrumentation.springweb.SpringWebHttpServerDecorator.DECORATE;
 
-import datadog.trace.api.Config;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import java.io.IOException;
 import java.util.List;
@@ -29,7 +28,7 @@ public class HandlerMappingResourceNameFilter extends OncePerRequestFilter imple
   @Override
   protected void doFilterInternal(
       final HttpServletRequest request,
-      HttpServletResponse response,
+      final HttpServletResponse response,
       final FilterChain filterChain)
       throws ServletException, IOException {
 
@@ -47,27 +46,8 @@ protected void doFilterInternal(
         // mapping.getHandler() threw exception.  Ignore
       }
     }
-    if (!Config.get().isTracerResponseBodyEnabled()){
-      filterChain.doFilter(request, response);
-      return;
-    }
-    DataDogHttpServletResponseWrapper wrapper = new DataDogHttpServletResponseWrapper(response);
-    filterChain.doFilter(request, wrapper);
-    String contentType = response.getContentType();
-    if(contentType==null){
-      return;
-    }
-    if (contentType.contains("application/json")) {
-      try {
-        String responseStr = new String(wrapper.getContent(), "UTF-8");
-        ((AgentSpan) parentSpan).setTag("response_body", responseStr);
-        wrapper.setContentType("application/json;charset="+Config.get().getTracerResponseBodyEncoding());
-        response = wrapper;
-        response.getWriter().write(responseStr);
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-    }
+
+    filterChain.doFilter(request, response);
   }
 
   /**

diff --git a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
@@ -236,17 +236,16 @@ public final class ConfigDefaults {
 
   static final boolean DEFAULT_REDIS_COMMAND_ARGS = false;
 
-  static final String DEFAULT_LOG_PATTERN="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - [%method,%line] %X{dd.service} %X{dd.trace_id} %X{dd.span_id} - %msg%n";
+  static final String DEFAULT_LOG_PATTERN =
+      "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - [%method,%line] %X{dd.service} %X{dd.trace_id} %X{dd.span_id} - %msg%n";
 
-  static final boolean DEFAULT_LOG_PATTERN_REPLACE=false;
+  static final boolean DEFAULT_LOG_PATTERN_REPLACE = false;
 
   static final boolean DEFAULT_TRACE_HEADER_ENABLED = false;
 
   static final boolean DEFAULT_TRACE_REQUEST_BODY_ENABLED = false;
 
-  static final boolean DEFAULT_TRACE_RESPONSE_BODY_ENABLED = false;
-
-  static final String DEFAULT_TRACE_RESPONSE_BODY_ENCODING="utf-8";
+  static final String DEFAULT_TRACE_RESPONSE_BODY_ENCODING = "utf-8";
 
   static final boolean DEFAULT_TRACE_DUBBO_PROVIDER_PROPAGATE_ENABLED = false;
 

diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java
@@ -139,8 +139,6 @@ public final class TracerConfig {
 
   public static final String TRACE_REQUEST_BODY_ENABLED = "trace.request.body.enabled";
 
-  public static final String TRACE_RESPONSE_BODY_ENABLED = "trace.response.body.enabled";
-
   public static final String TRACE_RESPONSE_BODY_ENCODING = "trace.response.body.encoding";
 
   public static final String TRACE_DUBBO_PROVIDER_PROPAGATE_ENABLED =

diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -129,7 +129,6 @@
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_REPORT_HOSTNAME;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_REQUEST_BODY_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_RESOLVER_ENABLED;
-import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_RESPONSE_BODY_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_RESPONSE_BODY_ENCODING;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_X_DATADOG_TAGS_MAX_LENGTH;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_WRITER_BAGGAGE_INJECT;
@@ -473,7 +472,6 @@
 import static datadog.trace.api.config.TracerConfig.TRACE_REPORT_HOSTNAME;
 import static datadog.trace.api.config.TracerConfig.TRACE_REQUEST_BODY_ENABLED;
 import static datadog.trace.api.config.TracerConfig.TRACE_RESOLVER_ENABLED;
-import static datadog.trace.api.config.TracerConfig.TRACE_RESPONSE_BODY_ENABLED;
 import static datadog.trace.api.config.TracerConfig.TRACE_RESPONSE_BODY_ENCODING;
 import static datadog.trace.api.config.TracerConfig.TRACE_SAMPLE_RATE;
 import static datadog.trace.api.config.TracerConfig.TRACE_SAMPLING_OPERATION_RULES;
@@ -977,8 +975,6 @@ static class HostNameHolder {
   private final boolean tracerHeaderEnabled;
   private final boolean tracerRequestBodyEnabled;
 
-  private final boolean tracerResponseBodyEnabled;
-
   private final String tracerResponseBodyEncoding;
   private final boolean axisPromoteResourceName;
   private final float traceFlushIntervalSeconds;
@@ -2038,9 +2034,6 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
         configProvider.getBoolean(
             TRACE_DUBBO_PROVIDER_PROPAGATE_ENABLED, DEFAULT_TRACE_DUBBO_PROVIDER_PROPAGATE_ENABLED);
 
-    tracerResponseBodyEnabled =
-        configProvider.getBoolean(TRACE_RESPONSE_BODY_ENABLED, DEFAULT_TRACE_RESPONSE_BODY_ENABLED);
-
     tracerResponseBodyEncoding =
         configProvider.getString(
             TRACE_RESPONSE_BODY_ENCODING, DEFAULT_TRACE_RESPONSE_BODY_ENCODING);
@@ -3556,10 +3549,6 @@ public boolean isDubboProviderPropagateEnabled() {
     return dubboProviderPropagateEnabled;
   }
 
-  public boolean isTracerResponseBodyEnabled() {
-    return tracerResponseBodyEnabled;
-  }
-
   public String getTracerResponseBodyEncoding() {
     return tracerResponseBodyEncoding.toLowerCase();
   }
@@ -4385,8 +4374,6 @@ public String toString() {
         + tracerHeaderEnabled
         + ", tracerRequestBodyEnabled="
         + tracerRequestBodyEnabled
-        + ", tracerResponseBodyEnabled="
-        + tracerResponseBodyEnabled
         + ", tracerResponseBodyEncoding="
         + tracerResponseBodyEncoding
         + ", dbClientSplitByInstance="