From 77b425362457c7d06101585306a46aa922da31df Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Fri, 4 Jul 2025 12:34:20 +0200 Subject: [PATCH] fix sentry safeguard info --- core/src/main/java/com/volmit/iris/Iris.java | 2 +- .../iris/core/safeguard/IrisSafeguard.java | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/volmit/iris/Iris.java b/core/src/main/java/com/volmit/iris/Iris.java index 9f39f70ad..a47b6c617 100644 --- a/core/src/main/java/com/volmit/iris/Iris.java +++ b/core/src/main/java/com/volmit/iris/Iris.java @@ -976,7 +976,7 @@ public class Iris extends VolmitPlugin implements Listener { event.setTag("iris.nms", INMS.get().getClass().getCanonicalName()); var context = IrisContext.get(); if (context != null) event.getContexts().set("engine", context.asContext()); - event.getContexts().set("safeguard", ServerBootSFG.allIncompatibilities); + event.getContexts().set("safeguard", IrisSafeguard.asContext()); return event; }); }); diff --git a/core/src/main/java/com/volmit/iris/core/safeguard/IrisSafeguard.java b/core/src/main/java/com/volmit/iris/core/safeguard/IrisSafeguard.java index 241bdd01f..7a4ca9b5c 100644 --- a/core/src/main/java/com/volmit/iris/core/safeguard/IrisSafeguard.java +++ b/core/src/main/java/com/volmit/iris/core/safeguard/IrisSafeguard.java @@ -2,6 +2,8 @@ package com.volmit.iris.core.safeguard; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; +import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.collection.KMap; import java.util.concurrent.atomic.AtomicBoolean; @@ -35,5 +37,23 @@ public class IrisSafeguard { return "stable"; } } + + public static KMap asContext() { + KMap m = new KMap<>(); + m.put("diskSpace", !ServerBootSFG.hasEnoughDiskSpace); + m.put("javaVersion", !ServerBootSFG.isCorrectJDK); + m.put("jre", ServerBootSFG.isJRE); + m.put("missingAgent", ServerBootSFG.missingAgent); + m.put("missingDimensionTypes", ServerBootSFG.missingDimensionTypes); + m.put("failedInjection", ServerBootSFG.failedInjection); + m.put("unsupportedVersion", ServerBootSFG.unsuportedversion); + m.put("serverSoftware", !ServerBootSFG.passedserversoftware); + KList incompatiblePlugins = new KList<>(); + ServerBootSFG.incompatibilities.forEach((plugin, present) -> { + if (present) incompatiblePlugins.add(plugin); + }); + m.put("plugins", incompatiblePlugins); + return m; + } }