Merge pull request #560 from Harkishen-Singh/fix-log-level

SuperQ · web-flow · commit 017e060f2f56 · 2022-01-14T17:11:21.000+01:00
Fix broken log-level for values other than debug.
diff --git a/cmd/postgres_exporter/datasource.go b/cmd/postgres_exporter/datasource.go
@@ -21,7 +21,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
diff --git a/cmd/postgres_exporter/main.go b/cmd/postgres_exporter/main.go
@@ -17,8 +17,8 @@ import (
 	"net/http"
 	"os"
 
-	"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/cmd/postgres_exporter/namespace.go b/cmd/postgres_exporter/namespace.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/lib/pq"
 	"github.com/prometheus/client_golang/prometheus"
 )
diff --git a/cmd/postgres_exporter/pg_setting.go b/cmd/postgres_exporter/pg_setting.go
@@ -19,7 +19,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
diff --git a/cmd/postgres_exporter/postgres_exporter.go b/cmd/postgres_exporter/postgres_exporter.go
@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
diff --git a/cmd/postgres_exporter/queries.go b/cmd/postgres_exporter/queries.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"github.com/blang/semver"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"gopkg.in/yaml.v2"
 )
 
diff --git a/cmd/postgres_exporter/server.go b/cmd/postgres_exporter/server.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
diff --git a/cmd/postgres_exporter/util.go b/cmd/postgres_exporter/util.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"github.com/lib/pq"
 )
 
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.14
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/go-kit/kit v0.11.0
+	github.com/go-kit/log v0.1.0
 	github.com/lib/pq v1.10.1
 	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
diff --git a/go.sum b/go.sum
diff --git a/scripts/errcheck_excludes.txt b/scripts/errcheck_excludes.txt
@@ -1,2 +1,2 @@
 // Never check for logger errors.
-(github.com/go-kit/kit/log.Logger).Log
+(github.com/go-kit/log.Logger).Log

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"regexp"`
`22`	`22`	`"strings"`
`23`	`23`
`24`		`- "github.com/go-kit/kit/log/level"`
	`24`	`+ "github.com/go-kit/log/level"`
`25`	`25`	`"github.com/prometheus/client_golang/prometheus"`
`26`	`26`	`)`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"time"`
`21`	`21`
`22`	`22`	`"github.com/blang/semver"`
`23`		`- "github.com/go-kit/kit/log/level"`
	`23`	`+ "github.com/go-kit/log/level"`
`24`	`24`	`"github.com/lib/pq"`
`25`	`25`	`"github.com/prometheus/client_golang/prometheus"`
`26`	`26`	`)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`"strconv"`
`20`	`20`	`"strings"`
`21`	`21`
`22`		`- "github.com/go-kit/kit/log/level"`
	`22`	`+ "github.com/go-kit/log/level"`
`23`	`23`	`"github.com/prometheus/client_golang/prometheus"`
`24`	`24`	`)`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`"time"`
`26`	`26`
`27`	`27`	`"github.com/blang/semver"`
`28`		`- "github.com/go-kit/kit/log/level"`
	`28`	`+ "github.com/go-kit/log/level"`
`29`	`29`	`"github.com/prometheus/client_golang/prometheus"`
`30`	`30`	`)`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`"fmt"`
`19`	`19`
`20`	`20`	`"github.com/blang/semver"`
`21`		`- "github.com/go-kit/kit/log/level"`
	`21`	`+ "github.com/go-kit/log/level"`
`22`	`22`	`"gopkg.in/yaml.v2"`
`23`	`23`	`)`
`24`	`24`
-Original file line number
+Diff line change
 require (
 	github.com/blang/semver v3.5.1+incompatible
 -	github.com/go-kit/kit v0.11.0
 +	github.com/go-kit/log v0.1.0
 	github.com/lib/pq v1.10.1
 	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`// Never check for logger errors.`
`2`		`-(github.com/go-kit/kit/log.Logger).Log`
	`2`	`+(github.com/go-kit/log.Logger).Log`