Now making use of the StackTraceCompactor for more readable stack tra…

…ce messages.
dbeaudoinfortin · Nov 18, 2024 · 63db487 · 63db487
1 parent 58df28a
commit 63db487
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -111,6 +111,11 @@
 	    <artifactId>gson</artifactId>
 	    <version>2.10.1</version>
 	</dependency>
+	<dependency>
+	  <groupId>io.github.dbeaudoinfortin</groupId>
+	  <artifactId>stack-trace-compactor</artifactId>
+	  <version>0.0.5</version>
+	</dependency>
   </dependencies>
   <distributionManagement>
     <repository>

diff --git a/src/main/java/com/dbf/naps/data/analysis/DataQueryRunner.java b/src/main/java/com/dbf/naps/data/analysis/DataQueryRunner.java
@@ -27,6 +27,7 @@
 import com.dbf.naps.data.globals.Urbanization;
 import com.dbf.naps.data.globals.UrbanizationMapping;
 import com.dbf.naps.data.utilities.Utils;
+import com.dbf.utils.stacktrace.StackTraceCompactor;
 
 public abstract class DataQueryRunner<O extends DataQueryOptions> extends FileRunner<O> {
 
@@ -56,14 +57,14 @@ public void run() {
 			records = queryData();
 			if(records.isEmpty()) return;
 		} catch (Throwable t) {
-			 log.error(getThreadId() + ":: ERROR executing data query for file " + getDataFile() + ".", t);
+			 log.error(getThreadId() + ":: ERROR executing data query for file " + getDataFile() + ".\n" + StackTraceCompactor.getCompactStackTrace(t));
 			return;
 		}
 
 		try {
 			writeToFile(records, queryUnits, title, getDataFile());
 		 } catch (Throwable t) {
-			 log.error(getThreadId() + ":: ERROR writing to file " + getDataFile() + ".", t);
+			 log.error(getThreadId() + ":: ERROR writing to file " + getDataFile() + ".\n" + StackTraceCompactor.getCompactStackTrace(t));
 			return;
 		 }
 	}

diff --git a/src/main/java/com/dbf/naps/data/db/NAPSDBAction.java b/src/main/java/com/dbf/naps/data/db/NAPSDBAction.java
@@ -36,8 +36,7 @@ protected void run() {
 		{
 			initDB();
 		} catch (Throwable t) {
-			log.error("Unexpected failure initializing the DB.", t);
-			throw new RuntimeException(t);
+			throw new RuntimeException("Unexpected failure initializing the DB.", t);
 		}
 	}
 

diff --git a/src/main/java/com/dbf/naps/data/download/NAPSDataDownloader.java b/src/main/java/com/dbf/naps/data/download/NAPSDataDownloader.java
@@ -10,6 +10,7 @@
 
 import com.dbf.naps.data.NAPSActionBase;
 import com.dbf.naps.data.download.options.YearlyDownloaderOptions;
