Skip to content

Commit 4863571

Browse files
dannykoppingsrijan55
dannykopping
authored and
srijan55
committed
Migrating from go-kit/kit/log to the slimmer go-kit/log (cortexproject#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]> Signed-off-by: Manish Kumar Gupta <[email protected]>
1 parent 9c81498 commit 4863571

File tree

255 files changed

+391
-367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

255 files changed

+391
-367
lines changed

‎.errcheck-exclude

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
io/ioutil.WriteFile
22
io/ioutil.ReadFile
3-
(github.com/go-kit/kit/log.Logger).Log
3+
(github.com/go-kit/log.Logger).Log
44
io.Copy
55
(github.com/opentracing/opentracing-go.Tracer).Inject
66
(*github.com/cortexproject/cortex/pkg/util/spanlogger.SpanLogger).Error

‎.golangci.yml

+7
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ linters:
77
- golint
88
- gofmt
99
- misspell
10+
- depguard
1011

1112
linters-settings:
1213
errcheck:
@@ -16,6 +17,12 @@ linters-settings:
1617
goimports:
1718
local-prefixes: "github.com/cortexproject/cortex"
1819

20+
depguard:
21+
list-type: blacklist
22+
include-go-root: true
23+
packages-with-error-message:
24+
- github.com/go-kit/kit/log: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log"
25+
1926
run:
2027
timeout: 5m
2128

‎cmd/blocksconvert/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"os"
88
"strings"
99

10-
"github.com/go-kit/kit/log/level"
10+
"github.com/go-kit/log/level"
1111
"github.com/grafana/dskit/services"
1212
"github.com/prometheus/client_golang/prometheus"
1313
"github.com/weaveworks/common/server"

‎cmd/cortex/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"strings"
1313
"time"
1414

15-
"github.com/go-kit/kit/log/level"
15+
"github.com/go-kit/log/level"
1616
"github.com/grafana/dskit/flagext"
1717
"github.com/pkg/errors"
1818
"github.com/prometheus/client_golang/prometheus"

‎cmd/query-tee/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"flag"
55
"os"
66

7-
"github.com/go-kit/kit/log/level"
7+
"github.com/go-kit/log/level"
88
"github.com/prometheus/client_golang/prometheus"
99
"github.com/prometheus/client_golang/prometheus/collectors"
1010
"github.com/weaveworks/common/logging"

‎cmd/test-exporter/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"math"
66
"time"
77

8-
"github.com/go-kit/kit/log/level"
8+
"github.com/go-kit/log/level"
99
"github.com/grafana/dskit/flagext"
1010
"github.com/prometheus/client_golang/prometheus"
1111
"github.com/weaveworks/common/server"

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
1919
github.com/felixge/fgprof v0.9.1
2020
github.com/fsouza/fake-gcs-server v1.7.0
21-
github.com/go-kit/kit v0.11.0
21+
github.com/go-kit/log v0.1.0
2222
github.com/go-openapi/strfmt v0.20.1
2323
github.com/go-openapi/swag v0.19.15
2424
github.com/go-redis/redis/v8 v8.9.0

‎integration/e2e/logger.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88
"time"
99

10-
"github.com/go-kit/kit/log"
10+
"github.com/go-kit/log"
1111
)
1212

1313
// Global logger to use in integration tests. We use a global logger to simplify

‎integration/e2e/scenario_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/go-kit/kit/log"
12+
"github.com/go-kit/log"
1313
"github.com/stretchr/testify/assert"
1414
"github.com/stretchr/testify/require"
1515
"github.com/thanos-io/thanos/pkg/objstore/s3"

‎integration/e2e/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"strings"
1313
"time"
1414

15-
"github.com/go-kit/kit/log"
15+
"github.com/go-kit/log"
1616
"github.com/grafana/dskit/backoff"
1717
"github.com/pkg/errors"
1818
"github.com/prometheus/common/expfmt"

‎integration/e2ecortex/storage.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/go-kit/kit/log"
8+
"github.com/go-kit/log"
99
"github.com/grafana/dskit/flagext"
1010
"github.com/oklog/ulid"
1111
"github.com/thanos-io/thanos/pkg/objstore"

‎integration/kv_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"testing"
1212
"time"
1313

14-
"github.com/go-kit/kit/log"
14+
"github.com/go-kit/log"
1515
"github.com/grafana/dskit/kv"
1616
"github.com/grafana/dskit/kv/consul"
1717
"github.com/grafana/dskit/kv/etcd"

‎pkg/alertmanager/alertmanager.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"sync"
1414
"time"
1515

16-
"github.com/go-kit/kit/log"
17-
"github.com/go-kit/kit/log/level"
16+
"github.com/go-kit/log"
17+
"github.com/go-kit/log/level"
1818
"github.com/grafana/dskit/flagext"
1919
"github.com/grafana/dskit/services"
2020
"github.com/pkg/errors"

‎pkg/alertmanager/alertmanager_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"flag"
55
"time"
66

