Merge pull request #2708 from Lucwousin/sentry-gunnoe-gek

client: Fix sentry, improve logging

runelite-client/runelite-client.gradle.kts

@@ -124,16 +124,10 @@ tasks {
 
         inputs.properties(tokens)
 
-        from("src/main/resources") {
-            include("sentry.properties")
-        }
+        from("src/main/resources/")
+        include("**/*.properties")
         into("${buildDir}/resources/main")
 
-        from("src/main/resources/net/runelite/client") {
-            include("open.osrs.properties")
-        }
-        into("${buildDir}/resources/main/net/runelite/client")
-
         filter(ReplaceTokens::class, "tokens" to tokens)
         filteringCharset = "UTF-8"
     }

runelite-client/src/main/java/net/runelite/client/util/Groups.java

@@ -1,6 +1,7 @@
 package net.runelite.client.util;
 
 import io.reactivex.rxjava3.subjects.PublishSubject;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -48,11 +49,14 @@ public class Groups extends ReceiverAdapter
 	{
 		this.openOSRSConfig = openOSRSConfig;
 
-		this.channel = new JChannel(RuneLite.class.getResourceAsStream("/udp.xml"))
-			.setName(RuneLite.uuid)
-			.setReceiver(this)
-			.setDiscardOwnMessages(true)
-			.connect("openosrs");
+		try (final InputStream is = RuneLite.class.getResourceAsStream("/udp-openosrs.xml"))
+		{
+			this.channel = new JChannel(is)
+				.setName(RuneLite.uuid)
+				.setReceiver(this)
+				.setDiscardOwnMessages(true)
+				.connect("openosrs");
+		}
 
 		eventBus.subscribe(ClientShutdown.class, this, (e) -> {
 			Future<Void> f = close();

runelite-client/src/main/resources/logback.xml

@@ -68,6 +68,6 @@
 		<appender-ref ref="Sentry" />
 	</root>
 
-	<logger name="org.pf4j.AbstractPluginManager" level="OFF"/>
-	<logger name="org.jgroups" level="ERROR"/>
+	<logger name="org.pf4j.AbstractPluginManager" level="WARN"/>
+	<logger name="org.jgroups" level="WARN"/>
 </configuration>

runelite-client/src/main/resources/sentry.properties

@@ -1,3 +1,3 @@
 dsn=https://fa31d674e44247fa93966c69a903770f@sentry.io/1811856
 release=@open.osrs.version@
-stacktrace.app.packages=stacktrace.app.packages=net.runelite.client
+stacktrace.app.packages=net.runelite,com.openosrs

runelite-client/src/main/resources/udp-openosrs.xml

@@ -6,7 +6,8 @@
 
 <config xmlns="urn:org:jgroups"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd">
+		xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd"
+        version="4.2.4.Final">
 	<UDP
 			bind_addr="127.0.0.1"
 			mcast_port="${jgroups.udp.mcast_port:45588}"