Add resource waiting time to query completion event

trinodb · Mar 14, 2019 · f1a3085 · f1a3085
1 parent b7dd733
commit f1a3085
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/presto-main/src/main/java/io/prestosql/event/QueryMonitor.java b/presto-main/src/main/java/io/prestosql/event/QueryMonitor.java
@@ -150,6 +150,7 @@ public void queryImmediateFailureEvent(BasicQueryInfo queryInfo, ExecutionFailur
                         ofMillis(0),
                         Optional.empty(),
                         Optional.empty(),
+                        Optional.empty(),
                         0,
                         0,
                         0,
@@ -227,6 +228,7 @@ private QueryStatistics createQueryStatistics(QueryInfo queryInfo)
                 ofMillis(queryStats.getTotalCpuTime().toMillis()),
                 ofMillis(queryStats.getTotalScheduledTime().toMillis()),
                 ofMillis(queryStats.getQueuedTime().toMillis()),
+                Optional.of(ofMillis(queryStats.getResourceWaitingTime().toMillis())),
                 Optional.of(ofMillis(queryStats.getAnalysisTime().toMillis())),
                 Optional.of(ofMillis(queryStats.getDistributedPlanningTime().toMillis())),
                 queryStats.getPeakUserMemoryReservation().toBytes(),

diff --git a/presto-spi/src/main/java/io/prestosql/spi/eventlistener/QueryStatistics.java b/presto-spi/src/main/java/io/prestosql/spi/eventlistener/QueryStatistics.java
@@ -24,6 +24,7 @@ public class QueryStatistics
     private final Duration cpuTime;
     private final Duration wallTime;
     private final Duration queuedTime;
+    private final Optional<Duration> waitingTime;
     private final Optional<Duration> analysisTime;
     private final Optional<Duration> distributedPlanningTime;
 
@@ -67,6 +68,7 @@ public QueryStatistics(
             Duration cpuTime,
             Duration wallTime,
             Duration queuedTime,
+            Optional<Duration> waitingTime,
             Optional<Duration> analysisTime,
             Optional<Duration> distributedPlanningTime,
             long peakUserMemoryBytes,
@@ -93,6 +95,7 @@ public QueryStatistics(
     {
         this.cpuTime = requireNonNull(cpuTime, "cpuTime is null");
         this.wallTime = requireNonNull(wallTime, "wallTime is null");
+        this.waitingTime = requireNonNull(waitingTime, "waitingTime is null");
         this.queuedTime = requireNonNull(queuedTime, "queuedTime is null");
         this.analysisTime = requireNonNull(analysisTime, "analysisTime is null");
         this.distributedPlanningTime = requireNonNull(distributedPlanningTime, "distributedPlanningTime is null");
@@ -134,6 +137,11 @@ public Duration getQueuedTime()
         return queuedTime;
     }
 
+    public Optional<Duration> getResourceWaitingTime()
+    {
+        return waitingTime;
+    }
+
     public Optional<Duration> getAnalysisTime()
     {
         return analysisTime;