wyl/spring-cloud-openfeign
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Defensive coding to avoid potential NPE

Browse Source 
Fixes gh-803
This commit is contained in:
Dave Syer
2016-01-31 16:19:16 +00:00
parent 2e9ff4c7d7
commit 82d8a11021
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/DefaultMetricsTagProvider.java
+15 -8
View File
@@ -16,6 +16,7 @@ package org.springframework.cloud.netflix.metrics;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -33,13 +34,14 @@ public class DefaultMetricsTagProvider implements MetricsTagProvider {
public Map<String, String> clientHttpRequestTags(HttpRequest request,
ClientHttpResponse response) {
String urlTemplate = RestTemplateUrlTemplateHolder.getRestTemplateUrlTemplate();
if (urlTemplate == null)
if (urlTemplate == null) {
urlTemplate = "none";
}
String status;
try {
status = (response == null) ? "CLIENT_ERROR" : ((Integer) response
.getRawStatusCode()).toString();
status = (response == null) ? "CLIENT_ERROR"
: ((Integer) response.getRawStatusCode()).toString();
}
catch (IOException e) {
status = "IO_ERROR";
@@ -60,17 +62,22 @@ public class DefaultMetricsTagProvider implements MetricsTagProvider {
tags.put("method", request.getMethod());
tags.put("status", ((Integer) response.getStatus()).toString());
String uri = sanitizeUrlTemplate(request
.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE).toString()
.substring(1));
String uri = (String) request
.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE);
if (uri == null) {
uri = request.getPathInfo();
}
uri = sanitizeUrlTemplate(uri.substring(1));
tags.put("uri", uri.isEmpty() ? "root" : uri);
Object exception = request.getAttribute("exception");
if (exception != null)
if (exception != null) {
tags.put("exception", exception.getClass().getSimpleName());
}
if (caller != null)
if (caller != null) {
tags.put("caller", caller);
}
return tags;
}