Update dependencies and drop large go-kit update

Pulling in the same changes as done in prometheus/common#255 Signed-off-by: John Howard <howardjohn@google.com>
howardjohn · Jun 3, 2021 · c5113b7 · c5113b7
1 parent 1a86938
commit c5113b7
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 297 deletions.
diff --git a/bridge_test.go b/bridge_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"
 

diff --git a/exporter_benchmark_test.go b/exporter_benchmark_test.go
@@ -17,7 +17,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 
 	"github.com/prometheus/client_golang/prometheus"
 

diff --git a/go.mod b/go.mod
@@ -1,11 +1,11 @@
 module github.com/prometheus/statsd_exporter
 
 require (
-	github.com/go-kit/kit v0.10.0
+	github.com/go-kit/log v0.1.0
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
-	github.com/prometheus/client_golang v1.9.0
+	github.com/prometheus/client_golang v1.10.1-0.20210603120351-253906201bda
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.19.0
+	github.com/prometheus/common v0.26.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/yaml.v2 v2.4.0
 )

diff --git a/go.sum b/go.sum
diff --git a/line_benchmark_test.go b/line_benchmark_test.go
@@ -16,7 +16,7 @@ package main
 import (
 	"testing"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 
 	"github.com/prometheus/statsd_exporter/pkg/line"
 )

diff --git a/main.go b/main.go
@@ -24,8 +24,8 @@ import (
 	"strconv"
 	"syscall"
 
-	"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/pkg/exporter/exporter.go b/pkg/exporter/exporter.go
@@ -17,8 +17,8 @@ import (
 	"os"
 	"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/statsd_exporter/pkg/clock"

diff --git a/pkg/exporter/exporter_test.go b/pkg/exporter/exporter_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"
 

diff --git a/pkg/line/line.go b/pkg/line/line.go
@@ -19,8 +19,8 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"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/statsd_exporter/pkg/event"

diff --git a/pkg/line/line_test.go b/pkg/line/line_test.go
@@ -17,7 +17,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/prometheus/statsd_exporter/pkg/event"

diff --git a/pkg/listener/listener.go b/pkg/listener/listener.go
@@ -20,8 +20,8 @@ import (
 	"os"
 	"strings"
 
-	"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/statsd_exporter/pkg/event"