cleanup: lint go code

Pranay0302 · Pranay0302 · commit 04c69b1b916f · 2021-01-30T20:25:17.000+05:30
at present 202 problems (51 errors) (151 warnings)
diff --git a/examples/golang/main.go b/examples/golang/main.go
@@ -6,10 +6,8 @@ import (
 	"github.com/pyroscope-io/pyroscope/pkg/agent/profiler"
 )
 
-func work(n int) {
-	for i := 0; i < n; i++ {
+func work(int) {
 
-	}
 }
 
 func fastFunction() {
diff --git a/pkg/agent/gospy/gospy.go b/pkg/agent/gospy/gospy.go
@@ -23,11 +23,11 @@ type GoSpy struct {
 	selfFrame *runtime.Frame
 }
 
-func Start(_pid int) (spy.Spy, error) {
+func Start(_ int) (spy.Spy, error) {
 	return &GoSpy{}, nil
 }
 
-func (s *GoSpy) Stop() error {
+func (*GoSpy) Stop() error {
 	return nil
 }
 
diff --git a/pkg/agent/selfprofile.go b/pkg/agent/selfprofile.go
@@ -7,7 +7,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func SelfProfile(cfg *config.Config, u upstream.Upstream, appName string) {
+func SelfProfile(_ *config.Config, u upstream.Upstream, appName string) {
 	// TODO: add sample rate
 	s := NewSession(u, appName, "gospy", 100, 0, false)
 	err := s.Start()
diff --git a/pkg/exec/cli.go b/pkg/exec/cli.go
@@ -195,12 +195,12 @@ func generateSeed(args []string) string {
 
 func generateCredentialsDrop() (*syscall.Credential, error) {
 	sudoUser := os.Getenv("SUDO_USER")
-	sudoUid := os.Getenv("SUDO_UID")
+	sudoUID := os.Getenv("SUDO_UID")
 	sudoGid := os.Getenv("SUDO_GID")
 
-	logrus.Infof("dropping permissions, running command as %q (%s/%s)", sudoUser, sudoUid, sudoGid)
+	logrus.Infof("dropping permissions, running command as %q (%s/%s)", sudoUser, sudoUID, sudoGid)
 
-	uid, err := strconv.Atoi(sudoUid)
+	uid, err := strconv.Atoi(sudoUID)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/server/controller.go b/pkg/server/controller.go
@@ -100,11 +100,11 @@ func renderServerError(rw http.ResponseWriter, text string) {
 	rw.Write([]byte("\n"))
 }
 
-type indexPageJson struct {
+type indexPageJSON struct {
 	AppNames []string `json:"appNames"`
 }
 
-type buildInfoJson struct {
+type bi struct {
 	GOOS              string `json:"goos"`
 	GOARCH            string `json:"goarch"`
 	Version           string `json:"version"`
@@ -121,7 +121,7 @@ type indexPage struct {
 	ExtraMetadata string
 }
 
-func (ctrl *Controller) renderIndexPage(dir http.FileSystem, rw http.ResponseWriter, r *http.Request) {
+func (ctrl *Controller) renderIndexPage(dir http.FileSystem, rw http.ResponseWriter, _ *http.Request) {
 	f, err := dir.Open("/index.html")
 	if err != nil {
 		renderServerError(rw, fmt.Sprintf("could not find file index.html: %q", err))
@@ -140,7 +140,7 @@ func (ctrl *Controller) renderIndexPage(dir http.FileSystem, rw http.ResponseWri
 		return
 	}
 
-	initialStateObj := indexPageJson{}
+	initialStateObj := indexPageJSON{}
 	ctrl.s.GetValues("__name__", func(v string) bool {
 		initialStateObj.AppNames = append(initialStateObj.AppNames, v)
 		return true
@@ -152,7 +152,7 @@ func (ctrl *Controller) renderIndexPage(dir http.FileSystem, rw http.ResponseWri
 	}
 	initialStateStr := string(b)
 
-	buildInfoObj := buildInfoJson{
+	buildInfoObj := bi{
 		GOOS:              runtime.GOOS,
 		GOARCH:            runtime.GOARCH,
 		Version:           build.Version,
diff --git a/pkg/server/labels.go b/pkg/server/labels.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 )
 
-func (ctrl *Controller) labelsHandler(w http.ResponseWriter, r *http.Request) {
+func (ctrl *Controller) labelsHandler(w http.ResponseWriter, _ *http.Request) {
 	res := []string{}
 	ctrl.s.GetKeys(func(k string) bool {
 		res = append(res, k)
@@ -19,7 +19,7 @@ func (ctrl *Controller) labelsHandler(w http.ResponseWriter, r *http.Request) {
 	w.Write(b)
 }
 
-func (ctrl *Controller) labelValuesHandler(w http.ResponseWriter, r *http.Request) {
+func (ctrl *Controller) labelValuesHandler(w http.ResponseWriter, _ *http.Request) {
 	res := []string{}
 	labelName := r.URL.Query().Get("label")
 	ctrl.s.GetValues(labelName, func(v string) bool {
diff --git a/pkg/storage/dict/trie.go b/pkg/storage/dict/trie.go
@@ -115,7 +115,6 @@ OuterLoop:
 				continue OuterLoop
 			} else {
 				// 2
-
 				varint.Write(w, uint64(leadIndex))
 				varint.Write(w, uint64(len(leadKey)))
 				return
diff --git a/pkg/storage/dimension/serialization.go b/pkg/storage/dimension/serialization.go
@@ -16,7 +16,11 @@ func (s *Dimension) Serialize(w io.Writer) error {
 
 	for _, k := range s.keys {
 		varint.Write(w, uint64(len(k)))
-		w.Write([]byte(k))
+		if err != nil {
+			return nil
+		} else {
+			w.Write([]byte(k))
+		}
 	}
 	return nil
 }
diff --git a/pkg/storage/labels/labels.go b/pkg/storage/labels/labels.go
@@ -11,7 +11,7 @@ type Labels struct {
 	db *badger.DB
 }
 
-func New(cfg *config.Config, db *badger.DB) *Labels {
+func New(_, db *badger.DB) *Labels {
 	ll := &Labels{
 		db: db,
 	}
diff --git a/pkg/storage/segment/segment.go b/pkg/storage/segment/segment.go
@@ -66,7 +66,7 @@ func (sn *streeNode) findAddons() []Addon {
 	return res
 }
 
-func (sn *streeNode) put(st, et time.Time, samples uint64, cb func(n *streeNode, depth int, dt time.Time, r *big.Rat, addons []Addon)) {
+func (sn *streeNode) put(st, et time.Time, _ uint64, cb func(n *streeNode, depth int, dt time.Time, r *big.Rat, addons []Addon)) {
 	nodes := []*streeNode{sn}
 
 	for len(nodes) > 0 {
diff --git a/pkg/storage/segment/segment_test.go b/pkg/storage/segment/segment_test.go
@@ -156,13 +156,10 @@ var _ = Describe("stree", func() {
 
 			It("works with 3 mins", func() {
 				s := New(r, m)
-
 				s.Put(testing.SimpleTime(10), testing.SimpleTime(70), 1, func(de int, t time.Time, r *big.Rat, a []Addon) {})
 				Expect(s.root).ToNot(BeNil())
 				Expect(s.root.depth).To(Equal(1))
-
 				spew.Dump(s.root)
-
 				// Expect(doGet(s, testing.SimpleTime(20, testing.SimpleTime(49))).To(HaveLen(3))
 			})
 
diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go
@@ -24,7 +24,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-var closingErr = errors.New("the db is in closing state")
+var errFoo = errors.New("the db is in closing state")
 
 type Storage struct {
 	closingMutex sync.Mutex
@@ -171,7 +171,7 @@ func (s *Storage) Put(startTime, endTime time.Time, key *Key, val *tree.Tree, sp
 	defer s.closingMutex.Unlock()
 
 	if s.closing {
-		return closingErr
+		return errFoo
 	}
 	logrus.WithFields(logrus.Fields{
 		"startTime": startTime.String(),
@@ -218,7 +218,7 @@ func (s *Storage) Get(startTime, endTime time.Time, key *Key) (*tree.Tree, *segm
 	defer s.closingMutex.Unlock()
 
 	if s.closing {
-		return nil, nil, "", 100, closingErr
+		return nil, nil, "", 100, errFoo
 	}
 
 	logrus.WithFields(logrus.Fields{
@@ -308,7 +308,7 @@ func (s *Storage) DiskUsage() map[string]bytesize.ByteSize {
 		"dimensions": 0,
 		"segments":   0,
 	}
-	for k, _ := range res {
+	for k := range res {
 		res[k] = dirSize(filepath.Join(s.cfg.Server.StoragePath, k))
 	}
 	return res
diff --git a/pkg/storage/tree/serialize_test.go b/pkg/storage/tree/serialize_test.go
@@ -22,7 +22,6 @@ var _ = Describe("tree package", func() {
 		It("returns correct results", func() {
 			Expect(tree.root.ChildrenNodes).To(HaveLen(1))
 		})
-
 	})
 
 	Context("trie.Serialize(d, )", func() {
diff --git a/pkg/storage/tree/tree.go b/pkg/storage/tree/tree.go
@@ -115,7 +115,7 @@ func (tn *treeNode) insert(targetLabel []byte) *treeNode {
 	return tn.ChildrenNodes[i]
 }
 
-func (t *Tree) Insert(key []byte, value uint64, merge ...bool) {
+func (t *Tree) Insert(key []byte, value uint64, _ ...bool) {
 	t.m.Lock()
 	defer t.m.Unlock()
 
diff --git a/pkg/structs/cappedarr/cappedarr_test.go b/pkg/structs/cappedarr/cappedarr_test.go
@@ -12,7 +12,6 @@ var _ = Describe("cappedarr", func() {
 	defer GinkgoRecover()
 	Context("simple case", func() {
 		It("works", func() {
-
 			values := []uint64{1, 2, 3, 4, 5, 6}
 			for i := 0; i < 1000; i++ {
 				ca := New(4)
diff --git a/pkg/structs/merge/merge.go b/pkg/structs/merge/merge.go
@@ -49,7 +49,7 @@ func MergeTriesConcurrently(concurrency int, tries ...Merger) Merger {
 	return pool[0]
 }
 
-func MergeTriesSerially(concurrency int, tries ...Merger) Merger {
+func MergeTriesSerially(_ int, tries ...Merger) Merger {
 	// rand.Shuffle(len(tries), func(i, j int) {
 	// 	tries[i], tries[j] = tries[j], tries[i]
 	// })
diff --git a/pkg/structs/transporttrie/trie_test.go b/pkg/structs/transporttrie/trie_test.go
@@ -207,7 +207,6 @@ var _ = Describe("trie package", func() {
 				Expect(buf4).To(Equal(buf3))
 			}
 			close(done)
-
 		}, 1.0)
 	})
 
diff --git a/pkg/testing/tmpdir.go b/pkg/testing/tmpdir.go
@@ -17,9 +17,9 @@ func DirStats(path string) (directories int, files int, size bytesize.ByteSize)
 			return err
 		}
 		if info.IsDir() {
-			directories += 1
+			directories++
 		} else {
-			files += 1
+			files++
 			size += bytesize.ByteSize(info.Size())
 		}
 		return nil
diff --git a/pkg/util/attime/attime.go b/pkg/util/attime/attime.go
@@ -46,7 +46,7 @@ func Parse(s string) time.Time {
 	return parseTimeReference(ref).Add(parseTimeOffset(offset))
 }
 
-func parseTimeReference(ref string) time.Time {
+func parseTimeReference(_ string) time.Time {
 	now := time.Now()
 	// TODO: implement
 	return now

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,8 @@ import (`
`6`	`6`	`"github.com/pyroscope-io/pyroscope/pkg/agent/profiler"`
`7`	`7`	`)`
`8`	`8`
`9`		`-func work(n int) {`
`10`		`- for i := 0; i < n; i++ {`
	`9`	`+func work(int) {`
`11`	`10`
`12`		`- }`
`13`	`11`	`}`
`14`	`12`
`15`	`13`	`func fastFunction() {`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,11 @@ type GoSpy struct {`
`23`	`23`	`selfFrame *runtime.Frame`
`24`	`24`	`}`
`25`	`25`
`26`		`-func Start(_pid int) (spy.Spy, error) {`
	`26`	`+func Start(_ int) (spy.Spy, error) {`
`27`	`27`	`return &GoSpy{}, nil`
`28`	`28`	`}`
`29`	`29`
`30`		`-func (s *GoSpy) Stop() error {`
	`30`	`+func (*GoSpy) Stop() error {`
`31`	`31`	`return nil`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"github.com/sirupsen/logrus"`
`8`	`8`	`)`
`9`	`9`
`10`		`-func SelfProfile(cfg *config.Config, u upstream.Upstream, appName string) {`
	`10`	`+func SelfProfile(_ *config.Config, u upstream.Upstream, appName string) {`
`11`	`11`	`// TODO: add sample rate`
`12`	`12`	`s := NewSession(u, appName, "gospy", 100, 0, false)`
`13`	`13`	`err := s.Start()`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,11 @@ func (s *Dimension) Serialize(w io.Writer) error {`
`16`	`16`
`17`	`17`	`for _, k := range s.keys {`
`18`	`18`	`varint.Write(w, uint64(len(k)))`
`19`		`- w.Write([]byte(k))`
	`19`	`+ if err != nil {`
	`20`	`+ return nil`
	`21`	`+ } else {`
	`22`	`+ w.Write([]byte(k))`
	`23`	`+ }`
`20`	`24`	`}`
`21`	`25`	`return nil`
`22`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ type Labels struct {`
`11`	`11`	`db *badger.DB`
`12`	`12`	`}`
`13`	`13`
`14`		`-func New(cfg config.Config, db badger.DB) *Labels {`
	`14`	`+func New(_, db badger.DB) Labels {`
`15`	`15`	`ll := &Labels{`
`16`	`16`	`db: db,`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func (sn *streeNode) findAddons() []Addon {`
`66`	`66`	`return res`
`67`	`67`	`}`
`68`	`68`
`69`		`-func (sn streeNode) put(st, et time.Time, samples uint64, cb func(n streeNode, depth int, dt time.Time, r *big.Rat, addons []Addon)) {`
	`69`	`+func (sn streeNode) put(st, et time.Time, _ uint64, cb func(n streeNode, depth int, dt time.Time, r *big.Rat, addons []Addon)) {`
`70`	`70`	`nodes := []*streeNode{sn}`
`71`	`71`
`72`	`72`	`for len(nodes) > 0 {`