Skip to content

fix: do not set null release if SetByTracksLibrary requested #209

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

Merged
wzieba merged 1 commit into from
Mar 27, 2024
Merged

fix: do not set null release if SetByTracksLibrary requested #209

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
5 changes: 2 additions & 3 deletions ...s/src/main/java/com/automattic/android/tracks/crashlogging/internal/SentryCrashLogging.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ internal class SentryCrashLogging constructor(
options.apply {
dsn = dataProvider.sentryDSN
environment = dataProvider.buildType
release = when (val releaseName = dataProvider.releaseName) {
is ReleaseName.SetByApplication -> releaseName.name
ReleaseName.SetByTracksLibrary -> null
(dataProvider.releaseName as? ReleaseName.SetByApplication)?.let {

@iangmaia iangmaia Mar 27, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, couldn't you just

release = (dataProvider.releaseName as? ReleaseName.SetByApplication)?.name

@wzieba wzieba Mar 27, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the same overlook I did in #206 😅. The version you provided will assign null to release if dataProvider.releaseName is not SetByApplication. And, in result, will overwrite the value Sentry SDK automatically assigned (what we wanted).

@iangmaia iangmaia Mar 27, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aah gotcha, you don't really want the value to be set to null when the cast doesn't succeed 👍

@wzieba wzieba Mar 27, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes - when dataProvider.releaseName is SetByTracksLibrary, we should do nothing with options.release

@iangmaia iangmaia Mar 27, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when dataProvider.releaseName is SetByTracksLibrary

You mean isn't ? 😅

@wzieba wzieba Mar 27, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 ReleaseName can be either SetByTracksLibrary or SetByApplication.

When dataProvider.releaseName is SetByTracksLibrary we should do nothing with options.release. I think that's the correct description, matching the implementation.

@iangmaia iangmaia Mar 27, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I thought you were mentioning the same type that's in the code. All clear now, thanks!

release = it.name
}
this.tracesSampleRate = tracesSampleRate
this.profilesSampleRate = profilesSampleRate
Expand Down