Move debug logging to TRaceRepository

spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyConfiguration.java

 package org.springframework.platform.netflix.zuul;
 
-import com.netflix.zuul.context.ContextLifecycleFilter;
-import com.netflix.zuul.http.ZuulServlet;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.trace.TraceRepository;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.context.embedded.FilterRegistrationBean;
@@ -11,14 +13,12 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.platform.netflix.zuul.filters.post.SendResponseFilter;
-import org.springframework.platform.netflix.zuul.filters.post.StatsFilter;
 import org.springframework.platform.netflix.zuul.filters.pre.DebugFilter;
-import org.springframework.platform.netflix.zuul.filters.pre.DebugRequestFilter;
 import org.springframework.platform.netflix.zuul.filters.pre.PreDecorationFilter;
 import org.springframework.platform.netflix.zuul.filters.route.RibbonRoutingFilter;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import com.netflix.zuul.context.ContextLifecycleFilter;
+import com.netflix.zuul.http.ZuulServlet;
 
 /**
  * @author Spencer Gibb
@@ -31,6 +31,9 @@ public class ZuulProxyConfiguration {
 
     @Autowired
     private ZuulProxyProperties props;
+    
+    @Autowired(required=false)
+    private TraceRepository traces;
 
     @Bean
     public FilterRegistrationBean contextLifecycleFilter() {
@@ -65,11 +68,6 @@ public class ZuulProxyConfiguration {
     }
 
     @Bean
-    public DebugRequestFilter debugRequestFilter() {
-        return new DebugRequestFilter();
-    }
-
-    @Bean
     public PreDecorationFilter preDecorationFilter() {
         return new PreDecorationFilter();
     }
@@ -77,7 +75,11 @@ public class ZuulProxyConfiguration {
     // route filters
     @Bean
     public RibbonRoutingFilter ribbonRoutingFilter() {
-        return new RibbonRoutingFilter();
+        RibbonRoutingFilter filter = new RibbonRoutingFilter();
+        if (traces!=null) {
+        	filter.setTraces(traces);
+        }
+		return filter;
     }
 
     // post filters
@@ -86,9 +88,4 @@ public class ZuulProxyConfiguration {
         return new SendResponseFilter();
     }
 
-    @Bean
-    public StatsFilter statsFilter() {
-        return new StatsFilter();
-    }
-
 }

spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/post/StatsFilter.java

-package org.springframework.platform.netflix.zuul.filters.post;
-
-import com.netflix.zuul.ZuulFilter;
-import com.netflix.zuul.context.RequestContext;
-
-import java.util.List;
-
-public class StatsFilter extends ZuulFilter {
-    @Override
-    public String filterType() {
-        return "post";
-    }
-
-    @Override
-    public int filterOrder() {
-        return 2000;
-    }
-
-    @Override
-    public boolean shouldFilter() {
-        return true;
-    }
-
-    @Override
-    public Object run() {
-        dumpRoutingDebug();
-        dumpRequestDebug();
-        return null;
-    }
-
-    public void dumpRequestDebug() {
-        @SuppressWarnings("unchecked")
-		List<String> rd = (List<String>) RequestContext.getCurrentContext().get("requestDebug");
-        if (rd != null) {
-            for (String it : rd) {
-                System.out.println("REQUEST_DEBUG::" + it);
-            }
-        }
-    }
-
-    public void dumpRoutingDebug() {
-        @SuppressWarnings("unchecked")
-		List<String> rd = (List<String>) RequestContext.getCurrentContext().get("routingDebug");
-        if (rd != null) {
-            for (String it : rd) {
-                System.out.println("ZUUL_DEBUG::"+it);
-            }
-        }
-    }
-
-}

spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/pre/DebugFilter.java

@@ -12,9 +12,9 @@ import javax.servlet.http.HttpServletRequest;
 public class DebugFilter extends ZuulFilter {
 
     static final DynamicBooleanProperty routingDebug = DynamicPropertyFactory.getInstance()
-            .getBooleanProperty(ZuulConstants.ZUUL_DEBUG_REQUEST, true);
+            .getBooleanProperty(ZuulConstants.ZUUL_DEBUG_REQUEST, false);
     static final DynamicStringProperty debugParameter = DynamicPropertyFactory.getInstance()
-            .getStringProperty(ZuulConstants.ZUUL_DEBUG_PARAMETER, "d");
+            .getStringProperty(ZuulConstants.ZUUL_DEBUG_PARAMETER, "debug");
 
     @Override
     public String filterType() {

spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/pre/DebugRequestFilter.java

-package org.springframework.platform.netflix.zuul.filters.pre;
-
-import com.netflix.zuul.ZuulFilter;
-
-import com.netflix.zuul.context.Debug;
-import com.netflix.zuul.context.RequestContext;
-import org.apache.commons.io.IOUtils;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-
-public class DebugRequestFilter extends ZuulFilter {
-    @Override
-    public String filterType() {
-        return "pre";
-    }
-
-    @Override
-    public int filterOrder() {
-        return 10000;
-    }
-
-    @Override
-    public boolean shouldFilter() {
-        return Debug.debugRequest();
-    }
-
-    @Override
-    public Object run() {
-        HttpServletRequest req = RequestContext.getCurrentContext().getRequest();
-
-        Debug.addRequestDebug("REQUEST:: " + req.getScheme() + " " + req.getRemoteAddr() + ":" + req.getRemotePort());
-
-        Debug.addRequestDebug("REQUEST:: > " + req.getMethod() + " " + req.getRequestURI() + " " + req.getProtocol());
-
-        Enumeration<String> headerIt = req.getHeaderNames();
-        while (headerIt.hasMoreElements()) {
-            String name = headerIt.nextElement();
-            String value = req.getHeader(name);
-            Debug.addRequestDebug("REQUEST:: > " + name + ":" + value);
-
-        }
-
-        final RequestContext ctx = RequestContext.getCurrentContext();
-        if (!ctx.isChunkedRequestBody()) {
-            try {
-                InputStream inp = ctx.getRequest().getInputStream();
-                if (inp != null) {
-                    String body = IOUtils.toString(inp);
-                    Debug.addRequestDebug("REQUEST:: > " + body);
-
-                }
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        return null;
-    }
-
-}