Skip to content

feat: Made ManifestMetaDataReader read the DIST #5107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bitsandfoxes wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −0
Open

feat: Made ManifestMetaDataReader read the DIST #5107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ final class ManifestMetadataReader {
static final String NDK_SCOPE_SYNC_ENABLE = "io.sentry.ndk.scope-sync.enable";
static final String NDK_SDK_NAME = "io.sentry.ndk.sdk-name";
static final String RELEASE = "io.sentry.release";
static final String DIST = "io.sentry.dist";
static final String ENVIRONMENT = "io.sentry.environment";
static final String SDK_NAME = "io.sentry.sdk.name";
static final String SDK_VERSION = "io.sentry.sdk.version";
Expand Down Expand Up @@ -269,6 +270,8 @@ static void applyMetadata(

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

options.setDist(readString(metadata, logger, DIST, options.getDist()));

options.setEnvironment(readString(metadata, logger, ENVIRONMENT, options.getEnvironment()));

options.setSessionTrackingIntervalMillis(
Expand Down
25 changes: 25 additions & 0 deletions sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,31 @@ class ManifestMetadataReaderTest {
assertNull(fixture.options.release)
}

@Test
fun `applyMetadata reads dist to options`() {
// Arrange
val bundle = bundleOf(ManifestMetadataReader.DIST to "test-dist")
val context = fixture.getContext(metaData = bundle)

// Act
ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)

// Assert
assertEquals("test-dist", fixture.options.dist)
}

@Test
fun `applyMetadata reads dist and keep default value if not found`() {
// Arrange
val context = fixture.getContext()

// Act
ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)

// Assert
assertNull(fixture.options.dist)
}

@Test
fun `applyMetadata reads session tracking interval to options`() {
// Arrange
Expand Down
Loading