+import com.dbf.utils.stacktrace.StackTraceCompactor;
 
 public abstract class NAPSDataDownloader extends NAPSActionBase<YearlyDownloaderOptions> {
 
@@ -26,7 +27,7 @@ protected void run() {
 		{
 			downloadFiles();
 		} catch (Throwable t) {
-			log.error("Unexpected failure.", t);
+			log.error("Unexpected failure.\n" + StackTraceCompactor.getCompactStackTrace(t));
 		}
 
 		log.info("Goodbye! 🙂");

diff --git a/src/main/java/com/dbf/naps/data/download/continuous/ContinuousFileDownloadRunner.java b/src/main/java/com/dbf/naps/data/download/continuous/ContinuousFileDownloadRunner.java
@@ -10,6 +10,7 @@
 import com.dbf.naps.data.download.options.YearlyDownloaderOptions;
 import com.dbf.naps.data.globals.Constants;
 import com.dbf.naps.data.globals.continuous.Compound;
+import com.dbf.utils.stacktrace.StackTraceCompactor;
 
 public class ContinuousFileDownloadRunner extends YearlyFileDownloadRunner {
 
@@ -45,7 +46,7 @@ public void run() {
 
 			downloadFile(uri, resolveFilePath(fileName.toString()));
 		 } catch (Throwable t) {
-			 log.error(getThreadId() + ":: ERROR downloading file for year " + getYear() + " and compound " + compound, t);
+			 log.error(getThreadId() + ":: ERROR downloading file for year " + getYear() + " and compound " + compound + "\n" + StackTraceCompactor.getCompactStackTrace(t));
 			return; //Don't throw a runtime exception, let the other threads run
 		 }
 	}

diff --git a/src/main/java/com/dbf/naps/data/download/integrated/IntegratedFileDownloadRunner.java b/src/main/java/com/dbf/naps/data/download/integrated/IntegratedFileDownloadRunner.java
@@ -15,6 +15,7 @@
 import com.dbf.naps.data.download.options.YearlyDownloaderOptions;
 import com.dbf.naps.data.globals.Constants;
 import com.dbf.naps.data.utilities.ZipUtil;
+import com.dbf.utils.stacktrace.StackTraceCompactor;
 
 public class IntegratedFileDownloadRunner extends YearlyFileDownloadRunner {
 
@@ -71,7 +72,7 @@ public void run() {
 			}
 
 		 } catch (Throwable t) {
-			 log.error(getThreadId() + ":: ERROR downloading file " + fileName + " for year " + getYear() + " at path " + urlPath, t);
+			 log.error(getThreadId() + ":: ERROR downloading file " + fileName + " for year " + getYear() + " at path " + urlPath + "\n" + StackTraceCompactor.getCompactStackTrace(t));
 			return; //Don't throw a runtime exception, let the other threads run
 		 }
 	}	

diff --git a/src/main/java/com/dbf/naps/data/download/sites/NAPSSitesDownloader.java b/src/main/java/com/dbf/naps/data/download/sites/NAPSSitesDownloader.java
@@ -10,6 +10,7 @@
 import com.dbf.naps.data.NAPSActionBase;
 import com.dbf.naps.data.download.NAPSDataDownloader;
 import com.dbf.naps.data.download.options.DownloaderOptions;
+import com.dbf.utils.stacktrace.StackTraceCompactor;
 
 public class NAPSSitesDownloader extends NAPSActionBase<DownloaderOptions> {
 
@@ -31,7 +32,7 @@ protected void run() {
 		{
 			downloadSiteFile();
 		} catch (Throwable t) {
-			log.error("Unexpected failure.", t);
+			log.error("Unexpected failure.\n" + StackTraceCompactor.getCompactStackTrace(t));
 		}
 
 		log.info("Goodbye! 🙂");

diff --git a/src/main/java/com/dbf/naps/data/download/sites/SitesFileDownloadRunner.java b/src/main/java/com/dbf/naps/data/download/sites/SitesFileDownloadRunner.java
@@ -9,6 +9,7 @@
 import com.dbf.naps.data.download.FileDownloadRunner;
 import com.dbf.naps.data.download.options.DownloaderOptions;
 import com.dbf.naps.data.globals.Constants;
+import com.dbf.utils.stacktrace.StackTraceCompactor;
 
 public class SitesFileDownloadRunner extends FileDownloadRunner<DownloaderOptions> {
 
@@ -28,7 +29,7 @@ public void run() {
 
 			downloadFile(uri, resolveFilePath("sites.csv"));
 		 } catch (Throwable t) {
-			 log.error(getThreadId() + ":: ERROR downloading sites file.", t);
+			 log.error(getThreadId() + ":: ERROR downloading sites file.\n" + StackTraceCompactor.getCompactStackTrace(t));
 			return;
 		 }
 	}

diff --git a/src/main/java/com/dbf/naps/data/exporter/NAPSDataExtractor.java b/src/main/java/com/dbf/naps/data/exporter/NAPSDataExtractor.java
@@ -21,6 +21,7 @@
 import com.dbf.naps.data.records.DataRecordGroup;
 import com.dbf.naps.data.utilities.DataCleaner;
 import com.dbf.naps.data.utilities.Utils;
+import com.dbf.utils.stacktrace.StackTraceCompactor;
 
 public abstract class NAPSDataExtractor<O extends ExtractorOptions> extends NAPSDBAction<O> {
 
@@ -41,7 +42,7 @@ protected void run() {
 			super.run();
 			exportData();
 		} catch (Throwable t) {
-			log.error("Unexpected failure.", t);
+			log.error("Unexpected failure.\n" + StackTraceCompactor.getCompactStackTrace(t));
 		}
 
 		log.info("Goodbye! 🙂");

diff --git a/src/main/java/com/dbf/naps/data/loader/FileLoaderRunner.java b/src/main/java/com/dbf/naps/data/loader/FileLoaderRunner.java
@@ -15,6 +15,7 @@
 import com.dbf.naps.data.db.mappers.SiteMapper;
 import com.dbf.naps.data.globals.PollutantMapping;
 import com.dbf.naps.data.utilities.DataCleaner;
+import com.dbf.utils.stacktrace.StackTraceCompactor;
 
 public abstract class FileLoaderRunner extends DBRunner<LoaderOptions> {
 
@@ -42,7 +43,7 @@ public void run() {
 		try {
 			processFile();
 		 } catch (Throwable t) {
-			 log.error(getThreadId() + ":: ERROR loading file " + getRawFile() + " into the database.", t);
+			 log.error(getThreadId() + ":: ERROR loading file " + getRawFile() + " into the database.\n" + StackTraceCompactor.getCompactStackTrace(t));
 			return; //Don't throw a runtime exception, let the other threads run
 		 }
 		log.info(getThreadId() + ":: Done loading file " + getRawFile() + " into the database.");

diff --git a/src/main/java/com/dbf/naps/data/loader/NAPSDataLoader.java b/src/main/java/com/dbf/naps/data/loader/NAPSDataLoader.java
@@ -12,6 +12,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.dbf.naps.data.db.NAPSDBAction;
+import com.dbf.utils.stacktrace.StackTraceCompactor;
 
 public abstract class NAPSDataLoader extends NAPSDBAction<LoaderOptions> {
 
@@ -29,7 +30,7 @@ protected void run() {
 			super.run();
 			loadFiles();
 		} catch (Throwable t) {
-			log.error("Unexpected failure.", t);
+			log.error("Unexpected failure.\n" + StackTraceCompactor.getCompactStackTrace(t));
 		}
 
 		log.info("Goodbye! 🙂");