Support Room kotlin gencode

CHANGELOG.md

@@ -8,6 +8,7 @@
 
 ### Fixes
 
+- Support Room kotlin codegen ([#630](https://github.com/getsentry/sentry-android-gradle-plugin/pull/630))
 - Make sentry-cli path calculation configuration-cache compatible ([#631](https://github.com/getsentry/sentry-android-gradle-plugin/pull/631))
   - This will prevent build from failing when e.g. switching branches with stale configuration cache
 

plugin-build/src/main/kotlin/io/sentry/android/gradle/instrumentation/androidx/room/AndroidXRoomDao.kt

@@ -9,10 +9,8 @@ import io.sentry.android.gradle.instrumentation.CommonClassVisitor
 import io.sentry.android.gradle.instrumentation.MethodContext
 import io.sentry.android.gradle.instrumentation.MethodInstrumentable
 import io.sentry.android.gradle.instrumentation.SpanAddingClassVisitorFactory
+import io.sentry.android.gradle.instrumentation.androidx.room.visitor.AndroidXRoomDaoVisitor
 import io.sentry.android.gradle.instrumentation.androidx.room.visitor.InstrumentableMethodsCollectingVisitor
-import io.sentry.android.gradle.instrumentation.androidx.room.visitor.RoomQueryVisitor
-import io.sentry.android.gradle.instrumentation.androidx.room.visitor.RoomQueryWithTransactionVisitor
-import io.sentry.android.gradle.instrumentation.androidx.room.visitor.RoomTransactionVisitor
 import io.sentry.android.gradle.util.info
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor
@@ -84,32 +82,13 @@ class RoomMethod(
         apiVersion: Int,
         originalVisitor: MethodVisitor,
         parameters: SpanAddingClassVisitorFactory.SpanAddingParameters
-    ): MethodVisitor = when (type) {
-        RoomMethodType.TRANSACTION -> RoomTransactionVisitor(
-            className,
-            apiVersion,
-            methodNode,
-            originalVisitor,
-            instrumentableContext.access,
-            instrumentableContext.descriptor
-        )
-        RoomMethodType.QUERY -> RoomQueryVisitor(
-            className,
-            apiVersion,
-            methodNode,
-            originalVisitor,
-            instrumentableContext.access,
-            instrumentableContext.descriptor
-        )
-        RoomMethodType.QUERY_WITH_TRANSACTION -> RoomQueryWithTransactionVisitor(
-            className,
-            apiVersion,
-            methodNode,
-            originalVisitor,
-            instrumentableContext.access,
-            instrumentableContext.descriptor
-        )
-    }
+    ): MethodVisitor = AndroidXRoomDaoVisitor(
+        className,
+        apiVersion,
+        originalVisitor,
+        instrumentableContext.access,
+        instrumentableContext.descriptor
+    )
 
     override fun isInstrumentable(data: MethodContext): Boolean {
         return data.name == fqName && data.descriptor == methodNode.desc &&

plugin-build/src/main/kotlin/io/sentry/android/gradle/instrumentation/androidx/room/visitor/AndroidXRoomDaoVisitor.kt

@@ -0,0 +1,75 @@
+package io.sentry.android.gradle.instrumentation.androidx.room.visitor
+
+import io.sentry.android.gradle.instrumentation.AbstractSpanAddingMethodVisitor
+import io.sentry.android.gradle.instrumentation.SpanOperations
+import org.objectweb.asm.Label
+import org.objectweb.asm.MethodVisitor
+import org.objectweb.asm.Opcodes
+
+class AndroidXRoomDaoVisitor(
+    private val className: String,
+    api: Int,
+    private val originalVisitor: MethodVisitor,
+    access: Int,
+    descriptor: String?
+) : AbstractSpanAddingMethodVisitor(
+    api = api,
+    originalVisitor = originalVisitor,
+    access = access,
+    descriptor = descriptor
+) {
+    private val childIfNullStatusOk = Label()
+    private val childIfNullFinallyPositive = Label()
+    private val childIfNullFinallyNegative = Label()
+    private val startSpanIfNull = Label()
+    private var finallyVisitCount = 0
+
+    override fun visitCode() {
+        super.visitCode()
+        originalVisitor.visitStartSpan(startSpanIfNull) {
+            visitLdcInsn(SpanOperations.DB_SQL_ROOM)
+            visitLdcInsn(className)
+        }
+        originalVisitor.visitLabel(startSpanIfNull)
+    }
+
+    override fun visitMethodInsn(
+        opcode: Int,
+        owner: String?,
+        name: String?,
+        descriptor: String?,
+        isInterface: Boolean
+    ) {
+        super.visitMethodInsn(opcode, owner, name, descriptor, isInterface)
+        // The backend binds the exception to the current span, via tracing without performance, so we don't need any special try/catch management.
+        if (opcode == Opcodes.INVOKEVIRTUAL) {
+            when (name) {
+                SET_TRANSACTION_SUCCESSFUL -> {
+                    // the original method wants to return, but we intervene here to set status
+                    originalVisitor.visitSetStatus(status = "OK", gotoIfNull = childIfNullStatusOk)
+                    originalVisitor.visitLabel(childIfNullStatusOk)
+                }
+                CLOSE, END_TRANSACTION -> {
+                    // room's finally block ends here, we add our code to finish the span
+
+                    // we visit finally block 2 times - one for the positive path in control flow (try) one for negative (catch)
+                    // hence we need to use different labels
+                    val visitCount = ++finallyVisitCount
+                    val label = if (visitCount == 1) {
+                        childIfNullFinallyPositive
+                    } else {
+                        childIfNullFinallyNegative
+                    }
+                    originalVisitor.visitFinallyBlock(gotoIfNull = label)
+                    originalVisitor.visitLabel(label)
+                }
+            }
+        }
+    }
+
+    companion object {
+        private const val CLOSE = "close"
+        private const val END_TRANSACTION = "endTransaction"
+        private const val SET_TRANSACTION_SUCCESSFUL = "setTransactionSuccessful"
+    }
+}