ref(snapshots): Register snapshot upload tasks per variant (#1105)

* ref(snapshots): Register snapshot upload tasks per variant

Move SentryUploadSnapshotsTask registration from SentryPlugin (global)
into AndroidComponentsConfig (per-variant), matching the pattern used by
proguard mappings, source bundles, and native symbols.

This wires applicationId directly from ApplicationVariant, eliminating
the need for the SnapshotsExtension and manual appId configuration.
Also wires sentry telemetry into the task.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* feat(snapshots): Add --snapshots-path CLI option to upload task

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: runningcode

plugin-build/src/main/kotlin/io/sentry/android/gradle/AndroidComponentsConfig.kt

@@ -29,6 +29,7 @@ import io.sentry.android.gradle.tasks.SentryGenerateIntegrationListTask
 import io.sentry.android.gradle.tasks.SentryGenerateProguardUuidTask
 import io.sentry.android.gradle.tasks.SentryUploadAppArtifactTask
 import io.sentry.android.gradle.tasks.SentryUploadProguardMappingsTask
+import io.sentry.android.gradle.tasks.SentryUploadSnapshotsTask
 import io.sentry.android.gradle.tasks.configureNativeSymbolsTask
 import io.sentry.android.gradle.tasks.dependencies.SentryExternalDependenciesReportTaskV2
 import io.sentry.android.gradle.telemetry.SentryTelemetryService
@@ -141,6 +142,15 @@ fun ApplicationAndroidComponentsExtension.configure(
         sentryProject,
       )
 
+      variant.configureSnapshotsTasks(
+        project,
+        extension,
+        sentryTelemetryProvider,
+        cliExecutable,
+        sentryOrg,
+        sentryProject,
+      )
+
       // we can't hook into asset generation, nor manifest merging, as all those tasks
       // are dependencies of the compilation / minification task
       // and as our ProGuard UUID depends on minification itself; creating a
@@ -452,6 +462,30 @@ private fun ApplicationVariant.configureDistributionPropertiesTask(
   return null
 }
 
+private fun ApplicationVariant.configureSnapshotsTasks(
+  project: Project,
+  extension: SentryPluginExtension,
+  sentryTelemetryProvider: Provider<SentryTelemetryService>,
+  cliExecutable: Provider<String>,
+  sentryOrg: String?,
+  sentryProject: String?,
+) {
+  val variant = AndroidVariant74(this)
+  val sentryProps = getPropertiesFilePath(project, variant)
+
+  SentryUploadSnapshotsTask.register(
+    project = project,
+    extension = extension,
+    sentryTelemetryProvider = sentryTelemetryProvider,
+    cliExecutable = cliExecutable,
+    sentryOrgOverride = sentryOrg,
+    sentryProjectOverride = sentryProject,
+    applicationId = applicationId,
+    sentryProperties = sentryProps,
+    taskSuffix = name.capitalized,
+  )
+}
+
 /**
  * Configure the upload AAB and APK tasks and set them up as finalizers on the respective producer
  * tasks

plugin-build/src/main/kotlin/io/sentry/android/gradle/SentryPlugin.kt

@@ -4,7 +4,6 @@ import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import io.sentry.BuildConfig
 import io.sentry.android.gradle.autoinstall.installDependencies
 import io.sentry.android.gradle.extensions.SentryPluginExtension
-import io.sentry.android.gradle.tasks.SentryUploadSnapshotsTask
 import io.sentry.android.gradle.util.AgpVersions
 import java.io.File
 import javax.inject.Inject
@@ -66,14 +65,6 @@ constructor(private val buildEvents: BuildEventListenerRegistryInternal) : Plugi
         sentryProjectParameter,
       )
 
-      SentryUploadSnapshotsTask.register(
-        project,
-        extension,
-        cliExecutable,
-        sentryOrgParameter,
-        sentryProjectParameter,
-      )
-
       project.installDependencies(extension, true)
     }
   }

plugin-build/src/main/kotlin/io/sentry/android/gradle/extensions/SentryPluginExtension.kt

@@ -127,14 +127,6 @@ abstract class SentryPluginExtension @Inject constructor(project: Project) {
     vcsInfoAction.execute(vcsInfo)
   }
 
-  val snapshots: SnapshotsExtension = objects.newInstance(SnapshotsExtension::class.java)
-
-  /** Configure the snapshots upload. */
-  @Experimental
-  fun snapshots(snapshotsAction: Action<SnapshotsExtension>) {
-    snapshotsAction.execute(snapshots)
-  }
-
   /**
    * Disables or enables the reporting of dependencies metadata for Sentry. If enabled the plugin
    * will collect external dependencies and will take care of uploading them to Sentry as part of

plugin-build/src/main/kotlin/io/sentry/android/gradle/extensions/SnapshotsExtension.kt

@@ -1,8 +1,9 @@
 package io.sentry.android.gradle.tasks
 
-import io.sentry.android.gradle.SentryPropertiesFileProvider.getPropertiesFilePath
 import io.sentry.android.gradle.autoinstall.SENTRY_GROUP
 import io.sentry.android.gradle.extensions.SentryPluginExtension
+import io.sentry.android.gradle.telemetry.SentryTelemetryService
+import io.sentry.android.gradle.telemetry.withSentryTelemetry
 import io.sentry.android.gradle.util.asSentryCliExec
 import org.gradle.api.Project
 import org.gradle.api.file.DirectoryProperty
@@ -14,6 +15,7 @@ import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.PathSensitive
 import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskProvider
+import org.gradle.api.tasks.options.Option
 import org.gradle.work.DisableCachingByDefault
 
 @DisableCachingByDefault(because = "Uploads should not be cached")
@@ -30,6 +32,11 @@ abstract class SentryUploadSnapshotsTask : SentryCliExecTask() {
   @get:PathSensitive(PathSensitivity.RELATIVE)
   abstract val snapshotsPath: DirectoryProperty
 
+  @Option(option = "snapshots-path", description = "Path to the snapshots directory to upload")
+  fun setSnapshotsPathOption(path: String) {
+    snapshotsPath.set(project.file(path))
+  }
+
   @get:Input @get:Optional abstract val vcsHeadSha: Property<String>
   @get:Input @get:Optional abstract val vcsBaseSha: Property<String>
   @get:Input @get:Optional abstract val vcsProvider: Property<String>
@@ -61,20 +68,22 @@ abstract class SentryUploadSnapshotsTask : SentryCliExecTask() {
     fun register(
       project: Project,
       extension: SentryPluginExtension,
+      sentryTelemetryProvider: Provider<SentryTelemetryService>?,
       cliExecutable: Provider<String>,
       sentryOrgOverride: String?,
       sentryProjectOverride: String?,
+      applicationId: Provider<String>,
+      sentryProperties: String?,
+      taskSuffix: String,
     ): TaskProvider<SentryUploadSnapshotsTask> {
       return project.tasks.register(
-        "sentryUploadSnapshots",
+        "sentryUploadSnapshots$taskSuffix",
         SentryUploadSnapshotsTask::class.java,
       ) { task ->
         task.workingDir(project.rootDir)
         task.debug.set(extension.debug)
         task.cliExecutable.set(cliExecutable)
-        task.sentryProperties.set(
-          getPropertiesFilePath(project)?.let { file -> project.file(file) }
-        )
+        task.sentryProperties.set(sentryProperties?.let { project.file(it) })
         task.sentryOrganization.set(
           sentryOrgOverride?.let { project.provider { it } } ?: extension.org
         )
@@ -83,8 +92,7 @@ abstract class SentryUploadSnapshotsTask : SentryCliExecTask() {
         )
         task.sentryAuthToken.set(extension.authToken)
         task.sentryUrl.set(extension.url)
-        task.appId.set(extension.snapshots.appId)
-        task.snapshotsPath.set(extension.snapshots.path)
+        task.appId.set(applicationId)
         task.vcsHeadSha.set(extension.vcsInfo.headSha)
         task.vcsBaseSha.set(extension.vcsInfo.baseSha)
         task.vcsProvider.set(extension.vcsInfo.vcsProvider)
@@ -93,6 +101,8 @@ abstract class SentryUploadSnapshotsTask : SentryCliExecTask() {
         task.vcsHeadRef.set(extension.vcsInfo.headRef)
         task.vcsBaseRef.set(extension.vcsInfo.baseRef)
         task.vcsPrNumber.set(extension.vcsInfo.prNumber)
+        sentryTelemetryProvider?.let { task.sentryTelemetryService.set(it) }
+        task.withSentryTelemetry(extension, sentryTelemetryProvider)
         task.asSentryCliExec()
       }
     }