Migrating from go-kit/kit/log to the slimmer go-kit/log (#4421)

* Migrating from go-kit/kit/log to the slimmer go-kit/log

Signed-off-by: Danny Kopping <[email protected]>

* Appeasing the linter

Signed-off-by: Danny Kopping <[email protected]>

* Fixing tests where log lines are produced with different label orders

Signed-off-by: Danny Kopping <[email protected]>

Author: dannykopping

.errcheck-exclude

@@ -1,6 +1,6 @@
 io/ioutil.WriteFile
 io/ioutil.ReadFile
-(github.com/go-kit/kit/log.Logger).Log
+(github.com/go-kit/log.Logger).Log
 io.Copy
 (github.com/opentracing/opentracing-go.Tracer).Inject
 (*github.com/cortexproject/cortex/pkg/util/spanlogger.SpanLogger).Error

.golangci.yml

@@ -7,6 +7,7 @@ linters:
     - golint
     - gofmt
     - misspell
+    - depguard
 
 linters-settings:
   errcheck:
@@ -16,6 +17,12 @@ linters-settings:
   goimports:
     local-prefixes: "github.com/cortexproject/cortex"
 
+  depguard:
+    list-type: blacklist
+    include-go-root: true
+    packages-with-error-message:
+      - github.com/go-kit/kit/log: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log"
+
 run:
   timeout: 5m
 

cmd/blocksconvert/main.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/services"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/weaveworks/common/server"

cmd/cortex/main.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/flagext"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"

cmd/query-tee/main.go

@@ -4,7 +4,7 @@ import (
 	"flag"
 	"os"
 
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/weaveworks/common/logging"

cmd/test-exporter/main.go

@@ -5,7 +5,7 @@ import (
 	"math"
 	"time"
 
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/flagext"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/weaveworks/common/server"

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
 	github.com/felixge/fgprof v0.9.1
 	github.com/fsouza/fake-gcs-server v1.7.0
-	github.com/go-kit/kit v0.11.0
+	github.com/go-kit/log v0.1.0
 	github.com/go-openapi/strfmt v0.20.1
 	github.com/go-openapi/swag v0.19.15
 	github.com/go-redis/redis/v8 v8.9.0

integration/e2e/logger.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 )
 
 // Global logger to use in integration tests. We use a global logger to simplify

integration/e2e/scenario_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/thanos-io/thanos/pkg/objstore/s3"

integration/e2e/service.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/grafana/dskit/backoff"
 	"github.com/pkg/errors"
 	"github.com/prometheus/common/expfmt"