SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-organise headers in the /trace of Zuul requests

Browse Source 
Now they match better what the vanilla /trace data does in terms of
object and field names.
This commit is contained in:
Dave Syer
2015-01-06 16:41:03 +00:00
parent 242886916f
commit da6da6d76c
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/ProxyRequestHelper.java
View File

@@ -182,8 +182,21 @@ public class ProxyRequestHelper {
if (traces != null) {
RequestContext context = RequestContext.getCurrentContext();
StringBuilder query = new StringBuilder();
for (String param : params.keySet()) {
for (String value : params.get(param)) {
query.append(param);
query.append("=");
query.append(value);
query.append("&");
}
}
info.put("method", verb);
info.put("path", uri);
info.put("query", query.toString());
info.put("remote", true);
info.put("serviceId", context.get("serviceId"));
info.put("proxy", context.get("proxy"));
Map<String, Object> trace = new LinkedHashMap<String, Object>();
Map<String, Object> input = new LinkedHashMap<String, Object>();
trace.put("request", input);
@@ -196,19 +209,7 @@ public class ProxyRequestHelper {
}
input.put(entry.getKey(), value);
}
StringBuilder query = new StringBuilder();
for (String param : params.keySet()) {
for (String value : params.get(param)) {
query.append(param);
query.append("=");
query.append(value);
query.append("&");
}
}
info.put("method", verb);
info.put("uri", uri);
info.put("query", query.toString());
RequestContext ctx = RequestContext.getCurrentContext();
if (!ctx.isChunkedRequestBody()) {
if (requestEntity != null) {
@@ -228,7 +229,6 @@ public class ProxyRequestHelper {
Map<String, Object> trace = (Map<String, Object>) info.get("headers");
Map<String, Object> output = new LinkedHashMap<String, Object>();
trace.put("response", output);
info.put("status", "" + status);
for (Entry<String, List<String>> key : headers.entrySet()) {
Collection<String> collection = key.getValue();
Object value = collection;
@@ -237,6 +237,7 @@ public class ProxyRequestHelper {
}
output.put(key.getKey(), value);
}
output.put("status", "" + status);
}
}

2
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/PreDecorationFilter.java
View File

@@ -55,7 +55,7 @@ public class PreDecorationFilter extends ZuulFilter {
String location = route.getLocation();
if (location != null) {
ctx.put("requestURI", route.getPath());
ctx.put("proxy", route.getId());