build: Sentry 5.1.0

Author: osipxd

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 ### Housekeeping
 
+- Sentry 4.2.0 -> 5.1.0
 - Gradle 6.8.3 -> 7.2
 
 ## [0.11.0] (2021-02-23)

buildSrc/src/main/kotlin/dependencies.kt

@@ -1,6 +1,6 @@
 @file:Suppress("ClassName")
 
-const val sentry = "io.sentry:sentry:4.2.0"
+const val sentry = "io.sentry:sentry:5.1.1"
 
 object fuel {
     private const val group = "com.github.kittinunf.fuel"

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

@@ -1,5 +1,6 @@
 package ru.endlesscode.inspector.report
 
+import io.sentry.EventProcessor
 import io.sentry.Integration
 import io.sentry.Sentry
 import io.sentry.SentryEvent
@@ -27,12 +28,14 @@ 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
-            }
+            options.addEventProcessor(object : EventProcessor {
+                override fun process(event: SentryEvent, hint: Any?): SentryEvent {
+                    fields.asSequence()
+                        .filter(ReportField::show)
+                        .forEach { event.setExtra(it.name, it.value) }
+                    return event
+                }
+            })
         }
 
         Sentry.configureScope { scope ->
@@ -116,7 +119,7 @@ public class SentryReporter private constructor(
         }
 
         /**
-         * Build configured [SentryReporter].
+         * Builds configured [SentryReporter].
          */
         override fun build(): Reporter {
             require(dsn.isNotBlank()) {

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

@@ -1,18 +1,17 @@
 package ru.endlesscode.inspector.sentry.bukkit
 
-import io.sentry.IHub
-import io.sentry.Integration
-import io.sentry.SentryOptions
+import io.sentry.*
 import org.bukkit.Server
 import org.bukkit.plugin.Plugin
 
 /**
- * SentryClientFactory that handles Bukkit-specific construction, like logging
+ * [Integration] that handles Bukkit-specific info, like logging
  * server and plugin information.
  */
 public class SentryBukkitIntegration(private val plugin: Plugin) : Integration {
 
     public companion object {
+
         private val KNOWN_SERVERS = listOf("Paper", "Spigot", "CraftBukkit", "BungeeCord", "WaterFall")
     }
 
@@ -25,10 +24,11 @@ public class SentryBukkitIntegration(private val plugin: Plugin) : Integration {
         options.sdkVersion?.addIntegration("bukkit")
         options.serverName = plugin.server.knownName
         options.setTag("minecraft", plugin.server.minecraftVersion)
-        options.addEventProcessor { event, _ ->
-            event.contexts.putAll(getContexts())
-            event
-        }
+        options.addEventProcessor(object : EventProcessor {
+            override fun process(event: SentryEvent, hint: Any?): SentryEvent {
+                return event.also { it.contexts.putAll(getContexts()) }
+            }
+        })
     }
 
     private fun getContexts(): Map<String, Map<String, Any>> {