Skip to content

QueryResource: Fix incorrect request log start times. #4656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fjy merged 2 commits into from
Aug 7, 2017
Merged

QueryResource: Fix incorrect request log start times. #4656

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c690deb
QueryResource: Fix incorrect request log start times.
gianm Aug 7, 2017
557d558
Fixups
gianm Aug 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions server/src/main/java/io/druid/server/QueryResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ public Response doPost(
@Context final HttpServletRequest req // used to get request content-type, remote address and AuthorizationInfo
) throws IOException
{
// Both startMs and startNs are needed: startMs is absolute time and startNs is high-resolution.
final long startMs = System.currentTimeMillis();
final long startNs = System.nanoTime();
Query<?> query = null;
QueryToolChest toolChest = null;
Expand Down Expand Up @@ -322,7 +324,7 @@ public void write(OutputStream outputStream) throws IOException, WebApplicationE

requestLogger.log(
new RequestLogLine(
new DateTime(TimeUnit.NANOSECONDS.toMillis(startNs)),
new DateTime(startMs),
req.getRemoteAddr(),
theQuery,
new QueryStats(
Expand Down Expand Up @@ -388,7 +390,7 @@ public void write(OutputStream outputStream) throws IOException, WebApplicationE
queryMetrics.reportQueryTime(queryTimeNs).emit(emitter);
requestLogger.log(
new RequestLogLine(
new DateTime(TimeUnit.NANOSECONDS.toMillis(startNs)),
new DateTime(startMs),
req.getRemoteAddr(),
query,
new QueryStats(
Expand Down Expand Up @@ -433,7 +435,7 @@ public void write(OutputStream outputStream) throws IOException, WebApplicationE
queryMetrics.reportQueryTime(queryTimeNs).emit(emitter);
requestLogger.log(
new RequestLogLine(
new DateTime(TimeUnit.NANOSECONDS.toMillis(startNs)),
new DateTime(startMs),
req.getRemoteAddr(),
query,
new QueryStats(ImmutableMap.<String, Object>of(
Expand Down