Merge branch 'main' into feat/property_disable_aop

lbloder · lbloder · commit f55d1e59baf5 · 2023-09-13T06:08:04.000+02:00
# Conflicts:
#	CHANGELOG.md
diff --git a/.github/workflows/agp-matrix.yml b/.github/workflows/agp-matrix.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc # pin@v2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: 'Set up Java: ${{ matrix.java }}'
         uses: actions/setup-java@v3
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: 'Set up Java: ${{ matrix.java }}'
         uses: actions/setup-java@v3
diff --git a/.github/workflows/format-code.yml b/.github/workflows/format-code.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: set up JDK 17
         uses: actions/setup-java@v3
diff --git a/.github/workflows/generate-javadocs.yml b/.github/workflows/generate-javadocs.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: set up JDK 17
         uses: actions/setup-java@v3
         with:
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,5 +10,5 @@ jobs:
   validation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # pin@v1
diff --git a/.github/workflows/integration-tests-benchmarks.yml b/.github/workflows/integration-tests-benchmarks.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: 'Set up Java: 17'
         uses: actions/setup-java@v3
@@ -69,7 +69,7 @@ jobs:
 
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: 'Set up Java: 17'
         uses: actions/setup-java@v3
diff --git a/.github/workflows/integration-tests-ui.yml b/.github/workflows/integration-tests-ui.yml
@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: 'Set up Java: 17'
         uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "Release a new version"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GH_RELEASE_PAT }}
           fetch-depth: 0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+### Features
