From 39629322a7f06b7d4b5aecdb0ff055e25883b8b0 Mon Sep 17 00:00:00 2001 From: John Ewing Date: Fri, 4 Sep 2020 14:07:38 +0100 Subject: [PATCH 1/2] Remove unneeded string() cast that now triggers vet check in go 1.15 --- cmd/bosun/expr/parse/node.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/bosun/expr/parse/node.go b/cmd/bosun/expr/parse/node.go index 5895a31cd9..23c2c985d6 100644 --- a/cmd/bosun/expr/parse/node.go +++ b/cmd/bosun/expr/parse/node.go @@ -364,10 +364,10 @@ func (b *BinaryNode) Check(t *Tree) error { t1 := b.Args[0].Return() t2 := b.Args[1].Return() if !(t1 == models.TypeSeriesSet || t1 == models.TypeNumberSet || t1 == models.TypeScalar) { - return fmt.Errorf("expected NumberSet, SeriesSet, or Scalar, got %v", string(t1)) + return fmt.Errorf("expected NumberSet, SeriesSet, or Scalar, got %v", t1) } if !(t2 == models.TypeSeriesSet || t2 == models.TypeNumberSet || t2 == models.TypeScalar) { - return fmt.Errorf("expected NumberSet, SeriesSet, or Scalar, got %v", string(t1)) + return fmt.Errorf("expected NumberSet, SeriesSet, or Scalar, got %v", t1) } if err := b.Args[0].Check(t); err != nil { return err From 5f115423195b21efde64d70af33d87c94ebd5f08 Mon Sep 17 00:00:00 2001 From: John Ewing Date: Fri, 4 Sep 2020 17:24:15 +0100 Subject: [PATCH 2/2] Remove string() cast in favour of Itoa --- cmd/scollector/collectors/processes_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/scollector/collectors/processes_linux.go b/cmd/scollector/collectors/processes_linux.go index 71ef20dd91..29f4cd49d1 100644 --- a/cmd/scollector/collectors/processes_linux.go +++ b/cmd/scollector/collectors/processes_linux.go @@ -148,7 +148,7 @@ func linuxProcMonitor(w *WatchedProc, md *opentsdb.MultiDataPoint) error { if err != nil { return fmt.Errorf("failed to convert process rss memory: %v", err) } - if pid == string(os.Getpid()) { + if pid == strconv.Itoa(os.Getpid()) { TotalScollectorMemoryMB = uint64(rss) * uint64(osPageSize) / 1024 / 1024 } totalRSSMem += rss