fix(android): Report missing properties file or keys when flavorAware is enabled

CHANGELOG.md

@@ -19,6 +19,7 @@
 ### Fixes
 
 - Check `captureReplay` return value in iOS bridge to avoid linking error events to uncaptured replays ([#6008](https://github.com/getsentry/sentry-react-native/pull/6008))
+- Report the expected properties file path and any missing keys when using `flavorAware` on Android, instead of failing with an opaque `Illegal null value provided in this collection` error ([#6031](https://github.com/getsentry/sentry-react-native/pull/6031))
 
 ### Dependencies
 

packages/core/sentry.gradle

@@ -208,9 +208,31 @@ plugins.withId('com.android.application') {
                                 try {
                                     sentryProps.load(new FileInputStream(propertiesFile))
                                 } catch (FileNotFoundException e) {
+                                    if (config.flavorAware) {
+                                        throw new GradleException(
+                                            "Sentry: expected properties file not found for variant '${variant}': ${propertiesFile}. " +
+                                            "Create it, or disable 'flavorAware' in project.ext.sentryCli.")
+                                    }
                                     project.logger.info("file not found '$propertiesFile' for '$variant'")
                                 }
 
+                                def sentryUrl = sentryProps.get("defaults.url")
+                                def sentryAuthToken = sentryProps.get("auth.token") ?: System.getenv("SENTRY_AUTH_TOKEN")
+                                def sentryOrg = sentryProps.get("defaults.org")
+                                def sentryProject = sentryProps.get("defaults.project")
+
+                                if (config.flavorAware) {
+                                    def missing = []
+                                    if (!sentryAuthToken) missing << "auth.token (or SENTRY_AUTH_TOKEN env var)"
+                                    if (!sentryOrg) missing << "defaults.org"
+                                    if (!sentryProject) missing << "defaults.project"
+                                    if (!missing.isEmpty()) {
+                                        throw new GradleException(
+                                            "Sentry: missing required properties in '${propertiesFile}' for variant '${variant}':\n" +
+                                            "  - " + missing.join("\n  - "))
+                                    }
+                                }
+
                                 def cliPackage = resolveSentryCliPackagePath(reactRoot)
                                 def cliExecutable = sentryProps.get("cli.executable", "$cliPackage/bin/sentry-cli")
 
@@ -228,18 +250,22 @@ plugins.withId('com.android.application') {
                                 args.addAll(!config.logLevel ? [] : [
                                     "--log-level", config.logLevel      // control verbosity of the output
                                 ])
-                                args.addAll(!config.flavorAware ? [] : [
-                                    "--url", sentryProps.get("defaults.url"),
-                                    "--auth-token", sentryProps.get("auth.token") ?: System.getenv("SENTRY_AUTH_TOKEN")
-                                ])
+                                if (config.flavorAware) {
+                                    if (sentryUrl) {
+                                        args.addAll(["--url", sentryUrl])
+                                    }
+                                    args.addAll(["--auth-token", sentryAuthToken])
+                                }
                                 args.addAll(["react-native", "gradle",
                                     "--bundle", bundleOutput,           // The path to a bundle that should be uploaded.
                                     "--sourcemap", sourcemapOutput      // The path to a sourcemap that should be uploaded.
                                 ])
-                                args.addAll(!config.flavorAware ? [] : [
-                                    "--org", sentryProps.get("defaults.org"),
-                                    "--project", sentryProps.get("defaults.project")
-                                ])
+                                if (config.flavorAware) {
+                                    args.addAll([
+                                        "--org", sentryOrg,
+                                        "--project", sentryProject
+                                    ])
+                                }
 
                                 args.addAll(extraArgs)