Merge branch 'main' into markushi/feat/app-start-info

Author: markushi

CHANGELOG.md

@@ -4,12 +4,26 @@
 
 ### Features
 
+- Add `installGroupsOverride` parameter and `installGroups` property to Build Distribution SDK ([#5062](https://github.com/getsentry/sentry-java/pull/5062))
+- Update Android targetSdk to API 36 (Android 16) ([#5016](https://github.com/getsentry/sentry-java/pull/5016))
+- Add AndroidManifest support for Spotlight configuration via `io.sentry.spotlight.enable` and `io.sentry.spotlight.url` ([#5064](https://github.com/getsentry/sentry-java/pull/5064))
 - Add ApplicationStartInfo API support for Android 15+ ([#5055](https://github.com/getsentry/sentry-java/pull/5055))
-  - Captures detailed app startup timing data from Android system
-  - Creates transactions with milestone spans (bind_application, application_oncreate, ttid, ttfd)
-  - Enriches with AppStartMetrics data (content provider spans, class names)
+  - Captures detailed app startup timing data based on [ApplicationStartInfo APIs](https://developer.android.com/reference/android/app/ApplicationStartInfo)
   - Opt-in via `SentryAndroidOptions.setEnableApplicationStartInfo(boolean)` (disabled by default)
-- Update Android targetSdk to API 36 (Android 16) ([#5016](https://github.com/getsentry/sentry-java/pull/5016))
+
+### Fixes
+
+- Extract `SpotlightIntegration` to separate `sentry-spotlight` module to prevent insecure HTTP URLs from appearing in release APKs ([#5064](https://github.com/getsentry/sentry-java/pull/5064))
+  - **Breaking:** Users who enable Spotlight must now add the `io.sentry:sentry-spotlight` dependency:
+    ```kotlin
+    dependencies {
+        debugImplementation("io.sentry:sentry-spotlight:<version>")
+    }
+    ```
+
+### Fixes
+
+- Fix scroll target detection for Jetpack Compose ([#5017](https://github.com/getsentry/sentry-java/pull/5017))
 
 ### Internal
 

gradle.properties

@@ -9,6 +9,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 
 # AndroidX required by AGP >= 3.6.x
 android.useAndroidX=true
+android.experimental.lint.version=8.9.0
 
 # Release information
 versionName=8.31.0

gradle/libs.versions.toml

@@ -82,7 +82,9 @@ androidx-annotation = { module = "androidx.annotation:annotation", version = "1.
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" }
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidxCompose" }
 androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidxCompose" }
-androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.2.1" }
+androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.4.0" }
+androidx-compose-material-icons-core = { module = "androidx.compose.material:material-icons-core", version="1.7.8" }
+androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version="1.7.8" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidxCompose" }
 # Note: don't change without testing forwards compatibility
 androidx-compose-ui-replay = { module = "androidx.compose.ui:ui", version = "1.5.0" }

sentry-android-core/build.gradle.kts

@@ -102,6 +102,7 @@ dependencies {
   testImplementation(libs.mockito.kotlin)
   testImplementation(libs.mockito.inline)
   testImplementation(projects.sentryTestSupport)
+  testImplementation(projects.sentrySpotlight)
   testImplementation(projects.sentryAndroidFragment)
   testImplementation(projects.sentryAndroidTimber)
   testImplementation(projects.sentryAndroidReplay)

sentry-android-core/proguard-rules.pro

@@ -83,3 +83,8 @@
 -dontwarn io.sentry.android.distribution.DistributionIntegration
 -keepnames class io.sentry.android.distribution.DistributionIntegration
 ##---------------End: proguard configuration for sentry-android-distribution  ----------
+
+##---------------Begin: proguard configuration for sentry-spotlight  ----------
+-dontwarn io.sentry.spotlight.SpotlightIntegration
+-keepnames class io.sentry.spotlight.SpotlightIntegration
+##---------------End: proguard configuration for sentry-spotlight  ----------

sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java

@@ -164,6 +164,10 @@ final class ManifestMetadataReader {
 
   static final String FEEDBACK_SHOW_BRANDING = "io.sentry.feedback.show-branding";
 
+  static final String SPOTLIGHT_ENABLE = "io.sentry.spotlight.enable";
+
+  static final String SPOTLIGHT_CONNECTION_URL = "io.sentry.spotlight.url";
+
   /** ManifestMetadataReader ctor */
   private ManifestMetadataReader() {}
 
@@ -642,6 +646,15 @@ static void applyMetadata(
                 metadata, logger, FEEDBACK_USE_SENTRY_USER, feedbackOptions.isUseSentryUser()));
         feedbackOptions.setShowBranding(
             readBool(metadata, logger, FEEDBACK_SHOW_BRANDING, feedbackOptions.isShowBranding()));
+
+        options.setEnableSpotlight(
+            readBool(metadata, logger, SPOTLIGHT_ENABLE, options.isEnableSpotlight()));
+
+        final @Nullable String spotlightUrl =
+            readString(metadata, logger, SPOTLIGHT_CONNECTION_URL, null);
+        if (spotlightUrl != null) {
+          options.setSpotlightConnectionUrl(spotlightUrl);
+        }
       }
       options
           .getLogger()

sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt

@@ -2217,4 +2217,76 @@ class ManifestMetadataReaderTest {
     assertTrue(headers.contains("Authorization"))
     assertTrue(headers.contains("X-Custom-Header"))
   }
+
+  // Spotlight Configuration Tests
+
+  @Test
+  fun `applyMetadata reads spotlight enabled and keeps default value if not found`() {
+    // Arrange
+    val context = fixture.getContext()
+
+    // Act
+    ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
+
+    // Assert
+    assertFalse(fixture.options.isEnableSpotlight)
+  }
+
+  @Test
+  fun `applyMetadata reads spotlight enabled to options`() {
+    // Arrange
+    val bundle = bundleOf(ManifestMetadataReader.SPOTLIGHT_ENABLE to true)
+    val context = fixture.getContext(metaData = bundle)
+
+    // Act
+    ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
+
+    // Assert
+    assertTrue(fixture.options.isEnableSpotlight)
+  }
+
+  @Test
+  fun `applyMetadata reads spotlight url and keeps null if not found`() {
+    // Arrange
+    val context = fixture.getContext()
+
+    // Act
+    ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
+
+    // Assert
+    assertNull(fixture.options.spotlightConnectionUrl)
+  }
+
+  @Test
+  fun `applyMetadata reads spotlight url to options`() {
+    // Arrange
+    val expectedUrl = "http://10.0.2.2:8969/stream"
+    val bundle = bundleOf(ManifestMetadataReader.SPOTLIGHT_CONNECTION_URL to expectedUrl)
+    val context = fixture.getContext(metaData = bundle)
+
+    // Act
+    ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
+
+    // Assert
+    assertEquals(expectedUrl, fixture.options.spotlightConnectionUrl)
+  }
+
+  @Test
+  fun `applyMetadata reads both spotlight enabled and url to options`() {
+    // Arrange
+    val expectedUrl = "http://localhost:8969/stream"
+    val bundle =
+      bundleOf(
+        ManifestMetadataReader.SPOTLIGHT_ENABLE to true,
+        ManifestMetadataReader.SPOTLIGHT_CONNECTION_URL to expectedUrl,
+      )
+    val context = fixture.getContext(metaData = bundle)
+
+    // Act
+    ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
+
+    // Assert
+    assertTrue(fixture.options.isEnableSpotlight)
+    assertEquals(expectedUrl, fixture.options.spotlightConnectionUrl)
+  }
 }

sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidTest.kt

@@ -26,7 +26,6 @@ import io.sentry.SentryOptions
 import io.sentry.SentryOptions.BeforeSendCallback
 import io.sentry.Session
 import io.sentry.ShutdownHookIntegration
-import io.sentry.SpotlightIntegration
 import io.sentry.SystemOutLogger
 import io.sentry.UncaughtExceptionHandlerIntegration
 import io.sentry.android.core.cache.AndroidEnvelopeCache
@@ -46,6 +45,7 @@ import io.sentry.cache.PersistingScopeObserver.TRANSACTION_FILENAME
 import io.sentry.cache.tape.QueueFile
 import io.sentry.protocol.Contexts
 import io.sentry.protocol.SentryId
+import io.sentry.spotlight.SpotlightIntegration
 import io.sentry.test.applyTestOptions
 import io.sentry.transport.NoOpEnvelopeCache
 import io.sentry.util.StringUtils

sentry-android-distribution/src/main/java/io/sentry/android/distribution/DistributionHttpClient.kt

@@ -27,6 +27,7 @@ internal class DistributionHttpClient(private val options: SentryOptions) {
     val versionCode: Long,
     val versionName: String,
     val buildConfiguration: String,
+    val installGroupsOverride: List<String>? = null,
   )
 
   /**
@@ -58,6 +59,9 @@ internal class DistributionHttpClient(private val options: SentryOptions) {
       append("&build_number=${URLEncoder.encode(params.versionCode.toString(), "UTF-8")}")
       append("&build_version=${URLEncoder.encode(params.versionName, "UTF-8")}")
       append("&build_configuration=${URLEncoder.encode(params.buildConfiguration, "UTF-8")}")
+      params.installGroupsOverride?.forEach { group ->
+        append("&install_groups=${URLEncoder.encode(group, "UTF-8")}")
+      }
     }
     val url = URL(urlString)
 

sentry-android-distribution/src/main/java/io/sentry/android/distribution/UpdateResponseParser.kt

@@ -57,6 +57,7 @@ internal class UpdateResponseParser(private val options: SentryOptions) {
     val downloadUrl = json.optString("download_url", "")
     val appName = json.optString("app_name", "")
     val createdDate = json.optString("created_date", "")
+    val installGroups = parseInstallGroups(json)
 
     // Validate required fields (optString returns "null" for null values)
     val missingFields = mutableListOf<String>()
@@ -77,6 +78,26 @@ internal class UpdateResponseParser(private val options: SentryOptions) {
       )
     }
 
-    return UpdateInfo(id, buildVersion, buildNumber, downloadUrl, appName, createdDate)
+    return UpdateInfo(
+      id,
+      buildVersion,
+      buildNumber,
+      downloadUrl,
+      appName,
+      createdDate,
+      installGroups,
+    )
+  }
+
+  private fun parseInstallGroups(json: JSONObject): List<String>? {
+    val installGroupsArray = json.optJSONArray("install_groups") ?: return null
+    val installGroups = mutableListOf<String>()
+    for (i in 0 until installGroupsArray.length()) {
+      val group = installGroupsArray.optString(i)
+      if (group.isNotEmpty() && group != "null") {
+        installGroups.add(group)
+      }
+    }
+    return if (installGroups.isEmpty()) null else installGroups
   }
 }