Merge branch 'main' into ryan/version-catalog-8

Author: rbro112

CHANGELOG.md

@@ -7,6 +7,19 @@
 - Add debug mode for Session Replay masking ([#4357](https://github.com/getsentry/sentry-java/pull/4357))
     - Use `Sentry.replay().enableDebugMaskingOverlay()` to overlay the screen with the Session Replay masks.
     - The masks will be invalidated at most once per `frameRate` (default 1 fps).
+- Extend Logs API to allow passing in `attributes` ([#4402](https://github.com/getsentry/sentry-java/pull/4402))
+  - `Sentry.logger.log` now takes a `SentryLogParameters`
+  - Use `SentryLogParameters.create(SentryAttributes.of(...))` to pass attributes
+    - Attribute values may be of type `string`, `boolean`, `integer` or `double`.
+    - Other types will be converted to `string`. Currently we simply call `toString()` but we might offer more in the future.
+    - You may manually flatten complex types into multiple separate attributes of simple types.
+      - e.g. intead of `SentryAttribute.named("point", Point(10, 20))` you may store it as `SentryAttribute.integerAttribute("point.x", point.x)` and `SentryAttribute.integerAttribute("point.y", point.y)`
+    - `SentryAttribute.named()` will automatically infer the type or fall back to `string`.
+    - `SentryAttribute.booleanAttribute()` takes a `Boolean` value
+    - `SentryAttribute.integerAttribute()` takes a `Integer` value
+    - `SentryAttribute.doubleAttribute()` takes a `Double` value
+    - `SentryAttribute.stringAttribute()` takes a `String` value
+  - We opted for handling parameters via `SentryLogParameters` to avoid creating tons of overloads that are ambiguous.
 
 ## 8.12.0
 

buildSrc/src/main/java/Config.kt

@@ -13,18 +13,10 @@ object Config {
 
     object BuildPlugins {
         val androidGradle = "com.android.tools.build:gradle:$AGP"
-        val gretty = "org.gretty"
-        val grettyVersion = "4.0.0"
         val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0"
     }
 
     object Android {
-        private val sdkVersion = 34
-
-        val minSdkVersion = 21
-        val targetSdkVersion = sdkVersion
-        val compileSdkVersion = sdkVersion
-
         val abiFilters = listOf("x86", "armeabi-v7a", "x86_64", "arm64-v8a")
 
         fun shouldSkipDebugVariant(name: String?): Boolean {
@@ -160,8 +152,6 @@ object Config {
 
     object QualityPlugins {
         object Jacoco {
-            val version = "0.8.7"
-
             // TODO [POTEL] add tests and restore
             val minimumCoverage = BigDecimal.valueOf(0.1)
         }

gradle/libs.versions.toml

@@ -10,6 +10,10 @@ kotlin = "1.9.24"
 okhttp = "4.9.2"
 springTwo = "2.7.18"
 springThree = "3.4.2"
+targetSdk = "34"
+compileSdk = "34"
+minSdk = "21"
+jacoco = "0.8.7"
 
 [plugins]
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
@@ -29,6 +33,7 @@ vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.3
 spring-boot-two = { id = "org.springframework.boot", version.ref = "springTwo" }
 spring-boot-three = { id = "org.springframework.boot", version.ref = "springThree" }
 spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" }
+gretty = { id = "org.gretty", version = "4.0.0" }
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" }

sentry-android-core/build.gradle.kts

@@ -11,11 +11,11 @@ plugins {
 }
 
 android {
-    compileSdk = Config.Android.compileSdkVersion
+    compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "io.sentry.android.core"
 
     defaultConfig {
-        minSdk = Config.Android.minSdkVersion
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

sentry-android-fragment/build.gradle.kts

@@ -10,11 +10,11 @@ plugins {
 }
 
 android {
-    compileSdk = Config.Android.compileSdkVersion
+    compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "io.sentry.android.fragment"
 
     defaultConfig {
-        minSdk = Config.Android.minSdkVersion
+        minSdk = libs.versions.minSdk.get().toInt()
 
         // for AGP 4.1
         buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")

sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts

@@ -10,13 +10,13 @@ plugins {
 }
 
 android {
-    compileSdk = Config.Android.compileSdkVersion
+    compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "io.sentry.uitest.android.benchmark"
 
     defaultConfig {
         applicationId = "io.sentry.uitest.android.benchmark"
-        minSdk = Config.Android.minSdkVersion
-        targetSdk = Config.Android.targetSdkVersion
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0.0"
 

sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    compileSdk = Config.Android.compileSdkVersion
+    compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "io.sentry.uitest.android.critical"
 
     signingConfigs {
@@ -17,8 +17,8 @@ android {
 
     defaultConfig {
         applicationId = "io.sentry.uitest.android.critical"
-        minSdk = Config.Android.minSdkVersion
-        targetSdk = Config.Android.targetSdkVersion
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
     }

sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts

@@ -10,12 +10,12 @@ plugins {
 }
 
 android {
-    compileSdk = Config.Android.compileSdkVersion
+    compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "io.sentry.uitest.android"
 
     defaultConfig {
-        minSdk = Config.Android.minSdkVersion
-        targetSdk = Config.Android.targetSdkVersion
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.compileSdk.get().toInt()
         versionCode = 1
         versionName = "1.0.0"
 

sentry-android-integration-tests/test-app-plain/build.gradle.kts

@@ -3,13 +3,13 @@ plugins {
 }
 
 android {
-    compileSdk = Config.Android.compileSdkVersion
+    compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "io.sentry.java.tests.perf.appplain"
 
     defaultConfig {
         applicationId = "io.sentry.java.tests.perf.appplain"
-        minSdk = Config.Android.minSdkVersion
-        targetSdk = Config.Android.targetSdkVersion
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
     }

sentry-android-integration-tests/test-app-sentry/build.gradle.kts

@@ -3,13 +3,13 @@ plugins {
 }
 
 android {
-    compileSdk = Config.Android.compileSdkVersion
+    compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "io.sentry.java.tests.perf.appsentry"
 
     defaultConfig {
         applicationId = "io.sentry.java.tests.perf.appsentry"
-        minSdk = Config.Android.minSdkVersion
-        targetSdk = Config.Android.targetSdkVersion
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0"
     }