Fix Multi Init Merge and Tests (getsentry#3694)

adinauer · web-flow · commit a43837332025 · 2024-09-17T10:42:51.000+02:00
diff --git a/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt b/sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt
@@ -1,5 +1,6 @@
 package io.sentry.jul
 
+import io.sentry.InitPriority
 import io.sentry.Sentry
 import io.sentry.SentryLevel
 import io.sentry.SentryOptions
@@ -57,13 +58,14 @@ class SentryHandlerTest {
     }
 
     @Test
-    fun `does not initialize Sentry if Sentry is already enabled`() {
+    fun `does not initialize Sentry if Sentry is already enabled with higher prio`() {
         val transport = mock<ITransport>()
         Sentry.init {
             it.dsn = "http://key@localhost/proj"
             it.environment = "manual-environment"
             it.setTransportFactory { _, _ -> transport }
             it.isEnableBackpressureHandling = false
+            it.initPriority = InitPriority.LOW
         }
         fixture = Fixture(transport = transport)
         fixture.logger.severe("testing environment field")
diff --git a/sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt b/sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt
@@ -1,6 +1,7 @@
 package io.sentry.log4j2
 
 import io.sentry.ITransportFactory
+import io.sentry.InitPriority
 import io.sentry.ScopesAdapter
 import io.sentry.Sentry
 import io.sentry.SentryLevel
@@ -82,12 +83,13 @@ class SentryAppenderTest {
     }
 
     @Test
-    fun `does not initialize Sentry if Sentry is already enabled`() {
+    fun `does not initialize Sentry if Sentry is already enabled with higher prio`() {
         Sentry.init {
             it.dsn = "http://key@localhost/proj"
             it.environment = "manual-environment"
             it.setTransportFactory(fixture.transportFactory)
             it.isEnableBackpressureHandling = false
+            it.initPriority = InitPriority.LOW
         }
         val logger = fixture.getSut()
         logger.error("testing environment field")
diff --git a/sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt b/sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt
@@ -8,6 +8,7 @@ import ch.qos.logback.core.encoder.Encoder
 import ch.qos.logback.core.encoder.EncoderBase
 import ch.qos.logback.core.status.Status
 import io.sentry.ITransportFactory
+import io.sentry.InitPriority
 import io.sentry.Sentry
 import io.sentry.SentryLevel
 import io.sentry.SentryOptions
@@ -88,7 +89,7 @@ class SentryAppenderTest {
     }
 
     @Test
-    fun `does not initialize Sentry if Sentry is already enabled`() {
+    fun `does not initialize Sentry if Sentry is already enabled with higher prio`() {
         fixture = Fixture(
             startLater = true,
             options = SentryOptions().also {
@@ -101,6 +102,7 @@ class SentryAppenderTest {
             it.setTransportFactory(fixture.transportFactory)
             it.setTag("tag-from-first-init", "some-value")
             it.isEnableBackpressureHandling = false
+            it.initPriority = InitPriority.LOW
         }
         fixture.start()
 
diff --git a/sentry/src/main/java/io/sentry/SentryOptions.java b/sentry/src/main/java/io/sentry/SentryOptions.java
@@ -2593,7 +2593,6 @@ public SentryOptions() {
    */
   private SentryOptions(final boolean empty) {
     if (!empty) {
-      setInitPriority(InitPriority.LOWEST);
       setSpanFactory(new DefaultSpanFactory());
       // SentryExecutorService should be initialized before any
       // SendCachedEventFireAndForgetIntegration
