Skip to content

Commit f6701a6

Browse files
runningcodeclaude
andcommitted
Update auth token property name and improve test coverage
- Rename property from `io.sentry.distribution.org-auth-token` to `io.sentry.distribution.auth-token` to match sentry-android-gradle-plugin - Rename method from `getDistributionOrgAuthToken` to `getDistributionAuthToken` - Improve test to verify first properties file with distribution options is used 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 18dc3af commit f6701a6

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

sentry/src/main/java/io/sentry/util/DebugMetaPropertiesApplier.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private static void applyDistributionOptions(
9696
for (Properties properties : debugMetaProperties) {
9797
final @Nullable String orgSlug = getDistributionOrgSlug(properties);
9898
final @Nullable String projectSlug = getDistributionProjectSlug(properties);
99-
final @Nullable String orgAuthToken = getDistributionOrgAuthToken(properties);
99+
final @Nullable String orgAuthToken = getDistributionAuthToken(properties);
100100
final @Nullable String buildConfiguration = getDistributionBuildConfiguration(properties);
101101

102102
if (orgSlug != null
@@ -156,9 +156,9 @@ private static void applyDistributionOptions(
156156
return debugMetaProperties.getProperty("io.sentry.distribution.project-slug");
157157
}
158158

159-
private static @Nullable String getDistributionOrgAuthToken(
159+
private static @Nullable String getDistributionAuthToken(
160160
final @NotNull Properties debugMetaProperties) {
161-
return debugMetaProperties.getProperty("io.sentry.distribution.org-auth-token");
161+
return debugMetaProperties.getProperty("io.sentry.distribution.auth-token");
162162
}
163163

164164
private static @Nullable String getDistributionBuildConfiguration(

sentry/src/test/java/io/sentry/util/DebugMetaPropertiesApplierTest.kt

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class DebugMetaPropertiesApplierTest {
1313
val properties = Properties()
1414
properties.setProperty("io.sentry.distribution.org-slug", "test-org")
1515
properties.setProperty("io.sentry.distribution.project-slug", "test-project")
16-
properties.setProperty("io.sentry.distribution.org-auth-token", "test-token")
16+
properties.setProperty("io.sentry.distribution.auth-token", "test-token")
1717
properties.setProperty("io.sentry.distribution.build-configuration", "debug")
1818

1919
val options = SentryOptions()
@@ -45,7 +45,7 @@ class DebugMetaPropertiesApplierTest {
4545
val properties = Properties()
4646
properties.setProperty("io.sentry.distribution.org-slug", "properties-org")
4747
properties.setProperty("io.sentry.distribution.project-slug", "properties-project")
48-
properties.setProperty("io.sentry.distribution.org-auth-token", "properties-token")
48+
properties.setProperty("io.sentry.distribution.auth-token", "properties-token")
4949
properties.setProperty("io.sentry.distribution.build-configuration", "properties-config")
5050

5151
val options = SentryOptions()
@@ -66,13 +66,20 @@ class DebugMetaPropertiesApplierTest {
6666
fun `applies distribution options from first properties file with values`() {
6767
val properties1 = Properties()
6868
val properties2 = Properties()
69-
properties2.setProperty("io.sentry.distribution.org-slug", "org-from-second")
69+
val properties3 = Properties()
70+
71+
// properties1 has non-distribution properties so is ignored:
72+
properties1.setProperty("io.sentry.unrelated", "unrelated")
73+
74+
// properties2 should end up being the ones set
7075
properties2.setProperty("io.sentry.distribution.project-slug", "project-from-second")
7176

77+
// properties3 also has distribution properties but since properties2 was first they are ignored.
78+
properties3.setProperty("io.sentry.distribution.project-slug", "project-from-third")
79+
7280
val options = SentryOptions()
73-
DebugMetaPropertiesApplier.apply(options, listOf(properties1, properties2))
81+
DebugMetaPropertiesApplier.apply(options, listOf(properties1, properties2, properties3))
7482

75-
assertEquals("org-from-second", options.distribution.orgSlug)
7683
assertEquals("project-from-second", options.distribution.projectSlug)
7784
}
7885

@@ -119,7 +126,7 @@ class DebugMetaPropertiesApplierTest {
119126
val properties = Properties()
120127
properties.setProperty("io.sentry.distribution.org-slug", "")
121128
properties.setProperty("io.sentry.distribution.project-slug", "")
122-
properties.setProperty("io.sentry.distribution.org-auth-token", "")
129+
properties.setProperty("io.sentry.distribution.auth-token", "")
123130
properties.setProperty("io.sentry.distribution.build-configuration", "")
124131

125132
val options = SentryOptions()

0 commit comments

Comments
 (0)