empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Refactor SignalLocalMetrics to be more resiliant to certain errors.

Browse source
This commit is contained in:
Greyson Parrelli 2022-01-13 11:17:02 -05:00 • committed by Cody Henthorne
parent cd4320c0ef
commit 01047e90ad
2 changed files with 59 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/database/LocalMetricsDatabase.kt
View file

@ -18,8 +18,8 @@ import java.util.concurrent.TimeUnit
*
* These metrics are only ever included in debug logs in an aggregate fashion (i.e. p50, p90, p99) and are never automatically uploaded anywhere.
*
* The performance of insertions is important, but given insertions frequency isn't crazy-high, we can also optimize for retrieval performance.
* SQLite isn't amazing at statistical analysis, so having indices that speeds those operations up is encouraged.
* The performance of insertions is important, but given insertion frequency isn't crazy-high, we can also optimize for retrieval performance.
* SQLite isn't amazing at statistical analysis, so having indices that speed up those operations is encouraged.
*
* This is it's own separate physical database, so it cannot do joins or queries with any other tables.
*/

112
app/src/main/java/org/thoughtcrime/securesms/util/SignalLocalMetrics.java
View file

@ -116,62 +116,62 @@ public final class SignalLocalMetrics {
public static void onInsertedIntoDatabase(long messageId, String id) {
if (id != null) {
ID_MAP.put(messageId, id);
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_DB_INSERT);
split(messageId, SPLIT_DB_INSERT);
}
}
public static void onJobStarted(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_JOB_ENQUEUE);
split(messageId, SPLIT_JOB_ENQUEUE);
}
public static void onDeliveryStarted(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_JOB_PRE_NETWORK);
split(messageId, SPLIT_JOB_PRE_NETWORK);
}
public static void onMessageEncrypted(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_ENCRYPT);
split(messageId, SPLIT_ENCRYPT);
}
public static void onMessageSent(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_NETWORK_MAIN);
split(messageId, SPLIT_NETWORK_MAIN);
}
public static void onSyncMessageSent(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_NETWORK_SYNC);
split(messageId, SPLIT_NETWORK_SYNC);
}
public static void onJobFinished(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_JOB_POST_NETWORK);
split(messageId, SPLIT_JOB_POST_NETWORK);
}
public static void onUiUpdated(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_UI_UPDATE);
LocalMetrics.getInstance().end(requireId(messageId));
split(messageId, SPLIT_UI_UPDATE);
end(messageId);
ID_MAP.remove(messageId);
}
public static void cancel(@Nullable String id) {
if (id != null) {
LocalMetrics.getInstance().cancel(id);
public static void cancel(long messageId) {
String splitId = ID_MAP.get(messageId);
if (splitId != null) {
LocalMetrics.getInstance().cancel(splitId);
}
ID_MAP.remove(messageId);
}
private static void split(long messageId, @NonNull String event) {
String splitId = ID_MAP.get(messageId);
if (splitId != null) {
LocalMetrics.getInstance().split(splitId, event);
}
}
public static void cancel(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().cancel(requireId(messageId));
}
private static @NonNull String requireId(long messageId) {
return Objects.requireNonNull(ID_MAP.get(messageId));
private static void end(long messageId) {
String splitId = ID_MAP.get(messageId);
if (splitId != null) {
LocalMetrics.getInstance().end(splitId);
}
}
}
@ -202,64 +202,53 @@ public final class SignalLocalMetrics {
public static void onInsertedIntoDatabase(long messageId, String id) {
if (id != null) {
ID_MAP.put(messageId, id);
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_DB_INSERT);
split(messageId, SPLIT_DB_INSERT);
}
}
public static void onJobStarted(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_JOB_ENQUEUE);
split(messageId, SPLIT_JOB_ENQUEUE);
}
public static void onSenderKeyStarted(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_JOB_PRE_NETWORK);
split(messageId, SPLIT_JOB_PRE_NETWORK);
}
public static void onSenderKeyShared(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_SENDER_KEY_SHARED);
split(messageId, SPLIT_SENDER_KEY_SHARED);
}
public static void onSenderKeyEncrypted(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_ENCRYPTION);
split(messageId, SPLIT_ENCRYPTION);
}
public static void onSenderKeyMessageSent(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_NETWORK_SENDER_KEY);
split(messageId, SPLIT_NETWORK_SENDER_KEY);
}
public static void onSenderKeySyncSent(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_NETWORK_SENDER_KEY_SYNC);
split(messageId, SPLIT_NETWORK_SENDER_KEY_SYNC);
}
public static void onSenderKeyMslInserted(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_MSL_SENDER_KEY);
split(messageId, SPLIT_MSL_SENDER_KEY);
}
public static void onLegacyMessageSent(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_NETWORK_LEGACY);
split(messageId, SPLIT_NETWORK_LEGACY);
}
public static void onLegacySyncFinished(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_NETWORK_LEGACY_SYNC);
split(messageId, SPLIT_NETWORK_LEGACY_SYNC);
}
public static void onJobFinished(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_JOB_POST_NETWORK);
split(messageId, SPLIT_JOB_POST_NETWORK);
}
public static void onUiUpdated(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_UI_UPDATE);
LocalMetrics.getInstance().end(requireId(messageId));
split(messageId, SPLIT_UI_UPDATE);
end(messageId);
ID_MAP.remove(messageId);
}
@ -271,13 +260,26 @@ public final class SignalLocalMetrics {
}
public static void cancel(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().cancel(requireId(messageId));
String splitId = ID_MAP.get(messageId);
if (splitId != null) {
LocalMetrics.getInstance().cancel(splitId);
}
ID_MAP.remove(messageId);
}
private static void split(long messageId, @NonNull String event) {
String splitId = ID_MAP.get(messageId);
if (splitId != null) {
LocalMetrics.getInstance().split(splitId, event);
}
}
private static @NonNull String requireId(long messageId) {
return Objects.requireNonNull(ID_MAP.get(messageId));
private static void end(long messageId) {
String splitId = ID_MAP.get(messageId);
if (splitId != null) {
LocalMetrics.getInstance().end(splitId);
}
}
}
}