Revert "misc: add support for sentry logging"

This reverts commit 8d2a29f286.

docker-compose.yml

@@ -213,9 +213,6 @@ services:
             - JVB_BREWERY_MUC
             - MAX_BRIDGE_PARTICIPANTS
             - OCTO_BRIDGE_SELECTION_STRATEGY
-            - SENTRY_DSN="${JICOFO_SENTRY_DSN}"
-            - SENTRY_ENVIRONMENT
-            - SENTRY_RELEASE
             - TZ
             - XMPP_DOMAIN
             - XMPP_AUTH_DOMAIN
@@ -259,9 +256,6 @@ services:
             - JVB_OCTO_PUBLIC_ADDRESS
             - JVB_OCTO_BIND_PORT
             - JVB_OCTO_REGION
-            - SENTRY_DSN="${JVB_SENTRY_DSN}"
-            - SENTRY_ENVIRONMENT
-            - SENTRY_RELEASE
             - TZ
         depends_on:
             - prosody

env.example

@@ -376,15 +376,3 @@ RESTART_POLICY=unless-stopped
 
 # Authenticate using external service or just focus external auth window if there is one already.
 # TOKEN_AUTH_URL=https://auth.meet.example.com/{room}
-
-# Sentry Error Tracking
-# Sentry Data Source Name (Endpoint for Sentry project)
-#JVB_SENTRY_DSN=https://public:private@host:port/1
-#JICOFO_SENTRY_DSN=https://public:private@host:port/1
-#JIGASI_SENTRY_DSN=https://public:private@host:port/1
-
-# Optional environment info to filter events
-#SENTRY_ENVIRONMENT=production
-
-# Optional release info to filter events
-#SENTRY_RELEASE=1.0.0

jicofo/rootfs/defaults/logging.properties

@@ -1,8 +1,4 @@
-{{ if .Env.SENTRY_DSN }}
-handlers=java.util.logging.ConsoleHandler,io.sentry.jul.SentryHandler
-{{ else }}
 handlers= java.util.logging.ConsoleHandler
-{{ end }}
 
 java.util.logging.ConsoleHandler.level = ALL
 java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
@@ -14,7 +10,6 @@ net.sf.level=SEVERE
 net.java.sip.communicator.plugin.reconnectplugin.level=FINE
 org.ice4j.level=SEVERE
 org.jitsi.impl.neomedia.level=SEVERE
-io.sentry.jul.SentryHandler.level=WARNING
 
 # Do not worry about missing strings
 net.java.sip.communicator.service.resources.AbstractResourcesService.level=SEVERE

jicofo/rootfs/etc/cont-init.d/10-config

@@ -1,7 +1,5 @@
 #!/usr/bin/with-contenv bash
 
-export SENTRY_RELEASE="${SENTRY_RELEASE:-$(apt-cache policy jicofo | sed -n '/Installed/p' | sed -e 's/[^:]*: //')}"
-
 if [[ -z $JICOFO_AUTH_PASSWORD ]]; then
     echo 'FATAL ERROR: Jicofo auth password must be set'
     exit 1
@@ -13,7 +11,10 @@ if [[ "$JICOFO_AUTH_PASSWORD" == "$OLD_JICOFO_AUTH_PASSWORD" ]]; then
     exit 1
 fi
 
-tpl /defaults/logging.properties > /config/logging.properties
 tpl /defaults/jicofo.conf > /config/jicofo.conf
 
+if [[ ! -f /config/logging.properties ]]; then
+    cp /defaults/logging.properties /config
+fi
+
 chown -R jicofo:jitsi /config

jigasi.yml

@@ -43,9 +43,6 @@ services:
             - GC_CLIENT_EMAIL
             - GC_CLIENT_ID
             - GC_CLIENT_CERT_URL
-            - SENTRY_DSN="${JIGASI_SENTRY_DSN}"
-            - SENTRY_ENVIRONMENT
-            - SENTRY_RELEASE
             - TZ
         depends_on:
             - prosody

jigasi/rootfs/defaults/logging.properties

