aboutsummaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorZHANG Dapeng <zdapeng@google.com>2018-05-21 12:44:06 -0700
committerGitHub <noreply@github.com>2018-05-21 12:44:06 -0700
commitf5f560ad365735a0c9bf8b86abeed16cf7dfdde7 (patch)
treeb0a34ef4d5036958b505cc1a4785ba883a91dfda /services
parent30478d88c722a5a25e74f80e43578cb265d0ccfb (diff)
downloadgrpc-grpc-java-f5f560ad365735a0c9bf8b86abeed16cf7dfdde7.tar.gz
all: TimeProvider to use nanos rather than millis
This is the same practice as #2833
Diffstat (limited to 'services')
-rw-r--r--services/src/main/java/io/grpc/services/ChannelzProtoUtil.java4
-rw-r--r--services/src/test/java/io/grpc/services/ChannelzProtoUtilTest.java10
-rw-r--r--services/src/test/java/io/grpc/services/ChannelzTestHelper.java4
3 files changed, 9 insertions, 9 deletions
diff --git a/services/src/main/java/io/grpc/services/ChannelzProtoUtil.java b/services/src/main/java/io/grpc/services/ChannelzProtoUtil.java
index e28361b2c..203b43621 100644
--- a/services/src/main/java/io/grpc/services/ChannelzProtoUtil.java
+++ b/services/src/main/java/io/grpc/services/ChannelzProtoUtil.java
@@ -138,7 +138,7 @@ final class ChannelzProtoUtil {
.setCallsStarted(stats.callsStarted)
.setCallsSucceeded(stats.callsSucceeded)
.setCallsFailed(stats.callsFailed)
- .setLastCallStartedTimestamp(Timestamps.fromMillis(stats.lastCallStartedMillis))
+ .setLastCallStartedTimestamp(Timestamps.fromNanos(stats.lastCallStartedNanos))
.build();
}
@@ -359,7 +359,7 @@ final class ChannelzProtoUtil {
.setCallsStarted(stats.callsStarted)
.setCallsSucceeded(stats.callsSucceeded)
.setCallsFailed(stats.callsFailed)
- .setLastCallStartedTimestamp(Timestamps.fromMillis(stats.lastCallStartedMillis));
+ .setLastCallStartedTimestamp(Timestamps.fromNanos(stats.lastCallStartedNanos));
if (stats.channelTrace != null) {
builder.setTrace(toChannelTrace(stats.channelTrace));
}
diff --git a/services/src/test/java/io/grpc/services/ChannelzProtoUtilTest.java b/services/src/test/java/io/grpc/services/ChannelzProtoUtilTest.java
index 563f83a3f..c6214cabf 100644
--- a/services/src/test/java/io/grpc/services/ChannelzProtoUtilTest.java
+++ b/services/src/test/java/io/grpc/services/ChannelzProtoUtilTest.java
@@ -106,7 +106,7 @@ public final class ChannelzProtoUtilTest {
.setCallsStarted(1)
.setCallsSucceeded(2)
.setCallsFailed(3)
- .setLastCallStartedTimestamp(Timestamps.fromMillis(4))
+ .setLastCallStartedTimestamp(Timestamps.fromNanos(4))
.build();
private final Channel channelProto = Channel
.newBuilder()
@@ -127,7 +127,7 @@ public final class ChannelzProtoUtilTest {
.setCallsStarted(1)
.setCallsSucceeded(2)
.setCallsFailed(3)
- .setLastCallStartedTimestamp(Timestamps.fromMillis(4))
+ .setLastCallStartedTimestamp(Timestamps.fromNanos(4))
.build();
private final Subchannel subchannelProto = Subchannel
.newBuilder()
@@ -146,7 +146,7 @@ public final class ChannelzProtoUtilTest {
.setCallsStarted(1)
.setCallsSucceeded(2)
.setCallsFailed(3)
- .setLastCallStartedTimestamp(Timestamps.fromMillis(4))
+ .setLastCallStartedTimestamp(Timestamps.fromNanos(4))
.build();
private final Server serverProto = Server
.newBuilder()
@@ -912,7 +912,7 @@ public final class ChannelzProtoUtilTest {
.setCallsStarted(stats.callsStarted)
.setCallsSucceeded(stats.callsSucceeded)
.setCallsFailed(stats.callsFailed)
- .setLastCallStartedMillis(stats.lastCallStartedMillis);
+ .setLastCallStartedNanos(stats.lastCallStartedNanos);
if (!stats.subchannels.isEmpty()) {
builder.setSubchannels(stats.subchannels);
}
@@ -938,7 +938,7 @@ public final class ChannelzProtoUtilTest {
.setCallsStarted(stats.callsStarted)
.setCallsSucceeded(stats.callsSucceeded)
.setCallsFailed(stats.callsFailed)
- .setLastCallStartedMillis(stats.lastCallStartedMillis)
+ .setLastCallStartedNanos(stats.lastCallStartedNanos)
.setListenSockets(stats.listenSockets);
}
}
diff --git a/services/src/test/java/io/grpc/services/ChannelzTestHelper.java b/services/src/test/java/io/grpc/services/ChannelzTestHelper.java
index 0acdd0287..072cb18b7 100644
--- a/services/src/test/java/io/grpc/services/ChannelzTestHelper.java
+++ b/services/src/test/java/io/grpc/services/ChannelzTestHelper.java
@@ -122,7 +122,7 @@ final class ChannelzTestHelper {
/*callsStarted=*/ 1,
/*callsSucceeded=*/ 2,
/*callsFailed=*/ 3,
- /*lastCallStartedMillis=*/ 4,
+ /*lastCallStartedNanos=*/ 4,
Collections.<Instrumented<SocketStats>>emptyList());
@Override
@@ -154,7 +154,7 @@ final class ChannelzTestHelper {
.setCallsStarted(1)
.setCallsSucceeded(2)
.setCallsFailed(3)
- .setLastCallStartedMillis(4)
+ .setLastCallStartedNanos(4)
.setSubchannels(Collections.<WithLogId>emptyList())
.setSockets(Collections.<WithLogId>emptyList())
.build();