Skip to content

Make trace nullable when stopping tracing #3499

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
avazirna merged 2 commits into from
Jan 19, 2026
Merged

Make trace nullable when stopping tracing #3499

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4110bc
Make trace nullable when stopping tracing
avazirna Jan 19, 2026
eeb83ab
Refactor
avazirna Jan 19, 2026
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
12 changes: 6 additions & 6 deletions app/src/org/commcare/google/services/analytics/CCPerfMonitoring.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,23 @@ object CCPerfMonitoring {
return null
}

fun stopTracing(trace: Trace, attrs: MutableMap<String, String>?) {
fun stopTracing(trace: Trace?, attrs: MutableMap<String, String>?) {
try {
attrs?.forEach { (key, value) -> trace.putAttribute(key, value) }
trace.stop()
attrs?.forEach { (key, value) -> trace?.putAttribute(key, value) }
trace?.stop()
} catch (exception: Exception) {
Logger.exception("Error stopping perf trace: ${trace.name}", exception)
Logger.exception("Error stopping perf trace: ${trace?.name?: "Unknown trace"}", exception)
}
}

fun stopFileEncryptionTracing(trace: Trace, fileSizeBytes: Long, fileName: String) {
fun stopFileEncryptionTracing(trace: Trace?, fileSizeBytes: Long, fileName: String) {
try {
val attrs: MutableMap<String, String> = HashMap()
attrs[ATTR_FILE_SIZE_BYTES] = fileSizeBytes.toString()
attrs[ATTR_FILE_TYPE] = FilenameUtils.getExtension(fileName)
stopTracing(trace, attrs)
} catch (e: java.lang.Exception) {
Logger.exception("Failed to stop tracing: ${trace.name}", e)
Logger.exception("Failed to stop tracing: $TRACE_FILE_ENCRYPTION_TIME", e)
}
}

Expand Down