Skip to content

Commit b8bd880

Browse files
authored
feat: Made ManifestMetaDataReader read the DIST (#5107)
1 parent 01221e2 commit b8bd880

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<meta-data android:name="io.sentry.screenshot.mask-all-text" android:value="true" />
2828
<meta-data android:name="io.sentry.screenshot.mask-all-images" android:value="true" />
2929
```
30+
- The `ManifestMetaDataReader` now read the `DIST` ([#5107](https://github.com/getsentry/sentry-java/pull/5107))
3031

3132
### Fixes
3233

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ final class ManifestMetadataReader {
4141
static final String NDK_SCOPE_SYNC_ENABLE = "io.sentry.ndk.scope-sync.enable";
4242
static final String NDK_SDK_NAME = "io.sentry.ndk.sdk-name";
4343
static final String RELEASE = "io.sentry.release";
44+
static final String DIST = "io.sentry.dist";
4445
static final String ENVIRONMENT = "io.sentry.environment";
4546
static final String SDK_NAME = "io.sentry.sdk.name";
4647
static final String SDK_VERSION = "io.sentry.sdk.version";
@@ -273,6 +274,8 @@ static void applyMetadata(
273274

274275
options.setRelease(readString(metadata, logger, RELEASE, options.getRelease()));
275276

277+
options.setDist(readString(metadata, logger, DIST, options.getDist()));
278+
276279
options.setEnvironment(readString(metadata, logger, ENVIRONMENT, options.getEnvironment()));
277280

278281
options.setSessionTrackingIntervalMillis(

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,31 @@ class ManifestMetadataReaderTest {
187187
assertNull(fixture.options.release)
188188
}
189189

190+
@Test
191+
fun `applyMetadata reads dist to options`() {
192+
// Arrange
193+
val bundle = bundleOf(ManifestMetadataReader.DIST to "test-dist")
194+
val context = fixture.getContext(metaData = bundle)
195+
196+
// Act
197+
ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
198+
199+
// Assert
200+
assertEquals("test-dist", fixture.options.dist)
201+
}
202+
203+
@Test
204+
fun `applyMetadata reads dist and keep default value if not found`() {
205+
// Arrange
206+
val context = fixture.getContext()
207+
208+
// Act
209+
ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
210+
211+
// Assert
212+
assertNull(fixture.options.dist)
213+
}
214+
190215
@Test
191216
fun `applyMetadata reads session tracking interval to options`() {
192217
// Arrange

0 commit comments

Comments
 (0)