Expose ErrorType in VerifierQueryEvent

prestodb · May 15, 2020 · bb2e616 · bb2e616
1 parent 0221e24
commit bb2e616
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/event/QueryFailure.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/event/QueryFailure.java
@@ -15,6 +15,7 @@
 
 import com.facebook.airlift.event.client.EventField;
 import com.facebook.airlift.event.client.EventType;
+import com.facebook.presto.spi.ErrorType;
 import com.facebook.presto.verifier.framework.QueryStage;
 
 import javax.annotation.concurrent.Immutable;
@@ -30,20 +31,23 @@ public class QueryFailure
     private final String clusterType;
     private final String queryStage;
     private final String errorCode;
+    private final String errorType;
     private final boolean retryable;
     private final String prestoQueryId;
     private final String stacktrace;
 
     public QueryFailure(
             QueryStage queryStage,
             String errorCode,
+            Optional<ErrorType> errorType,
             boolean retryable,
             Optional<String> prestoQueryId,
             String stacktrace)
     {
         this.queryStage = requireNonNull(queryStage.name(), "queryStage is null");
         this.clusterType = requireNonNull(queryStage.getTargetCluster().name(), "cluster is null");
         this.errorCode = requireNonNull(errorCode, "errorCode is null");
+        this.errorType = errorType.map(ErrorType::name).orElse(null);
         this.retryable = retryable;
         this.prestoQueryId = prestoQueryId.orElse(null);
         this.stacktrace = requireNonNull(stacktrace, "stacktrace is null");
@@ -67,6 +71,12 @@ public String getErrorCode()
         return errorCode;
     }
 
+    @EventField
+    public String getErrorType()
+    {
+        return errorType;
+    }
+
     @EventField
     public boolean isRetryable()
     {

diff --git a/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/QueryException.java b/presto-verifier/src/main/java/com/facebook/presto/verifier/framework/QueryException.java
@@ -14,6 +14,8 @@
 package com.facebook.presto.verifier.framework;
 
 import com.facebook.presto.jdbc.QueryStats;
+import com.facebook.presto.spi.ErrorCode;
+import com.facebook.presto.spi.ErrorCodeSupplier;
 import com.facebook.presto.verifier.event.QueryFailure;
 
 import java.util.Optional;
@@ -51,6 +53,9 @@ public QueryFailure toQueryFailure()
         return new QueryFailure(
                 queryStage,
                 getErrorCodeName(),
+                this instanceof PrestoQueryException
+                        ? ((PrestoQueryException) this).getErrorCode().map(ErrorCodeSupplier::toErrorCode).map(ErrorCode::getType)
+                        : Optional.empty(),
                 retryable,
                 this instanceof PrestoQueryException
                         ? ((PrestoQueryException) this).getQueryStats().map(QueryStats::getQueryId)