From 84ca056e3ee7bfac61fc78014ae1e5d4dcb813b1 Mon Sep 17 00:00:00 2001 From: Clayton Jacobs Date: Mon, 11 Jun 2018 18:07:30 +0800 Subject: [PATCH 1/3] metrics: removed repetitive math --- metrics/metrics.go | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/metrics/metrics.go b/metrics/metrics.go index e24324814c..06f1814885 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -68,18 +68,22 @@ func CollectProcessMetrics(refresh time.Duration) { } // Iterate loading the different stats and updating the meters for i := 1; ; i++ { - runtime.ReadMemStats(memstats[i%2]) - memAllocs.Mark(int64(memstats[i%2].Mallocs - memstats[(i-1)%2].Mallocs)) - memFrees.Mark(int64(memstats[i%2].Frees - memstats[(i-1)%2].Frees)) - memInuse.Mark(int64(memstats[i%2].Alloc - memstats[(i-1)%2].Alloc)) - memPauses.Mark(int64(memstats[i%2].PauseTotalNs - memstats[(i-1)%2].PauseTotalNs)) - if ReadDiskStats(diskstats[i%2]) == nil { - diskReads.Mark(diskstats[i%2].ReadCount - diskstats[(i-1)%2].ReadCount) - diskReadBytes.Mark(diskstats[i%2].ReadBytes - diskstats[(i-1)%2].ReadBytes) - diskWrites.Mark(diskstats[i%2].WriteCount - diskstats[(i-1)%2].WriteCount) - diskWriteBytes.Mark(diskstats[i%2].WriteBytes - diskstats[(i-1)%2].WriteBytes) + location1 := i%2 + location2 := (i-1)%2 + + runtime.ReadMemStats(memstats[location1]) + memAllocs.Mark(int64(memstats[location1].Mallocs - memstats[location2].Mallocs)) + memFrees.Mark(int64(memstats[location1].Frees - memstats[location2].Frees)) + memInuse.Mark(int64(memstats[location1].Alloc - memstats[location2].Alloc)) + memPauses.Mark(int64(memstats[location1].PauseTotalNs - memstats[location2].PauseTotalNs)) + + if ReadDiskStats(diskstats[location1]) == nil { + diskReads.Mark(diskstats[location1].ReadCount - diskstats[location2].ReadCount) + diskReadBytes.Mark(diskstats[location1].ReadBytes - diskstats[location2].ReadBytes) + diskWrites.Mark(diskstats[location1].WriteCount - diskstats[location2].WriteCount) + diskWriteBytes.Mark(diskstats[location1].WriteBytes - diskstats[location2].WriteBytes) } time.Sleep(refresh) } -} +} \ No newline at end of file From 92812006b14ebcd92ba9687b877b3c1f7931d4fd Mon Sep 17 00:00:00 2001 From: Clayton Jacobs Date: Mon, 11 Jun 2018 19:03:24 +0800 Subject: [PATCH 2/3] Update metrics.go --- metrics/metrics.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metrics/metrics.go b/metrics/metrics.go index 06f1814885..d5837fc689 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -86,4 +86,4 @@ func CollectProcessMetrics(refresh time.Duration) { } time.Sleep(refresh) } -} \ No newline at end of file +} From 2d91a930785009df6e24482599c8fa369c293392 Mon Sep 17 00:00:00 2001 From: Clayton Jacobs Date: Mon, 11 Jun 2018 19:12:45 +0800 Subject: [PATCH 3/3] blank space --- metrics/metrics.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metrics/metrics.go b/metrics/metrics.go index 06f1814885..d5837fc689 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -86,4 +86,4 @@ func CollectProcessMetrics(refresh time.Duration) { } time.Sleep(refresh) } -} \ No newline at end of file +}