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.
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
Weakly reference Activity for transaction finished callback #2203
Merged
+31
−2
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,7 @@ | |
import io.sentry.util.Objects; | ||
import java.io.Closeable; | ||
import java.io.IOException; | ||
import java.lang.ref.WeakReference; | ||
import java.util.Date; | ||
import java.util.List; | ||
import java.util.Map; | ||
|
@@ -146,6 +147,7 @@ private void stopPreviousTransactions() { | |
} | ||
|
||
private void startTracing(final @NotNull Activity activity) { | ||
WeakReference<Activity> weakActivity = new WeakReference<>(activity); | ||
if (performanceEnabled && !isRunningTransaction(activity) && hub != null) { | ||
// as we allow a single transaction running on the bound Scope, we finish the previous ones | ||
stopPreviousTransactions(); | ||
|
@@ -167,7 +169,20 @@ private void startTracing(final @NotNull Activity activity) { | |
(Date) null, | ||
true, | ||
(finishingTransaction) -> { | ||
activityFramesTracker.setMetrics(activity, finishingTransaction.getEventId()); | ||
@Nullable Activity unwrappedActivity = weakActivity.get(); | ||
if (unwrappedActivity != null) { | ||
activityFramesTracker.setMetrics( | ||
unwrappedActivity, finishingTransaction.getEventId()); | ||
} else { | ||
if (options != null) { | ||
options | ||
.getLogger() | ||
.log( | ||
SentryLevel.WARNING, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What log level should this be? |
||
"Unable to track activity frames as the Activity %s has been destroyed.", | ||
activityName); | ||
} | ||
} | ||
}); | ||
} else { | ||
// start transaction with app start timestamp | ||
|
@@ -178,7 +193,20 @@ private void startTracing(final @NotNull Activity activity) { | |
appStartTime, | ||
true, | ||
(finishingTransaction) -> { | ||
activityFramesTracker.setMetrics(activity, finishingTransaction.getEventId()); | ||
@Nullable Activity unwrappedActivity = weakActivity.get(); | ||
if (unwrappedActivity != null) { | ||
activityFramesTracker.setMetrics( | ||
unwrappedActivity, finishingTransaction.getEventId()); | ||
} else { | ||
if (options != null) { | ||
options | ||
.getLogger() | ||
.log( | ||
SentryLevel.WARNING, | ||
"Unable to track activity frames as the Activity %s has been destroyed.", | ||
activityName); | ||
} | ||
} | ||
}); | ||
// start specific span for app start | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please try to reproduce the issue with and without the fix using LeakCanary.
Upgrade leakcanary to the latest version -> https://github.com/square/leakcanary/releases/tag/v2.9.1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tried with
2.9.1
but it didn't find anything regardless ofWeakReference
or old implementation.