From cf06d3d7df95a8288293718401f70070c474ed99 Mon Sep 17 00:00:00 2001
From: Marko <marbar3778@yahoo.com>
Date: Mon, 30 Sep 2019 16:06:07 -0700
Subject: [PATCH] Merge PR #5111: Add linters from new golangci version

---
 .golangci.yml         | 9 +++++++++
 types/context_test.go | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.golangci.yml b/.golangci.yml
index fb242043b8..e0936cf935 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -16,6 +16,8 @@ linters:
     - scopelint
     - varcheck
     - godox
+    - funlen
+    - whitespace
 
 issues:
   exclude-rules:
@@ -28,3 +30,10 @@ issues:
     - text: "don't use an underscore in package name"
       linters:
         - golint
+    - text: "ST1003:"
+      linters:
+        - stylecheck
+
+linters-settings:
+  dogsled:
+    max-blank-identifiers: 3
diff --git a/types/context_test.go b/types/context_test.go
index 7d8138f93c..2da1abd6fe 100644
--- a/types/context_test.go
+++ b/types/context_test.go
@@ -91,7 +91,7 @@ func TestLogContext(t *testing.T) {
 	require.Equal(t, *logger.logs, []string{"debug", "info", "error"})
 }
 
-type dummy int64
+type dummy int64 //nolint: unused
 
 func (d dummy) Clone() interface{} {
 	return d