Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 18:30:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use a more accurate starting point for message send timings.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-08-23 10:05:48 -04:00
committed by Alex Hart
parent 1e050915ef
commit b7a067e954
18 changed files with 232 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/util/LocalMetrics.kt
View File

@@ -79,7 +79,7 @@ object LocalMetrics {
/**
* Stop tracking an event you were previously tracking. All future calls to [split] and [end] will do nothing for this id.
*/
fun drop(id: String) {
fun cancel(id: String) {
executor.execute {
eventsById.remove(id)
}

174
app/src/main/java/org/thoughtcrime/securesms/util/SignalLocalMetrics.java
View File

@@ -1,6 +1,12 @@
package org.thoughtcrime.securesms.util;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
/**
* A nice interface for {@link LocalMetrics} that gives us a place to define string constants and nicer method names.
@@ -55,54 +61,15 @@ public final class SignalLocalMetrics {
if (isConversationList) {
LocalMetrics.getInstance().split(conversationListId, SPLIT_RENDER);
LocalMetrics.getInstance().end(conversationListId);
LocalMetrics.getInstance().drop(otherId);
LocalMetrics.getInstance().cancel(otherId);
} else {
LocalMetrics.getInstance().split(otherId, SPLIT_RENDER);
LocalMetrics.getInstance().end(otherId);
LocalMetrics.getInstance().drop(conversationListId);
LocalMetrics.getInstance().cancel(conversationListId);
}
}
}
public static final class IndividualMessageSend {
private static final String NAME = "individual-message-send";
private static final String SPLIT_JOB_ENQUEUE = "job-enqueue";
private static final String SPLIT_JOB_PRE_NETWORK = "job-pre-network";
private static final String SPLIT_NETWORK = "network";
private static final String SPLIT_JOB_POST_NETWORK = "job-post-network";
private static final String SPLIT_UI_UPDATE = "ui-update";
public static void start(long messageId) {
LocalMetrics.getInstance().start(buildId(messageId), NAME);
}
public static void onJobStarted(long messageId) {
LocalMetrics.getInstance().split(buildId(messageId), SPLIT_JOB_ENQUEUE);
}
public static void onNetworkStarted(long messageId) {
LocalMetrics.getInstance().split(buildId(messageId), SPLIT_JOB_PRE_NETWORK);
}
public static void onNetworkFinished(long messageId) {
LocalMetrics.getInstance().split(buildId(messageId), SPLIT_NETWORK);
}
public static void onJobFinished(long messageId) {
LocalMetrics.getInstance().split(buildId(messageId), SPLIT_JOB_POST_NETWORK);
}
public static void onUiUpdated(long messageId) {
LocalMetrics.getInstance().split(buildId(messageId), SPLIT_UI_UPDATE);
LocalMetrics.getInstance().end(buildId(messageId));
}
private static String buildId(long messageId) {
return NAME + "-" + messageId;
}
}
public static final class ConversationOpen {
private static final String NAME = "conversation-open";
@@ -126,42 +93,143 @@ public final class SignalLocalMetrics {
}
}
public static final class GroupMessageSend {
private static final String NAME = "group-message-send";
public static final class IndividualMessageSend {
private static final String NAME = "individual-message-send";
private static final String SPLIT_DB_INSERT = "db-insert";
private static final String SPLIT_JOB_ENQUEUE = "job-enqueue";
private static final String SPLIT_JOB_PRE_NETWORK = "job-pre-network";
private static final String SPLIT_NETWORK = "network";
private static final String SPLIT_JOB_POST_NETWORK = "job-post-network";
private static final String SPLIT_UI_UPDATE = "ui-update";
public static void start(long messageId) {
LocalMetrics.getInstance().start(buildId(messageId), NAME);
private static final Map<Long, String> ID_MAP = new HashMap<>();
public static @NonNull String start() {
String id = NAME + System.currentTimeMillis();
LocalMetrics.getInstance().start(id, NAME);
return id;
}
public static void onInsertedIntoDatabase(long messageId, String id) {
if (id != null) {
ID_MAP.put(messageId, id);
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_DB_INSERT);
}
}
public static void onJobStarted(long messageId) {
LocalMetrics.getInstance().split(buildId(messageId), SPLIT_JOB_ENQUEUE);
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_JOB_ENQUEUE);
}
public static void onNetworkStarted(long messageId) {
LocalMetrics.getInstance().split(buildId(messageId), SPLIT_JOB_PRE_NETWORK);
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_JOB_PRE_NETWORK);
}
public static void onNetworkFinished(long messageId) {
LocalMetrics.getInstance().split(buildId(messageId), SPLIT_NETWORK);
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_NETWORK);
}
public static void onJobFinished(long messageId) {
LocalMetrics.getInstance().split(buildId(messageId), SPLIT_JOB_POST_NETWORK);
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_JOB_POST_NETWORK);
}
public static void onUiUpdated(long messageId) {
LocalMetrics.getInstance().split(buildId(messageId), SPLIT_UI_UPDATE);
LocalMetrics.getInstance().end(buildId(messageId));
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_UI_UPDATE);
LocalMetrics.getInstance().end(requireId(messageId));
ID_MAP.remove(messageId);
}
private static String buildId(long messageId) {
return NAME + "-" + messageId;
public static void cancel(@Nullable String id) {
if (id != null) {
LocalMetrics.getInstance().cancel(id);
}
}
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));
}
}
public static final class GroupMessageSend {
private static final String NAME = "group-message-send";
private static final String SPLIT_DB_INSERT = "db-insert";
private static final String SPLIT_JOB_ENQUEUE = "job-enqueue";
private static final String SPLIT_JOB_PRE_NETWORK = "job-pre-network";
private static final String SPLIT_NETWORK = "network";
private static final String SPLIT_JOB_POST_NETWORK = "job-post-network";
private static final String SPLIT_UI_UPDATE = "ui-update";
private static final Map<Long, String> ID_MAP = new HashMap<>();
public static @NonNull String start() {
String id = NAME + System.currentTimeMillis();
LocalMetrics.getInstance().start(id, NAME);
return id;
}
public static void onInsertedIntoDatabase(long messageId, String id) {
if (id != null) {
ID_MAP.put(messageId, id);
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_DB_INSERT);
}
}
public static void onJobStarted(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_JOB_ENQUEUE);
}
public static void onNetworkStarted(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_JOB_PRE_NETWORK);
}
public static void onNetworkFinished(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(messageId), SPLIT_NETWORK);
}
public static void onJobFinished(long messageId) {
if (!ID_MAP.containsKey(messageId)) return;
LocalMetrics.getInstance().split(requireId(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));
ID_MAP.remove(messageId);
}
public static void cancel(@Nullable String id) {
if (id != null) {
LocalMetrics.getInstance().cancel(id);
}
}
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));
}
}
}