Merge branch 'main' into feat/add-replay

buenaflor · web-flow · commit e13ce8ee80e0 · 2024-10-08T02:18:58.000+02:00
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,20 @@
 ### Features
 
 - Add experimental session replay options to common code ([#275](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/275))
+```kotlin
+Sentry.init { options ->
+  // Adjust these values for production
+  options.experimental.sessionReplay.onErrorSampleRate = 1.0
+  options.experimental.sessionReplay.sessionSampleRate = 1.0
+}
+```
+- Add `Sentry.isEnabled()` API to common code ([#273](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/273))
+
+### Dependencies
+
+- Bump Cocoa SDK from v8.36.0 to v8.37.0 ([#279](https://github.com/getsentry/sentry-kotlin-multiplatform/pull/279))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8370)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.36.0...8.37.0)
 
 ## 0.9.0
 
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
@@ -36,7 +36,7 @@ object Config {
         val sentryAndroid = "io.sentry:sentry-android:$sentryJavaVersion"
         val sentryJava = "io.sentry:sentry:$sentryJavaVersion"
 
-        val sentryCocoaVersion = "8.36.0"
+        val sentryCocoaVersion = "8.37.0"
         val sentryCocoa = "Sentry"
 
         object Samples {
diff --git a/scripts/commit-formatted-code.sh b/scripts/commit-formatted-code.sh
diff --git a/sentry-kotlin-multiplatform-gradle-plugin/gradle.properties b/sentry-kotlin-multiplatform-gradle-plugin/gradle.properties
@@ -2,7 +2,7 @@ id=io.sentry.kotlin.multiplatform.gradle
 implementationClass=io.sentry.kotlin.multiplatform.gradle.SentryPlugin
 versionName=0.9.0
 group=io.sentry
-sentryCocoaVersion=8.36.0
+sentryCocoaVersion=8.37.0
 
 # publication pom properties
 POM_NAME=Sentry Kotlin Multiplatform Gradle Plugin
diff --git a/sentry-kotlin-multiplatform/api/android/sentry-kotlin-multiplatform.api b/sentry-kotlin-multiplatform/api/android/sentry-kotlin-multiplatform.api
@@ -86,6 +86,7 @@ public final class io/sentry/kotlin/multiplatform/Sentry {
 	public final fun init (Lkotlin/jvm/functions/Function1;)V
 	public final fun initWithPlatformOptions (Lkotlin/jvm/functions/Function1;)V
 	public final fun isCrashedLastRun ()Z
+	public final fun isEnabled ()Z
 	public final fun setUser (Lio/sentry/kotlin/multiplatform/protocol/User;)V
 }
 
diff --git a/sentry-kotlin-multiplatform/api/jvm/sentry-kotlin-multiplatform.api b/sentry-kotlin-multiplatform/api/jvm/sentry-kotlin-multiplatform.api
@@ -83,6 +83,7 @@ public final class io/sentry/kotlin/multiplatform/Sentry {
 	public final fun init (Lkotlin/jvm/functions/Function1;)V
 	public final fun initWithPlatformOptions (Lkotlin/jvm/functions/Function1;)V
 	public final fun isCrashedLastRun ()Z
+	public final fun isEnabled ()Z
 	public final fun setUser (Lio/sentry/kotlin/multiplatform/protocol/User;)V
 }
 
diff --git a/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec b/sentry-kotlin-multiplatform/sentry_kotlin_multiplatform.podspec
@@ -12,7 +12,7 @@ Pod::Spec.new do |spec|
     spec.osx.deployment_target = '10.13'
     spec.tvos.deployment_target = '11.0'
     spec.watchos.deployment_target = '4.0'
-    spec.dependency 'Sentry', '8.36.0'
+    spec.dependency 'Sentry', '8.37.0'
                 
     if !Dir.exist?('build/cocoapods/framework/sentry_kotlin_multiplatform.framework') || Dir.empty?('build/cocoapods/framework/sentry_kotlin_multiplatform.framework')
         raise "
diff --git a/sentry-kotlin-multiplatform/src/appleMain/kotlin/io/sentry/kotlin/multiplatform/SentryBridge.apple.kt b/sentry-kotlin-multiplatform/src/appleMain/kotlin/io/sentry/kotlin/multiplatform/SentryBridge.apple.kt
@@ -108,6 +108,10 @@ internal actual class SentryBridge actual constructor(private val sentryInstance
         return SentrySDK.crashedLastRun()
     }
 
+    actual fun isEnabled(): Boolean {
+        return SentrySDK.isEnabled()
+    }
+
     actual fun close() {
         SentrySDK.close()
     }
diff --git a/sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/SentryBridge.commonJvm.kt b/sentry-kotlin-multiplatform/src/commonJvmMain/kotlin/io/sentry/kotlin/multiplatform/SentryBridge.commonJvm.kt
@@ -71,6 +71,10 @@ internal actual class SentryBridge actual constructor(private val sentryInstance
         return Sentry.isCrashedLastRun() ?: false
     }
 
+    actual fun isEnabled(): Boolean {
+        return Sentry.isEnabled()
+    }
+
     actual fun close() {
         Sentry.close()
     }
diff --git a/sentry-kotlin-multiplatform/src/commonMain/kotlin/io/sentry/kotlin/multiplatform/SentryBridge.kt b/sentry-kotlin-multiplatform/src/commonMain/kotlin/io/sentry/kotlin/multiplatform/SentryBridge.kt
@@ -30,5 +30,7 @@ internal expect class SentryBridge(sentryInstance: SentryInstance = SentryPlatfo
 
     fun isCrashedLastRun(): Boolean
 
+    fun isEnabled(): Boolean
+
     fun close()
 }
diff --git a/sentry-kotlin-multiplatform/src/commonMain/kotlin/io/sentry/kotlin/multiplatform/SentryKMP.kt b/sentry-kotlin-multiplatform/src/commonMain/kotlin/io/sentry/kotlin/multiplatform/SentryKMP.kt
@@ -154,6 +154,13 @@ public object Sentry {
         throw RuntimeException("Uncaught Exception from Kotlin Multiplatform.")
     }
 
+    /**
+     * Checks if the SDK is enabled.
+     */
+    public fun isEnabled(): Boolean {
+        return bridge.isEnabled()
+    }
+
     /**
      * Closes the SDK.
      */
diff --git a/sentry-kotlin-multiplatform/src/commonTest/kotlin/io/sentry/kotlin/multiplatform/SentryIntegrationTest.kt b/sentry-kotlin-multiplatform/src/commonTest/kotlin/io/sentry/kotlin/multiplatform/SentryIntegrationTest.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.test.runTest
 import kotlin.test.AfterTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFalse
 import kotlin.test.assertNotEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
@@ -225,6 +226,20 @@ class SentryIntegrationTest : BaseSentryTest() {
         assertEquals(expectedUsername, actualUsername)
     }
 
+    @Test
+    fun `isEnabled returns true when SDK is enabled`() {
+        sentryInit {
+            it.dsn = fakeDsn
+        }
+
+        assertTrue(Sentry.isEnabled())
+    }
+
+    @Test
+    fun `isEnabled returns false when SDK is disabled`() {
+        assertFalse(Sentry.isEnabled())
+    }
+
     @Test
     fun `global scope sets context correctly with different data types`() = runTest {
         val stringKey = "stringKey"
diff --git a/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock b/sentry-samples/kmp-app-cocoapods/iosApp/Podfile.lock
@@ -1,9 +1,9 @@
 PODS:
-  - Sentry (8.36.0):
-    - Sentry/Core (= 8.36.0)
-  - Sentry/Core (8.36.0)
+  - Sentry (8.37.0):
+    - Sentry/Core (= 8.37.0)
+  - Sentry/Core (8.37.0)
   - shared (1.0):
-    - Sentry (= 8.36.0)
+    - Sentry (= 8.37.0)
 
 DEPENDENCIES:
   - shared (from `../shared`)
@@ -17,8 +17,8 @@ EXTERNAL SOURCES:
     :path: "../shared"
 
 SPEC CHECKSUMS:
-  Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
-  shared: 2acb47666c83ce18e8d64c72ef9897f9bfc6cb1f
+  Sentry: ee060c09b2f7ec1240e95c766ab44c04c7bdb052
+  shared: 4717ae7bad4e94adc1177508d0519ab174142885
 
 PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756
 
diff --git a/sentry-samples/kmp-app-cocoapods/shared/shared.podspec b/sentry-samples/kmp-app-cocoapods/shared/shared.podspec
@@ -9,7 +9,7 @@ Pod::Spec.new do |spec|
     spec.vendored_frameworks      = 'build/cocoapods/framework/shared.framework'
     spec.libraries                = 'c++'
     spec.ios.deployment_target = '14.1'
-    spec.dependency 'Sentry', '8.36.0'
+    spec.dependency 'Sentry', '8.37.0'
                 
     if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
         raise "

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ public final class io/sentry/kotlin/multiplatform/Sentry {`
`86`	`86`	`public final fun init (Lkotlin/jvm/functions/Function1;)V`
`87`	`87`	`public final fun initWithPlatformOptions (Lkotlin/jvm/functions/Function1;)V`
`88`	`88`	`public final fun isCrashedLastRun ()Z`
	`89`	`+ public final fun isEnabled ()Z`
`89`	`90`	`public final fun setUser (Lio/sentry/kotlin/multiplatform/protocol/User;)V`
`90`	`91`	`}`
`91`	`92`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ public final class io/sentry/kotlin/multiplatform/Sentry {`
`83`	`83`	`public final fun init (Lkotlin/jvm/functions/Function1;)V`
`84`	`84`	`public final fun initWithPlatformOptions (Lkotlin/jvm/functions/Function1;)V`
`85`	`85`	`public final fun isCrashedLastRun ()Z`
	`86`	`+ public final fun isEnabled ()Z`
`86`	`87`	`public final fun setUser (Lio/sentry/kotlin/multiplatform/protocol/User;)V`
`87`	`88`	`}`
`88`	`89`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,10 @@ internal actual class SentryBridge actual constructor(private val sentryInstance`
`108`	`108`	`return SentrySDK.crashedLastRun()`
`109`	`109`	`}`
`110`	`110`
	`111`	`+ actual fun isEnabled(): Boolean {`
	`112`	`+ return SentrySDK.isEnabled()`
	`113`	`+ }`
	`114`	`+`
`111`	`115`	`actual fun close() {`
`112`	`116`	`SentrySDK.close()`
`113`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,10 @@ internal actual class SentryBridge actual constructor(private val sentryInstance`
`71`	`71`	`return Sentry.isCrashedLastRun() ?: false`
`72`	`72`	`}`
`73`	`73`
	`74`	`+ actual fun isEnabled(): Boolean {`
	`75`	`+ return Sentry.isEnabled()`
	`76`	`+ }`
	`77`	`+`
`74`	`78`	`actual fun close() {`
`75`	`79`	`Sentry.close()`
`76`	`80`	`}`