Skip to content
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

Jump to bottom

add logs to know how long sync processes take #3934

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

add logs to know how long sync processes take #3934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3997f38
add logs to know how long sync processes take
Okuro3499 Jul 24, 2024
18b9911
add more logs
Okuro3499 Jul 24, 2024
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
10 changes: 9 additions & 1 deletion app/src/main/java/org/ole/planet/myplanet/datamanager/Service.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import org.ole.planet.myplanet.model.MyPlanet
import org.ole.planet.myplanet.model.RealmCommunity
import org.ole.planet.myplanet.model.RealmUserModel.Companion.isUserExists
import org.ole.planet.myplanet.model.RealmUserModel.Companion.populateUsersTable
import org.ole.planet.myplanet.service.TransactionSyncManager.logDuration
import org.ole.planet.myplanet.service.UploadToShelfService
import org.ole.planet.myplanet.ui.sync.SyncActivity
import org.ole.planet.myplanet.utilities.AndroidDecrypter.Companion.generateIv
Expand Down Expand Up @@ -94,6 +95,7 @@ class Service(private val context: Context) {
callback.onError(context.getString(R.string.config_not_available), true)
return
}
val start = System.currentTimeMillis()
retrofitInterface?.checkVersion(Utilities.getUpdateUrl(settings))?.enqueue(object : Callback<MyPlanet?> {
@RequiresApi(Build.VERSION_CODES.M)
override fun onResponse(call: Call<MyPlanet?>, response: Response<MyPlanet?>) {
Expand Down Expand Up @@ -133,7 +135,11 @@ class Service(private val context: Context) {
callback.onError("Planet up to date", false)
}
}
val end = System.currentTimeMillis()
logDuration(start, end, "checkVersion")
} catch (e: Exception) {
val end = System.currentTimeMillis()
logDuration(start, end, "checkVersion")
callback.onError("New apk version required but not found on server - Contact admin", false)
}
}
Expand Down Expand Up @@ -295,7 +301,7 @@ class Service(private val context: Context) {
setText(context.getString(R.string.check_apk_version))
show()
}

