feat(jvm): add sdk version to reports

Author: kattrali

platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/CaptureJniLibrary.kt

@@ -102,6 +102,11 @@ internal object CaptureJniLibrary : IBridge {
      */
     external fun getDeviceId(loggerId: Long): String?
 
+    /**
+     * Returns the version of the underlying SDK
+     */
+    external fun getSdkVersion(): String?
+
     /**
      * Adds a field that should be attached to all logs emitted by the logger going forward.
      * If a field with a given key has already been registered with the logger, its value is

platform/jvm/capture/src/main/kotlin/io/bitdrift/capture/reports/processor/FatalIssueReporterProcessor.kt

@@ -10,6 +10,7 @@ package io.bitdrift.capture.reports.processor
 import android.content.Context
 import androidx.lifecycle.ProcessLifecycleOwner
 import com.google.flatbuffers.FlatBufferBuilder
+import io.bitdrift.capture.CaptureJniLibrary
 import io.bitdrift.capture.attributes.ClientAttributes
 import io.bitdrift.capture.reports.binformat.v1.AppBuildNumber
 import io.bitdrift.capture.reports.binformat.v1.DeviceMetrics
@@ -29,13 +30,17 @@ import kotlin.time.toDuration
 internal class FatalIssueReporterProcessor(
     appContext: Context,
     private val fatalIssueReporterStorage: IFatalIssueReporterStorage,
+    private val versionProvider: ISDKVersionProvider = CoreSDKVersionProvider(),
 ) {
     // Initial size for file builder buffer
     private val builderDefaultSize = 1024
     private val clientAttributes by lazy {
         // TODO(FranAguilera): BIT-5148 Refactor to avoid recreating ClientAttributes
         ClientAttributes(appContext, ProcessLifecycleOwner.get())
     }
+    private val sdkVersion by lazy {
+        versionProvider.getSDKVersion()
+    }
 
     /**
      * Process AppTerminations due to ANRs and native crashes into packed format
@@ -129,8 +134,7 @@ internal class FatalIssueReporterProcessor(
         SDKInfo.createSDKInfo(
             builder,
             builder.createString(ClientAttributes.SDK_LIBRARY_ID),
-            // e.g. 0.17.2 TODO(FranAguilera): BIT-5141. Extract sdk version
-            builder.createString(""),
+            if (sdkVersion != null) builder.createString(sdkVersion) else 0,
         )
 
     private fun createAppMetrics(builder: FlatBufferBuilder): Int {
@@ -166,3 +170,11 @@ internal class FatalIssueReporterProcessor(
         return DeviceMetrics.endDeviceMetrics(builder)
     }
 }
+
+internal interface ISDKVersionProvider {
+    fun getSDKVersion(): String?
+}
+
+private class CoreSDKVersionProvider : ISDKVersionProvider {
+    override fun getSDKVersion(): String? = CaptureJniLibrary.getSdkVersion()
+}

platform/jvm/capture/src/test/kotlin/io/bitdrift/capture/FatalIssueReporterProcessorTest.kt

@@ -20,6 +20,7 @@ import io.bitdrift.capture.reports.binformat.v1.Report
 import io.bitdrift.capture.reports.binformat.v1.ReportType
 import io.bitdrift.capture.reports.persistence.IFatalIssueReporterStorage
 import io.bitdrift.capture.reports.processor.FatalIssueReporterProcessor
+import io.bitdrift.capture.reports.processor.ISDKVersionProvider
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test
@@ -41,7 +42,13 @@ class FatalIssueReporterProcessorTest {
         val initializer = ContextHolder()
         initializer.create(ApplicationProvider.getApplicationContext())
         fatalIssueReporterProcessor =
-            FatalIssueReporterProcessor(APP_CONTEXT, fatalIssueReporterStorage)
+            FatalIssueReporterProcessor(
+                APP_CONTEXT,
+                fatalIssueReporterStorage,
+                object : ISDKVersionProvider {
+                    override fun getSDKVersion(): String? = "3.4.51"
+                },
+            )
     }
 
     @Test
@@ -77,7 +84,7 @@ class FatalIssueReporterProcessorTest {
             "persistJvmCrash_withFakeException_shouldCreateNonEmptyErrorModel",
         )
         assertThat(error.stackTrace(0)!!.sourceFile!!.path).isEqualTo("FatalIssueReporterProcessorTest.kt")
-        assertThat(error.stackTrace(0)!!.sourceFile!!.line).isEqualTo(50)
+        assertThat(error.stackTrace(0)!!.sourceFile!!.line).isEqualTo(57)
         assertThat(error.stackTrace(0)!!.sourceFile!!.column).isEqualTo(0)
     }
 

platform/jvm/src/jni.rs

@@ -42,7 +42,7 @@ use jni::objects::{
 use jni::signature::{Primitive, ReturnType};
 use jni::sys::{jboolean, jbyteArray, jdouble, jint, jlong, jobject, jvalue, JNI_TRUE};
 use jni::{JNIEnv, JavaVM};
-use platform_shared::metadata::Mobile;
+use platform_shared::metadata::{self, Mobile};
 use platform_shared::{LoggerHolder, LoggerId};
 use std::borrow::{Borrow, Cow};
 use std::collections::HashMap;
@@ -717,6 +717,19 @@ pub extern "system" fn Java_io_bitdrift_capture_CaptureJniLibrary_getSessionId<'
   )
 }
 
+#[no_mangle]
+pub extern "system" fn Java_io_bitdrift_capture_CaptureJniLibrary_getSdkVersion<'a>(
+  env: JNIEnv<'a>,
+  _class: JClass<'_>,
+) -> JString<'a> {
+  let version = metadata::SDK_VERSION.clone();
+  bd_client_common::error::with_handle_unexpected_or(
+    || Ok(env.new_string(version)?),
+    JObject::null().into(),
+    "jni get_sdk_version",
+  )
+}
+
 #[no_mangle]
 pub extern "system" fn Java_io_bitdrift_capture_CaptureJniLibrary_getDeviceId<'a>(
   env: JNIEnv<'a>,