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

Measure with nanoseconds in HttpExchangeTracer 

See gh-22266
This commit is contained in:
dreis2211 2020-07-08 19:55:27 +02:00 committed by Andy Wilkinson
parent ec3433aacf
commit d72f5139f1
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracer.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 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.
@ -22,6 +22,7 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -68,8 +69,7 @@ public class HttpExchangeTracer {
*/ */
public final void sendingResponse(HttpTrace trace, TraceableResponse response, Supplier<Principal> principal, public final void sendingResponse(HttpTrace trace, TraceableResponse response, Supplier<Principal> principal,
Supplier<String> sessionId) { Supplier<String> sessionId) {
setIfIncluded(Include.TIME_TAKEN, () -> System.currentTimeMillis() - trace.getTimestamp().toEpochMilli(), setIfIncluded(Include.TIME_TAKEN, () -> calculateTimeTaken(trace), trace::setTimeTaken);
trace::setTimeTaken);
setIfIncluded(Include.SESSION_ID, sessionId, trace::setSessionId); setIfIncluded(Include.SESSION_ID, sessionId, trace::setSessionId);
setIfIncluded(Include.PRINCIPAL, principal, trace::setPrincipal); setIfIncluded(Include.PRINCIPAL, principal, trace::setPrincipal);
trace.setResponse(new HttpTrace.Response(new FilteredTraceableResponse(response))); trace.setResponse(new HttpTrace.Response(new FilteredTraceableResponse(response)));
@ -102,6 +102,10 @@ public class HttpExchangeTracer {
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
} }
private long calculateTimeTaken(HttpTrace trace) {
return TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - trace.getNanoTime());
}
private final class FilteredTraceableRequest implements TraceableRequest { private final class FilteredTraceableRequest implements TraceableRequest {
private final TraceableRequest delegate; private final TraceableRequest delegate;

10
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpTrace.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 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.
@ -46,6 +46,8 @@ public final class HttpTrace {
private volatile Long timeTaken; private volatile Long timeTaken;
private final transient long nanoTime;
/** /**
* Creates a fully-configured {@code HttpTrace} instance. Primarily for use by * Creates a fully-configured {@code HttpTrace} instance. Primarily for use by
* {@link HttpTraceRepository} implementations when recreating a trace from a * {@link HttpTraceRepository} implementations when recreating a trace from a
@ -67,11 +69,13 @@ public final class HttpTrace {
this.principal = principal; this.principal = principal;
this.session = session; this.session = session;
this.timeTaken = timeTaken; this.timeTaken = timeTaken;
this.nanoTime = 0;
} }
HttpTrace(TraceableRequest request) { HttpTrace(TraceableRequest request) {
this.request = new Request(request); this.request = new Request(request);
this.timestamp = Instant.now(); this.timestamp = Instant.now();
this.nanoTime = System.nanoTime();
} }
public Instant getTimestamp() { public Instant getTimestamp() {
@ -118,6 +122,10 @@ public final class HttpTrace {
this.timeTaken = timeTaken; this.timeTaken = timeTaken;
} }
long getNanoTime() {
return this.nanoTime;
}
/** /**
* Trace of an HTTP request. * Trace of an HTTP request.
*/ */