diff options
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/networkstack/util/DnsUtils.java | 11 | ||||
| -rwxr-xr-x | src/com/android/server/connectivity/NetworkMonitor.java | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/com/android/networkstack/util/DnsUtils.java b/src/com/android/networkstack/util/DnsUtils.java index c47ccc1..83f2daf 100644 --- a/src/com/android/networkstack/util/DnsUtils.java +++ b/src/com/android/networkstack/util/DnsUtils.java @@ -147,7 +147,7 @@ public class DnsUtils { } catch (TimeoutException | InterruptedException e) { errorMsg = "Timeout"; } finally { - logDnsResult(result, watch.stop() /* latency */, logger, type, errorMsg); + logDnsResult(result, watch.stop() / 1000 /* latencyMs */, logger, type, errorMsg); } if (null != errorMsg) throw new UnknownHostException(host); @@ -155,8 +155,9 @@ public class DnsUtils { return result.toArray(new InetAddress[0]); } - private static void logDnsResult(@Nullable final List<InetAddress> results, final long latency, - @Nullable final DnsLogFunc logger, int type, @NonNull final String errorMsg) { + private static void logDnsResult(@Nullable final List<InetAddress> results, + final long latencyMs, @Nullable final DnsLogFunc logger, int type, + @NonNull final String errorMsg) { if (logger == null) { return; } @@ -166,9 +167,9 @@ public class DnsUtils { for (InetAddress address : results) { builder.append(',').append(address.getHostAddress()); } - logger.log(String.format("%dms OK %s", latency, builder.substring(1))); + logger.log(String.format("%dms OK %s", latencyMs, builder.substring(1))); } else { - logger.log(String.format("%dms FAIL in type %s %s", latency, dnsTypeToStr(type), + logger.log(String.format("%dms FAIL in type %s %s", latencyMs, dnsTypeToStr(type), errorMsg)); } } diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java index 093118a..8a1b0c7 100755 --- a/src/com/android/server/connectivity/NetworkMonitor.java +++ b/src/com/android/server/connectivity/NetworkMonitor.java @@ -1412,11 +1412,11 @@ public class NetworkMonitor extends StateMachine { time = watch.stop(); final String strIps = Arrays.toString(ips); success = (ips != null && ips.length > 0); - validationLog(PROBE_PRIVDNS, host, String.format("%dms: %s", time, strIps)); + validationLog(PROBE_PRIVDNS, host, String.format("%dus: %s", time, strIps)); } catch (UnknownHostException uhe) { time = watch.stop(); validationLog(PROBE_PRIVDNS, host, - String.format("%dms - Error: %s", time, uhe.getMessage())); + String.format("%dus - Error: %s", time, uhe.getMessage())); } logValidationProbe(time, PROBE_PRIVDNS, success ? DNS_SUCCESS : DNS_FAILURE); return success; @@ -2943,18 +2943,18 @@ public class NetworkMonitor extends StateMachine { if (mEvaluationTimer.isRunning()) { int[] transports = mNetworkCapabilities.getTransportTypes(); mMetricsLog.log(mCleartextDnsNetwork, transports, - new NetworkEvent(evtype, mEvaluationTimer.stop())); + new NetworkEvent(evtype, mEvaluationTimer.stop() / 1000)); mEvaluationTimer.reset(); } } - private void logValidationProbe(long durationMs, int probeType, int probeResult) { + private void logValidationProbe(long durationUs, int probeType, int probeResult) { int[] transports = mNetworkCapabilities.getTransportTypes(); boolean isFirstValidation = validationStage().mIsFirstValidation; ValidationProbeEvent ev = new ValidationProbeEvent.Builder() .setProbeType(probeType, isFirstValidation) .setReturnCode(probeResult) - .setDurationMs(durationMs) + .setDurationMs(durationUs / 1000) .build(); mMetricsLog.log(mCleartextDnsNetwork, transports, ev); } |