Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace go-kit/kit with go-kit/log, update dependencies #413

Merged
merged 2 commits into from Aug 12, 2021
Merged

Replace go-kit/kit with go-kit/log, update dependencies #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dc0ac8
Replace go-kit/kit with go-kit/log
mrueg Aug 4, 2021
ed2c399
go.mod: Update dependencies
mrueg Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/v1/api.go
View file
Open in desktop
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion api/v1/api_test.go
View file
Open in desktop
Expand Up @@ -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"

Expand Down
10 changes: 5 additions & 5 deletions go.mod
View file
Open in desktop
@@ -1,13 +1,13 @@
module github.com/prometheus/pushgateway

require (
github.com/go-kit/kit v0.10.0
github.com/golang/protobuf v1.5.1
github.com/go-kit/log v0.1.0
github.com/golang/protobuf v1.5.2
github.com/matttproud/golang_protobuf_extensions v1.0.1
github.com/prometheus/client_golang v1.10.0
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.19.0
github.com/prometheus/exporter-toolkit v0.5.1
github.com/prometheus/common v0.30.0
github.com/prometheus/exporter-toolkit v0.6.1
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
gopkg.in/alecthomas/kingpin.v2 v2.2.6
Expand Down
501 changes: 275 additions & 226 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions handler/delete.go
View file
Open in desktop
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion handler/handler_test.go
View file
Open in desktop
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions handler/push.go
View file
Open in desktop
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions handler/status.go
View file
Open in desktop
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions handler/wipe.go
View file
Open in desktop
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions main.go
View file
Open in desktop
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions storage/diskmetricstore.go
View file
Open in desktop
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion storage/diskmetricstore_test.go
View file
Open in desktop
Expand Up @@ -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"
Expand Down