diff options
Diffstat (limited to 'container-core')
2 files changed, 12 insertions, 1 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java index 1376b50dad9..e341b66e0f8 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; import static com.yahoo.container.jdisc.state.StateHandler.getSnapshotPreprocessor; @@ -151,7 +152,7 @@ public class MetricsPacketsHandler extends AbstractRequestHandler { private void addMetaData(long timestamp, String application, JSONObjectWithLegibleException packet) { packet.put(APPLICATION_KEY, application); - packet.put(TIMESTAMP_KEY, timestamp); + packet.put(TIMESTAMP_KEY, TimeUnit.MILLISECONDS.toSeconds(timestamp)); } private void addDimensions(MetricDimensions metricDimensions, JSONObjectWithLegibleException packet) throws JSONException { diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java index 3d9e1d520d8..92330345b50 100644 --- a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java +++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java @@ -17,6 +17,7 @@ import static com.yahoo.container.jdisc.state.MetricsPacketsHandler.PACKET_SEPAR import static com.yahoo.container.jdisc.state.MetricsPacketsHandler.STATUS_CODE_KEY; import static com.yahoo.container.jdisc.state.MetricsPacketsHandler.STATUS_MSG_KEY; import static com.yahoo.container.jdisc.state.MetricsPacketsHandler.TIMESTAMP_KEY; +import static com.yahoo.container.jdisc.state.StateHandlerTestBase.SNAPSHOT_INTERVAL; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -61,6 +62,15 @@ public class MetricsPacketsHandlerTest extends StateHandlerTestBase { } @Test + public void timestamp_resolution_is_in_seconds() throws Exception { + metric.add("counter", 1, null); + List<JsonNode> packets = incrementTimeAndGetJsonPackets(); + JsonNode counterPacket = packets.get(1); + + assertEquals(SNAPSHOT_INTERVAL/1000L, counterPacket.get(TIMESTAMP_KEY).asLong()); + } + + @Test public void expected_aggregators_are_output_for_gauge_metrics() throws Exception{ Metric.Context context = metric.createContext(Collections.singletonMap("dim1", "value1")); metric.set("gauge", 0.2, null); |