diff --git a/report/metrics.go b/report/metrics.go index da11215e0..e5a83c20b 100644 --- a/report/metrics.go +++ b/report/metrics.go @@ -104,18 +104,6 @@ func (m Metric) Copy() Metric { return c } -// WithFirst returns a fresh copy of m, with first set to t. -// TODO: This seems to be unused -func (m Metric) WithFirst(t time.Time) Metric { - return Metric{ - Samples: m.Samples, - Max: m.Max, - Min: m.Min, - First: t, - Last: m.Last, - } -} - // WithMax returns a fresh copy of m, with Max set to max func (m Metric) WithMax(max float64) Metric { return Metric{ diff --git a/test/fixture/report_fixture.go b/test/fixture/report_fixture.go index fa1110e20..9296d0acc 100644 --- a/test/fixture/report_fixture.go +++ b/test/fixture/report_fixture.go @@ -101,22 +101,22 @@ var ( ServiceUID = "service1234" ServiceNodeID = report.MakeServiceNodeID(ServiceUID) - ClientProcess1CPUMetric = report.MakeSingletonMetric(Now, 0.01).WithFirst(Now.Add(-1 * time.Second)) - ClientProcess1MemoryMetric = report.MakeSingletonMetric(Now, 0.02).WithFirst(Now.Add(-2 * time.Second)) + ClientProcess1CPUMetric = report.MakeSingletonMetric(Now.Add(-1*time.Second), 0.01) + ClientProcess1MemoryMetric = report.MakeSingletonMetric(Now.Add(-2*time.Second), 0.02) - ClientContainerCPUMetric = report.MakeSingletonMetric(Now, 0.03).WithFirst(Now.Add(-3 * time.Second)) - ClientContainerMemoryMetric = report.MakeSingletonMetric(Now, 0.04).WithFirst(Now.Add(-4 * time.Second)) + ClientContainerCPUMetric = report.MakeSingletonMetric(Now.Add(-3*time.Second), 0.03) + ClientContainerMemoryMetric = report.MakeSingletonMetric(Now.Add(-4*time.Second), 0.04) - ServerContainerCPUMetric = report.MakeSingletonMetric(Now, 0.05).WithFirst(Now.Add(-5 * time.Second)) - ServerContainerMemoryMetric = report.MakeSingletonMetric(Now, 0.06).WithFirst(Now.Add(-6 * time.Second)) + ServerContainerCPUMetric = report.MakeSingletonMetric(Now.Add(-5*time.Second), 0.05) + ServerContainerMemoryMetric = report.MakeSingletonMetric(Now.Add(-6*time.Second), 0.06) - ClientHostCPUMetric = report.MakeSingletonMetric(Now, 0.07).WithFirst(Now.Add(-7 * time.Second)) - ClientHostMemoryMetric = report.MakeSingletonMetric(Now, 0.08).WithFirst(Now.Add(-8 * time.Second)) - ClientHostLoad1Metric = report.MakeSingletonMetric(Now, 0.09).WithFirst(Now.Add(-9 * time.Second)) + ClientHostCPUMetric = report.MakeSingletonMetric(Now.Add(-7*time.Second), 0.07) + ClientHostMemoryMetric = report.MakeSingletonMetric(Now.Add(-8*time.Second), 0.08) + ClientHostLoad1Metric = report.MakeSingletonMetric(Now.Add(-9*time.Second), 0.09) - ServerHostCPUMetric = report.MakeSingletonMetric(Now, 0.12).WithFirst(Now.Add(-12 * time.Second)) - ServerHostMemoryMetric = report.MakeSingletonMetric(Now, 0.13).WithFirst(Now.Add(-13 * time.Second)) - ServerHostLoad1Metric = report.MakeSingletonMetric(Now, 0.14).WithFirst(Now.Add(-14 * time.Second)) + ServerHostCPUMetric = report.MakeSingletonMetric(Now.Add(-12*time.Second), 0.12) + ServerHostMemoryMetric = report.MakeSingletonMetric(Now.Add(-13*time.Second), 0.13) + ServerHostLoad1Metric = report.MakeSingletonMetric(Now.Add(-14*time.Second), 0.14) Report = report.Report{ ID: "test-report",