7-
"github.com/go-kit/kit/log"
7+
"github.com/go-kit/log"
88
"github.com/pkg/errors"
99
"github.com/prometheus/client_golang/prometheus"
1010
"github.com/prometheus/client_golang/prometheus/promauto"

‎pkg/alertmanager/alertmanager_http.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"net/http"
55
"text/template"
66

7-
"github.com/go-kit/kit/log/level"
7+
"github.com/go-kit/log/level"
88
"github.com/grafana/dskit/services"
99

1010
util_log "github.com/cortexproject/cortex/pkg/util/log"

‎pkg/alertmanager/alertmanager_http_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/go-kit/kit/log"
10+
"github.com/go-kit/log"
1111
"github.com/prometheus/alertmanager/cluster"
1212
"github.com/prometheus/client_golang/prometheus"
1313
"github.com/stretchr/testify/require"

‎pkg/alertmanager/alertmanager_ring.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"os"
77
"time"
88

9-
"github.com/go-kit/kit/log/level"
9+
"github.com/go-kit/log/level"
1010
"github.com/grafana/dskit/flagext"
1111
"github.com/grafana/dskit/kv"
1212

‎pkg/alertmanager/alertmanager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/go-kit/kit/log"
10+
"github.com/go-kit/log"
1111
"github.com/prometheus/alertmanager/config"
1212
"github.com/prometheus/alertmanager/types"
1313
"github.com/prometheus/client_golang/prometheus"

‎pkg/alertmanager/alertstore/bucketclient/bucket_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88
"sync"
99

10-
"github.com/go-kit/kit/log"
10+
"github.com/go-kit/log"
1111
"github.com/gogo/protobuf/proto"
1212
"github.com/pkg/errors"
1313
"github.com/thanos-io/thanos/pkg/objstore"

‎pkg/alertmanager/alertstore/objectclient/store.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99
"sync"
1010

11-
"github.com/go-kit/kit/log"
11+
"github.com/go-kit/log"
1212
"github.com/pkg/errors"
1313
"github.com/thanos-io/thanos/pkg/runutil"
1414

‎pkg/alertmanager/alertstore/store.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/go-kit/kit/log"
7+
"github.com/go-kit/log"
88
"github.com/prometheus/client_golang/prometheus"
99

1010
"github.com/cortexproject/cortex/pkg/alertmanager/alertspb"

‎pkg/alertmanager/alertstore/store_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"errors"
66
"testing"
77

8-
"github.com/go-kit/kit/log"
8+
"github.com/go-kit/log"
99
"github.com/prometheus/alertmanager/cluster/clusterpb"
1010
"github.com/stretchr/testify/assert"
1111
"github.com/stretchr/testify/require"

‎pkg/alertmanager/api.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"github.com/cortexproject/cortex/pkg/util/concurrency"
1717
util_log "github.com/cortexproject/cortex/pkg/util/log"
1818

19-
"github.com/go-kit/kit/log"
20-
"github.com/go-kit/kit/log/level"
19+
"github.com/go-kit/log"
20+
"github.com/go-kit/log/level"
2121
"github.com/pkg/errors"
2222
"github.com/prometheus/alertmanager/config"
2323
"github.com/prometheus/alertmanager/template"

‎pkg/alertmanager/api_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"net/http/httptest"
1010
"testing"
1111

12-
"github.com/go-kit/kit/log"
12+
"github.com/go-kit/log"
1313
"github.com/gorilla/mux"
1414
"github.com/grafana/dskit/flagext"
1515
"github.com/grafana/dskit/services"

‎pkg/alertmanager/distributor.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"strings"
1111
"sync"
1212

13-
"github.com/go-kit/kit/log"
14-
"github.com/go-kit/kit/log/level"
13+
"github.com/go-kit/log"
14+
"github.com/go-kit/log/level"
1515
"github.com/grafana/dskit/services"
1616
"github.com/opentracing/opentracing-go"
1717
"github.com/pkg/errors"

‎pkg/alertmanager/distributor_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"testing"
1414
"time"
1515

16-
"github.com/go-kit/kit/log"
16+
"github.com/go-kit/log"
1717
"github.com/grafana/dskit/flagext"
1818
"github.com/grafana/dskit/kv"
1919
"github.com/grafana/dskit/kv/consul"

‎pkg/alertmanager/multitenant.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"sync"
1414
"time"
1515

16-
"github.com/go-kit/kit/log"
17-
"github.com/go-kit/kit/log/level"
16+
"github.com/go-kit/log"
17+
"github.com/go-kit/log/level"
1818
"github.com/grafana/dskit/flagext"
1919
"github.com/grafana/dskit/kv"
2020
"github.com/grafana/dskit/services"

‎pkg/alertmanager/multitenant_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"testing"
2020
"time"
2121

22-
"github.com/go-kit/kit/log"
22+
"github.com/go-kit/log"
2323
"github.com/grafana/dskit/flagext"
2424
"github.com/grafana/dskit/kv/consul"
2525
"github.com/grafana/dskit/services"

‎pkg/alertmanager/state_persister.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"flag"
66
"time"
77

