Add ErrorLog plumbing to promhttp

Fix the error logging of the promhttp handler by connecting it to the promlog setup. * Switch to go-kit/log. * Cleanup CHANGELOG. Fixes: #1886 Signed-off-by: Ben Kochie <superq@gmail.com>
prometheus · Jun 3, 2021 · 3bc9a93 · 3bc9a93
1 parent 220aa5b
commit 3bc9a93
Show file tree

Hide file tree

Showing 100 changed files with 155 additions and 145 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,16 @@
 ## master / unreleased
 
-* [CHANGE] Rename flags `collector.filesystem.ignored-mount-points` and `collector.filesystem.ignored-fs-types` to match other collectors
+* [CHANGE]
 * [FEATURE]
 * [ENHANCEMENT]
 * [BUGFIX]
 
-Note: Ignoring invalid network speed will be the default in 2.x
+NOTE: Ignoring invalid network speed will be the default in 2.x
+NOTE: Filesystem collector flags have been renamed. `--collector.filesystem.ignored-mount-points` is now `--collector.filesystem.mount-points-exclude` and `--collector.filesystem.ignored-fs-types` is now `--collector.filesystem.fs-types-exclude`. The old flags will be removed in 2.x.
 
+* [CHANGE] Rename filesystem collector flags to match other collectors #2012
 * [FEATURE] Add flag to ignore network speed if it is unknown #1989
+* [BUGFIX] Add ErrorLog plumbing to promhttp #1887
 
 ## 1.1.2 / 2021-03-05
 

diff --git a/collector/arp_linux.go b/collector/arp_linux.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