+
+- Add `sendModules` option for disable sending modules ([#2926](https://github.com/getsentry/sentry-java/pull/2926))
+- Send `db.system` and `db.name` in span data for androidx.sqlite spans ([#2928](https://github.com/getsentry/sentry-java/pull/2928))
+
 ### Fixes
 
 - Add `sentry.enable-aot-compatibility` property to SpringBoot Jakarta `SentryAutoConfiguration` to enable building for GraalVM ([#2915](https://github.com/getsentry/sentry-java/pull/2915))
@@ -11,7 +16,6 @@
 - Bump Gradle from v8.2.1 to v8.3.0 ([#2900](https://github.com/getsentry/sentry-java/pull/2900))
   - [changelog](https://github.com/gradle/gradle/blob/master release-test/CHANGELOG.md#v830)
   - [diff](https://github.com/gradle/gradle/compare/v8.2.1...v8.3.0)
-- Add `sendModules` option for disable sending modules ([#2926](https://github.com/getsentry/sentry-java/pull/2926))
 
 ## 6.29.0
 
diff --git a/sentry-android-sqlite/src/main/java/io/sentry/android/sqlite/SQLiteSpanManager.kt b/sentry-android-sqlite/src/main/java/io/sentry/android/sqlite/SQLiteSpanManager.kt
@@ -11,7 +11,8 @@ import io.sentry.SpanStatus
 private const val TRACE_ORIGIN = "auto.db.sqlite"
 
 internal class SQLiteSpanManager(
-    private val hub: IHub = HubAdapter.getInstance()
+    private val hub: IHub = HubAdapter.getInstance(),
+    private val databaseName: String? = null
 ) {
     private val stackTraceFactory = SentryStackTraceFactory(hub.options)
 
@@ -46,6 +47,15 @@ internal class SQLiteSpanManager(
                 if (isMainThread) {
                     setData(SpanDataConvention.CALL_STACK_KEY, stackTraceFactory.inAppCallStack)
                 }
+                // if db name is null, then it's an in-memory database as per
+                // https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:sqlite/sqlite/src/main/java/androidx/sqlite/db/SupportSQLiteOpenHelper.kt;l=38-42
+                if (databaseName != null) {
+                    setData(SpanDataConvention.DB_SYSTEM_KEY, "sqlite")
+                    setData(SpanDataConvention.DB_NAME_KEY, databaseName)
+                } else {
+                    setData(SpanDataConvention.DB_SYSTEM_KEY, "in-memory")
+                }
+
                 finish()
             }
         }
diff --git a/sentry-android-sqlite/src/main/java/io/sentry/android/sqlite/SentrySupportSQLiteOpenHelper.kt b/sentry-android-sqlite/src/main/java/io/sentry/android/sqlite/SentrySupportSQLiteOpenHelper.kt
@@ -34,7 +34,7 @@ class SentrySupportSQLiteOpenHelper private constructor(
     private val delegate: SupportSQLiteOpenHelper
 ) : SupportSQLiteOpenHelper by delegate {
 
-    private val sqLiteSpanManager = SQLiteSpanManager()
+    private val sqLiteSpanManager = SQLiteSpanManager(databaseName = delegate.databaseName)
 
     private val sentryWritableDatabase: SupportSQLiteDatabase by lazy {
         SentrySupportSQLiteDatabase(delegate.writableDatabase, sqLiteSpanManager)
diff --git a/sentry-android-sqlite/src/test/java/io/sentry/android/sqlite/SQLiteSpanManagerTest.kt b/sentry-android-sqlite/src/test/java/io/sentry/android/sqlite/SQLiteSpanManagerTest.kt
@@ -26,7 +26,7 @@ class SQLiteSpanManagerTest {
         lateinit var sentryTracer: SentryTracer
         lateinit var options: SentryOptions
 
-        fun getSut(isSpanActive: Boolean = true): SQLiteSpanManager {
+        fun getSut(isSpanActive: Boolean = true, databaseName: String? = null): SQLiteSpanManager {
             options = SentryOptions().apply {
                 dsn = "https://key@sentry.io/proj"
             }
@@ -36,7 +36,7 @@ class SQLiteSpanManagerTest {
             if (isSpanActive) {
                 whenever(hub.span).thenReturn(sentryTracer)
             }
-            return SQLiteSpanManager(hub)
+            return SQLiteSpanManager(hub, databaseName)
         }
     }
 
@@ -119,4 +119,25 @@ class SQLiteSpanManagerTest {
         assertTrue(span.getData(SpanDataConvention.BLOCKED_MAIN_THREAD_KEY) as Boolean)
         assertNotNull(span.getData(SpanDataConvention.CALL_STACK_KEY))
     }
+
+    @Test
+    fun `when databaseName is provided, sets system and name as span data`() {
+        val sut = fixture.getSut(databaseName = "tracks.db")
+
+        sut.performSql("sql") {}
+        val span = fixture.sentryTracer.children.first()
+
+        assertEquals(span.data[SpanDataConvention.DB_SYSTEM_KEY], "sqlite")
+        assertEquals(span.data[SpanDataConvention.DB_NAME_KEY], "tracks.db")
+    }
+
+    @Test
+    fun `when databaseName is null, sets system to in-memory`() {
+        val sut = fixture.getSut()
+
+        sut.performSql("sql") {}
+        val span = fixture.sentryTracer.children.first()
+
+        assertEquals(span.data[SpanDataConvention.DB_SYSTEM_KEY], "in-memory")
+    }
 }
diff --git a/sentry-android-sqlite/src/test/java/io/sentry/android/sqlite/SentrySupportSQLiteOpenHelperTest.kt b/sentry-android-sqlite/src/test/java/io/sentry/android/sqlite/SentrySupportSQLiteOpenHelperTest.kt
@@ -2,6 +2,7 @@ package io.sentry.android.sqlite
 
 import androidx.sqlite.db.SupportSQLiteOpenHelper
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import kotlin.test.Test
@@ -37,7 +38,7 @@ class SentrySupportSQLiteOpenHelperTest {
         verify(fixture.mockOpenHelper).readableDatabase
 
         openHelper.databaseName
-        verify(fixture.mockOpenHelper).databaseName
+        verify(fixture.mockOpenHelper, times(2)).databaseName
 
         openHelper.close()
         verify(fixture.mockOpenHelper).close()