@@ -1,8 +1,4 @@
-{{ if .Env.SENTRY_DSN }}
-handlers=java.util.logging.ConsoleHandler,io.sentry.jul.SentryHandler
-{{ else }}
 handlers= java.util.logging.ConsoleHandler
-{{ end }}
 
 java.util.logging.ConsoleHandler.level = ALL
 java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
@@ -14,7 +10,6 @@ net.sf.level=SEVERE
 net.java.sip.communicator.plugin.reconnectplugin.level=FINE
 org.ice4j.level=SEVERE
 org.jitsi.impl.neomedia.level=SEVERE
-io.sentry.jul.SentryHandler.level=WARNING
 
 # Do not worry about missing strings
 net.java.sip.communicator.service.resources.AbstractResourcesService.level=SEVERE

jigasi/rootfs/etc/cont-init.d/10-config

@@ -1,7 +1,5 @@
 #!/usr/bin/with-contenv bash
 
-export SENTRY_RELEASE="${SENTRY_RELEASE:-$(apt-cache policy jigasi | sed -n '/Installed/p' | sed -e 's/[^:]*: //')}"
-
 if [[ -z $JIGASI_XMPP_PASSWORD ]]; then
     echo 'FATAL ERROR: Jigasi auth password must be set'
     exit 1
@@ -13,13 +11,15 @@ if [[ "$JIGASI_XMPP_PASSWORD" == "$OLD_JIGASI_XMPP_PASSWORD" ]]; then
     exit 1
 fi
 
-tpl /defaults/logging.properties > /config/logging.properties
 tpl /defaults/sip-communicator.properties > /config/sip-communicator.properties
-
 if [[ -f /config/custom-sip-communicator.properties ]]; then
     cat /config/custom-sip-communicator.properties >> /config/sip-communicator.properties
 fi
 
+if [[ ! -f /config/logging.properties ]]; then
+    cp /defaults/logging.properties /config
+fi
+
 mkdir -pm777 /tmp/transcripts
 chown jigasi:jitsi /tmp/transcripts
 

jvb/rootfs/defaults/logging.properties

@@ -1,8 +1,4 @@
-{{ if .Env.SENTRY_DSN }}
-handlers=java.util.logging.ConsoleHandler,io.sentry.jul.SentryHandler
-{{ else }}
 handlers= java.util.logging.ConsoleHandler
-{{ end }}
 
 java.util.logging.ConsoleHandler.level = ALL
 java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
@@ -10,8 +6,9 @@ java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLo
 net.java.sip.communicator.util.ScLogFormatter.programname=JVB
 
 .level=INFO
+
 org.jitsi.videobridge.xmpp.ComponentImpl.level=FINE
-io.sentry.jul.SentryHandler.level=WARNING
 
 # All of the INFO level logs from MediaStreamImpl are unnecessary in the context of jitsi-videobridge.
 org.jitsi.impl.neomedia.MediaStreamImpl.level=WARNING
+

jvb/rootfs/etc/cont-init.d/10-config

@@ -1,7 +1,6 @@
 #!/usr/bin/with-contenv bash
 
 export LOCAL_ADDRESS=$(ip addr show dev "$(ip route|awk '/^default/ { print $5 }')" | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
-export SENTRY_RELEASE="${SENTRY_RELEASE:-$(apt-cache policy jitsi-videobridge2 | sed -n '/Installed/p' | sed -e 's/[^:]*: //')}"
 
 if [[ -z $JVB_AUTH_PASSWORD ]]; then
     echo 'FATAL ERROR: JVB auth password must be set'
@@ -19,7 +18,10 @@ if [[ -f /config/custom-sip-communicator.properties ]]; then
     cat /config/custom-sip-communicator.properties >> /config/sip-communicator.properties
 fi
 
-tpl /defaults/logging.properties > /config/logging.properties
 tpl /defaults/jvb.conf > /config/jvb.conf
 
+if [[ ! -f /config/logging.properties ]]; then
+    cp /defaults/logging.properties /config
+fi
+
 chown -R jvb:jitsi /config