Merge pull request #296 from abhinandanpb/stats_time

Setting the cpu and memory stats of containers in nanoseconds
This commit is contained in:
Abhinandan Prativadi 2017-09-27 09:22:56 -07:00 committed by GitHub
commit cc5d3ef96a

View File

@ -117,11 +117,11 @@ func (c *criContainerdService) getContainerMetrics(
} }
metrics := s.(*cgroups.Metrics) metrics := s.(*cgroups.Metrics)
cs.Cpu = &runtime.CpuUsage{ cs.Cpu = &runtime.CpuUsage{
Timestamp: stats.Timestamp.Unix(), Timestamp: stats.Timestamp.UnixNano(),
UsageCoreNanoSeconds: &runtime.UInt64Value{metrics.CPU.Usage.Total}, UsageCoreNanoSeconds: &runtime.UInt64Value{metrics.CPU.Usage.Total},
} }
cs.Memory = &runtime.MemoryUsage{ cs.Memory = &runtime.MemoryUsage{
Timestamp: stats.Timestamp.Unix(), Timestamp: stats.Timestamp.UnixNano(),
WorkingSetBytes: &runtime.UInt64Value{metrics.Memory.Usage.Usage}, WorkingSetBytes: &runtime.UInt64Value{metrics.Memory.Usage.Usage},
} }
} }