From dc90375fddc2f5cdfe0d8ceb5720e38e21f5afdf Mon Sep 17 00:00:00 2001
From: mansap22 <110418152+mansap22@users.noreply.github.com>
Date: Thu, 29 Dec 2022 16:35:00 -0800
Subject: [PATCH] fix incorrect error sending (#114)

---
 monitoring.go | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/monitoring.go b/monitoring.go
index 588e14d93..3af597b6f 100644
--- 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
 }