Consolidate error tracker into core module

Author: NonSwag

bukkit/example-plugin/src/main/java/com/example/ExamplePlugin.java

@@ -3,7 +3,7 @@
 import dev.faststats.bukkit.BukkitMetrics;
 import dev.faststats.core.Metrics;
 import dev.faststats.core.chart.Chart;
-import dev.faststats.errors.ErrorTracker;
+import dev.faststats.core.ErrorTracker;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.net.URI;

core/build.gradle.kts

@@ -1,5 +1,7 @@
 dependencies {
-    api(project(":error-tracker"))
+    compileOnlyApi("com.google.code.gson:gson:2.13.2")
+    compileOnlyApi("org.jetbrains:annotations:26.0.2-1")
+    compileOnlyApi("org.jspecify:jspecify:1.0.0")
 
     testImplementation("com.google.code.gson:gson:2.13.2")
     testImplementation("org.junit.jupiter:junit-jupiter")

…a/dev/faststats/errors/ErrorTracker.java …ava/dev/faststats/core/ErrorTracker.javaerror-tracker/src/main/java/dev/faststats/errors/ErrorTracker.java renamed to core/src/main/java/dev/faststats/core/ErrorTracker.java error-tracker/src/main/java/dev/faststats/errors/ErrorTracker.java renamed to core/src/main/java/dev/faststats/core/ErrorTracker.java

@@ -1,23 +1,17 @@
-package dev.faststats.errors;
+package dev.faststats.core;
 
-import com.google.gson.JsonArray;
-import dev.faststats.errors.concurrent.TrackingExecutors;
-import dev.faststats.errors.concurrent.TrackingThreadFactory;
-import dev.faststats.errors.concurrent.TrackingThreadPoolExecutor;
-import dev.faststats.errors.impl.SimpleErrorTracker;
+import dev.faststats.core.concurrent.TrackingExecutors;
+import dev.faststats.core.concurrent.TrackingBase;
+import dev.faststats.core.concurrent.TrackingThreadFactory;
+import dev.faststats.core.concurrent.TrackingThreadPoolExecutor;
 import org.jetbrains.annotations.Contract;
 import org.jspecify.annotations.Nullable;
 
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-import java.util.Optional;
-
 /**
  * An error tracker.
  *
  * @since 0.10.0
  */
-// todo: cleanup
 public sealed interface ErrorTracker permits SimpleErrorTracker {
     /**
      * Create and attach a new context-aware error tracker.
@@ -76,23 +70,6 @@ static ErrorTracker contextUnaware() {
     @Contract(mutates = "this")
     void trackError(Throwable error);
 
-    /**
-     * Gets the error data.
-     *
-     * @return the error data
-     * @since 0.10.0
-     */
-    @Contract(pure = true)
-    Optional<JsonArray> getData(); // todo: keep public?
-
-    /**
-     * Clears the error data.
-     *
-     * @since 0.10.0
-     */
-    @Contract(mutates = "this")
-    void clear(); // todo: keep public?
-
     /**
      * Attaches an error context to the tracker.
      *
@@ -102,45 +79,13 @@ static ErrorTracker contextUnaware() {
     void attachErrorContext(@Nullable ClassLoader loader);
 
     /**
-     * Checks if the given error is from the given class loader.
+     * Returns the tracking base.
      *
-     * @param loader the class loader
-     * @param error  the error
-     * @return {@code true} if the error is from the given class loader.
+     * @return the tracking base
      * @since 0.10.0
      */
     @Contract(pure = true)
-    boolean isSameLoader(ClassLoader loader, Throwable error); // todo: keep public?
-
-    /**
-     * Creates a tracked runnable.
-     *
-     * @param runnable the runnable
-     * @return the tracked runnable
-     * @since 0.10.0
-     */
-    @Contract(value = "_ -> new", pure = true)
-    Runnable tracked(Runnable runnable); // todo: move to extra interface?
-
-    /**
-     * Creates a tracked action.
-     *
-     * @param action the action
-     * @return the tracked action
-     * @since 0.10.0
-     */
-    @Contract(value = "_ -> new", pure = true)
-    <T> PrivilegedAction<T> tracked(PrivilegedAction<T> action); // todo: move to extra interface?
-
-    /**
-     * Creates a tracked exception action.
-     *
-     * @param action the exception action
-     * @return the tracked exception action
-     * @since 0.10.0
-     */
-    @Contract(value = "_ -> new", pure = true)
-    <T> PrivilegedExceptionAction<T> tracked(PrivilegedExceptionAction<T> action); // todo: move to extra interface?
+    TrackingBase base();
 
     /**
      * Returns the tracking equivalent to {@link java.util.concurrent.Executors}.

core/src/main/java/dev/faststats/core/Metrics.java

@@ -1,7 +1,6 @@
 package dev.faststats.core;
 
 import dev.faststats.core.chart.Chart;
-import dev.faststats.errors.ErrorTracker;
 import org.jetbrains.annotations.Async;
 import org.jetbrains.annotations.Contract;
 

…v/faststats/errors/impl/MurmurHash3.java …java/dev/faststats/core/MurmurHash3.javaerror-tracker/src/main/java/dev/faststats/errors/impl/MurmurHash3.java renamed to core/src/main/java/dev/faststats/core/MurmurHash3.java error-tracker/src/main/java/dev/faststats/errors/impl/MurmurHash3.java renamed to core/src/main/java/dev/faststats/core/MurmurHash3.java

@@ -1,4 +1,4 @@
-package dev.faststats.errors.impl;
+package dev.faststats.core;
 
 import org.jetbrains.annotations.Contract;
 

…tats/errors/impl/SimpleErrorTracker.java …v/faststats/core/SimpleErrorTracker.javaerror-tracker/src/main/java/dev/faststats/errors/impl/SimpleErrorTracker.java renamed to core/src/main/java/dev/faststats/core/SimpleErrorTracker.java error-tracker/src/main/java/dev/faststats/errors/impl/SimpleErrorTracker.java renamed to core/src/main/java/dev/faststats/core/SimpleErrorTracker.java

@@ -1,27 +1,25 @@
-package dev.faststats.errors.impl;
+package dev.faststats.core;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import dev.faststats.errors.ErrorTracker;
-import dev.faststats.errors.concurrent.TrackingExecutors;
-import dev.faststats.errors.concurrent.TrackingThreadFactory;
-import dev.faststats.errors.concurrent.TrackingThreadPoolExecutor;
+import dev.faststats.core.concurrent.TrackingBase;
+import dev.faststats.core.concurrent.TrackingExecutors;
+import dev.faststats.core.concurrent.TrackingThreadFactory;
+import dev.faststats.core.concurrent.TrackingThreadPoolExecutor;
 import org.jspecify.annotations.Nullable;
 
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
-public final class SimpleErrorTracker implements ErrorTracker {
+final class SimpleErrorTracker implements ErrorTracker {
     private final int stackTraceLimit = Integer.getInteger("faststats.stack-trace-limit", 15);
     private final Map<String, Integer> collected = new ConcurrentHashMap<>();
     private final Map<String, JsonObject> reports = new ConcurrentHashMap<>();
 
+    private final TrackingBase base = new SimpleTrackingBase(this);
     private final TrackingExecutors executors = new SimpleTrackingExecutors(this);
     private final TrackingThreadFactory threadFactory = new SimpleTrackingThreadFactory(this);
     private final TrackingThreadPoolExecutor threadPoolExecutor = new SimpleTrackingThreadPoolExecutor(this);
@@ -86,20 +84,20 @@ private JsonObject compile(Throwable error, @Nullable List<StackTraceElement> su
             "\\b(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\b";
     private static final String IPV6_PATTERN =
             "(?i)\\b([0-9a-f]{1,4}:){7}[0-9a-f]{1,4}\\b|" +                          // Full form
-            "(?i)\\b([0-9a-f]{1,4}:){1,7}:\\b|" +                                     // Trailing ::
-            "(?i)\\b([0-9a-f]{1,4}:){1,6}:[0-9a-f]{1,4}\\b|" +                        // :: in middle (1 group after)
-            "(?i)\\b([0-9a-f]{1,4}:){1,5}(:[0-9a-f]{1,4}){1,2}\\b|" +                 // :: in middle (2 groups after)
-            "(?i)\\b([0-9a-f]{1,4}:){1,4}(:[0-9a-f]{1,4}){1,3}\\b|" +                 // :: in middle (3 groups after)
-            "(?i)\\b([0-9a-f]{1,4}:){1,3}(:[0-9a-f]{1,4}){1,4}\\b|" +                 // :: in middle (4 groups after)
-            "(?i)\\b([0-9a-f]{1,4}:){1,2}(:[0-9a-f]{1,4}){1,5}\\b|" +                 // :: in middle (5 groups after)
-            "(?i)\\b[0-9a-f]{1,4}:(:[0-9a-f]{1,4}){1,6}\\b|" +                        // :: in middle (6 groups after)
-            "(?i)\\b:(:[0-9a-f]{1,4}){1,7}\\b|" +                                     // Leading ::
-            "(?i)\\b::([0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4}\\b|" +                       // :: at start
-            "(?i)\\b::\\b";                                                           // Just ::
+                    "(?i)\\b([0-9a-f]{1,4}:){1,7}:\\b|" +                                     // Trailing ::
+                    "(?i)\\b([0-9a-f]{1,4}:){1,6}:[0-9a-f]{1,4}\\b|" +                        // :: in middle (1 group after)
+                    "(?i)\\b([0-9a-f]{1,4}:){1,5}(:[0-9a-f]{1,4}){1,2}\\b|" +                 // :: in middle (2 groups after)
+                    "(?i)\\b([0-9a-f]{1,4}:){1,4}(:[0-9a-f]{1,4}){1,3}\\b|" +                 // :: in middle (3 groups after)
+                    "(?i)\\b([0-9a-f]{1,4}:){1,3}(:[0-9a-f]{1,4}){1,4}\\b|" +                 // :: in middle (4 groups after)
+                    "(?i)\\b([0-9a-f]{1,4}:){1,2}(:[0-9a-f]{1,4}){1,5}\\b|" +                 // :: in middle (5 groups after)
+                    "(?i)\\b[0-9a-f]{1,4}:(:[0-9a-f]{1,4}){1,6}\\b|" +                        // :: in middle (6 groups after)
+                    "(?i)\\b:(:[0-9a-f]{1,4}){1,7}\\b|" +                                     // Leading ::
+                    "(?i)\\b::([0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4}\\b|" +                       // :: at start
+                    "(?i)\\b::\\b";                                                           // Just ::
     private static final String USER_HOME_PATH_PATTERN =
             "(/home/)[^/\\s]+" +                                                      // Linux: /home/username
-            "|(/Users/)[^/\\s]+" +                                                    // macOS: /Users/username
-            "|((?i)[A-Z]:\\\\Users\\\\)[^\\\\\\s]+";                                  // Windows: A-Z:\\Users\\username
+                    "|(/Users/)[^/\\s]+" +                                                    // macOS: /Users/username
+                    "|((?i)[A-Z]:\\\\Users\\\\)[^\\\\\\s]+";                                  // Windows: A-Z:\\Users\\username
 
     private String anonymize(String message) {
         message = message.replaceAll(IPV4_PATTERN, "[IP hidden]");
@@ -110,8 +108,7 @@ private String anonymize(String message) {
         return message;
     }
 
-    @Override
-    public Optional<JsonArray> getData() {
+    public JsonArray getData() {
         var report = new JsonArray(reports.size());
 
         reports.forEach((hash, object) -> {
@@ -132,10 +129,9 @@ public Optional<JsonArray> getData() {
             report.add(entry);
         });
 
-        return Optional.of(report);
+        return report;
     }
 
-    @Override
     public void clear() {
         collected.replaceAll((k, v) -> 0);
         reports.clear();
@@ -152,21 +148,40 @@ public void attachErrorContext(@Nullable ClassLoader loader) {
     }
 
     @Override
-    public boolean isSameLoader(ClassLoader loader, Throwable error) {
-        StackTraceElement[] stackTrace = error.getStackTrace();
+    public TrackingBase base() {
+        return base;
+    }
+
+    @Override
+    public TrackingExecutors executors() {
+        return executors;
+    }
+
+    @Override
+    public TrackingThreadFactory threadFactory() {
+        return threadFactory;
+    }
+
+    @Override
+    public TrackingThreadPoolExecutor threadPoolExecutor() {
+        return threadPoolExecutor;
+    }
+
+    private boolean isSameLoader(final ClassLoader loader, final Throwable error) {
+        var stackTrace = error.getStackTrace();
         if (stackTrace == null || stackTrace.length == 0) {
             return false;
         }
 
-        int firstNonLibraryIndex = findFirstNonLibraryFrameIndex(stackTrace);
+        var firstNonLibraryIndex = findFirstNonLibraryFrameIndex(stackTrace);
         if (firstNonLibraryIndex == -1) {
             return false;
         }
 
-        int framesToCheck = Math.min(5, stackTrace.length - firstNonLibraryIndex);
+        var framesToCheck = Math.min(5, stackTrace.length - firstNonLibraryIndex);
 
-        for (int i = 0; i < framesToCheck; i++) {
-            StackTraceElement frame = stackTrace[firstNonLibraryIndex + i];
+        for (var i = 0; i < framesToCheck; i++) {
+            var frame = stackTrace[firstNonLibraryIndex + i];
             if (isLibraryClass(frame.getClassName())) {
                 continue;
             }
@@ -178,75 +193,24 @@ public boolean isSameLoader(ClassLoader loader, Throwable error) {
         return true;
     }
 
-    @Override
-    public Runnable tracked(Runnable runnable) {
-        return () -> {
-            try {
-                runnable.run();
-            } catch (Throwable error) {
-                trackError(error);
-                throw error;
-            }
-        };
-    }
-
-    @Override
-    public <T> PrivilegedAction<T> tracked(PrivilegedAction<T> action) {
-        return () -> {
-            try {
-                return action.run();
-            } catch (Throwable error) {
-                trackError(error);
-                throw error;
-            }
-        };
-    }
-
-    @Override
-    public <T> PrivilegedExceptionAction<T> tracked(PrivilegedExceptionAction<T> action) {
-        return () -> {
-            try {
-                return action.run();
-            } catch (Throwable error) {
-                trackError(error);
-                throw error;
-            }
-        };
-    }
-
-    @Override
-    public TrackingExecutors executors() {
-        return executors;
-    }
-
-    @Override
-    public TrackingThreadFactory threadFactory() {
-        return threadFactory;
-    }
-
-    @Override
-    public TrackingThreadPoolExecutor threadPoolExecutor() {
-        return threadPoolExecutor;
-    }
-
-    private int findFirstNonLibraryFrameIndex(StackTraceElement[] stackTrace) {
-        for (int i = 0; i < stackTrace.length; i++) {
+    private int findFirstNonLibraryFrameIndex(final StackTraceElement[] stackTrace) {
+        for (var i = 0; i < stackTrace.length; i++) {
             if (!isLibraryClass(stackTrace[i].getClassName())) {
                 return i;
             }
         }
         return -1;
     }
 
-    private boolean isLibraryClass(String className) {
+    private boolean isLibraryClass(final String className) {
         return className.startsWith("java.")
                 || className.startsWith("javax.")
                 || className.startsWith("sun.")
                 || className.startsWith("com.sun.")
                 || className.startsWith("jdk.");
     }
 
-    private boolean isFromLoader(StackTraceElement frame, ClassLoader loader) {
+    private boolean isFromLoader(final StackTraceElement frame, final ClassLoader loader) {
         try {
             var clazz = Class.forName(frame.getClassName(), false, loader);
             return isSameClassLoader(clazz.getClassLoader(), loader);
@@ -255,18 +219,13 @@ private boolean isFromLoader(StackTraceElement frame, ClassLoader loader) {
         }
     }
 
-    private boolean isSameClassLoader(ClassLoader classLoader, ClassLoader loader) {
-        if (classLoader == loader) {
-            return true;
-        }
-        // Walk up the class loader hierarchy
-        ClassLoader current = classLoader;
-        while (current != null) {
-            if (current == loader) {
-                return true;
-            }
+    private boolean isSameClassLoader(final ClassLoader classLoader, final ClassLoader loader) {
+        if (classLoader == loader) return true;
+
+        var current = classLoader;
+        while (current != null && current != loader) {
             current = current.getParent();
         }
-        return false;
+        return loader == current;
     }
 }