From 0dc0ac8a3d4febd7c8ebe0ed175557977f6d3863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Wed, 4 Aug 2021 02:21:38 +0200 Subject: [PATCH] Replace go-kit/kit with go-kit/log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See also: https://github.com/prometheus/common/pull/304 Signed-off-by: Manuel Rüger --- api/v1/api.go | 4 ++-- api/v1/api_test.go | 2 +- go.mod | 2 +- go.sum | 2 ++ handler/delete.go | 4 ++-- handler/handler_test.go | 2 +- handler/push.go | 4 ++-- handler/status.go | 4 ++-- handler/wipe.go | 4 ++-- main.go | 4 ++-- storage/diskmetricstore.go | 4 ++-- storage/diskmetricstore_test.go | 2 +- 12 files changed, 20 insertions(+), 18 deletions(-) diff --git a/api/v1/api.go b/api/v1/api.go index dda973f9..16376186 100644 --- a/api/v1/api.go +++ b/api/v1/api.go @@ -18,8 +18,8 @@ import ( "net/http" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/common/route" dto "github.com/prometheus/client_model/go" diff --git a/api/v1/api_test.go b/api/v1/api_test.go index ddc8f0c8..c8bd3149 100644 --- a/api/v1/api_test.go +++ b/api/v1/api_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" //nolint:staticcheck // Ignore SA1019. Dependencies use the deprecated package, so we have to, too. "github.com/golang/protobuf/proto" diff --git a/go.mod b/go.mod index eefd9726..b4b118ea 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/prometheus/pushgateway require ( - github.com/go-kit/kit v0.10.0 + github.com/go-kit/log v0.1.0 github.com/golang/protobuf v1.5.1 github.com/matttproud/golang_protobuf_extensions v1.0.1 github.com/prometheus/client_golang v1.10.0 diff --git a/go.sum b/go.sum index b699e7a2..929ff9c1 100644 --- a/go.sum +++ b/go.sum @@ -62,6 +62,8 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0 h1:dXFJfIHVvUcpSgDOV+Ne6t7jXri8Tfv2uOLHUZ2XNuo= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-kit/log v0.1.0 h1:DGJh0Sm43HbOeYDNnVZFl8BvcYVvjD5bqYJvp0REbwQ= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4= diff --git a/handler/delete.go b/handler/delete.go index b01c1fd6..2b4de2ef 100644 --- a/handler/delete.go +++ b/handler/delete.go @@ -19,8 +19,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/common/route" "github.com/prometheus/pushgateway/storage" diff --git a/handler/handler_test.go b/handler/handler_test.go index 95d3a635..558fe05f 100644 --- a/handler/handler_test.go +++ b/handler/handler_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" //nolint:staticcheck // Ignore SA1019. Dependencies use the deprecated package, so we have to, too. "github.com/golang/protobuf/proto" "github.com/matttproud/golang_protobuf_extensions/pbutil" diff --git a/handler/push.go b/handler/push.go index 668fc9a1..1792e960 100644 --- a/handler/push.go +++ b/handler/push.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/matttproud/golang_protobuf_extensions/pbutil" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/common/expfmt" diff --git a/handler/status.go b/handler/status.go index 76a21b05..fc6d8b2b 100644 --- a/handler/status.go +++ b/handler/status.go @@ -23,8 +23,8 @@ import ( "strconv" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/common/version" "github.com/prometheus/pushgateway/storage" diff --git a/handler/wipe.go b/handler/wipe.go index ea56ad19..ee916d8e 100644 --- a/handler/wipe.go +++ b/handler/wipe.go @@ -17,8 +17,8 @@ import ( "net/http" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/pushgateway/storage" ) diff --git a/main.go b/main.go index 0c47d9d8..47b46c35 100644 --- a/main.go +++ b/main.go @@ -27,8 +27,8 @@ import ( "syscall" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/common/promlog" diff --git a/storage/diskmetricstore.go b/storage/diskmetricstore.go index 56695375..2013585d 100644 --- a/storage/diskmetricstore.go +++ b/storage/diskmetricstore.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" //nolint:staticcheck // Ignore SA1019. Dependencies use the deprecated package, so we have to, too. "github.com/golang/protobuf/proto" diff --git a/storage/diskmetricstore_test.go b/storage/diskmetricstore_test.go index 81dfc695..aa536908 100644 --- a/storage/diskmetricstore_test.go +++ b/storage/diskmetricstore_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" //nolint:staticcheck // Ignore SA1019. Dependencies use the deprecated package, so we have to, too. "github.com/golang/protobuf/proto" "github.com/prometheus/client_golang/prometheus"