diff --git a/collector/bcache_linux.go b/collector/bcache_linux.go
@@ -18,7 +18,7 @@ package collector
 import (
 	"fmt"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/procfs/bcache"
 	"gopkg.in/alecthomas/kingpin.v2"

diff --git a/collector/bonding_linux.go b/collector/bonding_linux.go
@@ -23,8 +23,8 @@ import (
 	"path/filepath"
 	"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"
 )
 

diff --git a/collector/boot_time_bsd.go b/collector/boot_time_bsd.go
@@ -17,7 +17,7 @@
 package collector
 
 import (
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

diff --git a/collector/boot_time_openbsd_amd64.go b/collector/boot_time_openbsd_amd64.go
@@ -16,7 +16,7 @@
 package collector
 
 import (
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/sys/unix"
 	"unsafe"

diff --git a/collector/boot_time_solaris.go b/collector/boot_time_solaris.go
@@ -17,7 +17,7 @@
 package collector
 
 import (
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/siebenmann/go-kstat"
 )

diff --git a/collector/btrfs_linux.go b/collector/btrfs_linux.go
@@ -18,7 +18,7 @@ package collector
 import (
 	"fmt"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/procfs/btrfs"
 )

diff --git a/collector/buddyinfo.go b/collector/buddyinfo.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"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/procfs"
 )

diff --git a/collector/collector.go b/collector/collector.go
@@ -20,8 +20,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/client_golang/prometheus"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

diff --git a/collector/conntrack_linux.go b/collector/conntrack_linux.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"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"
 )
 

diff --git a/collector/cpu_darwin.go b/collector/cpu_darwin.go
@@ -25,7 +25,7 @@ import (
 	"strconv"
 	"unsafe"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

diff --git a/collector/cpu_dragonfly.go b/collector/cpu_dragonfly.go
@@ -20,7 +20,7 @@ import (
 	"strconv"
 	"unsafe"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

diff --git a/collector/cpu_freebsd.go b/collector/cpu_freebsd.go
@@ -21,8 +21,8 @@ import (
 	"strconv"
 	"unsafe"
 
-	"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"
 	"golang.org/x/sys/unix"
 )

diff --git a/collector/cpu_linux.go b/collector/cpu_linux.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"sync"
 
-	"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/procfs"
 	"gopkg.in/alecthomas/kingpin.v2"

diff --git a/collector/cpu_openbsd.go b/collector/cpu_openbsd.go
@@ -20,7 +20,7 @@ import (
 	"strconv"
 	"unsafe"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/sys/unix"
 )

diff --git a/collector/cpu_openbsd_amd64.go b/collector/cpu_openbsd_amd64.go
@@ -19,7 +19,7 @@ import (
 	"strconv"
 	"unsafe"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/sys/unix"
 )

diff --git a/collector/cpu_solaris.go b/collector/cpu_solaris.go
@@ -19,7 +19,7 @@ package collector
 import (
 	"strconv"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	kstat "github.com/siebenmann/go-kstat"
 )

diff --git a/collector/cpufreq_linux.go b/collector/cpufreq_linux.go
@@ -18,7 +18,7 @@ package collector
 import (
 	"fmt"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/procfs/sysfs"
 )

diff --git a/collector/cpufreq_solaris.go b/collector/cpufreq_solaris.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	kstat "github.com/siebenmann/go-kstat"
 )

diff --git a/collector/devstat_dragonfly.go b/collector/devstat_dragonfly.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

diff --git a/collector/devstat_freebsd.go b/collector/devstat_freebsd.go
@@ -21,7 +21,7 @@ import (
 	"sync"
 	"unsafe"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

diff --git a/collector/diskstats_darwin.go b/collector/diskstats_darwin.go
@@ -18,7 +18,7 @@ package collector
 import (
 	"fmt"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/lufia/iostat"
 	"github.com/prometheus/client_golang/prometheus"
 )

diff --git a/collector/diskstats_linux.go b/collector/diskstats_linux.go
@@ -24,8 +24,8 @@ import (
 	"strconv"
 	"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"
 	"gopkg.in/alecthomas/kingpin.v2"
 )

diff --git a/collector/diskstats_openbsd.go b/collector/diskstats_openbsd.go
@@ -19,7 +19,7 @@ package collector
 import (
 	"unsafe"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/sys/unix"
 )

diff --git a/collector/diskstats_openbsd_amd64.go b/collector/diskstats_openbsd_amd64.go
@@ -18,7 +18,7 @@ package collector
 import (
 	"unsafe"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/sys/unix"
 )

diff --git a/collector/drbd_linux.go b/collector/drbd_linux.go
@@ -23,8 +23,8 @@ import (
 	"strconv"
 	"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"
 )
 

diff --git a/collector/edac_linux.go b/collector/edac_linux.go
@@ -20,7 +20,7 @@ import (
 	"path/filepath"
 	"regexp"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

diff --git a/collector/entropy_linux.go b/collector/entropy_linux.go
@@ -18,7 +18,7 @@ package collector
 import (
 	"fmt"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/procfs"
 )

diff --git a/collector/exec_bsd.go b/collector/exec_bsd.go
@@ -17,7 +17,7 @@
 package collector
 
 import (
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

diff --git a/collector/fibrechannel_linux.go b/collector/fibrechannel_linux.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"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/procfs/sysfs"
 )

diff --git a/collector/filefd_linux.go b/collector/filefd_linux.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

diff --git a/collector/filesystem_bsd.go b/collector/filesystem_bsd.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"unsafe"
 
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 )
 
 /*

diff --git a/collector/filesystem_common.go b/collector/filesystem_common.go
@@ -20,8 +20,8 @@ import (
 	"errors"
 	"regexp"
 
-	"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"
 	"gopkg.in/alecthomas/kingpin.v2"
 )

diff --git a/collector/filesystem_freebsd.go b/collector/filesystem_freebsd.go
@@ -16,7 +16,7 @@
 package collector
 
 import (
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"golang.org/x/sys/unix"
 )
 

diff --git a/collector/filesystem_linux.go b/collector/filesystem_linux.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"
 	"golang.org/x/sys/unix"
 	"gopkg.in/alecthomas/kingpin.v2"
 )

diff --git a/collector/filesystem_linux_test.go b/collector/filesystem_linux_test.go
@@ -14,7 +14,7 @@
 package collector
 
 import (
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"strings"
 	"testing"
 

diff --git a/collector/filesystem_openbsd_amd64.go b/collector/filesystem_openbsd_amd64.go
@@ -17,7 +17,7 @@
 package collector
 
 import (
-	"github.com/go-kit/kit/log/level"
+	"github.com/go-kit/log/level"
 	"golang.org/x/sys/unix"
 )
 

diff --git a/collector/hwmon_linux.go b/collector/hwmon_linux.go
@@ -24,8 +24,8 @@ import (
 	"strconv"
 	"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"
 	"golang.org/x/sys/unix"
 )

diff --git a/collector/infiniband_linux.go b/collector/infiniband_linux.go
@@ -22,8 +22,8 @@ import (
 	"os"
 	"strconv"
 
-	"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/procfs/sysfs"
 )