Add Sentry support for Issues and Performance

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:11-jre
+FROM openjdk:16-bullseye
 
 ENV OPENFIRE_USER=openfire \
     OPENFIRE_DIR=/usr/local/openfire \

distribution/src/resources/log4j2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Configuration monitorInterval="30">
+<Configuration monitorInterval="30" status="WARN" packages="io.sentry.log4j2">
     <Appenders>
         <!-- Modifying this appender is likely to break the log viewer that is part of the Openfire admin console.
            - If you'd like to have a differently formatted log file, it is advisable to create a new log file, by
@@ -18,6 +18,8 @@
         <Console name="console" target="SYSTEM_OUT">
             <PatternLayout pattern="%msg{nolookups}%n%throwable{0}"/>
         </Console>
+
+        <Sentry name="sentry" minimumBreadcrumbLevel="DEBUG" minimumEventLevel="ERROR" />
 
     </Appenders>
 
@@ -33,8 +35,9 @@
         <!-- OF-506: Jetty INFO messages are generally not useful. Ignore them by default. -->
         <Logger name="org.eclipse.jetty" level="warn"/>
 
-        <Root level="info">
+        <Root level="debug">
             <AppenderRef ref="openfire"/>
+            <AppenderRef ref="sentry"/>
         </Root>
     </Loggers>
 </Configuration>

starter/pom.xml

@@ -60,5 +60,11 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/libs/i4jruntime.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>io.sentry</groupId>
+            <artifactId>sentry-log4j2</artifactId>
+            <version>6.4.0</version>
+        </dependency>
+
     </dependencies>
 </project>

starter/src/main/java/org/jivesoftware/openfire/starter/ServerStarter.java

@@ -19,6 +19,7 @@
 
 import java.io.File;
 
+import io.sentry.Sentry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,6 +54,12 @@ public class ServerStarter {
     private static final String DEFAULT_LIB_DIR = "../lib";
 
     public static void main(String [] args) {
+        String sentryDsn = System.getProperty("sentry.dsn");
+        Sentry.init(options -> {
+            options.setDsn(sentryDsn == null ? "" : sentryDsn);
+            options.setTracesSampleRate(1.0);
+            options.setDebug(true);
+        });
         new ServerStarter().start();
     }
 

xmppserver/pom.xml

@@ -319,6 +319,17 @@
             <version>${slf4j.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.sentry</groupId>
+            <artifactId>sentry-log4j2</artifactId>
+            <version>6.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.sentry</groupId>
+            <artifactId>sentry-servlet</artifactId>
+            <version>6.4.0</version>
+        </dependency>
+
         <!-- RSS feed -->
         <dependency>
             <groupId>com.rometools</groupId>

xmppserver/src/main/java/org/jivesoftware/admin/SentryPerf.java

@@ -0,0 +1,34 @@
+package org.jivesoftware.admin;
+
+import io.sentry.ITransaction;
+import io.sentry.Sentry;
+import io.sentry.SpanStatus;
+import org.jivesoftware.util.SentryWrap;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+public class SentryPerf implements Filter {
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        HttpServletRequest httpRequest = (HttpServletRequest) servletRequest;
+        try {
+            SentryWrap.transaction(() -> filterChain.doFilter(servletRequest, servletResponse), httpRequest.getRequestURI(), "http.server");
+        } catch (IOException | ServletException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+}

xmppserver/src/main/java/org/jivesoftware/database/DbConnectionManager.java

@@ -31,6 +31,7 @@
 import java.util.Map;
 import java.util.MissingResourceException;
 
+import io.sentry.Sentry;
 import org.jivesoftware.util.ClassUtils;
 import org.jivesoftware.util.JiveGlobals;
 import org.slf4j.Logger;
@@ -176,6 +177,12 @@ public static Connection getConnection() throws SQLException {
                     // connection unless profiling is enabled. If yes, wrap the
                     // connection with a profiled connection.
                     if (!profilingEnabled) {
+                        if (Sentry.isEnabled()) {
+                            // Ah, but Sentry is live, so let's profile anyway.
+                            profilingEnabled = true;
+                            ProfiledConnection.start();
+                            return new ProfiledConnection(con);
+                        }
                         return con;
                     } else {
                         return new ProfiledConnection(con);