Guard SQLiteDriver.hasConnectionPool for sqlite 2.5.x delegates

Author: 0xadam-brown

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Add `SentrySQLiteDriver` to `sentry-android-sqlite` for instrumenting AndroidX's `SQLiteDriver` ([#5466](https://github.com/getsentry/sentry-java/pull/5466))
   - Automatically generates spans for all SQLite statements
   - To use it, pass your `SQLiteDriver` to `SentrySQLiteDriver.create(...)`
+  - You'll need `androidx.sqlite:sqlite` (2.5.0+) on your app's classpath (Room usually provides it for you). androidx.sqlite 2.6.0+ requires minSdk 23.
   - See https://docs.sentry.io/platforms/android/integrations/room-and-sqlite/ for more details, including info about migrating from `SentrySupportSQLiteOpenHelper`
 
 ## 8.43.1

sentry-android-sqlite/src/main/java/io/sentry/sqlite/SentrySQLiteDriver.kt

@@ -36,7 +36,13 @@ public class SentrySQLiteDriver private constructor(private val delegate: SQLite
   }
 
   override val hasConnectionPool: Boolean
-    get() = delegate.hasConnectionPool
+    get() =
+      try {
+        delegate.hasConnectionPool
+      } catch (_: LinkageError) {
+        // Delegates on androidx.sqlite < 2.6.0 won't have a hasConnectionPool property.
+        false
+      }
 
   @Suppress("TooGenericExceptionCaught")
   override fun open(fileName: String): SQLiteConnection {

sentry-android-sqlite/src/test/AndroidManifest.xml

@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:tools="http://schemas.android.com/tools">
 
-  <!-- Override b/c androidx.sqlite 2.6.0 raised its minSdk to 23, but this test module is at minSdk 21. -->
-  <uses-sdk tools:overrideLibrary="androidx.sqlite.db"/>
+  <!-- androidx.sqlite 2.6.0+ raised minSdk to 23; this module still targets 21. -->
+  <uses-sdk
+      tools:overrideLibrary="
+          androidx.sqlite.db,
+          androidx.sqlite.db.framework,
+          androidx.sqlite.driver.bundled,
+          androidx.sqlite.sqlite.anchor,
+          androidx.sqlite.sqlite.bundled.anchor,
+          androidx.sqlite.sqlite.framework.anchor" />
 </manifest>

sentry-android-sqlite/src/test/java/io/sentry/sqlite/SentrySQLiteDriverTest.kt

@@ -12,6 +12,7 @@ import io.sentry.SpanDataConvention
 import io.sentry.TransactionContext
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertIs
 import kotlin.test.assertNotNull
@@ -63,6 +64,27 @@ class SentrySQLiteDriverTest {
     assertSame(wrapped, doubleWrapped)
   }
 
+  @Test
+  fun `hasConnectionPool forwards delegate value when supported`() {
+    whenever(fixture.mockDriver.hasConnectionPool).thenReturn(true)
+    val sut = SentrySQLiteDriver.create(fixture.mockDriver) as SentrySQLiteDriver
+    assertTrue(sut.hasConnectionPool)
+  }
+
+  @Test
+  fun `hasConnectionPool returns false when delegate throws LinkageError`() {
+    whenever(fixture.mockDriver.hasConnectionPool).thenThrow(AbstractMethodError())
+    val sut = SentrySQLiteDriver.create(fixture.mockDriver) as SentrySQLiteDriver
+    assertFalse(sut.hasConnectionPool)
+  }
+
+  @Test
+  fun `hasConnectionPool does not catch non-LinkageErrors`() {
+    whenever(fixture.mockDriver.hasConnectionPool).thenThrow(IllegalStateException())
+    val sut = SentrySQLiteDriver.create(fixture.mockDriver) as SentrySQLiteDriver
+    assertFailsWith<IllegalStateException> { sut.hasConnectionPool }
+  }
+
   @Test
   fun `open returns SentrySQLiteConnection wrapping delegate if wrapping succeeds`() {
     val driver = fixture.getSut("myapp.db")
@@ -89,20 +111,6 @@ class SentrySQLiteDriverTest {
     }
   }
 
-  @Test
-  fun `all calls are propagated to the delegate`() {
-    val sut = fixture.getSut("myapp.db")
-
-    whenever(fixture.mockDriver.hasConnectionPool).thenReturn(true)
-    assertTrue(sut.hasConnectionPool)
-
-    whenever(fixture.mockDriver.hasConnectionPool).thenReturn(false)
-    assertFalse(sut.hasConnectionPool)
-
-    sut.open("myapp.db")
-    verify(fixture.mockDriver).open("myapp.db")
-  }
-
   // Smoke test ensuring all layers are properly wired up.
   @Test
   fun `full stack produces a span with correct metadata`() {