Retrieve org from extension, disable telemetry on CI (#599)

getsentry · Nov 28, 2023 · 8634419 · 8634419
1 parent 528f265
commit 8634419
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 5 deletions.
diff --git a/.github/workflows/test-matrix-agp-gradle.yaml b/.github/workflows/test-matrix-agp-gradle.yaml
@@ -103,6 +103,8 @@ jobs:
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/main' }}
           gradle-version: ${{ matrix.gradle }}
+          gradle-home-cache-excludes: |
+            caches/transforms-3
           arguments: integrationTest
 
       - name: Upload Test Results

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixes
+
+- Retrieve `sentryOrg` from the `SentryPluginExtension` for telemetry ([#599](https://github.com/getsentry/sentry-android-gradle-plugin/pull/599))
+
 ### Dependencies
 
 - Bump CLI from v2.21.5 to v2.22.3 ([#598](https://github.com/getsentry/sentry-android-gradle-plugin/pull/598), [#600](https://github.com/getsentry/sentry-android-gradle-plugin/pull/600))

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -58,6 +58,7 @@ object Libs {
 }
 
 object CI {
+    const val SENTRY_SDKS_DSN = "https://dd1f82ad30a331bd7def2a0dce926c6e@o447951.ingest.sentry.io/4506031723446272"
     fun canAutoUpload(): Boolean {
         return System.getenv("AUTO_UPLOAD").toBoolean() &&
                 !System.getenv("SENTRY_AUTH_TOKEN").isNullOrEmpty()

diff --git a/examples/android-gradle-kts/build.gradle.kts b/examples/android-gradle-kts/build.gradle.kts
@@ -23,6 +23,7 @@ android {
 sentry {
     autoUploadProguardMapping.set(CI.canAutoUpload())
 
+    telemetryDsn.set(CI.SENTRY_SDKS_DSN)
     tracingInstrumentation {
         enabled.set(false)
     }

diff --git a/examples/android-gradle/build.gradle b/examples/android-gradle/build.gradle
@@ -34,6 +34,7 @@ android {
 sentry {
     autoUploadProguardMapping = CI.INSTANCE.canAutoUpload()
 
+    telemetryDsn = CI.INSTANCE.SENTRY_SDKS_DSN
     tracingInstrumentation {
         enabled = false
     }

diff --git a/examples/android-guardsquare-proguard/build.gradle b/examples/android-guardsquare-proguard/build.gradle
@@ -50,6 +50,7 @@ sentry {
 
     dexguardEnabled = true
 
+    telemetryDsn = CI.INSTANCE.SENTRY_SDKS_DSN
     tracingInstrumentation {
         enabled = false
     }

diff --git a/examples/android-instrumentation-sample/build.gradle.kts b/examples/android-instrumentation-sample/build.gradle.kts
@@ -108,6 +108,10 @@ sentry {
     autoUploadSourceContext.set(CI.canAutoUpload())
     additionalSourceDirsForSourceContext.set(setOf("src/custom/java"))
 
+    org.set("sentry-sdks")
+    projectName.set("sentry-android")
+    telemetryDsn.set(CI.SENTRY_SDKS_DSN)
+
     tracingInstrumentation {
         forceInstrumentDependencies.set(true)
     }

diff --git a/examples/android-instrumentation-sample/sentry.properties b/examples/android-instrumentation-sample/sentry.properties
diff --git a/examples/android-ndk/build.gradle b/examples/android-ndk/build.gradle
@@ -41,6 +41,7 @@ if (System.getenv("AUTO_UPLOAD")) {
         includeNativeSources = true
         autoUploadNativeSymbols = CI.INSTANCE.canAutoUpload()
 
+        telemetryDsn = CI.INSTANCE.SENTRY_SDKS_DSN
         tracingInstrumentation {
             enabled = false
         }

diff --git a/plugin-build/src/main/kotlin/io/sentry/android/gradle/telemetry/SentryTelemetryService.kt b/plugin-build/src/main/kotlin/io/sentry/android/gradle/telemetry/SentryTelemetryService.kt
@@ -113,7 +113,11 @@ abstract class SentryTelemetryService :
 
                 hub.configureScope { scope ->
                     scope.user = User().also { user ->
-                        startParameters.defaultSentryOrganization?.let { user.id = it }
+                        startParameters.defaultSentryOrganization?.let { org ->
+                            if (org != "-") {
+                                user.id = org
+                            }
+                        }
                         startParameters.sentryOrganization?.let { user.id = it }
                     }
                 }
@@ -245,22 +249,23 @@ abstract class SentryTelemetryService :
             buildType: String
         ): SentryTelemetryServiceParams {
             val tags = extraTagsFromExtension(project, extension)
+            val org = sentryOrg ?: extension.org.orNull
 
             if (isExecAvailable()) {
                 return paramsWithExecAvailable(
                     project,
                     cliExecutable,
                     extension,
                     variant,
-                    sentryOrg,
+                    org,
                     buildType,
                     tags
                 )
             } else {
                 return SentryTelemetryServiceParams(
                     extension.telemetry.get(),
                     extension.telemetryDsn.get(),
-                    sentryOrg,
+                    org,
                     buildType,
                     tags,
                     extension.debug.get(),

diff --git a/plugin-build/src/test/resources/testFixtures/appTestProject/app/build.gradle b/plugin-build/src/test/resources/testFixtures/appTestProject/app/build.gradle
@@ -18,4 +18,5 @@ sentry {
     autoInstallation {
         enabled = false
     }
+    telemetry = false
 }