Refactor SimpleMetrics HTTP request and data creation

Author: NonSwag

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

@@ -1,5 +1,6 @@
 package org.faststats;
 
+import com.google.gson.FormattingStyle;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.stream.JsonReader;
@@ -48,8 +49,8 @@ public BukkitMetrics(Plugin plugin, String token) throws IOException {
         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("server_version", () -> plugin.getServer().getMinecraftVersion()));
-        addChart(Chart.line("player_amount", () -> plugin.getServer().getOnlinePlayers().size()));
+        addChart(Chart.pie("minecraft_version", () -> plugin.getServer().getMinecraftVersion()));
+        addChart(Chart.line("player_count", () -> plugin.getServer().getOnlinePlayers().size()));  // todo: rename in backend
         startSubmitting();
     }
 
@@ -63,8 +64,10 @@ private static Optional<JsonObject> readOrCreate(Path path) throws IOException {
     }
 
     private static void create(Path path) throws IOException {
+        Files.createDirectories(path.getParent());
         try (var out = Files.newOutputStream(path, StandardOpenOption.CREATE_NEW);
              var writer = new JsonWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8))) {
+            writer.setFormattingStyle(FormattingStyle.PRETTY);
             writer.beginObject();
             writer.name("serverId").value(UUID.randomUUID().toString());
             writer.name("enabled").value(true);

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

@@ -19,9 +19,7 @@
 import java.util.concurrent.TimeUnit;
 
 public abstract class SimpleMetrics implements Metrics {
-    private final HttpClient httpClient = HttpClient.newBuilder()
-            .connectTimeout(Duration.ofSeconds(3))
-            .build();
+    private final HttpClient httpClient = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(3)).build();
     private final Set<Chart<?>> charts = new HashSet<>();
 
     private final ScheduledExecutorService executor;
@@ -47,42 +45,35 @@ protected void submitData() {
         try {
             var bytes = createData().toString().getBytes(StandardCharsets.UTF_8);
             var compressed = Zstd.compress(bytes, 6);
-            var request = HttpRequest.newBuilder()
-                    .POST(HttpRequest.BodyPublishers.ofByteArray(compressed))
-                    .header("Content-Encoding", "zstd")
-                    .header("Content-Type", "application/octet-stream")
-                    .header("Authorization", "Bearer " + getToken())
-                    .header("User-Agent", "fastStats Metrics")
-                    .timeout(Duration.ofSeconds(3))
-                    .uri(URI.create(getURL()))
-                    .build();
+            var request = HttpRequest.newBuilder().POST(HttpRequest.BodyPublishers.ofByteArray(compressed)).header("content-encoding", "zstd").header("content-type", "application/octet-stream").header("authorization", "Bearer " + getToken()).header("user-agent", "fastStats Metrics").timeout(Duration.ofSeconds(3)).uri(URI.create(getURL())).build();
             httpClient.send(request, HttpResponse.BodyHandlers.discarding());
+            // todo: add debugs
         } catch (IOException | InterruptedException e) {
+            // todo: shorten connection errors
             error("Failed to submit metrics", e);
         }
     }
 
     protected JsonObject createData() {
         var data = new JsonObject();
-        data.addProperty("serverIdentifier", getServerId().toString());
-        data.addProperty("token", getToken());
+        var charts = new JsonObject();
 
-        data.addProperty("javaVersion", System.getProperty("java.version"));
-        data.addProperty("locale", System.getProperty("user.language"));
-        data.addProperty("osArch", System.getProperty("os.arch"));
-        data.addProperty("osName", System.getProperty("os.name"));
-        data.addProperty("osVersion", System.getProperty("os.version"));
-        data.addProperty("processors", Runtime.getRuntime().availableProcessors());
+        charts.addProperty("java_version", System.getProperty("java.version"));
+        charts.addProperty("os_arch", System.getProperty("os.arch")); // todo: rename in backend
+        charts.addProperty("os_name", System.getProperty("os.name")); // todo: rename in backend
+        charts.addProperty("os_version", System.getProperty("os.version")); // todo: rename in backend
+        charts.addProperty("core_count", Runtime.getRuntime().availableProcessors());
 
-        var charts = new JsonObject();
         this.charts.forEach(chart -> {
             try {
                 chart.getData().ifPresent(chartData -> charts.add(chart.getId(), chartData));
             } catch (Exception e) {
                 error("Failed to build chart data: " + chart.getId(), e);
             }
         });
-        if (!charts.isEmpty()) data.add("charts", charts);
+
+        data.addProperty("server_id", getServerId().toString());
+        data.add("data", charts);
         return data;
     }