Merge pull request #2174 from dexidp/update-etcd

Update etcd

.github/workflows/ci.yaml

@@ -30,7 +30,7 @@ jobs:
         options: --health-cmd "mysql -proot -e \"show databases;\"" --health-interval 10s --health-timeout 5s --health-retries 5
 
       etcd:
-        image: gcr.io/etcd-development/etcd:v3.2.9
+        image: gcr.io/etcd-development/etcd:v3.5.0
         ports:
           - 2379
         env:

cmd/dex/serve.go

@@ -21,6 +21,7 @@ import (
 	grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"github.com/oklog/run"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -101,12 +102,12 @@ func runServe(options serveOptions) error {
 	logger.Infof("config issuer: %s", c.Issuer)
 
 	prometheusRegistry := prometheus.NewRegistry()
-	err = prometheusRegistry.Register(prometheus.NewGoCollector())
+	err = prometheusRegistry.Register(collectors.NewGoCollector())
 	if err != nil {
 		return fmt.Errorf("failed to register Go runtime metrics: %v", err)
 	}
 
-	err = prometheusRegistry.Register(prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}))
+	err = prometheusRegistry.Register(collectors.NewProcessCollector(collectors.ProcessCollectorOpts{}))
 	if err != nil {
 		return fmt.Errorf("failed to register process metrics: %v", err)
 	}

docker-compose.yaml

@@ -25,7 +25,7 @@ services:
             POSTGRES_PASSWORD: postgres
 
     etcd:
-        image: gcr.io/etcd-development/etcd:v3.4.9
+        image: gcr.io/etcd-development/etcd:v3.5.0
         environment:
             ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
             ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379

go.mod

@@ -22,13 +22,13 @@ require (
 	github.com/mattn/go-sqlite3 v1.14.7
 	github.com/oklog/run v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.10.0
+	github.com/prometheus/client_golang v1.11.0
 	github.com/russellhaering/goxmldsig v1.1.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.1.3
 	github.com/stretchr/testify v1.7.0
-	go.etcd.io/etcd/client/pkg/v3 v3.5.0-rc.0
-	go.etcd.io/etcd/client/v3 v3.5.0-rc.0
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0
+	go.etcd.io/etcd/client/v3 v3.5.0
 	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
 	golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420
 	golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c