val start = System.currentTimeMillis()
retrofitInterface?.getConfiguration("$url/versions")?.enqueue(object : Callback<JsonObject?> {
override fun onResponse(call: Call<JsonObject?>, response: Response<JsonObject?>) {
if (response.isSuccessful) {
Expand Down Expand Up @@ -325,6 +331,8 @@ class Service(private val context: Context) {
val code = doc.getAsJsonPrimitive("code").asString
listener?.onConfigurationIdReceived(id, code)
activity.setSyncFailed(false)
val end = System.currentTimeMillis()
logDuration(start, end, "check app version")
} else {
activity.setSyncFailed(true)
showAlertDialog(context.getString(R.string.failed_to_get_configuration_id), false)
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/org/ole/planet/myplanet/service/SyncManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import org.ole.planet.myplanet.model.RealmMyLibrary.Companion.save
import org.ole.planet.myplanet.model.RealmMyTeam.Companion.insertMyTeams
import org.ole.planet.myplanet.model.RealmResourceActivity.Companion.onSynced
import org.ole.planet.myplanet.model.Rows
import org.ole.planet.myplanet.service.TransactionSyncManager.logDuration
import org.ole.planet.myplanet.utilities.Constants
import org.ole.planet.myplanet.utilities.Constants.PREFS_NAME
import org.ole.planet.myplanet.utilities.Constants.ShelfData
Expand Down Expand Up @@ -76,17 +77,21 @@ class SyncManager private constructor(private val context: Context) {

private fun authenticateAndSync() {
td = Thread {
val start = System.currentTimeMillis()
if (TransactionSyncManager.authenticate()) {
startSync()
} else {
handleException(context.getString(R.string.invalid_configuration))
destroy()
}
val end = System.currentTimeMillis()
logDuration(start, end, "authenticateAndSync")
}
td?.start()
}

private fun startSync() {
val start = System.currentTimeMillis()
try {
val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
val wifiInfo = wifiManager.connectionInfo
Expand Down Expand Up @@ -123,6 +128,8 @@ class SyncManager private constructor(private val context: Context) {
err.printStackTrace()
handleException(err.message)
} finally {
val end = System.currentTimeMillis()
logDuration(start, end, "startSync")
destroy()
}
}
Expand Down
30 changes: 27 additions & 3 deletions app/src/main/java/org/ole/planet/myplanet/service/TransactionSyncManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,24 @@ import java.io.IOException
object TransactionSyncManager {
fun authenticate(): Boolean {
val apiInterface = client?.create(ApiInterface::class.java)
val start = System.currentTimeMillis()
try {
val response: Response<DocumentResponse>? = apiInterface?.getDocuments(Utilities.header, Utilities.getUrl() + "/tablet_users/_all_docs")?.execute()
if (response != null) {
val end = System.currentTimeMillis()
logDuration(start, end, "authenticate")
return response.code() == 200
}
} catch (e: IOException) {
e.printStackTrace()
}
val end = System.currentTimeMillis()
logDuration(start, end, "authenticate")
return false
}

fun syncAllHealthData(mRealm: Realm, settings: SharedPreferences, listener: SyncListener) {
val start = System.currentTimeMillis()
listener.onSyncStarted()
val userName = settings.getString("loginUserName", "")
val password = settings.getString("loginUserPassword", "")
Expand All @@ -70,8 +76,14 @@ object TransactionSyncManager {
for (userModel in users) {
syncHealthData(userModel, header)
}
}, { listener.onSyncComplete() }) { error: Throwable ->
}, {
listener.onSyncComplete()
val end = System.currentTimeMillis()
logDuration(start, end, "syncAllHealthData")
}) { error: Throwable ->
error.message?.let { listener.onSyncFailed(it) }
val end = System.currentTimeMillis()
logDuration(start, end, "syncAllHealthData")
}
}

Expand All @@ -94,6 +106,7 @@ object TransactionSyncManager {
}

fun syncKeyIv(mRealm: Realm, settings: SharedPreferences, listener: SyncListener) {
val start = System.currentTimeMillis()
listener.onSyncStarted()
val model = UserProfileDbHandler(MainApplication.context).userModel
val userName = settings.getString("loginUserName", "")
Expand All @@ -104,8 +117,14 @@ object TransactionSyncManager {
mRealm.executeTransactionAsync({ realm: Realm ->
val userModel = realm.where(RealmUserModel::class.java).equalTo("id", id).findFirst()
syncHealthData(userModel, header)
}, { listener.onSyncComplete() }) { error: Throwable ->
error.message?.let { listener.onSyncFailed(it) }
}, {
listener.onSyncComplete()
val end = System.currentTimeMillis()
logDuration(start, end, "syncKeyIv")
}) { error: Throwable ->
error.message?.let {
listener.onSyncFailed(it)
}
}
}

Expand Down Expand Up @@ -228,4 +247,9 @@ object TransactionSyncManager {
e.printStackTrace()
}
}

fun logDuration(start: Long, end: Long, operation: String) {
val duration = end - start
println("Operation $operation took $duration milliseconds")
}
}
4 changes: 4 additions & 0 deletions app/src/main/java/org/ole/planet/myplanet/ui/sync/SyncActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import org.ole.planet.myplanet.datamanager.ApiClient.client
import org.ole.planet.myplanet.datamanager.Service.*
import org.ole.planet.myplanet.model.*
import org.ole.planet.myplanet.service.*
import org.ole.planet.myplanet.service.TransactionSyncManager.logDuration
import org.ole.planet.myplanet.ui.dashboard.DashboardActivity
import org.ole.planet.myplanet.ui.team.AdapterTeam.OnUserSelectedListener
import org.ole.planet.myplanet.utilities.*
Expand Down Expand Up @@ -721,6 +722,7 @@ abstract class SyncActivity : ProcessUserDataActivity(), SyncListener, CheckVers
}

private fun continueSync(dialog: MaterialDialog) {
val start = System.currentTimeMillis()
processedUrl = saveConfigAndContinue(dialog)
if (TextUtils.isEmpty(processedUrl)) return
isSync = true
Expand All @@ -730,6 +732,8 @@ abstract class SyncActivity : ProcessUserDataActivity(), SyncListener, CheckVers
Service(this).isPlanetAvailable(object : PlanetAvailableListener {
override fun isAvailable() {
Service(context).checkVersion(this@SyncActivity, settings)
val end = System.currentTimeMillis()
logDuration(start, end, "continueSync")
}
override fun notAvailable() {
if (!isFinishing) {
Expand Down