8-
"github.com/go-kit/kit/log"
9-
"github.com/go-kit/kit/log/level"
8+
"github.com/go-kit/log"
9+
"github.com/go-kit/log/level"
1010
"github.com/grafana/dskit/services"
1111
"github.com/pkg/errors"
1212
"github.com/prometheus/alertmanager/cluster/clusterpb"

‎pkg/alertmanager/state_persister_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"testing"
77
"time"
88

9-
"github.com/go-kit/kit/log"
9+
"github.com/go-kit/log"
1010
"github.com/grafana/dskit/services"
1111
"github.com/prometheus/alertmanager/cluster/clusterpb"
1212
"github.com/stretchr/testify/assert"

‎pkg/alertmanager/state_replication.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
"github.com/prometheus/client_golang/prometheus/promauto"
1010

11-
"github.com/go-kit/kit/log"
12-
"github.com/go-kit/kit/log/level"
11+
"github.com/go-kit/log"
12+
"github.com/go-kit/log/level"
1313
"github.com/grafana/dskit/services"
1414
"github.com/pkg/errors"
1515
"github.com/prometheus/alertmanager/cluster"

‎pkg/alertmanager/state_replication_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/go-kit/kit/log"
12+
"github.com/go-kit/log"
1313
"github.com/grafana/dskit/services"
1414
"github.com/prometheus/alertmanager/cluster/clusterpb"
1515
"github.com/prometheus/client_golang/prometheus"

‎pkg/api/api.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"github.com/NYTimes/gziphandler"
1212
"github.com/felixge/fgprof"
13-
"github.com/go-kit/kit/log"
14-
"github.com/go-kit/kit/log/level"
13+
"github.com/go-kit/log"
14+
"github.com/go-kit/log/level"
1515
"github.com/prometheus/client_golang/prometheus"
1616
"github.com/prometheus/prometheus/storage"
1717
"github.com/weaveworks/common/middleware"

‎pkg/api/handlers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"regexp"
99
"sync"
1010

11-
"github.com/go-kit/kit/log"
11+
"github.com/go-kit/log"
1212
"github.com/gorilla/mux"
1313
"github.com/pkg/errors"
1414
"github.com/prometheus/client_golang/prometheus"

‎pkg/chunk/aws/dynamodb_index_reader.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/aws/aws-sdk-go/aws/client"
1212
"github.com/aws/aws-sdk-go/aws/request"
1313
"github.com/aws/aws-sdk-go/service/dynamodb"
14-
gklog "github.com/go-kit/kit/log"
15-
"github.com/go-kit/kit/log/level"
14+
gklog "github.com/go-kit/log"
15+
"github.com/go-kit/log/level"
1616
"github.com/pkg/errors"
1717
"github.com/prometheus/client_golang/prometheus"
1818
"golang.org/x/sync/errgroup"

‎pkg/chunk/aws/dynamodb_storage_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"strings"
1111
"time"
1212

13-
"github.com/go-kit/kit/log/level"
13+
"github.com/go-kit/log/level"
1414
"github.com/grafana/dskit/backoff"
1515
ot "github.com/opentracing/opentracing-go"
1616
otlog "github.com/opentracing/opentracing-go/log"

‎pkg/chunk/aws/dynamodb_table_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/aws/aws-sdk-go/aws/awserr"
99
"github.com/aws/aws-sdk-go/service/dynamodb"
1010
"github.com/aws/aws-sdk-go/service/dynamodb/dynamodbiface"
11-
"github.com/go-kit/kit/log/level"
11+
"github.com/go-kit/log/level"
1212
"github.com/grafana/dskit/backoff"
1313
"github.com/pkg/errors"
1414
"github.com/prometheus/client_golang/prometheus"

‎pkg/chunk/aws/metrics_autoscaling.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"time"
88

9-
"github.com/go-kit/kit/log/level"
9+
"github.com/go-kit/log/level"
1010
"github.com/pkg/errors"
1111
promApi "github.com/prometheus/client_golang/api"
1212
promV1 "github.com/prometheus/client_golang/api/prometheus/v1"

‎pkg/chunk/aws/mock.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/aws/aws-sdk-go/service/dynamodb/dynamodbiface"
1717
"github.com/aws/aws-sdk-go/service/s3"
1818
"github.com/aws/aws-sdk-go/service/s3/s3iface"
19-
"github.com/go-kit/kit/log/level"
19+
"github.com/go-kit/log/level"
2020

2121
util_log "github.com/cortexproject/cortex/pkg/util/log"
2222
)

‎pkg/chunk/cache/cache.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"flag"
77
"time"
88

9-
"github.com/go-kit/kit/log"
9+
"github.com/go-kit/log"
1010
"github.com/prometheus/client_golang/prometheus"
1111
)
1212

‎pkg/chunk/cache/cache_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"testing"
99
"time"
1010

11-
"github.com/go-kit/kit/log"
11+
"github.com/go-kit/log"
1212
"github.com/prometheus/common/model"
1313
"github.com/prometheus/prometheus/pkg/labels"
1414
"github.com/stretchr/testify/require"

0 commit comments

Comments
 (0)