Skip to content

Commit

Permalink
Merge pull request #24753 from izeye
Browse files Browse the repository at this point in the history
* pr/24753:
  Update copyright of changed file
  Make MetricsClientHttpRequestInterceptor defensive against metrics recoding failures

Closes gh-24753
  • Loading branch information
snicoll committed Jan 18, 2021
2 parents 5df4011 + 1ad5a3f commit 28ed335
Showing 1 changed file with 12 additions and 3 deletions.
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -25,6 +25,8 @@

import io.micrometer.core.instrument.MeterRegistry;
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.core.NamedThreadLocal;
Expand All @@ -43,6 +45,8 @@
*/
class MetricsClientHttpRequestInterceptor implements ClientHttpRequestInterceptor {

private static final Log logger = LogFactory.getLog(MetricsClientHttpRequestInterceptor.class);

private static final ThreadLocal<Deque<String>> urlTemplate = new UrlTemplateThreadLocal();

private final MeterRegistry meterRegistry;
Expand Down Expand Up @@ -82,8 +86,13 @@ public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttp
return response;
}
finally {
getTimeBuilder(request, response).register(this.meterRegistry).record(System.nanoTime() - startTime,
TimeUnit.NANOSECONDS);
try {
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()) {
urlTemplate.remove();
}
Expand Down

0 comments on commit 28ed335

Please sign in to comment.