WIP: debug locally

Author: sladkoff

docker-compose.yml

@@ -5,14 +5,16 @@ services:
     image: itzg/minecraft-server:2024.2.0
     environment:
       EULA: "true"
-      TYPE: "PAPER"
+      TYPE: "FOLIA"
       VERSION: "1.20.4"
-      PLUGINS: |
-        https://github.com/sladkoff/minecraft-prometheus-exporter/releases/download/v2.6.0/minecraft-prometheus-exporter-2.6.0.jar
+#      PLUGINS: |
+#        https://github.com/sladkoff/minecraft-prometheus-exporter/releases/download/v2.5.0/minecraft-prometheus-exporter-2.5.0.jar
 
     ports:
       - "25565:25565"
       - "9940:9940"
+    expose:
+      - 9940
     volumes:
       - ./docker/data:/data
     stdin_open: true

src/main/java/de/sldk/mc/MetricsController.java

@@ -41,7 +41,7 @@ public void handle(String target, Request request, HttpServletRequest httpServle
             request.setHandled(true);
         } catch (InterruptedException | ExecutionException e) {
             exporter.getLogger().log(Level.WARNING, "Failed to read server statistic: " + e.getMessage());
-            exporter.getLogger().log(Level.FINE, "Failed to read server statistic: ", e);
+            exporter.getLogger().log(Level.INFO, "Failed to read server statistic: ", e);
             response.sendError(HttpStatus.INTERNAL_SERVER_ERROR_500);
         }
     }

src/main/java/de/sldk/mc/PrometheusExporter.java

@@ -24,7 +24,7 @@ private void startMetricsServer() {
         String host = config.get(PrometheusExporterConfig.HOST);
         Integer port = config.get(PrometheusExporterConfig.PORT);
 
-		server = new MetricsServer(host, port, this);
+        server = new MetricsServer(host, port, this);
 
         try {
             server.start();
@@ -41,7 +41,7 @@ public void onDisable() {
             server.stop();
         } catch (Exception e) {
             getLogger().log(Level.WARNING, "Failed to stop metrics server gracefully: " + e.getMessage());
-            getLogger().log(Level.FINE, "Failed to stop metrics server gracefully", e);
+            getLogger().log(Level.INFO, "Failed to stop metrics server gracefully", e);
         }
     }
 

src/main/java/de/sldk/mc/metrics/Metric.java

@@ -2,11 +2,9 @@
 
 import io.prometheus.client.Collector;
 import io.prometheus.client.CollectorRegistry;
-import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
 
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
 import java.util.logging.Logger;
 
 public abstract class Metric {
@@ -34,49 +32,17 @@ public CompletableFuture<Void> collect() {
             }
 
             /* If metric is capable of async execution run it on a thread pool */
-            if (isAsyncCapable()) {
-
-                try {
-                    doCollect();
-                }
-                catch (Exception e) {
-                    logException(e);
-                }
-                return;
-            }
 
-            /*
-            * Otherwise run the metric on the main thread and make the
-            * thread on thread pool wait for completion
-            */
             try {
-                Bukkit.getScheduler().callSyncMethod(plugin, () -> {
-                    try {
-                        doCollect();
-                    }
-                    catch (Exception e) {
-                        logException(e);
-                    }
-                    return null;
-                }).get();
-            } catch (InterruptedException | ExecutionException e) {
+                doCollect();
+            } catch (Exception e) {
                 logException(e);
             }
         });
     }
 
     protected abstract void doCollect();
 
-    /**
-     * This method is called during the Metric collection
-     * to determine if it is safe to do it async.
-     * By default, all Metrics are sync unless this method
-     * is overridden.
-     */
-    protected boolean isAsyncCapable() {
-        return false;
-    }
-
     private void logException(Exception e) {
         final Logger log = plugin.getLogger();
         final String className = getClass().getSimpleName();

src/main/java/de/sldk/mc/metrics/WorldSize.java

@@ -36,9 +36,4 @@ public void collect(World world) {
             log.throwing(this.getClass().getSimpleName(), "collect", t);
         }
     }
-
-    @Override
-    protected boolean isAsyncCapable() {
-        return true;
-    }
 }

src/main/resources/plugin.yml

@@ -4,3 +4,4 @@ author: sldk
 main: de.sldk.mc.PrometheusExporter
 website: sldk.de
 api-version: 1.16
+folia-supported: true