Add test constructor and improve logging in BukkitMetrics

Author: NonSwag

bukkit/src/main/java/org/faststats/BukkitMetrics.java

@@ -7,6 +7,7 @@
 import com.google.gson.stream.JsonWriter;
 import org.bukkit.plugin.Plugin;
 import org.faststats.chart.Chart;
+import org.jetbrains.annotations.TestOnly;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -18,6 +19,7 @@
 import java.nio.file.StandardOpenOption;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 import java.util.logging.Level;
 
@@ -54,6 +56,30 @@ public BukkitMetrics(Plugin plugin, String token) throws IOException {
         startSubmitting();
     }
 
+    @TestOnly
+    @SuppressWarnings("deprecation")
+    public BukkitMetrics(Plugin plugin, String token, UUID serverId, boolean enabled, boolean debug) {
+        this.serverId = serverId;
+        this.enabled = enabled;
+        this.debug = debug;
+
+        this.plugin = plugin;
+        this.onlineMode = checkOnlineMode();
+
+        this.token = token;
+
+        addChart(Chart.pie("online_mode", () -> String.valueOf(onlineMode)));
+        addChart(Chart.pie("plugin_version", () -> plugin.getDescription().getVersion()));
+        addChart(Chart.pie("server_type", () -> plugin.getServer().getName()));
+        addChart(Chart.pie("minecraft_version", () -> plugin.getServer().getMinecraftVersion()));
+        addChart(Chart.line("player_count", () -> plugin.getServer().getOnlinePlayers().size()));
+        startSubmitting();
+    }
+
+    protected void startSubmitting() {
+        startSubmitting(0, 30, TimeUnit.MINUTES);
+    }
+
     private static Optional<JsonObject> readOrCreate(Path path) throws IOException {
         if (Files.isRegularFile(path)) {
             return Optional.of(read(path));
@@ -101,14 +127,6 @@ private boolean isProxyOnlineMode() {
         return settings.getBoolean("bungeecord") && proxies.getBoolean("bungee-cord.online-mode");
     }
 
-    private <T> Optional<T> tryOrEmpty(Supplier<@Nullable T> supplier) {
-        try {
-            return Optional.ofNullable(supplier.get());
-        } catch (NoSuchMethodError | Exception e) {
-            return Optional.empty();
-        }
-    }
-
     @Override
     protected UUID getServerId() {
         return serverId;
@@ -121,16 +139,29 @@ protected boolean isEnabled() {
 
     @Override
     protected void error(String message, Throwable throwable) {
-        if (debug) plugin.getLogger().log(Level.SEVERE, message, throwable);
+        if (!debug) return;
+        var msg = "[" + BukkitMetrics.class.getName() + "]: " + message;
+        plugin.getLogger().log(Level.SEVERE, msg, throwable);
     }
 
     @Override
     protected void debug(String message) {
-        if (debug) plugin.getLogger().log(Level.INFO, message);
+        if (!debug) return;
+        var msg = "[" + BukkitMetrics.class.getName() + "]: " + message;
+        plugin.getLogger().log(Level.INFO, msg);
     }
 
     @Override
     public String getToken() {
         return token;
     }
+    
+    private <T> Optional<T> tryOrEmpty(Supplier<@Nullable T> supplier) {
+        try {
+            return Optional.ofNullable(supplier.get());
+        } catch (NoSuchMethodError | Exception e) {
+            error("Failed to call supplier", e);
+            return Optional.empty();
+        }
+    }
 }

core/src/main/java/org/faststats/SimpleMetrics.java

@@ -3,6 +3,7 @@
 import com.github.luben.zstd.Zstd;
 import com.google.gson.JsonObject;
 import org.faststats.chart.Chart;
+import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
 import java.net.URI;
@@ -21,19 +22,22 @@
 public abstract class SimpleMetrics implements Metrics {
     private final HttpClient httpClient = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(3)).build();
     private final Set<Chart<?>> charts = new HashSet<>();
+    private @Nullable ScheduledExecutorService executor = null;
 
-    private final ScheduledExecutorService executor;
+    protected void startSubmitting(int initialDelay, int period, TimeUnit unit) {
+        if (!isEnabled()) {
+            debug("Metrics disabled, not starting submission");
+            return;
+        }
 
-    public SimpleMetrics() {
         this.executor = Executors.newSingleThreadScheduledExecutor(runnable -> {
             var thread = new Thread(runnable, "metrics-submitter");
             thread.setDaemon(true);
             return thread;
         });
-    }
 
-    protected void startSubmitting() {
-        if (isEnabled()) executor.scheduleAtFixedRate(this::submitData, 0, 30, TimeUnit.MINUTES);
+        debug("Starting metrics submission");
+        executor.scheduleAtFixedRate(this::submitData, initialDelay, period, unit);
     }
 
     @Override
@@ -98,6 +102,9 @@ protected String getURL() {
     protected abstract void debug(String message);
 
     public void shutdown() {
+        debug("Shutting down metrics");
+        if (executor == null) return;
         executor.shutdown();
+        executor = null;
     }
 }