bump dependencies

collector.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/prometheus/common/log"
+	log "github.com/sirupsen/logrus"
 	"regexp"
 	"strings"
 	"time"

credhub_exporter.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/prometheus/common/log"
+	log "github.com/sirupsen/logrus"
 	"github.com/prometheus/common/version"
 	"gopkg.in/alecthomas/kingpin.v2"
 	"io/ioutil"
@@ -91,6 +91,16 @@ var (
 	tlsKeyFile = kingpin.Flag(
 		"web.tls.key_file", "Path to a file that contains the TLS private key (PEM format) ($CREDHUB_EXPORTER_WEB_TLS_KEYFILE)",
 	).Envar("CREDHUB_EXPORTER_WEB_TLS_KEYFILE").ExistingFile()
+
+	logLevel = kingpin.Flag(
+		"log.level", "Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal]",
+	).Default("info").String()
+	logStream = kingpin.Flag(
+		"log.stream", "Write log to given stream. Valid streams: [stdout, stderr]",
+	).Default("stderr").String()
+	logJson = kingpin.Flag(
+		"log.json", "When given, write log in json format",
+	).Bool()
 )
 
 type basicAuthHandler struct {
@@ -130,11 +140,18 @@ var (
 )
 
 func main() {
-	log.AddFlags(kingpin.CommandLine)
 	kingpin.Version(version.Print("credhub_exporter"))
 	kingpin.HelpFlag.Short('h')
 	kingpin.Parse()
 
+	log.SetOutput(os.Stderr)
+	if *logStream == "stdout" {
+		log.SetOutput(os.Stdout)
+	}
+	if *logJson {
+		log.SetFormatter(&log.JSONFormatter{})
+	}
+
 	log.Infoln("Starting credhub_exporter", version.Info())
 	log.Infoln("Build context", version.BuildContext())
 

go.mod

@@ -3,14 +3,11 @@ module github.com/orange-cloudfoundry/credhub_exporter
 go 1.15
 
 require (
-	code.cloudfoundry.org/credhub-cli v0.0.0-20210303183456-ce5a460d8bd7
+	code.cloudfoundry.org/credhub-cli v0.0.0-20210705130154-e13c0e0f2a0a
 	github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect
-	github.com/golang/protobuf v1.5.1 // indirect
-	github.com/prometheus/client_golang v1.10.0
-	github.com/prometheus/common v0.20.0
-	github.com/sirupsen/logrus v1.8.1 // indirect
-	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
-	golang.org/x/net v0.0.0-20210324051636-2c4c8ecb7826 // indirect
-	golang.org/x/sys v0.0.0-20210324051608-47abb6519492 // indirect
+	github.com/prometheus/client_golang v1.11.0
+	github.com/prometheus/common v0.29.0
+	github.com/prometheus/procfs v0.7.0 // indirect
+	github.com/sirupsen/logrus v1.8.1
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 )