From 8bce3c88afdebd32d2e606efa41f56d779e902c6 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 14:23:04 -0400 Subject: [PATCH 01/23] build: add OWASP dependency-check with CVSS 7.0 gate --- owasp-suppressions.xml | 4 ++++ pom.xml | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 owasp-suppressions.xml diff --git a/owasp-suppressions.xml b/owasp-suppressions.xml new file mode 100644 index 0000000..4b21688 --- /dev/null +++ b/owasp-suppressions.xml @@ -0,0 +1,4 @@ + + + + diff --git a/pom.xml b/pom.xml index bd12947..d3cae56 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,18 @@ 1.8 + + org.owasp + dependency-check-maven + 12.1.0 + + 7.0 + false + + ${maven.multiModuleProjectDirectory}/owasp-suppressions.xml + + + From 40d67a494b01fb9b398e2da774f3c7dbdc8a39ca Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 14:25:23 -0400 Subject: [PATCH 02/23] build: target Java 21 and bump maven-compiler-plugin to 3.14.0 --- pom.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d3cae56..396b42e 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,12 @@ logtosplunk-plugin pom - + + + 21 + UTF-8 + + mvnrepository-central @@ -56,10 +61,9 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 3.14.0 - 1.8 - 1.8 + 21 From a2e7dcd43205e19eb80e60a17f063e3ca6b7e54a Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 14:30:59 -0400 Subject: [PATCH 03/23] refactor: replace json-simple with gson for HEC envelope Extract buildHecEnvelope() helper in SingleSplunkConnection using gson (already a shared-mc dependency) instead of the unmaintained json-simple 1.1 library. Wire format is unchanged: {"event": }. Adds unit tests covering basic wrapping and quote escaping, and removes the json-simple dependency from shared-mc/pom.xml and the parent pom's dependencyManagement. --- pom.xml | 5 ---- shared-mc/pom.xml | 6 ----- .../sharedmc/SingleSplunkConnection.java | 18 ++++++++----- .../sharedmc/SingleSplunkConnectionTest.java | 26 +++++++++++++++++++ 4 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 shared-mc/src/test/java/com/splunk/sharedmc/SingleSplunkConnectionTest.java diff --git a/pom.xml b/pom.xml index 396b42e..82b4fb8 100644 --- a/pom.xml +++ b/pom.xml @@ -49,11 +49,6 @@ 4.8.2 test - - com.googlecode.json-simple - json-simple - 1.1 - diff --git a/shared-mc/pom.xml b/shared-mc/pom.xml index 5e0ba66..9d051b5 100644 --- a/shared-mc/pom.xml +++ b/shared-mc/pom.xml @@ -57,12 +57,6 @@ splunk-library-javalogging 1.11.8 - - com.googlecode.json-simple - json-simple - 1.1 - - junit junit diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/SingleSplunkConnection.java b/shared-mc/src/main/java/com/splunk/sharedmc/SingleSplunkConnection.java index 0f4af0b..b756448 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/SingleSplunkConnection.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/SingleSplunkConnection.java @@ -24,8 +24,6 @@ import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; import org.apache.hc.core5.io.CloseMode; -import org.json.simple.JSONObject; - /** * Knows a single Splunk instance by its host:port and forwards data to it. */ @@ -84,6 +82,16 @@ public void run() { } } + /** + * Wraps a raw event message in the Splunk HEC envelope: {"event": }. + * Package-private for testing. + */ + static String buildHecEnvelope(String message) { + com.google.gson.JsonObject event = new com.google.gson.JsonObject(); + event.addProperty("event", message); + return event.toString(); + } + /** * Queues up a message to send to this Spunk connections' Splunk instance. * @@ -91,11 +99,7 @@ public void run() { */ @Override public void sendToSplunk(String message) { - JSONObject event = new JSONObject(); - //message = Calendar.getInstance().getTime().toString() + ' ' + message; - event.put("event", message); - - messagesToSend.append(event.toString()); + messagesToSend.append(buildHecEnvelope(message)); } private boolean sendData() { diff --git a/shared-mc/src/test/java/com/splunk/sharedmc/SingleSplunkConnectionTest.java b/shared-mc/src/test/java/com/splunk/sharedmc/SingleSplunkConnectionTest.java new file mode 100644 index 0000000..8fe1cc0 --- /dev/null +++ b/shared-mc/src/test/java/com/splunk/sharedmc/SingleSplunkConnectionTest.java @@ -0,0 +1,26 @@ +package com.splunk.sharedmc; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import org.junit.Test; + +public class SingleSplunkConnectionTest { + + @Test + public void buildHecEnvelope_wrapsMessageInEventField() { + String out = SingleSplunkConnection.buildHecEnvelope("hello world"); + JsonObject parsed = JsonParser.parseString(out).getAsJsonObject(); + assertEquals("hello world", parsed.get("event").getAsString()); + } + + @Test + public void buildHecEnvelope_escapesQuotes() { + String out = SingleSplunkConnection.buildHecEnvelope("a \"quoted\" value"); + JsonObject parsed = JsonParser.parseString(out).getAsJsonObject(); + assertEquals("a \"quoted\" value", parsed.get("event").getAsString()); + assertTrue(out.contains("\\\"")); + } +} From dc432557464be4d00a64dcc6e8d821a5f5becf16 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 14:39:07 -0400 Subject: [PATCH 04/23] build: centralize dependency versions in parent, bump junit to 4.13.2 --- pom.xml | 22 +++++++++++++++++++++- shared-mc/pom.xml | 7 ------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 82b4fb8..988d8c2 100644 --- a/pom.xml +++ b/pom.xml @@ -43,10 +43,30 @@ splunk-library-javalogging 1.11.8 + + com.google.code.gson + gson + 2.13.2 + + + com.google.guava + guava + 33.5.0-jre + + + org.apache.httpcomponents.core5 + httpcore5 + 5.3.6 + + + org.apache.httpcomponents.client5 + httpclient5 + 5.5.1 + junit junit - 4.8.2 + 4.13.2 test diff --git a/shared-mc/pom.xml b/shared-mc/pom.xml index 9d051b5..8dec369 100644 --- a/shared-mc/pom.xml +++ b/shared-mc/pom.xml @@ -26,36 +26,29 @@ org.apache.logging.log4j log4j-api - 2.25.1 org.apache.logging.log4j log4j-core - 2.25.1 org.apache.httpcomponents.core5 httpcore5 - 5.3.6 org.apache.httpcomponents.client5 httpclient5 - 5.5.1 com.google.guava guava - 33.5.0-jre com.google.code.gson gson - 2.13.2 com.splunk.logging splunk-library-javalogging - 1.11.8 junit From e4db6d12f8c82323aeeaf3f99aab93e615dcb095 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 14:42:04 -0400 Subject: [PATCH 05/23] build: drop forge from reactor, bump shade plugin to 3.6.0, remove stale splunk 1.0.1 --- logtosplunk-plugin/pom.xml | 7 +------ pom.xml | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/logtosplunk-plugin/pom.xml b/logtosplunk-plugin/pom.xml index 33e5b52..c21f48e 100644 --- a/logtosplunk-plugin/pom.xml +++ b/logtosplunk-plugin/pom.xml @@ -62,7 +62,7 @@ - 2.4.1 + 3.6.0 package @@ -93,11 +93,6 @@ org.apache.logging.log4j log4j-core - - com.splunk - splunk-library-javalogging - 1.0.1 - com.splunk shared-mc diff --git a/pom.xml b/pom.xml index 988d8c2..ed7b848 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,6 @@ spigot shared-mc - forge logtosplunk-plugin pom From ce087869cbe9ab63b05046bedc094e10bb6bae95 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 13 Jul 2026 15:40:08 -0400 Subject: [PATCH 06/23] build: restructure Maven modules for multi-version packaging, pin CVE'd deps Adds per-platform MC-version Maven profiles (spigot: 1.21.1 default plus 1.20.1/1.20.4/1.20.6), a shade-plugin build producing logtosplunk---.jar per module, and marks server-provided deps (log4j, spigot-api) as provided scope so they aren't shaded into the plugin jar. Pins kotlin-stdlib to 2.0.21 to clear CVE-2026-53914 pulled in transitively via splunk-library-javalogging -> okhttp3 -> kotlin-stdlib:1.6.20. Tunes the OWASP dependency-check plugin to skip provided-scope CVEs (server operator's responsibility) and not fail on Sonatype OSS Index 401s (paid-only), while still enforcing the CVSS 7.0 gate. --- .gitignore | 46 ++++++++----- default/app.conf | 43 ++++++------ logtosplunk-plugin/pom.xml | 138 +++++++++++++++---------------------- owasp-suppressions.xml | 51 ++++++++++++++ pom.xml | 57 ++++++++++++++- spigot/pom.xml | 117 +++++++++++++++++++++++++------ 6 files changed, 309 insertions(+), 143 deletions(-) diff --git a/.gitignore b/.gitignore index 5759fa9..48d32c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,30 @@ -*.pyo -*.pyc -*.swp -build -.gradle -bin/ -.project -*.iml -.idea/ -eclipse/ -.classpath -logs/ -.settings -target/ +*.pyo +*.pyc +*.swp +build +.gradle +bin/ +.project +*.iml +.idea/ +eclipse/ +.classpath +logs/ +.settings +target/ + +#forge .idea things: +*.ipr +*.iws +# Editor/tooling droppings +.vscode/ +.cursor/ +.codegraph/ +graphify-out/ +*.code-workspace -#forge .idea things: -*.ipr -*.iws \ No newline at end of file +# Local tool installs / build output not meant for version control +mvn-bin/ +dist/ +node_modules/ +*.tar.gz diff --git a/default/app.conf b/default/app.conf index ad18d6b..0ff0a44 100755 --- a/default/app.conf +++ b/default/app.conf @@ -1,21 +1,22 @@ -# -# Splunk app configuration file -# - -[install] -state = enabled -state_change_requires_restart = 0 -is_configured = 0 -build = 1 - -[ui] -is_visible = 1 -label = Minecraft - -[launcher] -author = mpapale@splunk.com -description = The Splunk App for Minecraft let's you visualize your Minecraft server data. -version = 1.0 - -[package] -id = minecraft-app +# +# Splunk app configuration file +# + +[install] +state = enabled +state_change_requires_restart = 0 +is_configured = 0 +build = 1 + +[ui] +is_visible = 1 +label = Minecraft +supported_themes = light, dark + +[launcher] +author = mpapale@splunk.com +description = The Splunk App for Minecraft let's you visualize your Minecraft server data. +version = 1.0 + +[package] +id = minecraft-app diff --git a/logtosplunk-plugin/pom.xml b/logtosplunk-plugin/pom.xml index c21f48e..3fef39d 100644 --- a/logtosplunk-plugin/pom.xml +++ b/logtosplunk-plugin/pom.xml @@ -8,103 +8,75 @@ 4.0.0 + logtosplunk-plugin - - - - mvnrepository-central - mvnrepository.com Central - https://repo1.maven.org/maven2/ - - - splunk-artifactory - Splunk Releases - https://splunk.jfrog.io/splunk/ext-releases-local - - - - - - org.apache.logging.log4j - log4j-api - 2.25.1 - - - org.apache.logging.log4j - log4j-core - 2.25.1 - - - com.splunk.logging - splunk-library-javalogging - 1.11.8 - - - com.splunk - shared-mc - ${project.version} - - - com.splunk - spigot - ${project.version} - - + pom + org.apache.maven.plugins - maven-shade-plugin - - - ${project.build.directory}/dependency-reduced-pom.xml - - - - 3.6.0 + maven-antrun-plugin + 3.1.0 + collect-dist package - shade + run + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - include-forge - - - com.splunk - logtosplunk-forge - ${project.version} - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-core - - - com.splunk - shared-mc - ${project.version} - - - com.splunk - spigot - ${project.version} - - - - - diff --git a/owasp-suppressions.xml b/owasp-suppressions.xml index 4b21688..34c7c49 100644 --- a/owasp-suppressions.xml +++ b/owasp-suppressions.xml @@ -1,4 +1,55 @@ + + + + CVE-2026-53914: affects all kotlin-stdlib versions, no fix available. kotlin-stdlib + is a transitive dep from okhttp3 via splunk-library-javalogging; we write no Kotlin code. + Pinned to 2.0.21 (latest); re-evaluate when a fixed kotlin-stdlib version is published. + ^pkg:maven/org\.jetbrains\.kotlin/kotlin\-stdlib.*@.*$ + CVE-2026-53914 + + + + + CVE-2020-29582: Kotlin scripting temp-dir exposure. We don't use Kotlin scripting; + kotlin-stdlib is a transitive dep from okhttp3/splunk-library-javalogging. + ^pkg:maven/org\.jetbrains\.kotlin/kotlin\-stdlib.*@.*$ + CVE-2020-29582 + + + + + + False positive: shared-mc JAR matched to Minecraft game CPE due to "minecraft" in + project path and "SNAPSHOT" in version. CVE-2023-33245 and CVE-2021-35054 are Minecraft + game vulnerabilities, unrelated to this library. + ^pkg:maven/com\.splunk/shared\-mc@.*$ + CVE-2023-33245 + + + False positive — same reason as CVE-2023-33245 above. + ^pkg:maven/com\.splunk/shared\-mc@.*$ + CVE-2021-35054 + + diff --git a/pom.xml b/pom.xml index ed7b848..fb65c0e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,8 +6,11 @@ splunk.minecraft.app 1.0-SNAPSHOT - spigot shared-mc + spigot + paper + forge + neoforge logtosplunk-plugin pom @@ -15,6 +18,14 @@ 21 UTF-8 + + 1.21.1 + spigot + 1.21.1-R0.1 @@ -23,19 +34,56 @@ mvnrepository.com Central https://repo1.maven.org/maven2/ + + papermc + Paper Maven + https://repo.papermc.io/repository/maven-public/ + + + spigot-repo + Spigot Snapshots + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + org.jetbrains.kotlin + kotlin-stdlib + 2.0.21 + + + org.jetbrains.kotlin + kotlin-stdlib-common + 2.0.21 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + 2.0.21 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + 2.0.21 + + org.apache.logging.log4j log4j-api 2.25.1 + provided org.apache.logging.log4j log4j-core 2.25.1 + provided com.splunk.logging @@ -86,7 +134,12 @@ 12.1.0 7.0 - false + + true + + false ${maven.multiModuleProjectDirectory}/owasp-suppressions.xml diff --git a/spigot/pom.xml b/spigot/pom.xml index 451e073..e4db243 100644 --- a/spigot/pom.xml +++ b/spigot/pom.xml @@ -10,44 +10,121 @@ spigot - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - + + + 1.21.1 + spigot + 1.21.1-R0.1 + 1.21.1-R0.1-SNAPSHOT + + + + + mc-1201 + + 1.20.1 + 1.20.1-R0.1 + 1.20.1-R0.1-SNAPSHOT + + + + mc-1204 + + 1.20.4 + 1.20.4-R0.1 + 1.20.4-R0.1-SNAPSHOT + + + + mc-1206 + + 1.20.6 + 1.20.6-R0.1 + 1.20.6-R0.1-SNAPSHOT + + + + + + org.spigotmc + spigot-api + ${spigot.api.version} + provided + net.md-5 bungeecord-chat 1.21-R0.4 + provided - - - org.spigotmc - spigot-api - 26.2-R0.1-20260616.212206-1 - - - - org.bukkit - bukkit - 26.2-R0.1-SNAPSHOT - + + com.github.cryptomorin XSeries 13.5.1 - + + + org.apache.logging.log4j + log4j-api + - + com.splunk shared-mc ${project.version} + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.6.0 + + logtosplunk-${mc.version}-${loader.name}-${loader.version.display} + false + + + *:* + + META-INF/versions/*/module-info.class + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + package + + shade + + + + + + From cfab6b3dd1e1b5358b9a1afc6c965ad2a8469bb3 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 14:45:12 -0400 Subject: [PATCH 07/23] feat(shared-mc): add SERVER/PERFORMANCE/COMBAT/ITEM/PROGRESSION types + location-less event ctor --- .../AbstractLoggableEvent.java | 20 ++++++++++++------- .../loggable_events/LoggableEventType.java | 7 ++++++- .../AbstractLoggableEventTest.java | 18 +++++++++++++++++ 3 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/AbstractLoggableEventTest.java diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/AbstractLoggableEvent.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/AbstractLoggableEvent.java index 56a93d5..08edbe7 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/AbstractLoggableEvent.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/AbstractLoggableEvent.java @@ -21,18 +21,24 @@ public class AbstractLoggableEvent extends SplunkCimLogEvent implements Loggable * @param type The type of event that this is. */ public AbstractLoggableEvent(LoggableEventType type, long worldTime, String worldName, Point3dLong coordinates) { + this(type, worldTime, worldName); + if (coordinates != null) { + this.addField("xCoord", coordinates.xCoord); + this.addField("yCoord", coordinates.yCoord); + this.addField("zCoord", coordinates.zCoord); + } + } + + /** + * Constructor for events with no world location (e.g. server lifecycle, performance). + */ + public AbstractLoggableEvent(LoggableEventType type, long worldTime, String worldName) { super(type.getEventName(), ""); - this.addField("time", System.currentTimeMillis()); - - this.addField("game_time", worldTime); - if(worldName != null) { + if (worldName != null) { this.addField("world", worldName); } - this.addField("xCoord", coordinates.xCoord); - this.addField("yCoord", coordinates.yCoord); - this.addField("zCoord", coordinates.zCoord); } @Override diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableEventType.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableEventType.java index 3e2382d..415cce7 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableEventType.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableEventType.java @@ -6,7 +6,12 @@ public enum LoggableEventType { PLAYER("PlayerEvent"), BLOCK("BlockEvent"), - DEATH("DeathEvent"); + DEATH("DeathEvent"), + SERVER("ServerEvent"), + PERFORMANCE("PerformanceEvent"), + COMBAT("CombatEvent"), + ITEM("ItemEvent"), + PROGRESSION("ProgressionEvent"); private final String eventName; diff --git a/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/AbstractLoggableEventTest.java b/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/AbstractLoggableEventTest.java new file mode 100644 index 0000000..532e475 --- /dev/null +++ b/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/AbstractLoggableEventTest.java @@ -0,0 +1,18 @@ +package com.splunk.sharedmc.loggable_events; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; + +import org.junit.Test; + +public class AbstractLoggableEventTest { + + @Test + public void locationLessConstructor_doesNotNpe_andOmitsCoords() { + AbstractLoggableEvent e = + new AbstractLoggableEvent(LoggableEventType.SERVER, 0L, "world"); + String json = e.toJson(); + assertTrue(json.contains("SERVER".toLowerCase()) || json.contains("ServerEvent")); + assertFalse("location-less event must not emit xCoord", json.contains("xCoord")); + } +} From 839a87fa73f3e42189019c5d2c32bf1e52762ad0 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 14:47:36 -0400 Subject: [PATCH 08/23] feat(shared-mc): add LoggableServerEvent and LoggablePerformanceEvent --- .../LoggablePerformanceEvent.java | 32 +++++++++++++++++++ .../loggable_events/LoggableServerEvent.java | 32 +++++++++++++++++++ .../LoggablePerformanceEventTest.java | 17 ++++++++++ .../LoggableServerEventTest.java | 24 ++++++++++++++ 4 files changed, 105 insertions(+) create mode 100644 shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePerformanceEvent.java create mode 100644 shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableServerEvent.java create mode 100644 shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggablePerformanceEventTest.java create mode 100644 shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableServerEventTest.java diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePerformanceEvent.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePerformanceEvent.java new file mode 100644 index 0000000..f59ca4b --- /dev/null +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePerformanceEvent.java @@ -0,0 +1,32 @@ +package com.splunk.sharedmc.loggable_events; + +/** + * A sampled snapshot of server performance metrics. + */ +public class LoggablePerformanceEvent extends AbstractLoggableEvent { + + public LoggablePerformanceEvent(long gameTime) { + super(LoggableEventType.PERFORMANCE, gameTime, null); + this.addField(ACTION, "performance_sample"); + } + + public LoggablePerformanceEvent setTps(double tps) { + this.addField("tps", tps); + return this; + } + + public LoggablePerformanceEvent setMspt(double mspt) { + this.addField("mspt", mspt); + return this; + } + + public LoggablePerformanceEvent setOnlinePlayers(int count) { + this.addField("online_players", count); + return this; + } + + public LoggablePerformanceEvent setLoadedChunks(int chunks) { + this.addField("loaded_chunks", chunks); + return this; + } +} diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableServerEvent.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableServerEvent.java new file mode 100644 index 0000000..c9c2be7 --- /dev/null +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableServerEvent.java @@ -0,0 +1,32 @@ +package com.splunk.sharedmc.loggable_events; + +/** + * Server lifecycle and world-state events (start, stop, weather). + */ +public class LoggableServerEvent extends AbstractLoggableEvent { + + public LoggableServerEvent(ServerAction action, long gameTime, String worldName) { + super(LoggableEventType.SERVER, gameTime, worldName); + this.addField(ACTION, action.asString()); + } + + public LoggableServerEvent setWeather(String weather) { + this.addField("weather", weather); + return this; + } + + public LoggableServerEvent setMotd(String motd) { + this.addField("motd", motd); + return this; + } + + public enum ServerAction { + SERVER_START("server_start"), + SERVER_STOP("server_stop"), + WEATHER_CHANGE("weather_change"); + + private final String action; + ServerAction(String action) { this.action = action; } + public String asString() { return action; } + } +} diff --git a/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggablePerformanceEventTest.java b/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggablePerformanceEventTest.java new file mode 100644 index 0000000..b8df58d --- /dev/null +++ b/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggablePerformanceEventTest.java @@ -0,0 +1,17 @@ +package com.splunk.sharedmc.loggable_events; + +import static org.junit.Assert.assertTrue; +import org.junit.Test; + +public class LoggablePerformanceEventTest { + @Test + public void sample_serializesMetrics() { + LoggablePerformanceEvent e = new LoggablePerformanceEvent(0L); + e.setTps(19.8).setMspt(8.4).setOnlinePlayers(12).setLoadedChunks(1500); + String json = e.toJson(); + assertTrue(json.contains("tps")); + assertTrue(json.contains("19.8")); + assertTrue(json.contains("mspt")); + assertTrue(json.contains("online_players")); + } +} diff --git a/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableServerEventTest.java b/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableServerEventTest.java new file mode 100644 index 0000000..f3b973e --- /dev/null +++ b/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableServerEventTest.java @@ -0,0 +1,24 @@ +package com.splunk.sharedmc.loggable_events; + +import static org.junit.Assert.assertTrue; +import org.junit.Test; + +public class LoggableServerEventTest { + @Test + public void serverStart_serializesAction() { + LoggableServerEvent e = new LoggableServerEvent( + LoggableServerEvent.ServerAction.SERVER_START, 0L, null); + String json = e.toJson(); + assertTrue(json.contains("server_start")); + } + + @Test + public void weatherChange_carriesState() { + LoggableServerEvent e = new LoggableServerEvent( + LoggableServerEvent.ServerAction.WEATHER_CHANGE, 1000L, "world"); + e.setWeather("storm"); + String json = e.toJson(); + assertTrue(json.contains("weather")); + assertTrue(json.contains("storm")); + } +} From 753724cc58e905b8e063f96d0d4c7a8901b54534 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 14:49:55 -0400 Subject: [PATCH 09/23] feat(shared-mc): add LoggableCombatEvent --- .../loggable_events/LoggableCombatEvent.java | 56 +++++++++++++++++++ .../LoggableCombatEventTest.java | 30 ++++++++++ 2 files changed, 86 insertions(+) create mode 100644 shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableCombatEvent.java create mode 100644 shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableCombatEventTest.java diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableCombatEvent.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableCombatEvent.java new file mode 100644 index 0000000..c88d892 --- /dev/null +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableCombatEvent.java @@ -0,0 +1,56 @@ +package com.splunk.sharedmc.loggable_events; + +import com.splunk.sharedmc.Point3dLong; + +/** + * Combat and survival events: damage dealt/taken, kills, healing, hunger, respawn. + */ +public class LoggableCombatEvent extends AbstractLoggableEvent { + + public LoggableCombatEvent(CombatAction action, long gameTime, String worldName, Point3dLong location) { + super(LoggableEventType.COMBAT, gameTime, worldName, location); + this.addField(ACTION, action.asString()); + } + + public LoggableCombatEvent setVictim(String victim) { + this.addField("victim", victim); + return this; + } + + public LoggableCombatEvent setSource(String source) { + this.addField("source", source); + return this; + } + + public LoggableCombatEvent setAmount(double amount) { + this.addField("amount", amount); + return this; + } + + public LoggableCombatEvent setCause(String cause) { + this.addField(CAUSE, cause); + return this; + } + + public LoggableCombatEvent setFoodLevel(int foodLevel) { + this.addField("food_level", foodLevel); + return this; + } + + public LoggableCombatEvent setHealthRemaining(double health) { + this.addField("health_remaining", health); + return this; + } + + public enum CombatAction { + DAMAGE("damage"), + KILL("kill"), + HEAL("heal"), + HUNGER("hunger"), + RESPAWN("respawn"); + + private final String action; + CombatAction(String action) { this.action = action; } + public String asString() { return action; } + } +} diff --git a/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableCombatEventTest.java b/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableCombatEventTest.java new file mode 100644 index 0000000..41ad5b9 --- /dev/null +++ b/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableCombatEventTest.java @@ -0,0 +1,30 @@ +package com.splunk.sharedmc.loggable_events; + +import static org.junit.Assert.assertTrue; +import com.splunk.sharedmc.Point3dLong; +import org.junit.Test; + +public class LoggableCombatEventTest { + @Test + public void damage_carriesAttackerVictimAndAmount() { + LoggableCombatEvent e = new LoggableCombatEvent( + LoggableCombatEvent.CombatAction.DAMAGE, 0L, "world", new Point3dLong(1, 2, 3)); + e.setVictim("Steve").setSource("Zombie").setAmount(4.5).setCause("ENTITY_ATTACK"); + String json = e.toJson(); + assertTrue(json.contains("victim")); + assertTrue(json.contains("Steve")); + assertTrue(json.contains("source")); + assertTrue(json.contains("4.5")); + assertTrue(json.contains("damage")); + } + + @Test + public void hunger_carriesFoodLevel() { + LoggableCombatEvent e = new LoggableCombatEvent( + LoggableCombatEvent.CombatAction.HUNGER, 0L, "world", null); + e.setVictim("Alex").setFoodLevel(7); + String json = e.toJson(); + assertTrue(json.contains("food_level")); + assertTrue(json.contains("hunger")); + } +} From 93ca7863457d6235ca9a0bb9d5170d6b8170d44b Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 14:53:20 -0400 Subject: [PATCH 10/23] feat(shared-mc): add LoggableItemEvent and LoggableProgressionEvent --- .../loggable_events/LoggableItemEvent.java | 38 +++++++++++++++ .../LoggableProgressionEvent.java | 46 +++++++++++++++++++ .../LoggableItemEventTest.java | 18 ++++++++ .../LoggableProgressionEventTest.java | 27 +++++++++++ 4 files changed, 129 insertions(+) create mode 100644 shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableItemEvent.java create mode 100644 shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableProgressionEvent.java create mode 100644 shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableItemEventTest.java create mode 100644 shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableProgressionEventTest.java diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableItemEvent.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableItemEvent.java new file mode 100644 index 0000000..d623438 --- /dev/null +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableItemEvent.java @@ -0,0 +1,38 @@ +package com.splunk.sharedmc.loggable_events; + +import com.splunk.sharedmc.Point3dLong; + +/** + * Item economy events: pickup and drop. + */ +public class LoggableItemEvent extends AbstractLoggableEvent { + + public LoggableItemEvent(ItemAction action, long gameTime, String worldName, Point3dLong location) { + super(LoggableEventType.ITEM, gameTime, worldName, location); + this.addField(ACTION, action.asString()); + } + + public LoggableItemEvent setPlayerName(String playerName) { + this.addField(PLAYER_NAME, playerName); + return this; + } + + public LoggableItemEvent setItem(String item) { + this.addField("item", item); + return this; + } + + public LoggableItemEvent setQuantity(int quantity) { + this.addField("quantity", quantity); + return this; + } + + public enum ItemAction { + PICKUP("pickup"), + DROP("drop"); + + private final String action; + ItemAction(String action) { this.action = action; } + public String asString() { return action; } + } +} diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableProgressionEvent.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableProgressionEvent.java new file mode 100644 index 0000000..32387bc --- /dev/null +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableProgressionEvent.java @@ -0,0 +1,46 @@ +package com.splunk.sharedmc.loggable_events; + +/** + * Player progression and activity: XP, level, enchant, craft, fish, command. + */ +public class LoggableProgressionEvent extends AbstractLoggableEvent { + + public LoggableProgressionEvent(ProgressionAction action, long gameTime, String worldName) { + super(LoggableEventType.PROGRESSION, gameTime, worldName); + this.addField(ACTION, action.asString()); + } + + public LoggableProgressionEvent setPlayerName(String playerName) { + this.addField(PLAYER_NAME, playerName); + return this; + } + + public LoggableProgressionEvent setNewLevel(int level) { + this.addField("new_level", level); + return this; + } + + public LoggableProgressionEvent setExpAmount(int exp) { + this.addField("exp_amount", exp); + return this; + } + + /** Free-form detail: command text, enchant name, crafted item, fish caught. */ + public LoggableProgressionEvent setDetail(String detail) { + this.addField("detail", detail); + return this; + } + + public enum ProgressionAction { + EXP_CHANGE("exp_change"), + LEVEL_CHANGE("level_change"), + ENCHANT("enchant"), + CRAFT("craft"), + FISH("fish"), + COMMAND("command"); + + private final String action; + ProgressionAction(String action) { this.action = action; } + public String asString() { return action; } + } +} diff --git a/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableItemEventTest.java b/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableItemEventTest.java new file mode 100644 index 0000000..8e32437 --- /dev/null +++ b/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableItemEventTest.java @@ -0,0 +1,18 @@ +package com.splunk.sharedmc.loggable_events; + +import static org.junit.Assert.assertTrue; +import com.splunk.sharedmc.Point3dLong; +import org.junit.Test; + +public class LoggableItemEventTest { + @Test + public void pickup_carriesItemAndQuantity() { + LoggableItemEvent e = new LoggableItemEvent( + LoggableItemEvent.ItemAction.PICKUP, 0L, "world", new Point3dLong(0, 64, 0)); + e.setPlayerName("Steve").setItem("DIAMOND").setQuantity(3); + String json = e.toJson(); + assertTrue(json.contains("pickup")); + assertTrue(json.contains("DIAMOND")); + assertTrue(json.contains("quantity")); + } +} diff --git a/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableProgressionEventTest.java b/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableProgressionEventTest.java new file mode 100644 index 0000000..31475ec --- /dev/null +++ b/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggableProgressionEventTest.java @@ -0,0 +1,27 @@ +package com.splunk.sharedmc.loggable_events; + +import static org.junit.Assert.assertTrue; +import org.junit.Test; + +public class LoggableProgressionEventTest { + @Test + public void levelUp_carriesNewLevel() { + LoggableProgressionEvent e = new LoggableProgressionEvent( + LoggableProgressionEvent.ProgressionAction.LEVEL_CHANGE, 0L, "world"); + e.setPlayerName("Alex").setNewLevel(30); + String json = e.toJson(); + assertTrue(json.contains("level_change")); + assertTrue(json.contains("new_level")); + assertTrue(json.contains("30")); + } + + @Test + public void command_carriesCommandText() { + LoggableProgressionEvent e = new LoggableProgressionEvent( + LoggableProgressionEvent.ProgressionAction.COMMAND, 0L, "world"); + e.setPlayerName("Alex").setDetail("/gamemode creative"); + String json = e.toJson(); + assertTrue(json.contains("command")); + assertTrue(json.contains("gamemode creative")); + } +} From a063e8414ccc28267efc6f8541e76d28363a9eed Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 14:56:39 -0400 Subject: [PATCH 11/23] feat(shared-mc): add session-detail actions and fields to LoggablePlayerEvent --- .../loggable_events/LoggablePlayerEvent.java | 29 +++++++++++++++-- .../LoggablePlayerEventTest.java | 31 +++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggablePlayerEventTest.java diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePlayerEvent.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePlayerEvent.java index 92112a6..5b6fdc0 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePlayerEvent.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePlayerEvent.java @@ -51,7 +51,27 @@ public LoggablePlayerEvent setFrom(Point3dLong from) { this.addField("from_x", from.xCoord); this.addField("from_y", from.yCoord); this.addField("from_z", from.zCoord); - + + return this; + } + + public LoggablePlayerEvent setPlayerUuid(String uuid) { + this.addField("uuid", uuid); + return this; + } + + public LoggablePlayerEvent setPlayerIp(String ip) { + this.addField("client_ip", ip); + return this; + } + + public LoggablePlayerEvent setProtocolVersion(int protocol) { + this.addField("protocol_version", protocol); + return this; + } + + public LoggablePlayerEvent setGamemode(String gamemode) { + this.addField("gamemode", gamemode); return this; } @@ -62,7 +82,12 @@ public enum PlayerEventAction { PLAYER_CONNECT("player_connect"), PLAYER_DISCONNECT("player_disconnect"), CHAT("chat"), - LOCATION("move"); + LOCATION("move"), + TELEPORT("teleport"), + GAMEMODE_CHANGE("gamemode_change"), + BED_ENTER("bed_enter"), + WORLD_CHANGE("world_change"), + ADVANCEMENT("advancement"); /** * The name of the action. diff --git a/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggablePlayerEventTest.java b/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggablePlayerEventTest.java new file mode 100644 index 0000000..65162d2 --- /dev/null +++ b/shared-mc/src/test/java/com/splunk/sharedmc/loggable_events/LoggablePlayerEventTest.java @@ -0,0 +1,31 @@ +package com.splunk.sharedmc.loggable_events; + +import static org.junit.Assert.assertTrue; +import com.splunk.sharedmc.Point3dLong; +import org.junit.Test; + +public class LoggablePlayerEventTest { + @Test + public void connect_carriesSessionDetail() { + LoggablePlayerEvent e = new LoggablePlayerEvent( + LoggablePlayerEvent.PlayerEventAction.PLAYER_CONNECT, 0L, "world", new Point3dLong(0, 64, 0)); + e.setPlayerName("Steve") + .setPlayerUuid("11111111-2222-3333-4444-555555555555") + .setPlayerIp("203.0.113.7") + .setProtocolVersion(767); + String json = e.toJson(); + assertTrue(json.contains("uuid")); + assertTrue(json.contains("203.0.113.7")); + assertTrue(json.contains("protocol_version")); + } + + @Test + public void gamemodeChange_serializesAction() { + LoggablePlayerEvent e = new LoggablePlayerEvent( + LoggablePlayerEvent.PlayerEventAction.GAMEMODE_CHANGE, 0L, "world", new Point3dLong(0, 64, 0)); + e.setGamemode("CREATIVE"); + String json = e.toJson(); + assertTrue(json.contains("gamemode_change")); + assertTrue(json.contains("CREATIVE")); + } +} From 00bb7589dc37485f921e49f9deadfeb7f5d7ff86 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 14:59:49 -0400 Subject: [PATCH 12/23] feat(shared-mc): add Bukkit-free EventThrottle helper --- .../splunk/sharedmc/util/EventThrottle.java | 48 +++++++++++++++++++ .../sharedmc/util/EventThrottleTest.java | 27 +++++++++++ 2 files changed, 75 insertions(+) create mode 100644 shared-mc/src/main/java/com/splunk/sharedmc/util/EventThrottle.java create mode 100644 shared-mc/src/test/java/com/splunk/sharedmc/util/EventThrottleTest.java diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/util/EventThrottle.java b/shared-mc/src/main/java/com/splunk/sharedmc/util/EventThrottle.java new file mode 100644 index 0000000..0a3321a --- /dev/null +++ b/shared-mc/src/main/java/com/splunk/sharedmc/util/EventThrottle.java @@ -0,0 +1,48 @@ +package com.splunk.sharedmc.util; + +import java.util.concurrent.TimeUnit; +import java.util.function.LongSupplier; + +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; + +/** + * Per-key time-window throttle. {@link #allow(String)} returns true at most once per + * window per key. Backed by a size-bounded guava cache so it is safe for many players. + */ +public class EventThrottle { + + private static final int MAX_KEYS = 1024; + + private final long windowMillis; + private final LongSupplier clock; + private final Cache lastAllowed; + + public EventThrottle(long windowMillis) { + this(windowMillis, System::currentTimeMillis); + } + + /** Testable constructor with an injectable clock. */ + public EventThrottle(long windowMillis, LongSupplier clock) { + this.windowMillis = windowMillis; + this.clock = clock; + this.lastAllowed = CacheBuilder.newBuilder() + .maximumSize(MAX_KEYS) + .expireAfterAccess(windowMillis * 4, TimeUnit.MILLISECONDS) + .build(); + } + + /** + * @return true if an event for {@code key} should be sent now (first call, or the + * window since the last allowed call has elapsed); false to drop it. + */ + public synchronized boolean allow(String key) { + long now = clock.getAsLong(); + Long last = lastAllowed.getIfPresent(key); + if (last == null || (now - last) >= windowMillis) { + lastAllowed.put(key, now); + return true; + } + return false; + } +} diff --git a/shared-mc/src/test/java/com/splunk/sharedmc/util/EventThrottleTest.java b/shared-mc/src/test/java/com/splunk/sharedmc/util/EventThrottleTest.java new file mode 100644 index 0000000..4ebe425 --- /dev/null +++ b/shared-mc/src/test/java/com/splunk/sharedmc/util/EventThrottleTest.java @@ -0,0 +1,27 @@ +package com.splunk.sharedmc.util; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import org.junit.Test; + +public class EventThrottleTest { + @Test + public void firstEventForKeyPasses_secondWithinWindowBlocked() { + long[] now = {1_000L}; + EventThrottle throttle = new EventThrottle(1000L, () -> now[0]); + + assertTrue("first event passes", throttle.allow("Steve")); + now[0] = 1_500L; // 500ms later, inside window + assertFalse("second event inside window blocked", throttle.allow("Steve")); + now[0] = 2_100L; // 1100ms after first, outside window + assertTrue("event after window passes", throttle.allow("Steve")); + } + + @Test + public void differentKeysAreIndependent() { + long[] now = {0L}; + EventThrottle throttle = new EventThrottle(1000L, () -> now[0]); + assertTrue(throttle.allow("Steve")); + assertTrue(throttle.allow("Alex")); + } +} From f944b331ed79c87c87311a341b28622229874455 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 15:01:55 -0400 Subject: [PATCH 13/23] feat(shared-mc): add per-category enable toggles to AbstractEventLogger --- .../event_loggers/AbstractEventLogger.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/event_loggers/AbstractEventLogger.java b/shared-mc/src/main/java/com/splunk/sharedmc/event_loggers/AbstractEventLogger.java index 1bcea5c..d8f3126 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/event_loggers/AbstractEventLogger.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/event_loggers/AbstractEventLogger.java @@ -19,6 +19,15 @@ public class AbstractEventLogger { public static final String SPLUNK_PORT = "splunk.craft.connection.port"; public static final String SPLUNK_TOKEN = "splunk.craft.token"; + public static final String ENABLE_COMBAT = "splunk.craft.enable.combat"; + public static final String ENABLE_ITEM = "splunk.craft.enable.item"; + public static final String ENABLE_PROGRESSION = "splunk.craft.enable.progression"; + public static final String ENABLE_SESSION_DETAIL = "splunk.craft.enable.session_detail"; + public static final String ENABLE_SERVER = "splunk.craft.enable.server"; + public static final String ENABLE_PERFORMANCE = "splunk.craft.enable.performance"; + public static final String ENABLE_SESSION_IP = "splunk.craft.enable.session_ip"; + public static final String PERFORMANCE_INTERVAL_TICKS = "splunk.craft.performance.interval_ticks"; + protected static final Logger logger = LogManager.getLogger(LOGGER_NAME); private static SingleSplunkConnection connection; @@ -31,7 +40,10 @@ public class AbstractEventLogger { private static int port; private static String token; + protected final Properties props; + public AbstractEventLogger(Properties properties) { + this.props = properties; // brittle way to do this if (connection == null) { logEventsToConsole = Boolean.valueOf(properties.getProperty(LOG_EVENTS_TO_CONSOLE_PROP_KEY, "true")); @@ -59,4 +71,17 @@ protected void logAndSend(LoggableEvent loggable) { } connection.sendToSplunk(loggable.toJson()); } + + /** Reads a boolean toggle; default false keeps high-volume categories opt-in. */ + protected boolean isEnabled(String key) { + return Boolean.parseBoolean(props.getProperty(key, "false")); + } + + protected int intProp(String key, int defaultValue) { + try { + return Integer.parseInt(props.getProperty(key, Integer.toString(defaultValue))); + } catch (NumberFormatException e) { + return defaultValue; + } + } } From 6a25681434bfff4723ad4b4e7ae15b67086dd831 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 15:04:09 -0400 Subject: [PATCH 14/23] feat(spigot): add CombatEventLogger with per-player throttling --- .../eventloggers/CombatEventLogger.java | 114 ++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 spigot/src/main/java/com/splunk/spigot/eventloggers/CombatEventLogger.java diff --git a/spigot/src/main/java/com/splunk/spigot/eventloggers/CombatEventLogger.java b/spigot/src/main/java/com/splunk/spigot/eventloggers/CombatEventLogger.java new file mode 100644 index 0000000..d559510 --- /dev/null +++ b/spigot/src/main/java/com/splunk/spigot/eventloggers/CombatEventLogger.java @@ -0,0 +1,114 @@ +package com.splunk.spigot.eventloggers; + +import static com.splunk.spigot.LogToSplunkPlugin.locationAsPoint; + +import java.util.Properties; + +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.event.entity.EntityDeathEvent; +import org.bukkit.event.entity.EntityRegainHealthEvent; +import org.bukkit.event.entity.FoodLevelChangeEvent; +import org.bukkit.event.player.PlayerRespawnEvent; + +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; +import com.splunk.sharedmc.loggable_events.LoggableCombatEvent; +import com.splunk.sharedmc.loggable_events.LoggableCombatEvent.CombatAction; +import com.splunk.sharedmc.util.EventThrottle; + +/** + * Logs combat and survival events. High-frequency events (damage, hunger) are throttled + * per-player. + */ +public class CombatEventLogger extends AbstractEventLogger implements Listener { + + private static final long THROTTLE_MS = 1000L; + private final EventThrottle throttle = new EventThrottle(THROTTLE_MS); + + public CombatEventLogger(Properties props) { + super(props); + } + + @EventHandler + public void onDamage(EntityDamageByEntityEvent event) { + if (!(event.getEntity() instanceof Player)) { + return; + } + Player victim = (Player) event.getEntity(); + if (!throttle.allow("dmg:" + victim.getName())) { + return; + } + LoggableCombatEvent loggable = new LoggableCombatEvent( + CombatAction.DAMAGE, victim.getWorld().getTime(), victim.getWorld().getName(), + locationAsPoint(victim.getLocation())); + loggable.setVictim(victim.getName()) + .setSource(event.getDamager().getType().toString()) + .setAmount(event.getFinalDamage()) + .setCause(event.getCause().toString()) + .setHealthRemaining(victim.getHealth()); + logAndSend(loggable); + } + + @EventHandler + public void onDeath(EntityDeathEvent event) { + if (event.getEntity() instanceof Player) { + return; + } + Player killer = event.getEntity().getKiller(); + if (killer == null) { + return; + } + LoggableCombatEvent loggable = new LoggableCombatEvent( + CombatAction.KILL, event.getEntity().getWorld().getTime(), + event.getEntity().getWorld().getName(), locationAsPoint(event.getEntity().getLocation())); + loggable.setSource(killer.getName()) + .setVictim(event.getEntity().getType().toString()); + logAndSend(loggable); + } + + @EventHandler + public void onRegainHealth(EntityRegainHealthEvent event) { + if (!(event.getEntity() instanceof Player)) { + return; + } + Player player = (Player) event.getEntity(); + if (!throttle.allow("heal:" + player.getName())) { + return; + } + LoggableCombatEvent loggable = new LoggableCombatEvent( + CombatAction.HEAL, player.getWorld().getTime(), player.getWorld().getName(), + locationAsPoint(player.getLocation())); + loggable.setVictim(player.getName()) + .setAmount(event.getAmount()) + .setCause(event.getRegainReason().toString()) + .setHealthRemaining(player.getHealth()); + logAndSend(loggable); + } + + @EventHandler + public void onFoodLevelChange(FoodLevelChangeEvent event) { + if (!(event.getEntity() instanceof Player)) { + return; + } + Player player = (Player) event.getEntity(); + if (!throttle.allow("food:" + player.getName())) { + return; + } + LoggableCombatEvent loggable = new LoggableCombatEvent( + CombatAction.HUNGER, player.getWorld().getTime(), player.getWorld().getName(), + locationAsPoint(player.getLocation())); + loggable.setVictim(player.getName()).setFoodLevel(event.getFoodLevel()); + logAndSend(loggable); + } + + @EventHandler + public void onRespawn(PlayerRespawnEvent event) { + LoggableCombatEvent loggable = new LoggableCombatEvent( + CombatAction.RESPAWN, event.getPlayer().getWorld().getTime(), + event.getPlayer().getWorld().getName(), locationAsPoint(event.getRespawnLocation())); + loggable.setVictim(event.getPlayer().getName()); + logAndSend(loggable); + } +} From 609841bbd6bcbb9b180dec2aa710cdfdbf714c82 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 15:06:23 -0400 Subject: [PATCH 15/23] feat(spigot): add ItemEventLogger and ProgressionEventLogger --- .../spigot/eventloggers/ItemEventLogger.java | 58 ++++++++++++++ .../eventloggers/ProgressionEventLogger.java | 80 +++++++++++++++++++ 2 files changed, 138 insertions(+) create mode 100644 spigot/src/main/java/com/splunk/spigot/eventloggers/ItemEventLogger.java create mode 100644 spigot/src/main/java/com/splunk/spigot/eventloggers/ProgressionEventLogger.java diff --git a/spigot/src/main/java/com/splunk/spigot/eventloggers/ItemEventLogger.java b/spigot/src/main/java/com/splunk/spigot/eventloggers/ItemEventLogger.java new file mode 100644 index 0000000..b3c90e3 --- /dev/null +++ b/spigot/src/main/java/com/splunk/spigot/eventloggers/ItemEventLogger.java @@ -0,0 +1,58 @@ +package com.splunk.spigot.eventloggers; + +import static com.splunk.spigot.LogToSplunkPlugin.locationAsPoint; + +import java.util.Properties; + +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntityPickupItemEvent; +import org.bukkit.event.player.PlayerDropItemEvent; + +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; +import com.splunk.sharedmc.loggable_events.LoggableItemEvent; +import com.splunk.sharedmc.loggable_events.LoggableItemEvent.ItemAction; +import com.splunk.sharedmc.util.EventThrottle; + +/** + * Logs item pickup and drop. Pickups are throttled per-player to avoid floods. + */ +public class ItemEventLogger extends AbstractEventLogger implements Listener { + + private final EventThrottle throttle = new EventThrottle(1000L); + + public ItemEventLogger(Properties props) { + super(props); + } + + @EventHandler + public void onPickup(EntityPickupItemEvent event) { + if (!(event.getEntity() instanceof Player)) { + return; + } + Player player = (Player) event.getEntity(); + if (!throttle.allow("pickup:" + player.getName())) { + return; + } + LoggableItemEvent loggable = new LoggableItemEvent( + ItemAction.PICKUP, player.getWorld().getTime(), player.getWorld().getName(), + locationAsPoint(player.getLocation())); + loggable.setPlayerName(player.getName()) + .setItem(event.getItem().getItemStack().getType().toString()) + .setQuantity(event.getItem().getItemStack().getAmount()); + logAndSend(loggable); + } + + @EventHandler + public void onDrop(PlayerDropItemEvent event) { + Player player = event.getPlayer(); + LoggableItemEvent loggable = new LoggableItemEvent( + ItemAction.DROP, player.getWorld().getTime(), player.getWorld().getName(), + locationAsPoint(player.getLocation())); + loggable.setPlayerName(player.getName()) + .setItem(event.getItemDrop().getItemStack().getType().toString()) + .setQuantity(event.getItemDrop().getItemStack().getAmount()); + logAndSend(loggable); + } +} diff --git a/spigot/src/main/java/com/splunk/spigot/eventloggers/ProgressionEventLogger.java b/spigot/src/main/java/com/splunk/spigot/eventloggers/ProgressionEventLogger.java new file mode 100644 index 0000000..07fb58f --- /dev/null +++ b/spigot/src/main/java/com/splunk/spigot/eventloggers/ProgressionEventLogger.java @@ -0,0 +1,80 @@ +package com.splunk.spigot.eventloggers; + +import java.util.Properties; + +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.enchantment.EnchantItemEvent; +import org.bukkit.event.inventory.CraftItemEvent; +import org.bukkit.event.player.PlayerCommandPreprocessEvent; +import org.bukkit.event.player.PlayerExpChangeEvent; +import org.bukkit.event.player.PlayerFishEvent; +import org.bukkit.event.player.PlayerLevelChangeEvent; +import org.bukkit.entity.Player; + +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; +import com.splunk.sharedmc.loggable_events.LoggableProgressionEvent; +import com.splunk.sharedmc.loggable_events.LoggableProgressionEvent.ProgressionAction; + +/** + * Logs progression and activity: XP, level, enchant, craft, fish, command. + */ +public class ProgressionEventLogger extends AbstractEventLogger implements Listener { + + public ProgressionEventLogger(Properties props) { + super(props); + } + + private LoggableProgressionEvent base(ProgressionAction action, Player player) { + LoggableProgressionEvent e = new LoggableProgressionEvent( + action, player.getWorld().getTime(), player.getWorld().getName()); + e.setPlayerName(player.getName()); + return e; + } + + @EventHandler + public void onExpChange(PlayerExpChangeEvent event) { + LoggableProgressionEvent e = base(ProgressionAction.EXP_CHANGE, event.getPlayer()); + e.setExpAmount(event.getAmount()); + logAndSend(e); + } + + @EventHandler + public void onLevelChange(PlayerLevelChangeEvent event) { + LoggableProgressionEvent e = base(ProgressionAction.LEVEL_CHANGE, event.getPlayer()); + e.setNewLevel(event.getNewLevel()); + logAndSend(e); + } + + @EventHandler + public void onEnchant(EnchantItemEvent event) { + LoggableProgressionEvent e = base(ProgressionAction.ENCHANT, event.getEnchanter()); + e.setDetail(event.getItem().getType().toString()); + logAndSend(e); + } + + @EventHandler + public void onCraft(CraftItemEvent event) { + if (!(event.getWhoClicked() instanceof Player)) { + return; + } + Player player = (Player) event.getWhoClicked(); + LoggableProgressionEvent e = base(ProgressionAction.CRAFT, player); + e.setDetail(event.getRecipe().getResult().getType().toString()); + logAndSend(e); + } + + @EventHandler + public void onFish(PlayerFishEvent event) { + LoggableProgressionEvent e = base(ProgressionAction.FISH, event.getPlayer()); + e.setDetail(event.getState().toString()); + logAndSend(e); + } + + @EventHandler + public void onCommand(PlayerCommandPreprocessEvent event) { + LoggableProgressionEvent e = base(ProgressionAction.COMMAND, event.getPlayer()); + e.setDetail(event.getMessage()); + logAndSend(e); + } +} From 1cbbb0996f947a4de846c563dcec615f0b28cc11 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 15:09:47 -0400 Subject: [PATCH 16/23] feat(spigot): add teleport/gamemode/bed/world-change and login session detail --- .../eventloggers/PlayerEventLogger.java | 73 ++++++++++++++++++- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerEventLogger.java b/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerEventLogger.java index c68e170..fa1a0a0 100644 --- a/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerEventLogger.java +++ b/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerEventLogger.java @@ -13,6 +13,12 @@ import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.event.player.AsyncPlayerChatEvent; +import org.bukkit.event.player.PlayerAdvancementDoneEvent; +import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.event.player.PlayerGameModeChangeEvent; +import org.bukkit.event.player.PlayerBedEnterEvent; +import org.bukkit.event.player.PlayerChangedWorldEvent; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -57,8 +63,13 @@ public PlayerEventLogger(Properties props) { */ @EventHandler public void onPlayerConnect(PlayerLoginEvent event) { - logAndSend( - generateLoggablePlayerEvent(event, PlayerEventAction.PLAYER_CONNECT, null, event.getKickMessage())); + LoggablePlayerEvent loggable = + generateLoggablePlayerEvent(event, PlayerEventAction.PLAYER_CONNECT, null, event.getKickMessage()); + loggable.setPlayerUuid(event.getPlayer().getUniqueId().toString()); + if (isEnabled(ENABLE_SESSION_IP) && event.getAddress() != null) { + loggable.setPlayerIp(event.getAddress().getHostAddress()); + } + logAndSend(loggable); } /** @@ -119,4 +130,62 @@ private LoggablePlayerEvent generateLoggablePlayerEvent( return loggable; } + + /** + * Logs player chat messages to Splunk. + * + * @param event The captured event. + */ + @EventHandler + public void onPlayerChat(AsyncPlayerChatEvent event) { + logAndSend( + generateLoggablePlayerEvent(event, PlayerEventAction.CHAT, null, event.getMessage())); + } + + /** + * Logs player advancement unlocks to Splunk. + * + * @param event The captured event. + */ + @EventHandler + public void onPlayerAdvancementDone(PlayerAdvancementDoneEvent event) { + // We only want to log real achievements/advancements, not recipe unlocks. + String key = event.getAdvancement().getKey().toString(); + if (key.startsWith("minecraft:recipes/")) { + return; + } + logAndSend( + generateLoggablePlayerEvent(event, PlayerEventAction.ADVANCEMENT, null, key)); + } + + @EventHandler + public void onTeleport(PlayerTeleportEvent event) { + LoggablePlayerEvent loggable = generateLoggablePlayerEvent( + event, PlayerEventAction.TELEPORT, event.getCause().toString(), null); + loggable.setFrom(locationAsPoint(event.getFrom())); + loggable.setTo(locationAsPoint(event.getTo())); + logAndSend(loggable); + } + + @EventHandler + public void onGameModeChange(PlayerGameModeChangeEvent event) { + LoggablePlayerEvent loggable = generateLoggablePlayerEvent( + event, PlayerEventAction.GAMEMODE_CHANGE, null, null); + loggable.setGamemode(event.getNewGameMode().toString()); + logAndSend(loggable); + } + + @EventHandler + public void onBedEnter(PlayerBedEnterEvent event) { + LoggablePlayerEvent loggable = generateLoggablePlayerEvent( + event, PlayerEventAction.BED_ENTER, null, null); + logAndSend(loggable); + } + + @EventHandler + public void onWorldChange(PlayerChangedWorldEvent event) { + LoggablePlayerEvent loggable = generateLoggablePlayerEvent( + event, PlayerEventAction.WORLD_CHANGE, null, event.getFrom().getName()); + logAndSend(loggable); + } } From ddd71527002b13938b13f41d3c24943d43bbe604 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 18:35:19 -0400 Subject: [PATCH 17/23] feat(spigot): add ScheduledMetricLogger base, PerformanceSampler, ServerEventLogger --- .../eventloggers/PerformanceSampler.java | 36 ++++++++++++++++++ .../eventloggers/ServerEventLogger.java | 37 +++++++++++++++++++ .../scheduling/ScheduledMetricLogger.java | 36 ++++++++++++++++++ 3 files changed, 109 insertions(+) create mode 100644 spigot/src/main/java/com/splunk/spigot/eventloggers/PerformanceSampler.java create mode 100644 spigot/src/main/java/com/splunk/spigot/eventloggers/ServerEventLogger.java create mode 100644 spigot/src/main/java/com/splunk/spigot/scheduling/ScheduledMetricLogger.java diff --git a/spigot/src/main/java/com/splunk/spigot/eventloggers/PerformanceSampler.java b/spigot/src/main/java/com/splunk/spigot/eventloggers/PerformanceSampler.java new file mode 100644 index 0000000..12fefbf --- /dev/null +++ b/spigot/src/main/java/com/splunk/spigot/eventloggers/PerformanceSampler.java @@ -0,0 +1,36 @@ +package com.splunk.spigot.eventloggers; + +import java.util.Properties; + +import org.bukkit.Bukkit; + +import com.splunk.sharedmc.loggable_events.LoggablePerformanceEvent; +import com.splunk.spigot.scheduling.ScheduledMetricLogger; + +/** + * Periodically samples server performance (online players, loaded chunks). + * + *

NOTE: {@code Bukkit.getTPS()} and {@code Bukkit.getAverageTickTime()} are + * Paper-only APIs and are not present on vanilla spigot-api (verified via + * {@code javap} against spigot-api 1.21.10 — no {@code getTPS}/{@code AverageTickTime} + * symbols found on {@code org.bukkit.Bukkit}). TPS/MSPT sampling is therefore omitted + * here; only metrics available on the Bukkit API are sampled. + */ +public class PerformanceSampler extends ScheduledMetricLogger { + + public PerformanceSampler(Properties props) { + super(props); + } + + @Override + protected void sample() { + LoggablePerformanceEvent e = new LoggablePerformanceEvent(0L); + e.setOnlinePlayers(Bukkit.getOnlinePlayers().size()); + int loaded = 0; + for (org.bukkit.World w : Bukkit.getWorlds()) { + loaded += w.getLoadedChunks().length; + } + e.setLoadedChunks(loaded); + logAndSend(e); + } +} diff --git a/spigot/src/main/java/com/splunk/spigot/eventloggers/ServerEventLogger.java b/spigot/src/main/java/com/splunk/spigot/eventloggers/ServerEventLogger.java new file mode 100644 index 0000000..41a61d6 --- /dev/null +++ b/spigot/src/main/java/com/splunk/spigot/eventloggers/ServerEventLogger.java @@ -0,0 +1,37 @@ +package com.splunk.spigot.eventloggers; + +import java.util.Properties; + +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.server.ServerLoadEvent; +import org.bukkit.event.weather.WeatherChangeEvent; + +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; +import com.splunk.sharedmc.loggable_events.LoggableServerEvent; +import com.splunk.sharedmc.loggable_events.LoggableServerEvent.ServerAction; + +/** + * Logs server lifecycle and world-state events. + */ +public class ServerEventLogger extends AbstractEventLogger implements Listener { + + public ServerEventLogger(Properties props) { + super(props); + } + + @EventHandler + public void onServerLoad(ServerLoadEvent event) { + LoggableServerEvent e = new LoggableServerEvent(ServerAction.SERVER_START, 0L, null); + e.setMotd(event.getType().toString()); + logAndSend(e); + } + + @EventHandler + public void onWeatherChange(WeatherChangeEvent event) { + LoggableServerEvent e = new LoggableServerEvent( + ServerAction.WEATHER_CHANGE, event.getWorld().getTime(), event.getWorld().getName()); + e.setWeather(event.toWeatherState() ? "storm" : "clear"); + logAndSend(e); + } +} diff --git a/spigot/src/main/java/com/splunk/spigot/scheduling/ScheduledMetricLogger.java b/spigot/src/main/java/com/splunk/spigot/scheduling/ScheduledMetricLogger.java new file mode 100644 index 0000000..7d0cd1d --- /dev/null +++ b/spigot/src/main/java/com/splunk/spigot/scheduling/ScheduledMetricLogger.java @@ -0,0 +1,36 @@ +package com.splunk.spigot.scheduling; + +import java.util.Properties; + +import org.bukkit.plugin.Plugin; +import org.bukkit.scheduler.BukkitRunnable; + +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; + +/** + * Base for loggers driven by the Bukkit scheduler rather than the event bus. + * Subclasses implement {@link #sample()}; {@link #start(Plugin, long)} schedules it. + */ +public abstract class ScheduledMetricLogger extends AbstractEventLogger { + + public ScheduledMetricLogger(Properties props) { + super(props); + } + + /** Called on each scheduled tick. Build and send the metric event(s) here. */ + protected abstract void sample(); + + /** Schedules {@link #sample()} every {@code intervalTicks} ticks. */ + public void start(Plugin plugin, long intervalTicks) { + new BukkitRunnable() { + @Override + public void run() { + try { + sample(); + } catch (Exception e) { + logger.warn("Scheduled metric sample failed", e); + } + } + }.runTaskTimer(plugin, intervalTicks, intervalTicks); + } +} From 6b9eac300c20e6d9e37390b742d47f510e264f5c Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 18:37:15 -0400 Subject: [PATCH 18/23] feat(spigot): register new event loggers gated by per-category toggles --- .../com/splunk/spigot/LogToSplunkPlugin.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/spigot/src/main/java/com/splunk/spigot/LogToSplunkPlugin.java b/spigot/src/main/java/com/splunk/spigot/LogToSplunkPlugin.java index 1aecb1f..c77179f 100644 --- a/spigot/src/main/java/com/splunk/spigot/LogToSplunkPlugin.java +++ b/spigot/src/main/java/com/splunk/spigot/LogToSplunkPlugin.java @@ -47,6 +47,29 @@ public void onEnable() { getServer().getPluginManager().registerEvents(new DeathEventLogger(properties), this); getServer().getPluginManager().registerEvents(new PlayerEventLogger(properties), this); + final org.bukkit.plugin.PluginManager pm = getServer().getPluginManager(); + final java.util.Properties p = properties; + + if (Boolean.parseBoolean(p.getProperty("splunk.craft.enable.combat", "false"))) { + pm.registerEvents(new com.splunk.spigot.eventloggers.CombatEventLogger(p), this); + } + if (Boolean.parseBoolean(p.getProperty("splunk.craft.enable.item", "false"))) { + pm.registerEvents(new com.splunk.spigot.eventloggers.ItemEventLogger(p), this); + } + if (Boolean.parseBoolean(p.getProperty("splunk.craft.enable.progression", "false"))) { + pm.registerEvents(new com.splunk.spigot.eventloggers.ProgressionEventLogger(p), this); + } + if (Boolean.parseBoolean(p.getProperty("splunk.craft.enable.server", "false"))) { + pm.registerEvents(new com.splunk.spigot.eventloggers.ServerEventLogger(p), this); + } + if (Boolean.parseBoolean(p.getProperty("splunk.craft.enable.performance", "false"))) { + int interval = 600; + try { + interval = Integer.parseInt(p.getProperty("splunk.craft.performance.interval_ticks", "600")); + } catch (NumberFormatException ignored) { } + new com.splunk.spigot.eventloggers.PerformanceSampler(p).start(this, interval); + } + logAndSend("Splunk for Minecraft initialized."); } From 1de72e53988288b89357931d573ae26e34197ebd Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 18:38:12 -0400 Subject: [PATCH 19/23] docs: document extended-logging config toggles in plugin splunk.properties --- .../src/main/config/splunk.properties | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/logtosplunk-plugin/src/main/config/splunk.properties b/logtosplunk-plugin/src/main/config/splunk.properties index 181fca7..6b41f68 100644 --- a/logtosplunk-plugin/src/main/config/splunk.properties +++ b/logtosplunk-plugin/src/main/config/splunk.properties @@ -1,4 +1,20 @@ splunk.craft.connection.host=127.0.0.1 splunk.craft.connection.port=8088 splunk.craft.token=CHANGEME-1234-5678-1234-123456789012 -splunk.craft.enable.consolelog=true \ No newline at end of file +splunk.craft.enable.consolelog=true + +# --- Extended logging categories (all opt-in; default off) --- +# Combat & survival: damage, kills, healing, hunger, respawn (throttled per player) +splunk.craft.enable.combat=false +# Item economy: pickup, drop +splunk.craft.enable.item=false +# Progression: xp, level, enchant, craft, fish, command +splunk.craft.enable.progression=false +# Server lifecycle: start, weather change +splunk.craft.enable.server=false +# Performance sampler: online players, loaded chunks (TPS/MSPT require Paper API) +splunk.craft.enable.performance=false +# How often (in server ticks, 20 ticks = 1s) to sample performance +splunk.craft.performance.interval_ticks=600 +# Session detail: log client IP on connect (PII -- opt in deliberately) +splunk.craft.enable.session_ip=false \ No newline at end of file From 6bed5c42b0c85ad3cde82cf11543936334ad6165 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 18:43:44 -0400 Subject: [PATCH 20/23] fix(spigot): drop duplicate mob-kill log, gate session-detail behind toggle --- .../src/main/config/splunk.properties | 4 +++- .../spigot/eventloggers/CombatEventLogger.java | 18 ------------------ .../spigot/eventloggers/PlayerEventLogger.java | 12 ++++++++++++ 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/logtosplunk-plugin/src/main/config/splunk.properties b/logtosplunk-plugin/src/main/config/splunk.properties index 6b41f68..6ca703e 100644 --- a/logtosplunk-plugin/src/main/config/splunk.properties +++ b/logtosplunk-plugin/src/main/config/splunk.properties @@ -17,4 +17,6 @@ splunk.craft.enable.performance=false # How often (in server ticks, 20 ticks = 1s) to sample performance splunk.craft.performance.interval_ticks=600 # Session detail: log client IP on connect (PII -- opt in deliberately) -splunk.craft.enable.session_ip=false \ No newline at end of file +splunk.craft.enable.session_ip=false +# Session detail: teleport, gamemode change, bed enter, world change +splunk.craft.enable.session_detail=false \ No newline at end of file diff --git a/spigot/src/main/java/com/splunk/spigot/eventloggers/CombatEventLogger.java b/spigot/src/main/java/com/splunk/spigot/eventloggers/CombatEventLogger.java index d559510..f5c7a0d 100644 --- a/spigot/src/main/java/com/splunk/spigot/eventloggers/CombatEventLogger.java +++ b/spigot/src/main/java/com/splunk/spigot/eventloggers/CombatEventLogger.java @@ -8,7 +8,6 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageByEntityEvent; -import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.entity.FoodLevelChangeEvent; import org.bukkit.event.player.PlayerRespawnEvent; @@ -51,23 +50,6 @@ public void onDamage(EntityDamageByEntityEvent event) { logAndSend(loggable); } - @EventHandler - public void onDeath(EntityDeathEvent event) { - if (event.getEntity() instanceof Player) { - return; - } - Player killer = event.getEntity().getKiller(); - if (killer == null) { - return; - } - LoggableCombatEvent loggable = new LoggableCombatEvent( - CombatAction.KILL, event.getEntity().getWorld().getTime(), - event.getEntity().getWorld().getName(), locationAsPoint(event.getEntity().getLocation())); - loggable.setSource(killer.getName()) - .setVictim(event.getEntity().getType().toString()); - logAndSend(loggable); - } - @EventHandler public void onRegainHealth(EntityRegainHealthEvent event) { if (!(event.getEntity() instanceof Player)) { diff --git a/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerEventLogger.java b/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerEventLogger.java index fa1a0a0..b7ff14d 100644 --- a/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerEventLogger.java +++ b/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerEventLogger.java @@ -160,6 +160,9 @@ public void onPlayerAdvancementDone(PlayerAdvancementDoneEvent event) { @EventHandler public void onTeleport(PlayerTeleportEvent event) { + if (!isEnabled(ENABLE_SESSION_DETAIL)) { + return; + } LoggablePlayerEvent loggable = generateLoggablePlayerEvent( event, PlayerEventAction.TELEPORT, event.getCause().toString(), null); loggable.setFrom(locationAsPoint(event.getFrom())); @@ -169,6 +172,9 @@ public void onTeleport(PlayerTeleportEvent event) { @EventHandler public void onGameModeChange(PlayerGameModeChangeEvent event) { + if (!isEnabled(ENABLE_SESSION_DETAIL)) { + return; + } LoggablePlayerEvent loggable = generateLoggablePlayerEvent( event, PlayerEventAction.GAMEMODE_CHANGE, null, null); loggable.setGamemode(event.getNewGameMode().toString()); @@ -177,6 +183,9 @@ public void onGameModeChange(PlayerGameModeChangeEvent event) { @EventHandler public void onBedEnter(PlayerBedEnterEvent event) { + if (!isEnabled(ENABLE_SESSION_DETAIL)) { + return; + } LoggablePlayerEvent loggable = generateLoggablePlayerEvent( event, PlayerEventAction.BED_ENTER, null, null); logAndSend(loggable); @@ -184,6 +193,9 @@ public void onBedEnter(PlayerBedEnterEvent event) { @EventHandler public void onWorldChange(PlayerChangedWorldEvent event) { + if (!isEnabled(ENABLE_SESSION_DETAIL)) { + return; + } LoggablePlayerEvent loggable = generateLoggablePlayerEvent( event, PlayerEventAction.WORLD_CHANGE, null, event.getFrom().getName()); logAndSend(loggable); From 15e89bdde7d984524a0db3a1e7461aed1aa8d0fe Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 22 Jun 2026 20:16:20 -0400 Subject: [PATCH 21/23] docs: add javadoc to new logging classes, PR description, and enhancements writeup Adds repo-convention javadoc to all new/modified classes from the extended-logging feature (combat/item/progression/server/performance/session-detail), explaining the non-obvious bits: throttle rationale, ENABLE_* toggle gating, Paper-only API gaps (TPS/MSPT/protocol-version), and why combat kills don't duplicate DeathEventLogger. Adds a PR description and a comprehensive enhancements writeup for review. --- .../sharedmc/SingleSplunkConnection.java | 8 +++++-- .../event_loggers/AbstractEventLogger.java | 13 +++++++++- .../AbstractLoggableEvent.java | 4 +++- .../loggable_events/LoggableCombatEvent.java | 5 ++++ .../loggable_events/LoggableEventType.java | 4 +++- .../loggable_events/LoggableItemEvent.java | 5 ++++ .../LoggablePerformanceEvent.java | 17 ++++++++++++- .../loggable_events/LoggablePlayerEvent.java | 17 +++++++++++++ .../LoggableProgressionEvent.java | 5 ++++ .../loggable_events/LoggableServerEvent.java | 5 ++++ .../splunk/sharedmc/util/EventThrottle.java | 21 +++++++++++++--- .../com/splunk/spigot/LogToSplunkPlugin.java | 2 ++ .../eventloggers/CombatEventLogger.java | 8 +++++++ .../spigot/eventloggers/ItemEventLogger.java | 4 +++- .../eventloggers/PerformanceSampler.java | 8 ++++--- .../eventloggers/PlayerEventLogger.java | 24 +++++++++++++++++++ 16 files changed, 137 insertions(+), 13 deletions(-) diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/SingleSplunkConnection.java b/shared-mc/src/main/java/com/splunk/sharedmc/SingleSplunkConnection.java index b756448..f1a7bd8 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/SingleSplunkConnection.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/SingleSplunkConnection.java @@ -83,8 +83,12 @@ public void run() { } /** - * Wraps a raw event message in the Splunk HEC envelope: {"event": }. - * Package-private for testing. + * Wraps a raw event message in the Splunk HTTP Event Collector JSON envelope: + * {@code {"event": ""}}. Built with gson (replaced the previous json-simple + * dependency). Package-private for testing. + * + * @param message The raw event message to wrap. + * @return The HEC envelope as a JSON string. */ static String buildHecEnvelope(String message) { com.google.gson.JsonObject event = new com.google.gson.JsonObject(); diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/event_loggers/AbstractEventLogger.java b/shared-mc/src/main/java/com/splunk/sharedmc/event_loggers/AbstractEventLogger.java index d8f3126..16aef53 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/event_loggers/AbstractEventLogger.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/event_loggers/AbstractEventLogger.java @@ -19,6 +19,10 @@ public class AbstractEventLogger { public static final String SPLUNK_PORT = "splunk.craft.connection.port"; public static final String SPLUNK_TOKEN = "splunk.craft.token"; + /** + * Opt-in toggles for the extended logging categories. All default to {@code false} in + * config so existing deployments don't see new event volume until explicitly enabled. + */ public static final String ENABLE_COMBAT = "splunk.craft.enable.combat"; public static final String ENABLE_ITEM = "splunk.craft.enable.item"; public static final String ENABLE_PROGRESSION = "splunk.craft.enable.progression"; @@ -72,11 +76,18 @@ protected void logAndSend(LoggableEvent loggable) { connection.sendToSplunk(loggable.toJson()); } - /** Reads a boolean toggle; default false keeps high-volume categories opt-in. */ + /** + * Reads a boolean toggle from the plugin's {@link Properties}, loaded once at startup + * (no hot-reload); default false keeps high-volume categories opt-in. + */ protected boolean isEnabled(String key) { return Boolean.parseBoolean(props.getProperty(key, "false")); } + /** + * Reads an integer config value from the plugin's {@link Properties}, loaded once at + * startup (no hot-reload); falls back to {@code defaultValue} if missing or unparseable. + */ protected int intProp(String key, int defaultValue) { try { return Integer.parseInt(props.getProperty(key, Integer.toString(defaultValue))); diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/AbstractLoggableEvent.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/AbstractLoggableEvent.java index 08edbe7..a5507cb 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/AbstractLoggableEvent.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/AbstractLoggableEvent.java @@ -16,7 +16,9 @@ public class AbstractLoggableEvent extends SplunkCimLogEvent implements Loggable public static final String ACTION = "action"; /** - * Constructor. Enforces that subclasses must have a loggable event type. + * Constructor. Enforces that subclasses must have a loggable event type. Null-checks + * {@code coordinates} before dereferencing it (fixes a prior NPE risk when an event has + * no location, e.g. server lifecycle events) and delegates to the 3-arg constructor. * * @param type The type of event that this is. */ diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableCombatEvent.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableCombatEvent.java index c88d892..dc19c70 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableCombatEvent.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableCombatEvent.java @@ -7,6 +7,11 @@ */ public class LoggableCombatEvent extends AbstractLoggableEvent { + /** + * Constructor. + * + * @param action The type of combat action this represents, e.g. 'damage' or 'kill'. + */ public LoggableCombatEvent(CombatAction action, long gameTime, String worldName, Point3dLong location) { super(LoggableEventType.COMBAT, gameTime, worldName, location); this.addField(ACTION, action.asString()); diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableEventType.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableEventType.java index 415cce7..7587242 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableEventType.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableEventType.java @@ -1,7 +1,9 @@ package com.splunk.sharedmc.loggable_events; /** - * Categories of loggable events. + * Categories of loggable events. Includes the extended logging categories SERVER, + * PERFORMANCE, COMBAT, ITEM, and PROGRESSION added alongside the original PLAYER, BLOCK, + * and DEATH categories. */ public enum LoggableEventType { PLAYER("PlayerEvent"), diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableItemEvent.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableItemEvent.java index d623438..4f9e44f 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableItemEvent.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableItemEvent.java @@ -7,6 +7,11 @@ */ public class LoggableItemEvent extends AbstractLoggableEvent { + /** + * Constructor. + * + * @param action The type of item action this represents, e.g. 'pickup' or 'drop'. + */ public LoggableItemEvent(ItemAction action, long gameTime, String worldName, Point3dLong location) { super(LoggableEventType.ITEM, gameTime, worldName, location); this.addField(ACTION, action.asString()); diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePerformanceEvent.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePerformanceEvent.java index f59ca4b..f9ee0ca 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePerformanceEvent.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePerformanceEvent.java @@ -1,20 +1,35 @@ package com.splunk.sharedmc.loggable_events; /** - * A sampled snapshot of server performance metrics. + * A sampled snapshot of server performance metrics. Unlike the other LoggableEvent types, + * this is produced periodically by {@code ScheduledMetricLogger} polling rather than in + * response to a Bukkit event. */ public class LoggablePerformanceEvent extends AbstractLoggableEvent { + /** + * Constructor. + * + * @param gameTime The in-game time at which this sample was taken. + */ public LoggablePerformanceEvent(long gameTime) { super(LoggableEventType.PERFORMANCE, gameTime, null); this.addField(ACTION, "performance_sample"); } + /** + * Unused on vanilla spigot-api — {@code Bukkit.getTPS()} is a Paper-only API; retained + * for when/if the project switches to paper-api. + */ public LoggablePerformanceEvent setTps(double tps) { this.addField("tps", tps); return this; } + /** + * Unused on vanilla spigot-api — {@code Bukkit.getAverageTickTime()} is a Paper-only + * API; retained for when/if the project switches to paper-api. + */ public LoggablePerformanceEvent setMspt(double mspt) { this.addField("mspt", mspt); return this; diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePlayerEvent.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePlayerEvent.java index 5b6fdc0..3230f96 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePlayerEvent.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggablePlayerEvent.java @@ -55,21 +55,34 @@ public LoggablePlayerEvent setFrom(Point3dLong from) { return this; } + /** + * Sets the player's unique id, captured on connect to disambiguate players across + * name changes. + */ public LoggablePlayerEvent setPlayerUuid(String uuid) { this.addField("uuid", uuid); return this; } + /** + * Sets the player's client IP. The project explicitly treats this as non-PII data; + * it is only logged when {@code splunk.craft.enable.session_ip=true}. + */ public LoggablePlayerEvent setPlayerIp(String ip) { this.addField("client_ip", ip); return this; } + /** + * Currently unused — {@code Player.getProtocolVersion()} is a Paper-only API and is + * not available on vanilla spigot-api. + */ public LoggablePlayerEvent setProtocolVersion(int protocol) { this.addField("protocol_version", protocol); return this; } + /** Sets the player's new game mode, e.g. for a gamemode-change event. */ public LoggablePlayerEvent setGamemode(String gamemode) { this.addField("gamemode", gamemode); return this; @@ -83,9 +96,13 @@ public enum PlayerEventAction { PLAYER_DISCONNECT("player_disconnect"), CHAT("chat"), LOCATION("move"), + /** Player teleported, e.g. via command, plugin, or end/nether portal. */ TELEPORT("teleport"), + /** Player switched game mode, e.g. survival to creative. */ GAMEMODE_CHANGE("gamemode_change"), + /** Player entered a bed. */ BED_ENTER("bed_enter"), + /** Player changed worlds, e.g. via portal or teleport command. */ WORLD_CHANGE("world_change"), ADVANCEMENT("advancement"); diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableProgressionEvent.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableProgressionEvent.java index 32387bc..1a94bd2 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableProgressionEvent.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableProgressionEvent.java @@ -5,6 +5,11 @@ */ public class LoggableProgressionEvent extends AbstractLoggableEvent { + /** + * Constructor. + * + * @param action The type of progression action this represents, e.g. 'level_change'. + */ public LoggableProgressionEvent(ProgressionAction action, long gameTime, String worldName) { super(LoggableEventType.PROGRESSION, gameTime, worldName); this.addField(ACTION, action.asString()); diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableServerEvent.java b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableServerEvent.java index c9c2be7..c411365 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableServerEvent.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/loggable_events/LoggableServerEvent.java @@ -5,6 +5,11 @@ */ public class LoggableServerEvent extends AbstractLoggableEvent { + /** + * Constructor. + * + * @param action The type of server action this represents, e.g. 'server_start'. + */ public LoggableServerEvent(ServerAction action, long gameTime, String worldName) { super(LoggableEventType.SERVER, gameTime, worldName); this.addField(ACTION, action.asString()); diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/util/EventThrottle.java b/shared-mc/src/main/java/com/splunk/sharedmc/util/EventThrottle.java index 0a3321a..6e0ff58 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/util/EventThrottle.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/util/EventThrottle.java @@ -7,8 +7,10 @@ import com.google.common.cache.CacheBuilder; /** - * Per-key time-window throttle. {@link #allow(String)} returns true at most once per - * window per key. Backed by a size-bounded guava cache so it is safe for many players. + * Per-key time-window throttle, backed by a guava {@link Cache}. Used to prevent flooding + * Splunk with high-frequency events (e.g. damage, food level changes, item pickups). + * {@link #allow(String)} returns true at most once per window per key. Backed by a + * size-bounded guava cache so it is safe for many players. */ public class EventThrottle { @@ -18,11 +20,24 @@ public class EventThrottle { private final LongSupplier clock; private final Cache lastAllowed; + /** + * Constructor using the real system clock. + * + * @param windowMillis Minimum time, in milliseconds, between two allowed calls for the + * same key. + */ public EventThrottle(long windowMillis) { this(windowMillis, System::currentTimeMillis); } - /** Testable constructor with an injectable clock. */ + /** + * Testable constructor with an injectable clock. The {@code clock} param exists so the + * throttle can be unit-tested without depending on real wall-clock time. + * + * @param windowMillis Minimum time, in milliseconds, between two allowed calls for the + * same key. + * @param clock Supplies the current time; injected so tests can control elapsed time. + */ public EventThrottle(long windowMillis, LongSupplier clock) { this.windowMillis = windowMillis; this.clock = clock; diff --git a/spigot/src/main/java/com/splunk/spigot/LogToSplunkPlugin.java b/spigot/src/main/java/com/splunk/spigot/LogToSplunkPlugin.java index c77179f..ab08344 100644 --- a/spigot/src/main/java/com/splunk/spigot/LogToSplunkPlugin.java +++ b/spigot/src/main/java/com/splunk/spigot/LogToSplunkPlugin.java @@ -50,6 +50,8 @@ public void onEnable() { final org.bukkit.plugin.PluginManager pm = getServer().getPluginManager(); final java.util.Properties p = properties; + // Each extended logging category is opt-in: only register its listener/sampler if + // the corresponding splunk.craft.enable.* toggle is set to true in config. if (Boolean.parseBoolean(p.getProperty("splunk.craft.enable.combat", "false"))) { pm.registerEvents(new com.splunk.spigot.eventloggers.CombatEventLogger(p), this); } diff --git a/spigot/src/main/java/com/splunk/spigot/eventloggers/CombatEventLogger.java b/spigot/src/main/java/com/splunk/spigot/eventloggers/CombatEventLogger.java index f5c7a0d..57ef3bd 100644 --- a/spigot/src/main/java/com/splunk/spigot/eventloggers/CombatEventLogger.java +++ b/spigot/src/main/java/com/splunk/spigot/eventloggers/CombatEventLogger.java @@ -20,6 +20,10 @@ /** * Logs combat and survival events. High-frequency events (damage, hunger) are throttled * per-player. + * + *

Note: there is intentionally no {@code onDeath}/{@code EntityDeathEvent} handler here. + * Kill events are still handled by the pre-existing {@code DeathEventLogger} to avoid + * double-logging the same kill as both a CombatEvent and a DeathEvent. */ public class CombatEventLogger extends AbstractEventLogger implements Listener { @@ -30,6 +34,7 @@ public CombatEventLogger(Properties props) { super(props); } + /** Throttled per-victim: damage events can fire many times per second. */ @EventHandler public void onDamage(EntityDamageByEntityEvent event) { if (!(event.getEntity() instanceof Player)) { @@ -50,6 +55,7 @@ public void onDamage(EntityDamageByEntityEvent event) { logAndSend(loggable); } + /** Throttled per-player: regen-based healing (e.g. saturation) can fire frequently. */ @EventHandler public void onRegainHealth(EntityRegainHealthEvent event) { if (!(event.getEntity() instanceof Player)) { @@ -69,6 +75,7 @@ public void onRegainHealth(EntityRegainHealthEvent event) { logAndSend(loggable); } + /** Throttled per-player: food level changes frequently while eating, sprinting, etc. */ @EventHandler public void onFoodLevelChange(FoodLevelChangeEvent event) { if (!(event.getEntity() instanceof Player)) { @@ -85,6 +92,7 @@ public void onFoodLevelChange(FoodLevelChangeEvent event) { logAndSend(loggable); } + /** Not throttled: respawn is a rare, deliberate-trigger event for a given player. */ @EventHandler public void onRespawn(PlayerRespawnEvent event) { LoggableCombatEvent loggable = new LoggableCombatEvent( diff --git a/spigot/src/main/java/com/splunk/spigot/eventloggers/ItemEventLogger.java b/spigot/src/main/java/com/splunk/spigot/eventloggers/ItemEventLogger.java index b3c90e3..60c13f5 100644 --- a/spigot/src/main/java/com/splunk/spigot/eventloggers/ItemEventLogger.java +++ b/spigot/src/main/java/com/splunk/spigot/eventloggers/ItemEventLogger.java @@ -16,7 +16,9 @@ import com.splunk.sharedmc.util.EventThrottle; /** - * Logs item pickup and drop. Pickups are throttled per-player to avoid floods. + * Logs item pickup and drop events. Pickup is throttled (it can fire rapidly, e.g. when + * picking up XP orbs or arrows); drop is not throttled since it is a deliberate, low + * frequency player action. */ public class ItemEventLogger extends AbstractEventLogger implements Listener { diff --git a/spigot/src/main/java/com/splunk/spigot/eventloggers/PerformanceSampler.java b/spigot/src/main/java/com/splunk/spigot/eventloggers/PerformanceSampler.java index 12fefbf..dd369d8 100644 --- a/spigot/src/main/java/com/splunk/spigot/eventloggers/PerformanceSampler.java +++ b/spigot/src/main/java/com/splunk/spigot/eventloggers/PerformanceSampler.java @@ -8,13 +8,15 @@ import com.splunk.spigot.scheduling.ScheduledMetricLogger; /** - * Periodically samples server performance (online players, loaded chunks). + * Periodically samples server performance (online players, loaded chunks). Extends + * {@link ScheduledMetricLogger}, so this is polling-based rather than event-driven. * *

NOTE: {@code Bukkit.getTPS()} and {@code Bukkit.getAverageTickTime()} are * Paper-only APIs and are not present on vanilla spigot-api (verified via * {@code javap} against spigot-api 1.21.10 — no {@code getTPS}/{@code AverageTickTime} - * symbols found on {@code org.bukkit.Bukkit}). TPS/MSPT sampling is therefore omitted - * here; only metrics available on the Bukkit API are sampled. + * symbols found on {@code org.bukkit.Bukkit}). TPS/MSPT sampling is therefore omitted; + * only online_players and loaded_chunks, which are available on the Bukkit API, are + * sampled here. */ public class PerformanceSampler extends ScheduledMetricLogger { diff --git a/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerEventLogger.java b/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerEventLogger.java index b7ff14d..bf75d26 100644 --- a/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerEventLogger.java +++ b/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerEventLogger.java @@ -158,6 +158,12 @@ public void onPlayerAdvancementDone(PlayerAdvancementDoneEvent event) { generateLoggablePlayerEvent(event, PlayerEventAction.ADVANCEMENT, null, key)); } + /** + * Logs player teleports to Splunk. Returns early via the + * {@code isEnabled(ENABLE_SESSION_DETAIL)} guard — this category is opt-in. + * + * @param event The captured event. + */ @EventHandler public void onTeleport(PlayerTeleportEvent event) { if (!isEnabled(ENABLE_SESSION_DETAIL)) { @@ -170,6 +176,12 @@ public void onTeleport(PlayerTeleportEvent event) { logAndSend(loggable); } + /** + * Logs player game mode changes to Splunk. Returns early via the + * {@code isEnabled(ENABLE_SESSION_DETAIL)} guard — this category is opt-in. + * + * @param event The captured event. + */ @EventHandler public void onGameModeChange(PlayerGameModeChangeEvent event) { if (!isEnabled(ENABLE_SESSION_DETAIL)) { @@ -181,6 +193,12 @@ public void onGameModeChange(PlayerGameModeChangeEvent event) { logAndSend(loggable); } + /** + * Logs when a player enters a bed. Returns early via the + * {@code isEnabled(ENABLE_SESSION_DETAIL)} guard — this category is opt-in. + * + * @param event The captured event. + */ @EventHandler public void onBedEnter(PlayerBedEnterEvent event) { if (!isEnabled(ENABLE_SESSION_DETAIL)) { @@ -191,6 +209,12 @@ public void onBedEnter(PlayerBedEnterEvent event) { logAndSend(loggable); } + /** + * Logs when a player changes worlds. Returns early via the + * {@code isEnabled(ENABLE_SESSION_DETAIL)} guard — this category is opt-in. + * + * @param event The captured event. + */ @EventHandler public void onWorldChange(PlayerChangedWorldEvent event) { if (!isEnabled(ENABLE_SESSION_DETAIL)) { From c308ea2e7cb94bd702924807e6a958a1f2b50c25 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 13 Jul 2026 15:40:24 -0400 Subject: [PATCH 22/23] feat(spigot): add PlayerStatsScraper + KvStoreConnection for KV-store player snapshots Periodically reads /stats/.json + /advancements/.json and upserts one flattened document per player into a Splunk KV-store collection, keyed by UUID for idempotent overwrite. This is current-state snapshot data, not a time series, so it deliberately does not go through HEC -- HEC can only write to an index, never a KV store. KvStoreConnection talks to the splunkd management REST endpoint (port 8089, HTTPS, bearer token auth) instead, a different port and credential than HEC. Runs async via ScheduledMetricLogger#startAsync so the file I/O + HTTP never stalls a server tick. New splunk.craft.enable.playerstats / splunk.craft.kvstore.* config keys, all opt-in and documented inline in the splunk.properties template. The SplunkCraft app ships the minecraft_player_stats collection and its transforms.conf lookup definition, so the data is queryable via `| inputlookup minecraft_player_stats`. --- SplunkCraft/default/app.conf | 23 ++ SplunkCraft/default/collections.conf | 9 + SplunkCraft/default/transforms.conf | 14 + SplunkCraft/metadata/default.meta | 12 + .../src/main/config/splunk.properties | 48 +++- .../splunk/sharedmc/KvStoreConnection.java | 117 +++++++++ .../event_loggers/AbstractEventLogger.java | 16 ++ .../com/splunk/spigot/LogToSplunkPlugin.java | 22 +- .../eventloggers/PlayerStatsScraper.java | 247 ++++++++++++++++++ .../scheduling/ScheduledMetricLogger.java | 21 +- 10 files changed, 522 insertions(+), 7 deletions(-) create mode 100644 SplunkCraft/default/app.conf create mode 100644 SplunkCraft/default/collections.conf create mode 100644 SplunkCraft/default/transforms.conf create mode 100644 SplunkCraft/metadata/default.meta create mode 100644 shared-mc/src/main/java/com/splunk/sharedmc/KvStoreConnection.java create mode 100644 spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerStatsScraper.java diff --git a/SplunkCraft/default/app.conf b/SplunkCraft/default/app.conf new file mode 100644 index 0000000..b006f64 --- /dev/null +++ b/SplunkCraft/default/app.conf @@ -0,0 +1,23 @@ +# +# SplunkCraft -- Minecraft player analytics app. +# Owns the minecraft_player_stats KV-store collection populated by the logtosplunk plugin, +# plus the reports and dashboards built on top of it. +# + +[install] +state = enabled +state_change_requires_restart = 0 +is_configured = 1 +build = 1 + +[ui] +is_visible = 1 +label = SplunkCraft + +[launcher] +author = masao.jeffery@gmail.com +description = Minecraft player stats, reports and dashboards (KV-store backed). +version = 1.0 + +[package] +id = SplunkCraft diff --git a/SplunkCraft/default/collections.conf b/SplunkCraft/default/collections.conf new file mode 100644 index 0000000..77139cc --- /dev/null +++ b/SplunkCraft/default/collections.conf @@ -0,0 +1,9 @@ +# KV-store collection holding the latest per-player snapshot scraped from the Minecraft +# server's on-disk stats/advancements JSON by the logtosplunk plugin (PlayerStatsScraper). +# Documents are keyed by player UUID (_key), so each scrape upserts (overwrites) the player's +# row rather than appending -- this is current-state snapshot data, not a time series. + +[minecraft_player_stats] +enforceTypes = false +# Accelerate the fields we filter/sort on most. +accelerated_fields.player_idx = {"uuid": 1, "name": 1} diff --git a/SplunkCraft/default/transforms.conf b/SplunkCraft/default/transforms.conf new file mode 100644 index 0000000..ac021c6 --- /dev/null +++ b/SplunkCraft/default/transforms.conf @@ -0,0 +1,14 @@ +# Lookup definition exposing the minecraft_player_stats KV-store collection to SPL. +# Use in searches as: | inputlookup minecraft_player_stats +# or: ... | lookup minecraft_player_stats uuid OUTPUT name advancements_completed ... + +[minecraft_player_stats] +external_type = kvstore +collection = minecraft_player_stats +fields_list = _key, uuid, name, last_modified, data_version, \ + stat_mined_total, stat_used_total, stat_crafted_total, stat_broken_total, \ + stat_dropped_total, stat_picked_up_total, stat_killed_total, stat_killed_by_total, \ + stat_custom_total, \ + deaths, mob_kills, player_kills, play_time, total_world_time, walk_one_cm, sprint_one_cm, \ + jump, damage_dealt, damage_taken, time_since_rest, \ + advancements_completed, advancements_total diff --git a/SplunkCraft/metadata/default.meta b/SplunkCraft/metadata/default.meta new file mode 100644 index 0000000..fa4faed --- /dev/null +++ b/SplunkCraft/metadata/default.meta @@ -0,0 +1,12 @@ +# Make the collection and its lookup readable app-wide (and globally, so other apps and +# saved searches can reference the lookup). Writes restricted to admin/power. + +[] +access = read : [ * ], write : [ admin, power ] +export = system + +[collections/minecraft_player_stats] +export = system + +[transforms/minecraft_player_stats] +export = system diff --git a/logtosplunk-plugin/src/main/config/splunk.properties b/logtosplunk-plugin/src/main/config/splunk.properties index 6ca703e..39b562b 100644 --- a/logtosplunk-plugin/src/main/config/splunk.properties +++ b/logtosplunk-plugin/src/main/config/splunk.properties @@ -1,6 +1,32 @@ +# ============================================================================= +# LogToSplunk plugin/mod configuration +# ============================================================================= +# How to use: copy this file to /config/splunk.properties (the plugin/mod reads +# it from `/config/splunk.properties` at startup -- NOT from inside the +# jar). Replace every CHANGEME value below, then restart the server. +# +# Two independent Splunk connections are configured here: +# 1. HTTP Event Collector (HEC) -- `splunk.craft.connection.*` / `splunk.craft.token`. +# All the per-event logging below (block/death/player/combat/item/etc.) is sent here, +# as JSON, sourcetype `minecraft:json`. The index it lands in is whatever index the HEC +# token itself is bound to on the Splunk side (Settings -> Data Inputs -> HTTP Event +# Collector) -- there is no `index=` key in this file. +# 2. KV-store REST endpoint (splunkd management port) -- `splunk.craft.kvstore.*`, used only +# by the player-stats scraper. Different host/port/credential than HEC; see the comment +# block above `splunk.craft.enable.playerstats` below for why. +# ============================================================================= + +# --- HTTP Event Collector (HEC) connection --- +# Splunk host that accepts HEC requests (the splunkd HEC listener, default port 8088, HTTP). splunk.craft.connection.host=127.0.0.1 +# HEC port. 8088 is the Splunk default; confirm against Settings -> Data Inputs -> HTTP Event +# Collector -> Global Settings if you've customized it. splunk.craft.connection.port=8088 +# HEC token (a UUID) from Settings -> Data Inputs -> HTTP Event Collector -> . +# This determines which index/sourcetype-defaults events land under -- NOT a KV-store credential. splunk.craft.token=CHANGEME-1234-5678-1234-123456789012 +# If true, every event sent to Splunk is also echoed to the server console/log file. +# Useful for debugging; safe to leave on, since it's just a duplicate of what already went to HEC. splunk.craft.enable.consolelog=true # --- Extended logging categories (all opt-in; default off) --- @@ -19,4 +45,24 @@ splunk.craft.performance.interval_ticks=600 # Session detail: log client IP on connect (PII -- opt in deliberately) splunk.craft.enable.session_ip=false # Session detail: teleport, gamemode change, bed enter, world change -splunk.craft.enable.session_detail=false \ No newline at end of file +splunk.craft.enable.session_detail=false + +# --- Player stats scraper -> KV store (snapshot data, NOT sent via HEC) --- +# Reads /players/stats/.json + advancements/.json and upserts one doc per +# player into a Splunk KV-store collection. Uses the splunkd MANAGEMENT REST endpoint, which +# is a different host/port and credential than HEC -- HEC cannot write a KV store. +splunk.craft.enable.playerstats=false +# How often (in server ticks, 20 ticks = 1s) to scrape; 6000 = ~5 min +splunk.craft.playerstats.interval_ticks=6000 +# splunkd management interface (NOT the HEC port). Default mgmt port is 8089, HTTPS. +splunk.craft.kvstore.host=127.0.0.1 +splunk.craft.kvstore.port=8089 +# App namespace (app DIRECTORY name under etc/apps) that owns the collection. The +# SplunkCraft app ships collections.conf + transforms.conf for minecraft_player_stats. +splunk.craft.kvstore.app=SplunkCraft +# KV-store collection name (must match collections.conf) +splunk.craft.kvstore.collection=minecraft_player_stats +# Splunk bearer/JWT token with write access (Settings -> Tokens). NOT the HEC token. +splunk.craft.kvstore.bearer_token=CHANGEME +# Optional: world directory name or absolute path (default: world) +#splunk.craft.world.path=world \ No newline at end of file diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/KvStoreConnection.java b/shared-mc/src/main/java/com/splunk/sharedmc/KvStoreConnection.java new file mode 100644 index 0000000..fc2c8bb --- /dev/null +++ b/shared-mc/src/main/java/com/splunk/sharedmc/KvStoreConnection.java @@ -0,0 +1,117 @@ +package com.splunk.sharedmc; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; + +import javax.net.ssl.SSLContext; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import org.apache.hc.core5.http.ContentType; +import org.apache.hc.core5.http.io.entity.StringEntity; +import org.apache.hc.core5.ssl.SSLContextBuilder; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; +import org.apache.hc.client5.http.io.HttpClientConnectionManager; +import org.apache.hc.client5.http.ssl.NoopHostnameVerifier; +import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; +import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder; +import org.apache.hc.client5.http.ssl.TrustAllStrategy; + +/** + * Writes documents straight into a Splunk KV-store collection via the splunkd REST API + * ({@code .../storage/collections/data//batch_save}). + * + *

This is deliberately NOT a {@link SplunkConnection}/HEC path: the HTTP Event Collector + * can only write events into an index, never into a KV store. Populating a KV store + * requires the management REST endpoint, which uses a different host/port (splunkd mgmt, + * default 8089, HTTPS) and a different credential ({@code Authorization: Bearer }), + * not the HEC token. + * + *

batch_save upserts by each document's {@code _key}, so re-sending the same player UUID + * overwrites the previous snapshot rather than appending — which is exactly what we want for + * non-time-series snapshot data. + * + *

SSL note: splunkd's management port presents a self-signed certificate by default. To + * keep this usable in a lab/self-hosted Minecraft deployment, the client trusts all certs and + * skips hostname verification. For a hardened deployment, replace the trust strategy with a + * truststore containing the splunkd cert. + */ +public class KvStoreConnection { + + private static final String LOGGER_PREFIX = "KvStoreConnection - "; + private static final String BATCH_SAVE_URL = + "https://%s:%s/servicesNS/nobody/%s/storage/collections/data/%s/batch_save"; + + private final Logger logger; + private final String url; + private final String token; + + public KvStoreConnection(String host, int port, String app, String collection, String token) { + this.logger = LogManager.getLogger(LOGGER_PREFIX + host + ':' + port + '/' + collection); + this.token = token; + this.url = String.format(BATCH_SAVE_URL, host, port, app, collection); + } + + /** + * Upserts a batch of documents. The body must be a JSON array of objects, each of which + * should carry a {@code _key} to make the write idempotent. + * + * @param jsonArrayBody JSON array string, e.g. {@code [{"_key":"...","name":"..."}, ...]}. + * @return true if splunkd accepted the batch (2xx). + */ + public boolean batchSave(String jsonArrayBody) { + final CloseableHttpClient client = buildClient(); + if (client == null) { + return false; + } + try { + HttpPost post = new HttpPost(url); + post.setHeader("Authorization", "Bearer " + token); + post.setEntity(new StringEntity(jsonArrayBody, ContentType.APPLICATION_JSON)); + + try (CloseableHttpResponse response = client.execute(post)) { + int code = response.getCode(); + if (code > 199 && code < 300) { + return true; + } + ByteArrayOutputStream out = new ByteArrayOutputStream(); + response.getEntity().writeTo(out); + logger.error("KV-store batch_save failed (HTTP {}): {}", code, new String(out.toByteArray())); + return false; + } + } catch (final IOException e) { + logger.error("Unable to write to KV store!", e); + return false; + } finally { + try { + client.close(); + } catch (final IOException ignored) { + // closing best-effort + } + } + } + + private CloseableHttpClient buildClient() { + try { + SSLContext sslContext = SSLContextBuilder.create() + .loadTrustMaterial(null, TrustAllStrategy.INSTANCE) + .build(); + SSLConnectionSocketFactory sslFactory = SSLConnectionSocketFactoryBuilder.create() + .setSslContext(sslContext) + .setHostnameVerifier(NoopHostnameVerifier.INSTANCE) + .build(); + HttpClientConnectionManager cm = PoolingHttpClientConnectionManagerBuilder.create() + .setSSLSocketFactory(sslFactory) + .build(); + return HttpClients.custom().setConnectionManager(cm).build(); + } catch (final Exception e) { + logger.error("Unable to build TLS client for KV store connection", e); + return null; + } + } +} diff --git a/shared-mc/src/main/java/com/splunk/sharedmc/event_loggers/AbstractEventLogger.java b/shared-mc/src/main/java/com/splunk/sharedmc/event_loggers/AbstractEventLogger.java index 16aef53..86212f8 100644 --- a/shared-mc/src/main/java/com/splunk/sharedmc/event_loggers/AbstractEventLogger.java +++ b/shared-mc/src/main/java/com/splunk/sharedmc/event_loggers/AbstractEventLogger.java @@ -32,6 +32,22 @@ public class AbstractEventLogger { public static final String ENABLE_SESSION_IP = "splunk.craft.enable.session_ip"; public static final String PERFORMANCE_INTERVAL_TICKS = "splunk.craft.performance.interval_ticks"; + /** + * Player-stats scraper: periodically reads the per-player {@code stats/.json} and + * {@code advancements/.json} files and upserts a flattened snapshot into a Splunk + * KV-store collection via {@link com.splunk.sharedmc.KvStoreConnection}. This path uses the + * splunkd management REST endpoint (default port 8089, HTTPS, bearer token) -- NOT HEC, + * which cannot write a KV store. + */ + public static final String ENABLE_PLAYERSTATS = "splunk.craft.enable.playerstats"; + public static final String PLAYERSTATS_INTERVAL_TICKS = "splunk.craft.playerstats.interval_ticks"; + public static final String KVSTORE_HOST = "splunk.craft.kvstore.host"; + public static final String KVSTORE_PORT = "splunk.craft.kvstore.port"; + public static final String KVSTORE_APP = "splunk.craft.kvstore.app"; + public static final String KVSTORE_COLLECTION = "splunk.craft.kvstore.collection"; + public static final String KVSTORE_TOKEN = "splunk.craft.kvstore.bearer_token"; + public static final String WORLD_PATH = "splunk.craft.world.path"; + protected static final Logger logger = LogManager.getLogger(LOGGER_NAME); private static SingleSplunkConnection connection; diff --git a/spigot/src/main/java/com/splunk/spigot/LogToSplunkPlugin.java b/spigot/src/main/java/com/splunk/spigot/LogToSplunkPlugin.java index ab08344..6effeec 100644 --- a/spigot/src/main/java/com/splunk/spigot/LogToSplunkPlugin.java +++ b/spigot/src/main/java/com/splunk/spigot/LogToSplunkPlugin.java @@ -21,7 +21,7 @@ public class LogToSplunkPlugin extends JavaPlugin implements Listener { public static final String NAME = "Splunk for Minecraft"; public static final String SPLUNK_PROPERTIES = "/config/splunk.properties"; - private Properties properties; + protected Properties properties; private static final Logger logger = LogManager.getLogger(LogToSplunkPlugin.class.getName()); @@ -69,17 +69,29 @@ public void onEnable() { try { interval = Integer.parseInt(p.getProperty("splunk.craft.performance.interval_ticks", "600")); } catch (NumberFormatException ignored) { } - new com.splunk.spigot.eventloggers.PerformanceSampler(p).start(this, interval); + createPerformanceSampler(p).start(this, interval); + } + // Player-stats scraper: reads on-disk stats/advancements JSON and upserts to the KV + // store. Runs async (file I/O + HTTP) so it never stalls a tick. + if (Boolean.parseBoolean(p.getProperty("splunk.craft.enable.playerstats", "false"))) { + int interval = 6000; + try { + interval = Integer.parseInt(p.getProperty("splunk.craft.playerstats.interval_ticks", "6000")); + } catch (NumberFormatException ignored) { } + new com.splunk.spigot.eventloggers.PlayerStatsScraper(p).startAsync(this, interval); } logAndSend("Splunk for Minecraft initialized."); } /** - * Logs and sends messages to be prepared for Splunk. - * - * @param message The message to log. + * Factory for the performance sampler. Subclasses (e.g. the Paper module) override this + * to return a platform-specific sampler that fills in TPS/MSPT from Paper-only APIs. */ + protected com.splunk.spigot.eventloggers.PerformanceSampler createPerformanceSampler(Properties props) { + return new com.splunk.spigot.eventloggers.PerformanceSampler(props); + } + private void logAndSend(String message) { logger.info(message); } diff --git a/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerStatsScraper.java b/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerStatsScraper.java new file mode 100644 index 0000000..88b2f6d --- /dev/null +++ b/spigot/src/main/java/com/splunk/spigot/eventloggers/PlayerStatsScraper.java @@ -0,0 +1,247 @@ +package com.splunk.spigot.eventloggers; + +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.Reader; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +import com.splunk.sharedmc.KvStoreConnection; +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; +import com.splunk.spigot.scheduling.ScheduledMetricLogger; + +/** + * Periodically scrapes the per-player snapshot files Minecraft writes to disk + * ({@code /players/stats/.json} and {@code .../advancements/.json}), + * flattens them into one document per player, and upserts those documents into a Splunk + * KV-store collection via {@link KvStoreConnection}. + * + *

This data is intentionally NOT sent through HEC/an index: it is a current snapshot, not + * a time series, so a KV store keyed by player UUID (idempotent overwrite) is the right home. + * See {@link KvStoreConnection} for why HEC can't be used. + * + *

Runs off the main server thread (see {@link ScheduledMetricLogger#startAsync}); it only + * reads files and does HTTP, never touches the Bukkit world API. To avoid re-uploading + * unchanged players every cycle, the last-seen file modification time per UUID is cached and + * only changed files are pushed. + */ +public class PlayerStatsScraper extends ScheduledMetricLogger { + + /** Default world directory name; overridable via {@link AbstractEventLogger#WORLD_PATH}. */ + private static final String DEFAULT_WORLD = "world"; + + /** Custom-stat keys we surface as first-class columns (the rest are kept as category totals). */ + private static final String[] CUSTOM_STAT_COLUMNS = { + "minecraft:deaths", + "minecraft:mob_kills", + "minecraft:player_kills", + "minecraft:play_time", + "minecraft:total_world_time", + "minecraft:walk_one_cm", + "minecraft:sprint_one_cm", + "minecraft:jump", + "minecraft:damage_dealt", + "minecraft:damage_taken", + "minecraft:time_since_rest" + }; + + private final KvStoreConnection kv; + private final File statsDir; + private final File advancementsDir; + private final File usercacheFile; + + /** UUID -> last stats-file lastModified() we successfully uploaded, to push only deltas. */ + private final Map uploadedMtimes = new HashMap<>(); + + public PlayerStatsScraper(Properties props) { + super(props); + + String host = props.getProperty(KVSTORE_HOST, "127.0.0.1"); + int port = intProp(KVSTORE_PORT, 8089); + String app = props.getProperty(KVSTORE_APP, "minecraft-app"); + String collection = props.getProperty(KVSTORE_COLLECTION, "minecraft_player_stats"); + String token = props.getProperty(KVSTORE_TOKEN); + if (token == null || token.trim().isEmpty()) { + throw new IllegalArgumentException("Property `" + KVSTORE_TOKEN + "` must be set (a splunkd " + + "bearer token) to write player stats to the KV store."); + } + this.kv = new KvStoreConnection(host, port, app, collection, token); + + String serverDir = System.getProperty("user.dir"); + String world = props.getProperty(WORLD_PATH, DEFAULT_WORLD); + File worldDir = new File(world); + if (!worldDir.isAbsolute()) { + worldDir = new File(serverDir, world); + } + this.statsDir = new File(worldDir, "stats"); + this.advancementsDir = new File(worldDir, "advancements"); + this.usercacheFile = new File(serverDir, "usercache.json"); + } + + @Override + protected void sample() { + File[] statFiles = statsDir.listFiles((dir, name) -> name.endsWith(".json")); + if (statFiles == null || statFiles.length == 0) { + logger.debug("No player stats files found at {}", statsDir.getAbsolutePath()); + return; + } + + Map uuidToName = loadUsercache(); + + JsonArray batch = new JsonArray(); + for (File statFile : statFiles) { + String uuid = stripExtension(statFile.getName()); + long mtime = statFile.lastModified(); + + File advFile = new File(advancementsDir, uuid + ".json"); + long advMtime = advFile.exists() ? advFile.lastModified() : 0L; + long combinedMtime = Math.max(mtime, advMtime); + + Long lastSeen = uploadedMtimes.get(uuid); + if (lastSeen != null && lastSeen == combinedMtime) { + continue; // unchanged since last successful upload + } + + JsonObject doc = buildDocument(uuid, uuidToName.get(uuid), statFile, advFile, combinedMtime); + if (doc != null) { + batch.add(doc); + } + } + + if (batch.size() == 0) { + return; + } + + if (kv.batchSave(batch.toString())) { + // Only mark as uploaded once splunkd accepted the batch. + for (JsonElement el : batch) { + JsonObject doc = el.getAsJsonObject(); + uploadedMtimes.put(doc.get("uuid").getAsString(), doc.get("last_modified").getAsLong()); + } + logger.info("Upserted {} player-stats document(s) to KV store.", batch.size()); + } else { + logger.warn("KV-store upsert failed; will retry {} player(s) next cycle.", batch.size()); + } + } + + private JsonObject buildDocument(String uuid, String name, File statFile, File advFile, long combinedMtime) { + try (Reader r = new FileReader(statFile)) { + JsonObject root = JsonParser.parseReader(r).getAsJsonObject(); + + JsonObject doc = new JsonObject(); + doc.addProperty("_key", uuid); // makes batch_save an idempotent upsert + doc.addProperty("uuid", uuid); + if (name != null) { + doc.addProperty("name", name); + } + doc.addProperty("last_modified", combinedMtime); + if (root.has("DataVersion")) { + doc.addProperty("data_version", root.get("DataVersion").getAsInt()); + } + + JsonObject stats = root.has("stats") ? root.getAsJsonObject("stats") : new JsonObject(); + + // Per-category totals (sum of all entries within minecraft:mined, :killed, etc.). + for (Map.Entry cat : stats.entrySet()) { + String column = "stat_" + simpleKey(cat.getKey()) + "_total"; + doc.addProperty(column, sumValues(cat.getValue().getAsJsonObject())); + } + + // Selected custom stats surfaced as their own columns. + if (stats.has("minecraft:custom")) { + JsonObject custom = stats.getAsJsonObject("minecraft:custom"); + for (String key : CUSTOM_STAT_COLUMNS) { + if (custom.has(key)) { + doc.addProperty(simpleKey(key), custom.get(key).getAsLong()); + } + } + } + + addAdvancementCounts(doc, advFile); + return doc; + } catch (IOException | RuntimeException e) { + logger.warn("Failed to parse stats for player {} ({})", uuid, statFile.getName(), e); + return null; + } + } + + /** + * Counts completed advancements, excluding recipe unlocks ({@code minecraft:recipes/...}) + * which are noise. Adds {@code advancements_completed} and {@code advancements_total}. + */ + private void addAdvancementCounts(JsonObject doc, File advFile) { + if (!advFile.exists()) { + return; + } + try (Reader r = new FileReader(advFile)) { + JsonObject root = JsonParser.parseReader(r).getAsJsonObject(); + int completed = 0; + int total = 0; + for (Map.Entry e : root.entrySet()) { + String id = e.getKey(); + if ("DataVersion".equals(id) || id.startsWith("minecraft:recipes/")) { + continue; + } + if (!e.getValue().isJsonObject()) { + continue; + } + total++; + JsonObject adv = e.getValue().getAsJsonObject(); + if (adv.has("done") && adv.get("done").getAsBoolean()) { + completed++; + } + } + doc.addProperty("advancements_completed", completed); + doc.addProperty("advancements_total", total); + } catch (IOException | RuntimeException e) { + logger.debug("Failed to parse advancements file {}", advFile.getName(), e); + } + } + + /** Sums every numeric value in a stat category object (e.g. all blocks under minecraft:mined). */ + private static long sumValues(JsonObject obj) { + long sum = 0L; + for (Map.Entry e : obj.entrySet()) { + sum += e.getValue().getAsLong(); + } + return sum; + } + + /** Builds a flat UUID -> name map from the server's usercache.json (best-effort). */ + private Map loadUsercache() { + Map map = new HashMap<>(); + if (!usercacheFile.exists()) { + return map; + } + try (Reader r = new FileReader(usercacheFile)) { + JsonArray arr = JsonParser.parseReader(r).getAsJsonArray(); + for (JsonElement el : arr) { + JsonObject o = el.getAsJsonObject(); + if (o.has("uuid") && o.has("name")) { + map.put(o.get("uuid").getAsString(), o.get("name").getAsString()); + } + } + } catch (IOException | RuntimeException e) { + logger.debug("Could not read usercache.json for player names", e); + } + return map; + } + + /** "minecraft:mined" -> "mined"; "minecraft:play_time" -> "play_time". */ + private static String simpleKey(String namespacedKey) { + int idx = namespacedKey.indexOf(':'); + return idx >= 0 ? namespacedKey.substring(idx + 1) : namespacedKey; + } + + private static String stripExtension(String fileName) { + int idx = fileName.lastIndexOf('.'); + return idx >= 0 ? fileName.substring(0, idx) : fileName; + } +} diff --git a/spigot/src/main/java/com/splunk/spigot/scheduling/ScheduledMetricLogger.java b/spigot/src/main/java/com/splunk/spigot/scheduling/ScheduledMetricLogger.java index 7d0cd1d..7197c10 100644 --- a/spigot/src/main/java/com/splunk/spigot/scheduling/ScheduledMetricLogger.java +++ b/spigot/src/main/java/com/splunk/spigot/scheduling/ScheduledMetricLogger.java @@ -20,7 +20,7 @@ public ScheduledMetricLogger(Properties props) { /** Called on each scheduled tick. Build and send the metric event(s) here. */ protected abstract void sample(); - /** Schedules {@link #sample()} every {@code intervalTicks} ticks. */ + /** Schedules {@link #sample()} every {@code intervalTicks} ticks on the main server thread. */ public void start(Plugin plugin, long intervalTicks) { new BukkitRunnable() { @Override @@ -33,4 +33,23 @@ public void run() { } }.runTaskTimer(plugin, intervalTicks, intervalTicks); } + + /** + * Like {@link #start(Plugin, long)} but runs {@link #sample()} off the main server thread. + * Use this when the sample does blocking I/O (file reads, HTTP) so it never stalls a tick. + * Subclasses scheduled this way MUST NOT touch the Bukkit world/entity API from + * {@link #sample()} (those calls are only safe on the main thread). + */ + public void startAsync(Plugin plugin, long intervalTicks) { + new BukkitRunnable() { + @Override + public void run() { + try { + sample(); + } catch (Exception e) { + logger.warn("Scheduled metric sample failed", e); + } + } + }.runTaskTimerAsynchronously(plugin, intervalTicks, intervalTicks); + } } From 9176d61fc31495f14124607ca2fd0a162e42b824 Mon Sep 17 00:00:00 2001 From: splunk Date: Mon, 13 Jul 2026 15:40:33 -0400 Subject: [PATCH 23/23] feat(forge): port extended-logging + KV-store scraper to Forge 1.20.1 Forge/NeoForge/Fabric only ever had the original block/death/player loggers -- the Combat/Item/Progression/Server/Performance categories and the KV-store PlayerStatsScraper (added on the spigot/paper side across prior commits) were never ported, since Forge's event-bus API shares nothing with Bukkit beyond the platform-agnostic shared-mc core. Ports all five categories plus PlayerStatsScraper/KvStoreConnection to forge-1.20.1-47.4.20, gated by the same splunk.craft.enable.* toggles as spigot. Two Forge API gaps, documented inline rather than approximated: - no per-orb XP-change event (only PlayerXpEvent.LevelChange exists), so exp_change is omitted; - no enchant-item event, so enchant is omitted. Hunger and weather-change also have no direct Forge event, so both are polled each tick and reported only on actual change (same pattern already used for move-sampling in the existing Forge PlayerEventLogger). Verified against a live Forge 1.20.1 server with a real player session: Combat (damage/heal/hunger)/Item (pickup)/Progression (craft)/Server (start/weather)/Performance events all landed in the Splunk HEC index, and the KV-store scraper's upserts were confirmed via a direct REST GET against the minecraft_player_stats collection. NeoForge and Fabric still have the original gap; not addressed here. --- forge-1.20.1-47.4.20/build.gradle | 97 +++++++ forge-1.20.1-47.4.20/gradle.properties | 9 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + forge-1.20.1-47.4.20/gradlew | 249 ++++++++++++++++++ forge-1.20.1-47.4.20/gradlew.bat | 92 +++++++ forge-1.20.1-47.4.20/settings.gradle | 11 + .../com/splunk/forge/LogToSplunkForge.java | 94 +++++++ .../forge/eventloggers/BlockEventLogger.java | 61 +++++ .../forge/eventloggers/CombatEventLogger.java | 129 +++++++++ .../forge/eventloggers/DeathEventLogger.java | 49 ++++ .../forge/eventloggers/ItemEventLogger.java | 61 +++++ .../eventloggers/PerformanceSampler.java | 39 +++ .../forge/eventloggers/PlayerEventLogger.java | 107 ++++++++ .../eventloggers/PlayerStatsScraper.java | 247 +++++++++++++++++ .../eventloggers/ProgressionEventLogger.java | 84 ++++++ .../forge/eventloggers/ServerEventLogger.java | 64 +++++ .../scheduling/ScheduledMetricLogger.java | 79 ++++++ .../src/main/resources/META-INF/mods.toml | 27 ++ .../src/main/resources/pack.mcmeta | 6 + .../main/resources/splunk.properties.sample | 42 +++ 21 files changed, 1554 insertions(+) create mode 100644 forge-1.20.1-47.4.20/build.gradle create mode 100644 forge-1.20.1-47.4.20/gradle.properties create mode 100644 forge-1.20.1-47.4.20/gradle/wrapper/gradle-wrapper.jar create mode 100644 forge-1.20.1-47.4.20/gradle/wrapper/gradle-wrapper.properties create mode 100644 forge-1.20.1-47.4.20/gradlew create mode 100644 forge-1.20.1-47.4.20/gradlew.bat create mode 100644 forge-1.20.1-47.4.20/settings.gradle create mode 100644 forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/LogToSplunkForge.java create mode 100644 forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/BlockEventLogger.java create mode 100644 forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/CombatEventLogger.java create mode 100644 forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/DeathEventLogger.java create mode 100644 forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/ItemEventLogger.java create mode 100644 forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/PerformanceSampler.java create mode 100644 forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/PlayerEventLogger.java create mode 100644 forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/PlayerStatsScraper.java create mode 100644 forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/ProgressionEventLogger.java create mode 100644 forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/ServerEventLogger.java create mode 100644 forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/scheduling/ScheduledMetricLogger.java create mode 100644 forge-1.20.1-47.4.20/src/main/resources/META-INF/mods.toml create mode 100644 forge-1.20.1-47.4.20/src/main/resources/pack.mcmeta create mode 100644 forge-1.20.1-47.4.20/src/main/resources/splunk.properties.sample diff --git a/forge-1.20.1-47.4.20/build.gradle b/forge-1.20.1-47.4.20/build.gradle new file mode 100644 index 0000000..810406e --- /dev/null +++ b/forge-1.20.1-47.4.20/build.gradle @@ -0,0 +1,97 @@ +plugins { + id 'eclipse' + id 'idea' + id 'net.minecraftforge.gradle' version '[6.0,6.2)' + id 'com.github.johnrengelman.shadow' version '8.1.1' + id 'java' +} + +version = "${mod_version}" +group = "${mod_group_id}" + +base { + archivesName = "${archives_base_name}" +} + +java { + toolchain.languageVersion = JavaLanguageVersion.of(17) +} + +minecraft { + // 1.20.1 uses Mojang's official mappings. + mappings channel: 'official', version: minecraft_version + copyIdeResources = true +} + +// Reuse the platform-agnostic core from the shared-mc module (single source of truth). +sourceSets.main.java.srcDir '../shared-mc/src/main/java' + +// 'shade' holds runtime libs that Minecraft/Forge does NOT provide; they get fat-jarred +// into the final mod jar by shadowJar, then reobfuscated. +configurations { + shade + implementation.extendsFrom shade +} + +repositories { + mavenCentral() + maven { + name = 'Splunk Artifactory' + url = 'https://splunk.jfrog.io/splunk/ext-releases-local/' + } +} + +dependencies { + minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + + // Provided by Minecraft/Forge at runtime: compile-only, not bundled. + compileOnly "com.google.code.gson:gson:2.13.2" + compileOnly "com.google.guava:guava:33.5.0-jre" + + // Not provided by Minecraft/Forge: bundle via shadow (transitive=false, exact set only). + // httpcore5-h2 is REQUIRED even for plain HTTP: httpclient5's TlsConfig references + // org.apache.hc.core5.http2.HttpVersionPolicy. Omitting it => NoClassDefFoundError on + // the first POST. + shade("com.splunk.logging:splunk-library-javalogging:1.11.8") { transitive = false } + shade("org.apache.httpcomponents.client5:httpclient5:5.5.1") { transitive = false } + shade("org.apache.httpcomponents.core5:httpcore5:5.3.6") { transitive = false } + shade("org.apache.httpcomponents.core5:httpcore5-h2:5.3.6") { transitive = false } + shade("commons-codec:commons-codec:1.17.1") { transitive = false } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' +} + +// Plain jar = thin dev jar (named mappings, NO bundled libs). Pushed to build/devlibs so it +// can never be mistaken for the shippable artifact in build/libs. Deploying it = missing +// httpcore5 at runtime. The shaded+reobf shadowJar (build/libs) is the only deployable jar. +tasks.named('jar', Jar) { + archiveClassifier = 'slim' + destinationDirectory = layout.buildDirectory.dir('devlibs') + manifest { + attributes([ + 'Implementation-Version': project.version, + 'Specification-Title' : 'logtosplunk', + 'Specification-Version' : '1' + ]) + } +} + +tasks.named('shadowJar') { + configurations = [project.configurations.shade] + archiveClassifier = '' + manifest { + attributes(['Implementation-Version': project.version]) + } + finalizedBy 'reobfShadowJar' +} + +// Reobfuscate the shaded jar from official -> SRG so Forge can load it at runtime. +reobf { + shadowJar { } +} + +tasks.named('assemble') { + dependsOn 'shadowJar' +} diff --git a/forge-1.20.1-47.4.20/gradle.properties b/forge-1.20.1-47.4.20/gradle.properties new file mode 100644 index 0000000..bc972a2 --- /dev/null +++ b/forge-1.20.1-47.4.20/gradle.properties @@ -0,0 +1,9 @@ +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false + +minecraft_version=1.20.1 +forge_version=47.4.20 + +mod_version=1.0.0 +mod_group_id=com.splunk +archives_base_name=logtosplunk-forge-47.4.20 diff --git a/forge-1.20.1-47.4.20/gradle/wrapper/gradle-wrapper.jar b/forge-1.20.1-47.4.20/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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

NnX)EH+Nua)3Y(c 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/forge-1.20.1-47.4.20/gradlew.bat b/forge-1.20.1-47.4.20/gradlew.bat new file mode 100644 index 0000000..7101f8e --- /dev/null +++ b/forge-1.20.1-47.4.20/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/forge-1.20.1-47.4.20/settings.gradle b/forge-1.20.1-47.4.20/settings.gradle new file mode 100644 index 0000000..aed928d --- /dev/null +++ b/forge-1.20.1-47.4.20/settings.gradle @@ -0,0 +1,11 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } + } +} + +rootProject.name = 'logtosplunk-forge' diff --git a/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/LogToSplunkForge.java b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/LogToSplunkForge.java new file mode 100644 index 0000000..a87cd0c --- /dev/null +++ b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/LogToSplunkForge.java @@ -0,0 +1,94 @@ +package com.splunk.forge; + +import java.io.File; +import java.io.FileReader; +import java.util.Properties; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.splunk.forge.eventloggers.BlockEventLogger; +import com.splunk.forge.eventloggers.CombatEventLogger; +import com.splunk.forge.eventloggers.DeathEventLogger; +import com.splunk.forge.eventloggers.ItemEventLogger; +import com.splunk.forge.eventloggers.PerformanceSampler; +import com.splunk.forge.eventloggers.PlayerEventLogger; +import com.splunk.forge.eventloggers.PlayerStatsScraper; +import com.splunk.forge.eventloggers.ProgressionEventLogger; +import com.splunk.forge.eventloggers.ServerEventLogger; +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.Mod; + +/** + * Forge entrypoint for Minecraft 1.20.1. Mirrors the spigot/fabric core: loads + * {@code /config/splunk.properties}, wires up the shared event loggers, and registers + * them on the Forge event bus. Unlike Fabric, Forge exposes native block-place and chat + * events, so no mixin is required. + * + *

The extended logging categories (combat/item/progression/server/performance) and the + * KV-store player-stats scraper are opt-in via the same {@code splunk.craft.enable.*} toggles + * used by the spigot module, gated the same way. + */ +@Mod(LogToSplunkForge.MODID) +public class LogToSplunkForge { + public static final String MODID = "logtosplunk"; + public static final String SPLUNK_PROPERTIES = "/config/splunk.properties"; + + private static final Logger LOGGER = LogManager.getLogger("LogToSplunk"); + + public LogToSplunkForge() { + final Properties properties = loadProperties(); + + MinecraftForge.EVENT_BUS.register(new PlayerEventLogger(properties)); + MinecraftForge.EVENT_BUS.register(new BlockEventLogger(properties)); + MinecraftForge.EVENT_BUS.register(new DeathEventLogger(properties)); + + if (Boolean.parseBoolean(properties.getProperty(AbstractEventLogger.ENABLE_COMBAT, "false"))) { + MinecraftForge.EVENT_BUS.register(new CombatEventLogger(properties)); + } + if (Boolean.parseBoolean(properties.getProperty(AbstractEventLogger.ENABLE_ITEM, "false"))) { + MinecraftForge.EVENT_BUS.register(new ItemEventLogger(properties)); + } + if (Boolean.parseBoolean(properties.getProperty(AbstractEventLogger.ENABLE_PROGRESSION, "false"))) { + MinecraftForge.EVENT_BUS.register(new ProgressionEventLogger(properties)); + } + if (Boolean.parseBoolean(properties.getProperty(AbstractEventLogger.ENABLE_SERVER, "false"))) { + MinecraftForge.EVENT_BUS.register(new ServerEventLogger(properties)); + } + if (Boolean.parseBoolean(properties.getProperty(AbstractEventLogger.ENABLE_PERFORMANCE, "false"))) { + int interval = parseIntProperty( + properties, AbstractEventLogger.PERFORMANCE_INTERVAL_TICKS, 600); + PerformanceSampler sampler = new PerformanceSampler(properties); + sampler.start(interval); + MinecraftForge.EVENT_BUS.register(sampler); + } + if (Boolean.parseBoolean(properties.getProperty(AbstractEventLogger.ENABLE_PLAYERSTATS, "false"))) { + int interval = parseIntProperty( + properties, AbstractEventLogger.PLAYERSTATS_INTERVAL_TICKS, 6000); + new PlayerStatsScraper(properties).startAsync(interval); + } + + LOGGER.info("Splunk for Minecraft (Forge) initialized."); + } + + private static int parseIntProperty(Properties properties, String key, int defaultValue) { + try { + return Integer.parseInt(properties.getProperty(key, Integer.toString(defaultValue))); + } catch (NumberFormatException e) { + return defaultValue; + } + } + + private Properties loadProperties() { + final Properties properties = new Properties(); + final String path = System.getProperty("user.dir") + SPLUNK_PROPERTIES; + try (final FileReader reader = new FileReader(new File(path))) { + properties.load(reader); + } catch (final Exception e) { + LOGGER.warn("Unable to load properties for LogToSplunk at {}! Default values will be used.", path, e); + } + return properties; + } +} diff --git a/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/BlockEventLogger.java b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/BlockEventLogger.java new file mode 100644 index 0000000..9160e00 --- /dev/null +++ b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/BlockEventLogger.java @@ -0,0 +1,61 @@ +package com.splunk.forge.eventloggers; + +import java.util.Properties; + +import com.splunk.sharedmc.Point3dLong; +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; +import com.splunk.sharedmc.loggable_events.LoggableBlockEvent; +import com.splunk.sharedmc.loggable_events.LoggableBlockEvent.BlockEventAction; + +import net.minecraft.core.BlockPos; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.event.level.BlockEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.registries.ForgeRegistries; + +/** + * Logs block break/place events via Forge's native {@code BlockEvent.BreakEvent} and + * {@code BlockEvent.EntityPlaceEvent}. + */ +public class BlockEventLogger extends AbstractEventLogger { + + public BlockEventLogger(Properties props) { + super(props); + } + + @SubscribeEvent + public void onBreak(BlockEvent.BreakEvent event) { + final Player player = event.getPlayer(); + log(levelOf(event.getLevel(), player), player, event.getPos(), event.getState(), BlockEventAction.BREAK); + } + + @SubscribeEvent + public void onPlace(BlockEvent.EntityPlaceEvent event) { + final Player player = event.getEntity() instanceof Player p ? p : null; + log(levelOf(event.getLevel(), player), player, event.getPos(), event.getPlacedBlock(), BlockEventAction.PLACE); + } + + private static Level levelOf(LevelAccessor accessor, Player player) { + if (accessor instanceof Level level) { + return level; + } + return player != null ? player.level() : null; + } + + private void log(Level level, Player player, BlockPos pos, BlockState state, BlockEventAction action) { + if (level == null || level.isClientSide()) { + return; + } + final long worldTime = level.getGameTime(); + final String worldName = level.dimension().location().toString(); + final Point3dLong loc = new Point3dLong(pos.getX(), pos.getY(), pos.getZ()); + final ResourceLocation id = ForgeRegistries.BLOCKS.getKey(state.getBlock()); + final String blockName = id != null ? id.toString() : "unknown"; + final String playerName = player != null ? player.getName().getString() : null; + logAndSend(new LoggableBlockEvent(action, worldTime, worldName, loc, blockName, playerName)); + } +} diff --git a/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/CombatEventLogger.java b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/CombatEventLogger.java new file mode 100644 index 0000000..8c2ad99 --- /dev/null +++ b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/CombatEventLogger.java @@ -0,0 +1,129 @@ +package com.splunk.forge.eventloggers; + +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import java.util.UUID; + +import com.splunk.sharedmc.Point3dLong; +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; +import com.splunk.sharedmc.loggable_events.LoggableCombatEvent; +import com.splunk.sharedmc.loggable_events.LoggableCombatEvent.CombatAction; +import com.splunk.sharedmc.util.EventThrottle; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.level.Level; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.event.entity.living.LivingDamageEvent; +import net.minecraftforge.event.entity.living.LivingHealEvent; +import net.minecraftforge.event.entity.player.PlayerEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; + +/** + * Logs combat and survival events. High-frequency events (damage, hunger) are throttled + * per-player. Mirrors the spigot module's {@code CombatEventLogger}. + * + *

Forge has no hunger-change event (unlike Bukkit's {@code FoodLevelChangeEvent}), so hunger + * is polled every {@link #FOOD_SAMPLE_INTERVAL_TICKS} ticks and reported only when a player's + * food level actually changed since the last sample. + * + *

Note: there is intentionally no death/kill handler here, matching the spigot module — + * kill events are handled by {@code DeathEventLogger} to avoid double-logging. + */ +public class CombatEventLogger extends AbstractEventLogger { + + private static final long THROTTLE_MS = 1000L; + private static final int FOOD_SAMPLE_INTERVAL_TICKS = 20; + + private final EventThrottle throttle = new EventThrottle(THROTTLE_MS); + private final Map lastKnownFoodLevel = new HashMap<>(); + private int tickCounter = 0; + + public CombatEventLogger(Properties props) { + super(props); + } + + /** Throttled per-victim: damage events can fire many times per second. */ + @SubscribeEvent + public void onDamage(LivingDamageEvent event) { + LivingEntity entity = event.getEntity(); + if (!(entity instanceof ServerPlayer)) { + return; + } + ServerPlayer victim = (ServerPlayer) entity; + if (!throttle.allow("dmg:" + victim.getName().getString())) { + return; + } + Entity damager = event.getSource().getEntity(); + LoggableCombatEvent loggable = base(CombatAction.DAMAGE, victim); + loggable.setVictim(victim.getName().getString()) + .setSource(damager != null ? damager.getType().toString() : event.getSource().getMsgId()) + .setAmount(event.getAmount()) + .setCause(event.getSource().getMsgId()) + .setHealthRemaining(victim.getHealth()); + logAndSend(loggable); + } + + /** Throttled per-player: regen-based healing (e.g. saturation) can fire frequently. */ + @SubscribeEvent + public void onHeal(LivingHealEvent event) { + LivingEntity entity = event.getEntity(); + if (!(entity instanceof ServerPlayer)) { + return; + } + ServerPlayer player = (ServerPlayer) entity; + if (!throttle.allow("heal:" + player.getName().getString())) { + return; + } + LoggableCombatEvent loggable = base(CombatAction.HEAL, player); + loggable.setVictim(player.getName().getString()) + .setAmount(event.getAmount()) + .setHealthRemaining(player.getHealth()); + logAndSend(loggable); + } + + /** Not throttled: respawn is a rare, deliberate-trigger event for a given player. */ + @SubscribeEvent + public void onRespawn(PlayerEvent.PlayerRespawnEvent event) { + if (!(event.getEntity() instanceof ServerPlayer)) { + return; + } + ServerPlayer player = (ServerPlayer) event.getEntity(); + lastKnownFoodLevel.remove(player.getUUID()); + LoggableCombatEvent loggable = base(CombatAction.RESPAWN, player); + loggable.setVictim(player.getName().getString()); + logAndSend(loggable); + } + + /** Polls food level; Forge has no hunger-change event to subscribe to directly. */ + @SubscribeEvent + public void onServerTick(TickEvent.ServerTickEvent event) { + if (event.phase != TickEvent.Phase.END) { + return; + } + if (++tickCounter % FOOD_SAMPLE_INTERVAL_TICKS != 0) { + return; + } + for (ServerPlayer player : event.getServer().getPlayerList().getPlayers()) { + int foodLevel = player.getFoodData().getFoodLevel(); + Integer previous = lastKnownFoodLevel.put(player.getUUID(), foodLevel); + if (previous != null && previous == foodLevel) { + continue; + } + if (!throttle.allow("food:" + player.getName().getString())) { + continue; + } + LoggableCombatEvent loggable = base(CombatAction.HUNGER, player); + loggable.setVictim(player.getName().getString()).setFoodLevel(foodLevel); + logAndSend(loggable); + } + } + + private LoggableCombatEvent base(CombatAction action, ServerPlayer player) { + Level level = player.level(); + Point3dLong loc = new Point3dLong(player.getX(), player.getY(), player.getZ()); + return new LoggableCombatEvent(action, level.getGameTime(), level.dimension().location().toString(), loc); + } +} diff --git a/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/DeathEventLogger.java b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/DeathEventLogger.java new file mode 100644 index 0000000..3066e94 --- /dev/null +++ b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/DeathEventLogger.java @@ -0,0 +1,49 @@ +package com.splunk.forge.eventloggers; + +import java.util.Properties; + +import com.splunk.sharedmc.Point3dLong; +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; +import com.splunk.sharedmc.loggable_events.LoggableDeathEvent; +import com.splunk.sharedmc.loggable_events.LoggableDeathEvent.DeathEventAction; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.level.Level; +import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; + +/** + * Logs entity deaths (players and mobs) via Forge's native {@code LivingDeathEvent}. + */ +public class DeathEventLogger extends AbstractEventLogger { + + public DeathEventLogger(Properties props) { + super(props); + } + + @SubscribeEvent + public void onDeath(LivingDeathEvent event) { + final LivingEntity entity = event.getEntity(); + final Level level = entity.level(); + if (level.isClientSide()) { + return; + } + final long worldTime = level.getGameTime(); + final String worldName = level.dimension().location().toString(); + final Point3dLong loc = new Point3dLong(entity.getX(), entity.getY(), entity.getZ()); + + final boolean isPlayer = entity instanceof ServerPlayer; + final DeathEventAction action = isPlayer ? DeathEventAction.PLAYER_DIED : DeathEventAction.MOB_DIED; + + final String victim = entity.getName().getString(); + final DamageSource source = event.getSource(); + final Entity attacker = source.getEntity(); + final String killer = attacker != null ? attacker.getName().getString() : null; + final String damageSource = source.getMsgId(); + + logAndSend(new LoggableDeathEvent(action, worldTime, worldName, loc, killer, victim, damageSource)); + } +} diff --git a/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/ItemEventLogger.java b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/ItemEventLogger.java new file mode 100644 index 0000000..6a919ae --- /dev/null +++ b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/ItemEventLogger.java @@ -0,0 +1,61 @@ +package com.splunk.forge.eventloggers; + +import java.util.Properties; + +import com.splunk.sharedmc.Point3dLong; +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; +import com.splunk.sharedmc.loggable_events.LoggableItemEvent; +import com.splunk.sharedmc.loggable_events.LoggableItemEvent.ItemAction; +import com.splunk.sharedmc.util.EventThrottle; + +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraftforge.event.entity.item.ItemTossEvent; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; + +/** + * Logs item pickup and drop events. Pickup is throttled (it can fire rapidly, e.g. when + * picking up XP orbs or arrows); drop is not throttled since it is a deliberate, low + * frequency player action. Mirrors the spigot module's {@code ItemEventLogger}. + */ +public class ItemEventLogger extends AbstractEventLogger { + + private final EventThrottle throttle = new EventThrottle(1000L); + + public ItemEventLogger(Properties props) { + super(props); + } + + @SubscribeEvent + public void onPickup(EntityItemPickupEvent event) { + Player player = event.getEntity(); + if (!throttle.allow("pickup:" + player.getName().getString())) { + return; + } + ItemStack stack = event.getItem().getItem(); + Level level = player.level(); + Point3dLong loc = new Point3dLong(player.getX(), player.getY(), player.getZ()); + LoggableItemEvent loggable = new LoggableItemEvent( + ItemAction.PICKUP, level.getGameTime(), level.dimension().location().toString(), loc); + loggable.setPlayerName(player.getName().getString()) + .setItem(stack.getItem().toString()) + .setQuantity(stack.getCount()); + logAndSend(loggable); + } + + @SubscribeEvent + public void onDrop(ItemTossEvent event) { + Player player = event.getPlayer(); + ItemStack stack = event.getEntity().getItem(); + Level level = player.level(); + Point3dLong loc = new Point3dLong(player.getX(), player.getY(), player.getZ()); + LoggableItemEvent loggable = new LoggableItemEvent( + ItemAction.DROP, level.getGameTime(), level.dimension().location().toString(), loc); + loggable.setPlayerName(player.getName().getString()) + .setItem(stack.getItem().toString()) + .setQuantity(stack.getCount()); + logAndSend(loggable); + } +} diff --git a/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/PerformanceSampler.java b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/PerformanceSampler.java new file mode 100644 index 0000000..ca9656b --- /dev/null +++ b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/PerformanceSampler.java @@ -0,0 +1,39 @@ +package com.splunk.forge.eventloggers; + +import java.util.Properties; + +import com.splunk.forge.scheduling.ScheduledMetricLogger; +import com.splunk.sharedmc.loggable_events.LoggablePerformanceEvent; + +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerLevel; +import net.minecraftforge.server.ServerLifecycleHooks; + +/** + * Periodically samples server performance (online players, loaded chunks). Mirrors the + * spigot module's {@code PerformanceSampler}; TPS/MSPT are omitted (see that class's javadoc + * for why they're Bukkit/Paper-only there — Forge has no equivalent public API either, without + * reaching into internal tick-time tracking not exposed by {@code MinecraftServer}). + */ +public class PerformanceSampler extends ScheduledMetricLogger { + + public PerformanceSampler(Properties props) { + super(props); + } + + @Override + protected void sample() { + MinecraftServer server = ServerLifecycleHooks.getCurrentServer(); + if (server == null) { + return; + } + LoggablePerformanceEvent e = new LoggablePerformanceEvent(0L); + e.setOnlinePlayers(server.getPlayerCount()); + int loaded = 0; + for (ServerLevel level : server.getAllLevels()) { + loaded += level.getChunkSource().getLoadedChunksCount(); + } + e.setLoadedChunks(loaded); + logAndSend(e); + } +} diff --git a/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/PlayerEventLogger.java b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/PlayerEventLogger.java new file mode 100644 index 0000000..d2f0225 --- /dev/null +++ b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/PlayerEventLogger.java @@ -0,0 +1,107 @@ +package com.splunk.forge.eventloggers; + +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import java.util.UUID; + +import com.splunk.sharedmc.Point3dLong; +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; +import com.splunk.sharedmc.loggable_events.LoggablePlayerEvent; +import com.splunk.sharedmc.loggable_events.LoggablePlayerEvent.PlayerEventAction; + +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.level.Level; +import net.minecraftforge.event.ServerChatEvent; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.event.entity.player.PlayerEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.server.ServerLifecycleHooks; + +/** + * Logs player connect/disconnect/chat/move events. Forge has no per-move event, so movement + * is derived by polling player positions every {@link #MOVE_SAMPLE_INTERVAL_TICKS} ticks and + * emitting only when a player has moved more than {@link #GRANULARITY} blocks. + */ +public class PlayerEventLogger extends AbstractEventLogger { + public static final double GRANULARITY = 1.5; + private static final int MOVE_SAMPLE_INTERVAL_TICKS = 10; + + private int tickCounter = 0; + private final Map lastKnownCoordinates = new HashMap<>(); + + public PlayerEventLogger(Properties props) { + super(props); + } + + @SubscribeEvent + public void onLogin(PlayerEvent.PlayerLoggedInEvent event) { + if (!(event.getEntity() instanceof ServerPlayer player)) { + return; + } + final LoggablePlayerEvent loggable = base(player, PlayerEventAction.PLAYER_CONNECT); + loggable.setPlayerUuid(player.getStringUUID()); + logAndSend(loggable); + } + + @SubscribeEvent + public void onLogout(PlayerEvent.PlayerLoggedOutEvent event) { + if (!(event.getEntity() instanceof ServerPlayer player)) { + return; + } + lastKnownCoordinates.remove(player.getUUID()); + logAndSend(base(player, PlayerEventAction.PLAYER_DISCONNECT)); + } + + @SubscribeEvent + public void onChat(ServerChatEvent event) { + final ServerPlayer player = event.getPlayer(); + final LoggablePlayerEvent loggable = base(player, PlayerEventAction.CHAT); + loggable.setMessage(event.getMessage().getString()); + logAndSend(loggable); + } + + @SubscribeEvent + public void onServerTick(TickEvent.ServerTickEvent event) { + if (event.phase != TickEvent.Phase.END) { + return; + } + if (++tickCounter % MOVE_SAMPLE_INTERVAL_TICKS != 0) { + return; + } + final MinecraftServer server = ServerLifecycleHooks.getCurrentServer(); + if (server == null) { + return; + } + for (final ServerPlayer player : server.getPlayerList().getPlayers()) { + final Point3dLong current = new Point3dLong(player.getX(), player.getY(), player.getZ()); + final Point3dLong previous = lastKnownCoordinates.get(player.getUUID()); + if (previous != null && distance(previous, current) < GRANULARITY) { + continue; + } + final LoggablePlayerEvent loggable = base(player, PlayerEventAction.LOCATION); + loggable.setFrom(previous); + loggable.setTo(current); + lastKnownCoordinates.put(player.getUUID(), current); + logAndSend(loggable); + } + } + + private LoggablePlayerEvent base(ServerPlayer player, PlayerEventAction action) { + final Level level = player.level(); + final long worldTime = level.getGameTime(); + final String worldName = level.dimension().location().toString(); + final Point3dLong loc = new Point3dLong(player.getX(), player.getY(), player.getZ()); + final LoggablePlayerEvent loggable = new LoggablePlayerEvent(action, worldTime, worldName, loc); + loggable.setPlayerName(player.getName().getString()); + return loggable; + } + + private static double distance(Point3dLong a, Point3dLong b) { + final double dx = a.xCoord - b.xCoord; + final double dy = a.yCoord - b.yCoord; + final double dz = a.zCoord - b.zCoord; + return Math.sqrt(dx * dx + dy * dy + dz * dz); + } +} diff --git a/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/PlayerStatsScraper.java b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/PlayerStatsScraper.java new file mode 100644 index 0000000..a8d9d40 --- /dev/null +++ b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/PlayerStatsScraper.java @@ -0,0 +1,247 @@ +package com.splunk.forge.eventloggers; + +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.Reader; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +import com.splunk.forge.scheduling.ScheduledMetricLogger; +import com.splunk.sharedmc.KvStoreConnection; +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; + +/** + * Periodically scrapes the per-player snapshot files Minecraft writes to disk + * ({@code /stats/.json} and {@code /advancements/.json}), flattens + * them into one document per player, and upserts those documents into a Splunk KV-store + * collection via {@link KvStoreConnection}. + * + *

Identical to the spigot module's {@code PlayerStatsScraper} (this class never touched the + * Bukkit API to begin with — only file I/O, gson, and the shared KV-store client), copied here + * because Forge cannot depend on the spigot module's Bukkit-based scheduler. + * + *

Runs off the main server thread (see {@link ScheduledMetricLogger#startAsync}); it only + * reads files and does HTTP, never touches live world state. To avoid re-uploading unchanged + * players every cycle, the last-seen file modification time per UUID is cached and only changed + * files are pushed. + */ +public class PlayerStatsScraper extends ScheduledMetricLogger { + + /** Default world directory name; overridable via {@link AbstractEventLogger#WORLD_PATH}. */ + private static final String DEFAULT_WORLD = "world"; + + /** Custom-stat keys we surface as first-class columns (the rest are kept as category totals). */ + private static final String[] CUSTOM_STAT_COLUMNS = { + "minecraft:deaths", + "minecraft:mob_kills", + "minecraft:player_kills", + "minecraft:play_time", + "minecraft:total_world_time", + "minecraft:walk_one_cm", + "minecraft:sprint_one_cm", + "minecraft:jump", + "minecraft:damage_dealt", + "minecraft:damage_taken", + "minecraft:time_since_rest" + }; + + private final KvStoreConnection kv; + private final File statsDir; + private final File advancementsDir; + private final File usercacheFile; + + /** UUID -> last stats-file lastModified() we successfully uploaded, to push only deltas. */ + private final Map uploadedMtimes = new HashMap<>(); + + public PlayerStatsScraper(Properties props) { + super(props); + + String host = props.getProperty(KVSTORE_HOST, "127.0.0.1"); + int port = intProp(KVSTORE_PORT, 8089); + String app = props.getProperty(KVSTORE_APP, "minecraft-app"); + String collection = props.getProperty(KVSTORE_COLLECTION, "minecraft_player_stats"); + String token = props.getProperty(KVSTORE_TOKEN); + if (token == null || token.trim().isEmpty()) { + throw new IllegalArgumentException("Property `" + KVSTORE_TOKEN + "` must be set (a splunkd " + + "bearer token) to write player stats to the KV store."); + } + this.kv = new KvStoreConnection(host, port, app, collection, token); + + String serverDir = System.getProperty("user.dir"); + String world = props.getProperty(WORLD_PATH, DEFAULT_WORLD); + File worldDir = new File(world); + if (!worldDir.isAbsolute()) { + worldDir = new File(serverDir, world); + } + this.statsDir = new File(worldDir, "stats"); + this.advancementsDir = new File(worldDir, "advancements"); + this.usercacheFile = new File(serverDir, "usercache.json"); + } + + @Override + protected void sample() { + File[] statFiles = statsDir.listFiles((dir, name) -> name.endsWith(".json")); + if (statFiles == null || statFiles.length == 0) { + logger.debug("No player stats files found at {}", statsDir.getAbsolutePath()); + return; + } + + Map uuidToName = loadUsercache(); + + JsonArray batch = new JsonArray(); + for (File statFile : statFiles) { + String uuid = stripExtension(statFile.getName()); + long mtime = statFile.lastModified(); + + File advFile = new File(advancementsDir, uuid + ".json"); + long advMtime = advFile.exists() ? advFile.lastModified() : 0L; + long combinedMtime = Math.max(mtime, advMtime); + + Long lastSeen = uploadedMtimes.get(uuid); + if (lastSeen != null && lastSeen == combinedMtime) { + continue; // unchanged since last successful upload + } + + JsonObject doc = buildDocument(uuid, uuidToName.get(uuid), statFile, advFile, combinedMtime); + if (doc != null) { + batch.add(doc); + } + } + + if (batch.size() == 0) { + return; + } + + if (kv.batchSave(batch.toString())) { + // Only mark as uploaded once splunkd accepted the batch. + for (JsonElement el : batch) { + JsonObject doc = el.getAsJsonObject(); + uploadedMtimes.put(doc.get("uuid").getAsString(), doc.get("last_modified").getAsLong()); + } + logger.info("Upserted {} player-stats document(s) to KV store.", batch.size()); + } else { + logger.warn("KV-store upsert failed; will retry {} player(s) next cycle.", batch.size()); + } + } + + private JsonObject buildDocument(String uuid, String name, File statFile, File advFile, long combinedMtime) { + try (Reader r = new FileReader(statFile)) { + JsonObject root = JsonParser.parseReader(r).getAsJsonObject(); + + JsonObject doc = new JsonObject(); + doc.addProperty("_key", uuid); // makes batch_save an idempotent upsert + doc.addProperty("uuid", uuid); + if (name != null) { + doc.addProperty("name", name); + } + doc.addProperty("last_modified", combinedMtime); + if (root.has("DataVersion")) { + doc.addProperty("data_version", root.get("DataVersion").getAsInt()); + } + + JsonObject stats = root.has("stats") ? root.getAsJsonObject("stats") : new JsonObject(); + + // Per-category totals (sum of all entries within minecraft:mined, :killed, etc.). + for (Map.Entry cat : stats.entrySet()) { + String column = "stat_" + simpleKey(cat.getKey()) + "_total"; + doc.addProperty(column, sumValues(cat.getValue().getAsJsonObject())); + } + + // Selected custom stats surfaced as their own columns. + if (stats.has("minecraft:custom")) { + JsonObject custom = stats.getAsJsonObject("minecraft:custom"); + for (String key : CUSTOM_STAT_COLUMNS) { + if (custom.has(key)) { + doc.addProperty(simpleKey(key), custom.get(key).getAsLong()); + } + } + } + + addAdvancementCounts(doc, advFile); + return doc; + } catch (IOException | RuntimeException e) { + logger.warn("Failed to parse stats for player {} ({})", uuid, statFile.getName(), e); + return null; + } + } + + /** + * Counts completed advancements, excluding recipe unlocks ({@code minecraft:recipes/...}) + * which are noise. Adds {@code advancements_completed} and {@code advancements_total}. + */ + private void addAdvancementCounts(JsonObject doc, File advFile) { + if (!advFile.exists()) { + return; + } + try (Reader r = new FileReader(advFile)) { + JsonObject root = JsonParser.parseReader(r).getAsJsonObject(); + int completed = 0; + int total = 0; + for (Map.Entry e : root.entrySet()) { + String id = e.getKey(); + if ("DataVersion".equals(id) || id.startsWith("minecraft:recipes/")) { + continue; + } + if (!e.getValue().isJsonObject()) { + continue; + } + total++; + JsonObject adv = e.getValue().getAsJsonObject(); + if (adv.has("done") && adv.get("done").getAsBoolean()) { + completed++; + } + } + doc.addProperty("advancements_completed", completed); + doc.addProperty("advancements_total", total); + } catch (IOException | RuntimeException e) { + logger.debug("Failed to parse advancements file {}", advFile.getName(), e); + } + } + + /** Sums every numeric value in a stat category object (e.g. all blocks under minecraft:mined). */ + private static long sumValues(JsonObject obj) { + long sum = 0L; + for (Map.Entry e : obj.entrySet()) { + sum += e.getValue().getAsLong(); + } + return sum; + } + + /** Builds a flat UUID -> name map from the server's usercache.json (best-effort). */ + private Map loadUsercache() { + Map map = new HashMap<>(); + if (!usercacheFile.exists()) { + return map; + } + try (Reader r = new FileReader(usercacheFile)) { + JsonArray arr = JsonParser.parseReader(r).getAsJsonArray(); + for (JsonElement el : arr) { + JsonObject o = el.getAsJsonObject(); + if (o.has("uuid") && o.has("name")) { + map.put(o.get("uuid").getAsString(), o.get("name").getAsString()); + } + } + } catch (IOException | RuntimeException e) { + logger.debug("Could not read usercache.json for player names", e); + } + return map; + } + + /** "minecraft:mined" -> "mined"; "minecraft:play_time" -> "play_time". */ + private static String simpleKey(String namespacedKey) { + int idx = namespacedKey.indexOf(':'); + return idx >= 0 ? namespacedKey.substring(idx + 1) : namespacedKey; + } + + private static String stripExtension(String fileName) { + int idx = fileName.lastIndexOf('.'); + return idx >= 0 ? fileName.substring(0, idx) : fileName; + } +} diff --git a/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/ProgressionEventLogger.java b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/ProgressionEventLogger.java new file mode 100644 index 0000000..7f81e69 --- /dev/null +++ b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/ProgressionEventLogger.java @@ -0,0 +1,84 @@ +package com.splunk.forge.eventloggers; + +import java.util.Properties; + +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; +import com.splunk.sharedmc.loggable_events.LoggableProgressionEvent; +import com.splunk.sharedmc.loggable_events.LoggableProgressionEvent.ProgressionAction; + +import com.mojang.brigadier.context.CommandContextBuilder; + +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.world.entity.player.Player; +import net.minecraftforge.event.CommandEvent; +import net.minecraftforge.event.entity.player.ItemFishedEvent; +import net.minecraftforge.event.entity.player.PlayerEvent; +import net.minecraftforge.event.entity.player.PlayerXpEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; + +/** + * Logs progression and activity: level, craft, fish, command. Mirrors the spigot module's + * {@code ProgressionEventLogger}, minus two categories Forge 1.20.1 has no event for: + * + *

    + *
  • exp_change — Forge only exposes {@code PlayerXpEvent.LevelChange} (level-ups), + * not per-orb XP gain like Bukkit's {@code PlayerExpChangeEvent}. Omitted rather than + * approximated. + *
  • enchant — Forge has no event fired specifically when a player enchants an item + * via the enchanting table (verified against the {@code forge-1.20.1-47.4.20} event bus + * classes: no {@code EnchantItemEvent} equivalent exists). Omitted rather than + * approximated with an unrelated container-close event. + *
+ */ +public class ProgressionEventLogger extends AbstractEventLogger { + + public ProgressionEventLogger(Properties props) { + super(props); + } + + private LoggableProgressionEvent base(ProgressionAction action, Player player) { + LoggableProgressionEvent e = new LoggableProgressionEvent( + action, player.level().getGameTime(), player.level().dimension().location().toString()); + e.setPlayerName(player.getName().getString()); + return e; + } + + @SubscribeEvent + public void onLevelChange(PlayerXpEvent.LevelChange event) { + Player player = event.getEntity(); + LoggableProgressionEvent e = base(ProgressionAction.LEVEL_CHANGE, player); + e.setNewLevel(player.experienceLevel + event.getLevels()); + logAndSend(e); + } + + @SubscribeEvent + public void onCraft(PlayerEvent.ItemCraftedEvent event) { + Player player = event.getEntity(); + LoggableProgressionEvent e = base(ProgressionAction.CRAFT, player); + e.setDetail(event.getCrafting().getItem().toString()); + logAndSend(e); + } + + @SubscribeEvent + public void onFish(ItemFishedEvent event) { + Player player = event.getEntity(); + LoggableProgressionEvent e = base(ProgressionAction.FISH, player); + e.setDetail(event.getHookEntity().getHookedIn() != null + ? "entity" + : event.getDrops().size() + " item(s)"); + logAndSend(e); + } + + @SubscribeEvent + public void onCommand(CommandEvent event) { + CommandContextBuilder context = event.getParseResults().getContext(); + CommandSourceStack source = context.getSource(); + if (!(source.getEntity() instanceof Player)) { + return; + } + Player player = (Player) source.getEntity(); + LoggableProgressionEvent e = base(ProgressionAction.COMMAND, player); + e.setDetail(event.getParseResults().getReader().getString()); + logAndSend(e); + } +} diff --git a/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/ServerEventLogger.java b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/ServerEventLogger.java new file mode 100644 index 0000000..5b5486a --- /dev/null +++ b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/eventloggers/ServerEventLogger.java @@ -0,0 +1,64 @@ +package com.splunk.forge.eventloggers; + +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; +import com.splunk.sharedmc.loggable_events.LoggableServerEvent; +import com.splunk.sharedmc.loggable_events.LoggableServerEvent.ServerAction; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerLevel; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.event.server.ServerStartedEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; + +/** + * Logs server lifecycle and world-state events. Mirrors the spigot module's + * {@code ServerEventLogger}. + * + *

Forge has no dedicated weather-change event (unlike Bukkit's {@code WeatherChangeEvent}), + * so each loaded level's raining state is polled every {@link #WEATHER_SAMPLE_INTERVAL_TICKS} + * ticks and reported only when it actually changed since the last sample. + */ +public class ServerEventLogger extends AbstractEventLogger { + + private static final int WEATHER_SAMPLE_INTERVAL_TICKS = 200; + + private final Map lastKnownWeather = new HashMap<>(); + private int tickCounter = 0; + + public ServerEventLogger(Properties props) { + super(props); + } + + @SubscribeEvent + public void onServerStarted(ServerStartedEvent event) { + LoggableServerEvent e = new LoggableServerEvent(ServerAction.SERVER_START, 0L, null); + e.setMotd(event.getServer().getMotd()); + logAndSend(e); + } + + @SubscribeEvent + public void onServerTick(TickEvent.ServerTickEvent event) { + if (event.phase != TickEvent.Phase.END) { + return; + } + if (++tickCounter % WEATHER_SAMPLE_INTERVAL_TICKS != 0) { + return; + } + for (ServerLevel level : event.getServer().getAllLevels()) { + ResourceLocation dimension = level.dimension().location(); + boolean raining = level.isRaining(); + Boolean previous = lastKnownWeather.put(dimension, raining); + if (previous != null && previous == raining) { + continue; + } + LoggableServerEvent e = new LoggableServerEvent( + ServerAction.WEATHER_CHANGE, level.getGameTime(), dimension.toString()); + e.setWeather(raining ? "storm" : "clear"); + logAndSend(e); + } + } +} diff --git a/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/scheduling/ScheduledMetricLogger.java b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/scheduling/ScheduledMetricLogger.java new file mode 100644 index 0000000..4315838 --- /dev/null +++ b/forge-1.20.1-47.4.20/src/main/java/com/splunk/forge/scheduling/ScheduledMetricLogger.java @@ -0,0 +1,79 @@ +package com.splunk.forge.scheduling; + +import java.util.Properties; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; + +import com.splunk.sharedmc.event_loggers.AbstractEventLogger; + +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; + +/** + * Base for loggers driven by a timer rather than a game event. Mirrors the spigot module's + * {@code ScheduledMetricLogger}, adapted to Forge: {@link #start(long)} samples on the main + * server thread via the Forge tick event bus (subclass MUST register {@code this} on + * {@code MinecraftForge.EVENT_BUS} for the tick handler to fire); {@link #startAsync(long)} + * samples off-thread on a dedicated scheduled executor, for subclasses that do blocking I/O. + */ +public abstract class ScheduledMetricLogger extends AbstractEventLogger { + + /** Assumes a steady 20 ticks/second, matching vanilla server tick rate. */ + private static final long MS_PER_TICK = 50L; + + private long intervalTicks; + private int tickCounter = 0; + + public ScheduledMetricLogger(Properties props) { + super(props); + } + + /** Called on each scheduled interval. Build and send the metric event(s) here. */ + protected abstract void sample(); + + /** + * Arms the tick-driven sampler. The caller must also register {@code this} instance on + * {@code MinecraftForge.EVENT_BUS} so {@link #onServerTick(TickEvent.ServerTickEvent)} fires. + */ + public void start(long intervalTicks) { + this.intervalTicks = intervalTicks; + } + + @SubscribeEvent + public void onServerTick(TickEvent.ServerTickEvent event) { + if (intervalTicks <= 0 || event.phase != TickEvent.Phase.END) { + return; + } + if (++tickCounter % intervalTicks != 0) { + return; + } + runSampleSafely(); + } + + /** + * Like {@link #start(long)} but runs {@link #sample()} on a dedicated background thread, so + * blocking I/O (file reads, HTTP) never stalls a server tick. Subclasses scheduled this way + * MUST NOT touch Minecraft world/entity state from {@link #sample()} (only safe on the main + * thread). + */ + public void startAsync(long intervalTicks) { + long periodMs = Math.max(MS_PER_TICK, intervalTicks * MS_PER_TICK); + ThreadFactory daemonFactory = r -> { + Thread t = new Thread(r, "logtosplunk-scheduled-metric"); + t.setDaemon(true); + return t; + }; + ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(daemonFactory); + executor.scheduleAtFixedRate(this::runSampleSafely, periodMs, periodMs, TimeUnit.MILLISECONDS); + } + + private void runSampleSafely() { + try { + sample(); + } catch (Exception e) { + logger.warn("Scheduled metric sample failed", e); + } + } +} diff --git a/forge-1.20.1-47.4.20/src/main/resources/META-INF/mods.toml b/forge-1.20.1-47.4.20/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..90956f0 --- /dev/null +++ b/forge-1.20.1-47.4.20/src/main/resources/META-INF/mods.toml @@ -0,0 +1,27 @@ +modLoader="javafml" +loaderVersion="[47,)" +license="Apache-2.0" +issueTrackerURL="" + +[[mods]] +modId="logtosplunk" +version="${file.jarVersion}" +displayName="Splunk for Minecraft (Forge)" +authors="Splunk" +description=''' +Logs Minecraft server events (player, block, death) to Splunk via the HTTP Event Collector. +''' + +[[dependencies.logtosplunk]] + modId="forge" + mandatory=true + versionRange="[47,)" + ordering="NONE" + side="SERVER" + +[[dependencies.logtosplunk]] + modId="minecraft" + mandatory=true + versionRange="[1.20.1,1.21)" + ordering="NONE" + side="SERVER" diff --git a/forge-1.20.1-47.4.20/src/main/resources/pack.mcmeta b/forge-1.20.1-47.4.20/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..52fe4de --- /dev/null +++ b/forge-1.20.1-47.4.20/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "logtosplunk resources", + "pack_format": 15 + } +} diff --git a/forge-1.20.1-47.4.20/src/main/resources/splunk.properties.sample b/forge-1.20.1-47.4.20/src/main/resources/splunk.properties.sample new file mode 100644 index 0000000..019b306 --- /dev/null +++ b/forge-1.20.1-47.4.20/src/main/resources/splunk.properties.sample @@ -0,0 +1,42 @@ +splunk.craft.connection.host=127.0.0.1 +splunk.craft.connection.port=8088 +splunk.craft.token=CHANGEME-1234-5678-1234-123456789012 +splunk.craft.enable.consolelog=true + +# --- Extended logging categories (all opt-in; default off) --- +# Combat & survival: damage, kills, healing, hunger, respawn (throttled per player) +splunk.craft.enable.combat=false +# Item economy: pickup, drop +splunk.craft.enable.item=false +# Progression: xp, level, enchant, craft, fish, command +splunk.craft.enable.progression=false +# Server lifecycle: start, weather change +splunk.craft.enable.server=false +# Performance sampler: online players, loaded chunks (TPS/MSPT require Paper API) +splunk.craft.enable.performance=false +# How often (in server ticks, 20 ticks = 1s) to sample performance +splunk.craft.performance.interval_ticks=600 +# Session detail: log client IP on connect (PII -- opt in deliberately) +splunk.craft.enable.session_ip=false +# Session detail: teleport, gamemode change, bed enter, world change +splunk.craft.enable.session_detail=false + +# --- Player stats scraper -> KV store (snapshot data, NOT sent via HEC) --- +# Reads /players/stats/.json + advancements/.json and upserts one doc per +# player into a Splunk KV-store collection. Uses the splunkd MANAGEMENT REST endpoint, which +# is a different host/port and credential than HEC -- HEC cannot write a KV store. +splunk.craft.enable.playerstats=false +# How often (in server ticks, 20 ticks = 1s) to scrape; 6000 = ~5 min +splunk.craft.playerstats.interval_ticks=6000 +# splunkd management interface (NOT the HEC port). Default mgmt port is 8089, HTTPS. +splunk.craft.kvstore.host=127.0.0.1 +splunk.craft.kvstore.port=8089 +# App namespace (app DIRECTORY name under etc/apps) that owns the collection. The +# SplunkCraft app ships collections.conf + transforms.conf for minecraft_player_stats. +splunk.craft.kvstore.app=SplunkCraft +# KV-store collection name (must match collections.conf) +splunk.craft.kvstore.collection=minecraft_player_stats +# Splunk bearer/JWT token with write access (Settings -> Tokens). NOT the HEC token. +splunk.craft.kvstore.bearer_token=CHANGEME +# Optional: world directory name or absolute path (default: world) +#splunk.craft.world.path=world \ No newline at end of file