root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.4.x 

Closes gh-24872
This commit is contained in:
Stephane Nicoll 2021-01-18 17:08:36 +01:00
parent 819809849f 28ed3355bd
commit 59b01324ae
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -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;
*/ */
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
return response; return response;
} }
finally { finally {
try {
getTimeBuilder(request, response).register(this.meterRegistry).record(System.nanoTime() - startTime, getTimeBuilder(request, response).register(this.meterRegistry).record(System.nanoTime() - startTime,
TimeUnit.NANOSECONDS); TimeUnit.NANOSECONDS);
}
catch (Exception ex) {
logger.info("Failed to record metrics.", ex);
}
if (urlTemplate.get().isEmpty()) { if (urlTemplate.get().isEmpty()) {
urlTemplate.remove(); urlTemplate.remove();
} }