Merge pull request #3 from EndlessCodeGroup/bugfix/exceptions-file-reporter

Fix debug logs

Author: osipxd

inspector-bukkit/src/main/kotlin/plugin/TrackedPlugin.kt

@@ -8,6 +8,8 @@ import org.bukkit.generator.ChunkGenerator
 import org.bukkit.plugin.java.JavaPlugin
 import ru.endlesscode.inspector.bukkit.report.BukkitEnvironment
 import ru.endlesscode.inspector.bukkit.report.BukkitUnwrapReporter
+import ru.endlesscode.inspector.bukkit.util.debug
+import ru.endlesscode.inspector.bukkit.util.fixDebugLogs
 import ru.endlesscode.inspector.report.ReportEnvironment
 import ru.endlesscode.inspector.report.ReportedException
 import ru.endlesscode.inspector.report.Reporter
@@ -66,15 +68,15 @@ public abstract class TrackedPlugin @JvmOverloads constructor(
         reporter.enabled = environment.isInspectorEnabled
         reporter.addHandler(
             beforeReport = { message, data ->
-                logger.log(Level.FINE, "$TAG $message", data.exception)
+                logger.debug("$TAG $message", data.exception)
             },
             onSuccess = { message, _ ->
                 logger.warning("$TAG $message")
                 logger.warning("$TAG Error was reported to author!")
             },
             onError = {
                 logger.warning("$TAG Error on report: ${it.localizedMessage}")
-                logger.log(Level.FINE, TAG, it)
+                logger.debug(TAG, it)
             }
         )
     }
@@ -84,15 +86,16 @@ public abstract class TrackedPlugin @JvmOverloads constructor(
         val fileHandler = FileHandler("$logsDir/latest.log", true).apply {
             level = Level.ALL
             formatter = object : Formatter() {
-                val timeFormatter = SimpleDateFormat("dd/MM/yy HH:mm:ss")
+                val timeFormatter = SimpleDateFormat("MM/dd HH:mm:ss")
 
                 override fun format(record: LogRecord): String {
-                    val message = "[${timeFormatter.format(Date(record.millis))} ${record.level}]: ${record.message}\n"
+                    val message = "[${timeFormatter.format(Date(record.millis))}][${record.level}]: ${record.message}\n"
                     return record.thrown?.stackTraceText?.let { "$message$it" } ?: message
                 }
             }
         }
         logger.addHandler(fileHandler)
+        logger.fixDebugLogs()
     }
 
     protected abstract fun createReporter(): Reporter
@@ -131,7 +134,7 @@ public abstract class TrackedPlugin @JvmOverloads constructor(
         sender: CommandSender,
         command: Command,
         label: String,
-        args: Array<out String>
+        args: Array<out String>,
     ): Boolean {
         return track("Exception occurred on command '$label' with arguments: ${args.contentToString()}") {
             lifecycle.onCommand(sender, command, label, args)
@@ -142,7 +145,7 @@ public abstract class TrackedPlugin @JvmOverloads constructor(
         sender: CommandSender,
         command: Command,
         alias: String,
-        args: Array<out String>
+        args: Array<out String>,
     ): MutableList<String>? {
         return track {
             lifecycle.onTabComplete(sender, command, alias, args)

inspector-bukkit/src/main/kotlin/util/Logger.kt

@@ -0,0 +1,18 @@
+package ru.endlesscode.inspector.bukkit.util
+
+import java.util.logging.Level
+import java.util.logging.Logger
+
+private const val DEBUG_TAG = "[DEBUG]"
+
+internal fun Logger.debug(message: String, throwable: Throwable) {
+    log(Level.INFO, "$DEBUG_TAG$message", throwable)
+}
+
+internal fun Logger.fixDebugLogs() {
+    // Use INFO level and replace it with FINE after isLoggable check.
+    setFilter { record ->
+        if (record.message?.startsWith(DEBUG_TAG) == true) record.level = Level.FINE
+        true
+    }
+}

inspector-sentry-reporter/src/main/kotlin/SentryReporter.kt

@@ -27,6 +27,12 @@ public class SentryReporter private constructor(
             options.addInAppInclude(focus.focusedPackage)
             options.enableUncaughtExceptionHandler = false
             integrations.forEach(options::addIntegration)
+            options.addEventProcessor { event, _ ->
+                fields.asSequence()
+                    .filter(ReportField::show)
+                    .forEach { event.setExtra(it.name, it.value) }
+                event
+            }
         }
 
         Sentry.configureScope { scope ->
@@ -41,20 +47,17 @@ public class SentryReporter private constructor(
     }
 
     override fun report(message: String, exception: Exception, async: Boolean) {
-        val sentryMessage = Message().apply {
-            formatted = message
-        }
+        val exceptionData = ExceptionData(exception)
+        handlers.beforeReport(message, exceptionData)
 
         val event = SentryEvent(exception).apply {
-            setMessage(sentryMessage)
-            fields.asSequence()
-                .filter(ReportField::show)
-                .forEach { setExtra(it.name, it.value) }
+            setMessage(Message().apply {
+                formatted = message
+            })
         }
         Sentry.captureEvent(event)
 
         // We can't track errors on error sending. So we just assume that report was sent successfully.
-        val exceptionData = ExceptionData(exception)
         handlers.onSuccess(message, exceptionData)
     }
 

sentry-bukkit/src/main/kotlin/SentryBukkitIntegration.kt

@@ -25,7 +25,7 @@ public class SentryBukkitIntegration(private val plugin: Plugin) : Integration {
         options.sdkVersion?.addIntegration("bukkit")
         options.serverName = plugin.server.knownName
         options.setTag("minecraft", plugin.server.minecraftVersion)
-        options.setBeforeSend { event, _ ->
+        options.addEventProcessor { event, _ ->
             event.contexts.putAll(getContexts())
             event
         }