diff --git a/app/report_lifo.go b/app/report_lifo.go index 9bdc9b7c3..398015a2f 100644 --- a/app/report_lifo.go +++ b/app/report_lifo.go @@ -51,7 +51,7 @@ func NewReportLIFO(r reporter, maxAge time.Duration) *ReportLIFO { case req := <-l.requests: // Request for the current report. - report := report.NewReport() + report := report.MakeReport() for _, r := range l.reports { report.Merge(r.Report) } diff --git a/experimental/demoprobe/generate.go b/experimental/demoprobe/generate.go index 1a44c9e10..0a7039753 100644 --- a/experimental/demoprobe/generate.go +++ b/experimental/demoprobe/generate.go @@ -15,7 +15,7 @@ func init() { // DemoReport makes up a report. func DemoReport(nodeCount int) report.Report { - r := report.NewReport() + r := report.MakeReport() // Make up some plausible IPv4 numbers hosts := []string{} diff --git a/experimental/genreport/generate.go b/experimental/genreport/generate.go index 0de3008f3..79308416e 100644 --- a/experimental/genreport/generate.go +++ b/experimental/genreport/generate.go @@ -15,7 +15,7 @@ func init() { // DemoReport makes up a report. func DemoReport(nodeCount int) report.Report { - r := report.NewReport() + r := report.MakeReport() // Make up some plausible IPv4 numbers hosts := []string{} diff --git a/experimental/graphviz/report_lifo.go b/experimental/graphviz/report_lifo.go index c785e24d7..1f7ba6aa0 100644 --- a/experimental/graphviz/report_lifo.go +++ b/experimental/graphviz/report_lifo.go @@ -50,7 +50,7 @@ func NewReportLIFO(r reporter, maxAge time.Duration) *ReportLIFO { l.reports = cleanOld(l.reports, time.Now().Add(-maxAge)) case req := <-l.requests: - report := report.NewReport() + report := report.MakeReport() for _, r := range l.reports { report.Merge(r.Report) } diff --git a/experimental/oneshot/main.go b/experimental/oneshot/main.go index 9147e636d..8c7ef5e65 100644 --- a/experimental/oneshot/main.go +++ b/experimental/oneshot/main.go @@ -34,7 +34,7 @@ func main() { } defer c.Stop() - report := report.NewReport() + report := report.MakeReport() irq := interrupt() OUTER: for { diff --git a/probe/main.go b/probe/main.go index ce7fb2733..48c34c7c1 100644 --- a/probe/main.go +++ b/probe/main.go @@ -104,7 +104,7 @@ func main() { nodeID = hostname // TODO: we should sanitize the hostname pubTick = time.Tick(*publishInterval) spyTick = time.Tick(*spyInterval) - r = report.NewReport() + r = report.MakeReport() ) for { @@ -113,7 +113,7 @@ func main() { publishTicks.WithLabelValues().Add(1) r.HostMetadatas[nodeID] = hostMetadata(hostname) publisher.Publish(r) - r = report.NewReport() + r = report.MakeReport() case <-spyTick: r.Merge(spy(hostname, hostname, *spyProcs, pms)) diff --git a/probe/spy.go b/probe/spy.go index 422f205de..5d7246421 100644 --- a/probe/spy.go +++ b/probe/spy.go @@ -24,7 +24,7 @@ func spy( spyDuration.WithLabelValues().Observe(float64(time.Since(begin))) }(time.Now()) - r := report.NewReport() + r := report.MakeReport() conns, err := procspy.Connections(includeProcesses) if err != nil { diff --git a/report/report.go b/report/report.go index 086353920..6d2b33b03 100644 --- a/report/report.go +++ b/report/report.go @@ -77,8 +77,8 @@ type Row struct { ValueMinor string `json:"value_minor,omitempty"` // e.g. KB/s } -// NewReport makes a clean report, ready to Merge() other reports into. -func NewReport() Report { +// MakeReport makes a clean report, ready to Merge() other reports into. +func MakeReport() Report { return Report{ Process: NewTopology(), // Transport Topology diff --git a/xfer/collector.go b/xfer/collector.go index a1970ba2c..7f5ffcb08 100644 --- a/xfer/collector.go +++ b/xfer/collector.go @@ -62,7 +62,7 @@ func NewCollector(batchTime time.Duration) Collector { func (c *realCollector) loop(batchTime time.Duration) { var ( tick = tick(batchTime) - current = report.NewReport() + current = report.MakeReport() addrs = map[string]chan struct{}{} wg = &sync.WaitGroup{} // per-address goroutines ) @@ -92,7 +92,7 @@ func (c *realCollector) loop(batchTime time.Duration) { select { case <-tick: c.out <- current - current = report.NewReport() + current = report.MakeReport() case pc := <-c.peekc: pc <- current diff --git a/xfer/merge_test.go b/xfer/merge_test.go index 531fbbd1c..888196583 100644 --- a/xfer/merge_test.go +++ b/xfer/merge_test.go @@ -38,12 +38,12 @@ func TestMerge(t *testing.T) { time.Sleep(batchTime / 10) // connect { - r := report.NewReport() + r := report.MakeReport() r.HostMetadatas["p1"] = report.HostMetadata{Hostname: "test1"} p1.Publish(r) } { - r := report.NewReport() + r := report.MakeReport() r.HostMetadatas["p2"] = report.HostMetadata{Hostname: "test2"} p2.Publish(r) }