fix incorrect error sending (#114)

sigmacomputing · Aug 29, 2023 · cec8eca · cec8eca
1 parent 4619ddd
commit cec8eca
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/monitoring.go b/monitoring.go
@@ -437,6 +437,12 @@ func (sc *snowflakeConn) blockOnRunningQuery(
 				if err != nil {
 					return err
 				}
+				return (&SnowflakeError{
+					Number:   code,
+					SQLState: resp.Data.SQLState,
+					Message:  err.Error(),
+					QueryID:  resp.Data.QueryID,
+				}).exceptionTelemetry(sc)
 			}
 			if code == -1 {
 				ok, deadline := ctx.Deadline()
@@ -446,12 +452,6 @@ func (sc *snowflakeConn) blockOnRunningQuery(
 					logger.WithContext(ctx).Errorf("sullSnowflakeRestful")
 				}
 			}
-			return (&SnowflakeError{
-				Number:   code,
-				SQLState: resp.Data.SQLState,
-				Message:  err.Error(),
-				QueryID:  resp.Data.QueryID,
-			}).exceptionTelemetry(sc)
 		}
 		return err
 	}
@@ -464,6 +464,12 @@ func (sc *snowflakeConn) blockOnRunningQuery(
 				code = ErrQueryStatus
 				message = fmt.Sprintf("%s: (failed to parse original code: %s: %s)", message, resp.Code, err.Error())
 			}
+			return (&SnowflakeError{
+				Number:   code,
+				SQLState: resp.Data.SQLState,
+				Message:  message,
+				QueryID:  resp.Data.QueryID,
+			}).exceptionTelemetry(sc)
 		}
 		if code == -1 {
 			ok, deadline := ctx.Deadline()
@@ -473,12 +479,6 @@ func (sc *snowflakeConn) blockOnRunningQuery(
 				logger.WithContext(ctx).Errorf("sullSnowflakeRestful")
 			}
 		}
-		return (&SnowflakeError{
-			Number:   code,
-			SQLState: resp.Data.SQLState,
-			Message:  message,
-			QueryID:  resp.Data.QueryID,
-		}).exceptionTelemetry(sc)
 	}
 	return nil
 }