From 8188428bf2603aba81e036c8923996b20f0db14c Mon Sep 17 00:00:00 2001 From: david Date: Fri, 3 Apr 2026 18:08:25 +0200 Subject: [PATCH] Move built-in data appending above custom metrics This allows for end users to override built-in metrics --- .../java/dev/faststats/core/SimpleMetrics.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/dev/faststats/core/SimpleMetrics.java b/core/src/main/java/dev/faststats/core/SimpleMetrics.java index 38cadb7..7dbfd5a 100644 --- a/core/src/main/java/dev/faststats/core/SimpleMetrics.java +++ b/core/src/main/java/dev/faststats/core/SimpleMetrics.java @@ -260,6 +260,13 @@ protected JsonObject createData() { metrics.addProperty("os_name", osName); metrics.addProperty("os_version", osVersion); + try { + appendDefaultData(metrics); + } catch (final Throwable t) { + error("Failed to append default data", t); + getErrorTracker().ifPresent(tracker -> tracker.trackError(t)); + } + this.metrics.forEach(metric -> { try { metric.getData().ifPresent(element -> metrics.add(metric.getId(), element)); @@ -269,13 +276,6 @@ protected JsonObject createData() { } }); - try { - appendDefaultData(metrics); - } catch (final Throwable t) { - error("Failed to append default data", t); - getErrorTracker().ifPresent(tracker -> tracker.trackError(t)); - } - data.addProperty("identifier", config.serverId().toString()); data.add("data", metrics);