Update code to fix almost all pre-existing lint errors (#2008)

* Cleanup linting errors around deadcode

To be specific ineffassign, deadcode and unused errors

Signed-off-by: Nathan Zender <[email protected]>

* Replaced by keysFn and if the config defines it then it will distribute
keys using hashing

Signed-off-by: Nathan Zender <[email protected]>

* Hold over from when readBatch as also the iterator

Now that we have an iterator there is no need to also have a consumed
bool on the underlying object.

Signed-off-by: Nathan Zender <[email protected]>

* Necessary to fix the false sharing problem

Will never actually be used. Only necessary to pad out CPU cache lines.

Signed-off-by: Nathan Zender <[email protected]>

* Removing unused code

Signed-off-by: Nathan Zender <[email protected]>

* Cleanup all gosimple suggestions

Signed-off-by: Nathan Zender <[email protected]>

* Fixing all errcheck

Attempted not to change any existing logic so if an error was ignored we
will now either explicitly ignore it or in the case of a goroutine being
called with a func that is ignoring the error we will just put a
//noling:errcheck on that line.

If it was in a test case we went ahead and did the extra assertion
checks b/c its always good to know where something might have errored in
your test cases.

Signed-off-by: Nathan Zender <[email protected]>

* Fix most staticcheck lint issues

Signed-off-by: Nathan Zender <[email protected]>

* Cleanup deprecated call to snappy.NewWriter

Signed-off-by: Nathan Zender <[email protected]>

* Remove rev from Makefile

Signed-off-by: Nathan Zender <[email protected]>

* Reorder imports

Signed-off-by: Nathan Zender <[email protected]>

* Ignoring this for now

We have opened up issue
#2015 to address the
deprecation of this type.

Signed-off-by: Nathan Zender <[email protected]>

* Explicitly ignoring this error

The test is currently failing due to a data race. I believe it is due to
this bug in golang.

golang/go#30597

As far as this test cares it does not really matter that this happens so
removing the need to check for NoError "fixes" it.

Signed-off-by: Nathan Zender <[email protected]>

* Require noerror since this is a test

Signed-off-by: Nathan Zender <[email protected]>

* Switch over to use require.NoError

Signed-off-by: Nathan Zender <[email protected]>

* Move func to test class since that is only place it was used

Signed-off-by: Nathan Zender <[email protected]>

* Log warning if save to cache errors

Signed-off-by: Nathan Zender <[email protected]>

* Condense a little

Signed-off-by: Nathan Zender <[email protected]>

* Use returned error instead of capturing it

Signed-off-by: Nathan Zender <[email protected]>

* Bringing back ctx and adding comment

Signed-off-by: Nathan Zender <[email protected]>

* Log error if changing ring state fails when Leaving

Signed-off-by: Nathan Zender <[email protected]>

* If context deadline exceeded return the error

Signed-off-by: Nathan Zender <[email protected]>

* Can't defer this otherwise we will have no data

Signed-off-by: Nathan Zender <[email protected]>

* Comment to make it clear why this nolint was added

Signed-off-by: Nathan Zender <[email protected]>

* Refactor method out

Since Fixture is already in testutils and it is being used in both
places pulled it out into a common helper method in the testutils
package.

Signed-off-by: Nathan Zender <[email protected]>

* io.Copy added to global errcheck exclude

Signed-off-by: Nathan Zender <[email protected]>

* If error dont do anything else

Signed-off-by: Nathan Zender <[email protected]>

* Cleanup unused function

Signed-off-by: Nathan Zender <[email protected]>

* Adding tracer to global excludes

Signed-off-by: Nathan Zender <[email protected]>

* Cleanup post rebase

Formatting and import issues that got missed when merging.

Signed-off-by: Nathan Zender <[email protected]>

* Ratelimiter returns resource exhausted error

This is necessary so that when it is used with the backoff retry it will
allow for the backoff to continue to work as expected.

Signed-off-by: Nathan Zender <[email protected]>

Author: zendern

.errcheck-exclude

@@ -1,3 +1,5 @@
 io/ioutil.WriteFile
 io/ioutil.ReadFile
 (github.com/go-kit/kit/log.Logger).Log
+io.Copy
+(github.com/opentracing/opentracing-go.Tracer).Inject

Makefile

@@ -122,7 +122,7 @@ protos: $(PROTO_GOS)
 
 lint:
 	misspell -error docs
-	golangci-lint run --new-from-rev ed7c302fd968 --build-tags netgo --timeout=5m --enable golint --enable misspell --enable gofmt
+	golangci-lint run --build-tags netgo --timeout=5m --enable golint --enable misspell --enable gofmt
 
 	# Validate Kubernetes spec files. Requires:
 	# https://kubeval.instrumenta.dev

cmd/cortex/main_test.go

@@ -161,13 +161,13 @@ func captureOutput(t *testing.T) *capturedOutput {
 	co.wg.Add(1)
 	go func() {
 		defer co.wg.Done()
-		_, _ = io.Copy(&co.stdoutBuf, stdoutR)
+		io.Copy(&co.stdoutBuf, stdoutR)
 	}()
 
 	co.wg.Add(1)
 	go func() {
 		defer co.wg.Done()
-		_, _ = io.Copy(&co.stderrBuf, stderrR)
+		io.Copy(&co.stderrBuf, stderrR)
 	}()
 
 	return co

cmd/test-exporter/main.go

@@ -52,5 +52,6 @@ func main() {
 	}))
 
 	prometheus.MustRegister(runner)
