From cbb35fa0157b9d36d89a7f043a9eb4384ee9cb14 Mon Sep 17 00:00:00 2001
From: Jose Medrano <josmed@microsoft.com>
Date: Fri, 20 Oct 2023 19:25:59 +0200
Subject: [PATCH 1/4] [TaskExecutor] Adds extra SQLException logging on error

---
 .../java/com/microsoft/lst_bench/task/TaskExecutor.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java b/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java
index af3a4384..cf7ecf6a 100644
--- a/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java
+++ b/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java
@@ -26,6 +26,7 @@
 import com.microsoft.lst_bench.telemetry.ImmutableEventInfo;
 import com.microsoft.lst_bench.telemetry.SQLTelemetryRegistry;
 import com.microsoft.lst_bench.util.StringUtils;
+import java.sql.SQLException;
 import java.time.Instant;
 import java.util.Map;
 import org.slf4j.Logger;
@@ -100,6 +101,12 @@ public void executeTask(Connection connection, TaskExec task, Map<String, Object
                     + statement.getStatement()
                     + "; error message: "
                     + e.getMessage();
+
+            if (e instanceof SQLException) {
+              SQLException sqlException = (SQLException) e;
+              loggedError += "SQL State: " + sqlException.getSQLState() + " Error Code: " + sqlException.getErrorCode() + loggedError;
+            }
+
             for (String skipException : exceptionStrings) {
               if (e.getMessage().contains(skipException)) {
                 LOGGER.warn(loggedError);

From 3706cfb9f04b4b8243d726d4834cd406238c2055 Mon Sep 17 00:00:00 2001
From: Jose Medrano <josmed@microsoft.com>
Date: Mon, 23 Oct 2023 10:19:37 +0200
Subject: [PATCH 2/4] Fixes indentation

---
 .../java/com/microsoft/lst_bench/task/TaskExecutor.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java b/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java
index cf7ecf6a..fe395910 100644
--- a/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java
+++ b/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java
@@ -104,7 +104,12 @@ public void executeTask(Connection connection, TaskExec task, Map<String, Object
 
             if (e instanceof SQLException) {
               SQLException sqlException = (SQLException) e;
-              loggedError += "SQL State: " + sqlException.getSQLState() + " Error Code: " + sqlException.getErrorCode() + loggedError;
+              loggedError +=
+                  "SQL State: "
+                      + sqlException.getSQLState()
+                      + " Error Code: "
+                      + sqlException.getErrorCode()
+                      + loggedError;
             }
 
             for (String skipException : exceptionStrings) {

From b333589c30c788985e6b63c17b6f5b41e2d85627 Mon Sep 17 00:00:00 2001
From: Jose Medrano <josmed@microsoft.com>
Date: Tue, 24 Oct 2023 13:59:57 +0200
Subject: [PATCH 3/4] Minor fixes

---
 src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java b/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java
index fe395910..5238b09a 100644
--- a/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java
+++ b/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java
@@ -104,10 +104,10 @@ public void executeTask(Connection connection, TaskExec task, Map<String, Object
 
             if (e instanceof SQLException) {
               SQLException sqlException = (SQLException) e;
-              loggedError +=
+              loggedError =
                   "SQL State: "
                       + sqlException.getSQLState()
-                      + " Error Code: "
+                      + "; Error Code: "
                       + sqlException.getErrorCode()
                       + loggedError;
             }

From f44e714ed072a40204ac611c4c5fe87404284952 Mon Sep 17 00:00:00 2001
From: Jose Medrano <josmed@microsoft.com>
Date: Tue, 24 Oct 2023 14:11:34 +0200
Subject: [PATCH 4/4] Insert specific sql property values before error message

---
 .../com/microsoft/lst_bench/task/TaskExecutor.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java b/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java
index 5238b09a..17bfe27d 100644
--- a/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java
+++ b/src/main/java/com/microsoft/lst_bench/task/TaskExecutor.java
@@ -98,20 +98,20 @@ public void executeTask(Connection connection, TaskExec task, Map<String, Object
                 "Exception executing statement: "
                     + statement.getId()
                     + ", statement text: "
-                    + statement.getStatement()
-                    + "; error message: "
-                    + e.getMessage();
+                    + statement.getStatement();
 
+            // sql server driver exception messages
             if (e instanceof SQLException) {
               SQLException sqlException = (SQLException) e;
-              loggedError =
-                  "SQL State: "
+              loggedError +=
+                  "; SQL State: "
                       + sqlException.getSQLState()
                       + "; Error Code: "
-                      + sqlException.getErrorCode()
-                      + loggedError;
+                      + sqlException.getErrorCode();
             }
 
+            loggedError += "; Error message: " + e.getMessage();
+
             for (String skipException : exceptionStrings) {
               if (e.getMessage().contains(skipException)) {
                 LOGGER.warn(loggedError);