Commit ddfa1e63 authored by izeye's avatar izeye Committed by Stephane Nicoll

Make MetricsClientHttpRequestInterceptor defensive against metrics recoding failures

See gh-24753
parent 5df40116
...@@ -25,6 +25,8 @@ import java.util.concurrent.TimeUnit; ...@@ -25,6 +25,8 @@ import java.util.concurrent.TimeUnit;
import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Timer; import io.micrometer.core.instrument.Timer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.actuate.metrics.AutoTimer; import org.springframework.boot.actuate.metrics.AutoTimer;
import org.springframework.core.NamedThreadLocal; import org.springframework.core.NamedThreadLocal;
...@@ -43,6 +45,8 @@ import org.springframework.web.util.UriTemplateHandler; ...@@ -43,6 +45,8 @@ import org.springframework.web.util.UriTemplateHandler;
*/ */
class MetricsClientHttpRequestInterceptor implements ClientHttpRequestInterceptor { class MetricsClientHttpRequestInterceptor implements ClientHttpRequestInterceptor {
private static final Log logger = LogFactory.getLog(MetricsClientHttpRequestInterceptor.class);
private static final ThreadLocal<Deque<String>> urlTemplate = new UrlTemplateThreadLocal(); private static final ThreadLocal<Deque<String>> urlTemplate = new UrlTemplateThreadLocal();
private final MeterRegistry meterRegistry; private final MeterRegistry meterRegistry;
...@@ -82,8 +86,13 @@ class MetricsClientHttpRequestInterceptor implements ClientHttpRequestIntercepto ...@@ -82,8 +86,13 @@ class MetricsClientHttpRequestInterceptor implements ClientHttpRequestIntercepto
return response; return response;
} }
finally { finally {
getTimeBuilder(request, response).register(this.meterRegistry).record(System.nanoTime() - startTime, try {
TimeUnit.NANOSECONDS); getTimeBuilder(request, response).register(this.meterRegistry).record(System.nanoTime() - startTime,
TimeUnit.NANOSECONDS);
}
catch (Exception ex) {
logger.info("Failed to record metrics.", ex);
}
if (urlTemplate.get().isEmpty()) { if (urlTemplate.get().isEmpty()) {
urlTemplate.remove(); urlTemplate.remove();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment