Skip to content

Fix memory leak issue in SentryFlutterPlugin #1588

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
marandaneto merged 6 commits into from
Aug 9, 2023
Merged

Fix memory leak issue in SentryFlutterPlugin #1588

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cd10d1
Fixing memory leak issue in SentryFlutterPlugin
linkaipeng Aug 8, 2023
8b830c1
Update changelog #1588
linkaipeng Aug 8, 2023
3d1c814
Fix some lining issues for SentryFlutterPlugin.
linkaipeng Aug 8, 2023
5ab3e22
Merge branch 'main' into main
linkaipeng Aug 8, 2023
6e46fa1
Update CHANGELOG.md
marandaneto Aug 9, 2023
896dad3
Merge branch 'main' into main
marandaneto Aug 9, 2023
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
Prev Previous commit
Next Next commit
Fix some lining issues for SentryFlutterPlugin. 
Fix some lining issues for SentryFlutterPlugin.
  • Loading branch information
@linkaipeng
linkaipeng committed Aug 8, 2023
commit 3d1c8145518ea5468c111cdec66911399f92132a
26 changes: 19 additions & 7 deletions flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,15 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
args.getIfNotNull<String>("environment") { options.environment = it }
args.getIfNotNull<String>("release") { options.release = it }
args.getIfNotNull<String>("dist") { options.dist = it }
args.getIfNotNull<Boolean>("enableAutoSessionTracking") { options.isEnableAutoSessionTracking = it }
args.getIfNotNull<Long>("autoSessionTrackingIntervalMillis") { options.sessionTrackingIntervalMillis = it }
args.getIfNotNull<Long>("anrTimeoutIntervalMillis") { options.anrTimeoutIntervalMillis = it }
args.getIfNotNull<Boolean>("enableAutoSessionTracking") {
options.isEnableAutoSessionTracking = it
}
args.getIfNotNull<Long>("autoSessionTrackingIntervalMillis") {
options.sessionTrackingIntervalMillis = it
}
args.getIfNotNull<Long>("anrTimeoutIntervalMillis") {
options.anrTimeoutIntervalMillis = it
}
args.getIfNotNull<Boolean>("attachThreads") { options.isAttachThreads = it }
args.getIfNotNull<Boolean>("attachStacktrace") { options.isAttachStacktrace = it }
args.getIfNotNull<Boolean>("enableAutoNativeBreadcrumbs") {
Expand Down Expand Up @@ -208,7 +214,7 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
val appStartTimeMillis = DateUtils.nanosToMillis(appStartTime.nanoTimestamp().toDouble())
val item = mapOf<String, Any?>(
"appStartTime" to appStartTimeMillis,
"isColdStart" to isColdStart,
"isColdStart" to isColdStart
)
result.success(item)
}
Expand Down Expand Up @@ -249,7 +255,7 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
val frames = mapOf<String, Any?>(
"totalFrames" to total,
"slowFrames" to slow,
"frozenFrames" to frozen,
"frozenFrames" to frozen
)
result.success(frames)
}
Expand Down Expand Up @@ -400,7 +406,9 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
result.success("")
}

private class BeforeSendCallbackImpl(private val sdkVersion: SdkVersion?) : SentryOptions.BeforeSendCallback {
private class BeforeSendCallbackImpl(
private val sdkVersion: SdkVersion?
) : SentryOptions.BeforeSendCallback {
override fun execute(event: SentryEvent, hint: Hint): SentryEvent {
setEventOriginTag(event)
addPackages(event, sdkVersion)
Expand All @@ -424,7 +432,11 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
}
}

private fun setEventEnvironmentTag(event: SentryEvent, origin: String = "android", environment: String) {
private fun setEventEnvironmentTag(
event: SentryEvent,
origin: String = "android",
environment: String
) {
event.setTag("event.origin", origin)
event.setTag("event.environment", environment)
}
Expand Down