-	server.Run()
+	err = server.Run()
+	util.CheckFatal("running server", err)
 }

pkg/alertmanager/alertmanager.go

@@ -78,6 +78,8 @@ func init() {
 			// from disk, we just ignore web-based reload signals. Config updates are
 			// only applied externally via ApplyConfig().
 			case <-webReload:
+			default:
+				continue
 			}
 		}
 	}()
@@ -176,7 +178,7 @@ func clusterWait(p *cluster.Peer, timeout time.Duration) func() time.Duration {
 
 // ApplyConfig applies a new configuration to an Alertmanager.
 func (am *Alertmanager) ApplyConfig(userID string, conf *config.Config) error {
-	templateFiles := make([]string, len(conf.Templates), len(conf.Templates))
+	templateFiles := make([]string, len(conf.Templates))
 	if len(conf.Templates) > 0 {
 		for i, t := range conf.Templates {
 			templateFiles[i] = filepath.Join(am.cfg.DataDir, "templates", userID, t)

pkg/chunk/aws/dynamodb_storage_client.go

@@ -245,7 +245,7 @@ func (a dynamoDBStorageClient) BatchWrite(ctx context.Context, input chunk.Write
 			if awsErr, ok := err.(awserr.Error); ok && ((awsErr.Code() == dynamodb.ErrCodeProvisionedThroughputExceededException) || request.Retryable()) {
 				logWriteRetry(ctx, requests)
 				unprocessed.TakeReqs(requests, -1)
-				a.writeThrottle.WaitN(ctx, len(requests))
+				_ = a.writeThrottle.WaitN(ctx, len(requests))
 				backoff.Wait()
 				continue
 			} else if ok && awsErr.Code() == validationException {
@@ -269,7 +269,7 @@ func (a dynamoDBStorageClient) BatchWrite(ctx context.Context, input chunk.Write
 		unprocessedItems := dynamoDBWriteBatch(resp.UnprocessedItems)
 		if len(unprocessedItems) > 0 {
 			logWriteRetry(ctx, unprocessedItems)
-			a.writeThrottle.WaitN(ctx, unprocessedItems.Len())
+			_ = a.writeThrottle.WaitN(ctx, unprocessedItems.Len())
 			unprocessed.TakeReqs(unprocessedItems, -1)
 		}
 

pkg/chunk/aws/dynamodb_storage_client_test.go

@@ -17,7 +17,8 @@ const (
 
 func TestChunksPartialError(t *testing.T) {
 	fixture := dynamoDBFixture(0, 10, 20)
-	defer fixture.Teardown()
+	defer testutils.TeardownFixture(t, fixture)
+
 	_, client, err := testutils.Setup(fixture, tableName)
 	require.NoError(t, err)
 

pkg/chunk/aws/dynamodb_table_client.go

@@ -80,7 +80,7 @@ func (d dynamoTableClient) backoffAndRetry(ctx context.Context, fn func(context.
 
 func (d callManager) backoffAndRetry(ctx context.Context, fn func(context.Context) error) error {
 	if d.limiter != nil { // Tests will have a nil limiter.
-		d.limiter.Wait(ctx)
+		_ = d.limiter.Wait(ctx)
 	}
 
 	backoff := util.NewBackoff(ctx, d.backoffConfig)

pkg/chunk/aws/mock.go

@@ -56,6 +56,7 @@ func (a dynamoDBStorageClient) setErrorParameters(provisionedErr, errAfter int)
 	}
 }
 
+//nolint:unused //Leaving this around in the case we need to create a table via mock this is useful.
 func (m *mockDynamoDBClient) createTable(name string) {
 	m.mtx.Lock()
 	defer m.mtx.Unlock()

pkg/chunk/cache/fifo_cache.go

@@ -228,7 +228,7 @@ func (c *FifoCache) Get(ctx context.Context, key string) (interface{}, bool) {
 	index, ok := c.index[key]
 	if ok {
 		updated := c.entries[index].updated
-		if c.validity == 0 || time.Now().Sub(updated) < c.validity {
+		if c.validity == 0 || time.Since(updated) < c.validity {
 			return c.entries[index].value, true
 		}