LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ConnectivityMetricsEvent: add ifname, netid, transports

Browse Source 
This patch adds new fields to ConnectivityMetricsEvent to make it more
symmetric to IpConnectivityEvent in ipconnectivity.proto.

Follow-up patches will start populating these fields for users of
IpConnectivityLog.

Test: unit tests updated, $ runtest frameworks-net passes
Bug: 34901696
Change-Id: I396767cdfcf38cce893c0d6e1f4524f12e3fdc64
This commit is contained in:
Hugo Benichi
2017-03-15 16:35:26 +09:00
parent 4953ce3d15
commit cf17909273
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java
View File

@@ -85,7 +85,7 @@ public class IpConnectivityMetricsTest extends TestCase {
new Thread() { new Thread() {
public void run() { public void run() {
for (int j = 0; j < nEvents; j++) { for (int j = 0; j < nEvents; j++) {
assertTrue(logger.log(i * 100 + j, FAKE_EV)); assertTrue(logger.log(1 + i * 100 + j, FAKE_EV));
} }
} }
}.start(); }.start();
@@ -96,7 +96,7 @@ public class IpConnectivityMetricsTest extends TestCase {
Iterator<ConnectivityMetricsEvent> iter = got.iterator(); Iterator<ConnectivityMetricsEvent> iter = got.iterator();
for (int i = 0; i < nCallers; i++) { for (int i = 0; i < nCallers; i++) {
for (int j = 0; j < nEvents; j++) { for (int j = 0; j < nEvents; j++) {
int expectedTimestamp = i * 100 + j; int expectedTimestamp = 1 + i * 100 + j;
assertEventsEqual(expectedEvent(expectedTimestamp), iter.next()); assertEventsEqual(expectedEvent(expectedTimestamp), iter.next());
} }
} }

11
tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java
View File

@@ -23,6 +23,7 @@ import android.net.metrics.ConnectStats;
import android.net.metrics.DnsEvent; import android.net.metrics.DnsEvent;
import android.net.metrics.INetdEventListener; import android.net.metrics.INetdEventListener;
import android.net.metrics.IpConnectivityLog; import android.net.metrics.IpConnectivityLog;
import android.os.Parcelable;
import android.os.RemoteException; import android.os.RemoteException;
import android.system.OsConstants; import android.system.OsConstants;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;
@@ -165,8 +166,8 @@ public class NetdEventListenerServiceTest extends TestCase {
// call onLost() asynchronously to logDnsAsync's onDnsEvent() calls. // call onLost() asynchronously to logDnsAsync's onDnsEvent() calls.
mCallbackCaptor.getValue().onLost(new Network(105)); mCallbackCaptor.getValue().onLost(new Network(105));
// do not verify unpredictable batch // do not verify batch with unpredictable length
verify(mLog, timeout(500).times(1)).log(any()); verify(mLog, timeout(500).times(1)).log(any(Parcelable.class));
} }
@SmallTest @SmallTest
@@ -279,11 +280,7 @@ public class NetdEventListenerServiceTest extends TestCase {
} }
void logDnsAsync(int netId, int[] latencies) { void logDnsAsync(int netId, int[] latencies) {
new Thread() { new Thread(() -> log(netId, latencies)).start();
public void run() {
log(netId, latencies);
}
}.start();
} }
void verifyLoggedDnsEvents(DnsEvent... expected) { void verifyLoggedDnsEvents(DnsEvent... expected) {