diff --git a/leaf-api/build.gradle.kts.patch b/leaf-api/build.gradle.kts.patch index 4cc2450c..3e77c99e 100644 --- a/leaf-api/build.gradle.kts.patch +++ b/leaf-api/build.gradle.kts.patch @@ -37,7 +37,7 @@ api("org.apache.logging.log4j:log4j-api:$log4jVersion") api("org.slf4j:slf4j-api:$slf4jVersion") api("com.mojang:brigadier:1.3.10") -+ api("io.sentry:sentry:8.4.0") // Pufferfish ++ api("io.sentry:sentry:8.13.2") // Pufferfish // Deprecate bungeecord-chat in favor of adventure api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.19") { diff --git a/leaf-server/src/main/java/gg/pufferfish/pufferfish/sentry/PufferfishSentryAppender.java b/leaf-server/src/main/java/gg/pufferfish/pufferfish/sentry/PufferfishSentryAppender.java index 74e7cc82..be560786 100644 --- a/leaf-server/src/main/java/gg/pufferfish/pufferfish/sentry/PufferfishSentryAppender.java +++ b/leaf-server/src/main/java/gg/pufferfish/pufferfish/sentry/PufferfishSentryAppender.java @@ -13,21 +13,21 @@ import java.util.Map; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Marker; +import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.appender.AbstractAppender; +import org.apache.logging.log4j.core.config.Property; import org.apache.logging.log4j.core.filter.AbstractFilter; import org.dreeam.leaf.config.modules.misc.SentryDSN; public class PufferfishSentryAppender extends AbstractAppender { - private static final org.apache.logging.log4j.Logger LOGGER = LogManager.getLogger(PufferfishSentryAppender.class.getSimpleName()); + private static final Logger LOGGER = LogManager.getLogger(PufferfishSentryAppender.class.getSimpleName()); private static final Gson GSON = new Gson(); private final Level logLevel; public PufferfishSentryAppender(Level logLevel) { - super("PufferfishSentryAdapter", new SentryFilter(), null); + super("PufferfishSentryAdapter", new SentryFilter(), null, true, Property.EMPTY_ARRAY); this.logLevel = logLevel; } @@ -108,26 +108,5 @@ public class PufferfishSentryAppender extends AbstractAppender { } private static class SentryFilter extends AbstractFilter { - - @Override - public Result filter(Logger logger, org.apache.logging.log4j.Level level, Marker marker, String msg, - Object... params) { - return this.filter(logger.getName()); - } - - @Override - public Result filter(Logger logger, org.apache.logging.log4j.Level level, Marker marker, Object msg, Throwable t) { - return this.filter(logger.getName()); - } - - @Override - public Result filter(LogEvent event) { - return this.filter(event == null ? null : event.getLoggerName()); - } - - private Result filter(String loggerName) { - return loggerName != null && loggerName.startsWith("gg.castaway.pufferfish.sentry") ? Result.DENY - : Result.NEUTRAL; - } } } diff --git a/leaf-server/src/main/java/gg/pufferfish/pufferfish/sentry/SentryManager.java b/leaf-server/src/main/java/gg/pufferfish/pufferfish/sentry/SentryManager.java index 47558c45..75e26222 100644 --- a/leaf-server/src/main/java/gg/pufferfish/pufferfish/sentry/SentryManager.java +++ b/leaf-server/src/main/java/gg/pufferfish/pufferfish/sentry/SentryManager.java @@ -4,13 +4,13 @@ import io.sentry.Sentry; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.dreeam.leaf.config.modules.misc.SentryDSN; public class SentryManager { private static final Logger LOGGER = LogManager.getLogger(SentryManager.class); private SentryManager() { - } private static boolean initialized = false; @@ -27,7 +27,7 @@ public class SentryManager { initialized = true; Sentry.init(options -> { - options.setDsn(org.dreeam.leaf.config.modules.misc.SentryDSN.sentryDsn); + options.setDsn(SentryDSN.sentryDsn); options.setMaxBreadcrumbs(100); });