update client to promauto

Signed-off-by: SagiROosto <sagi.rosenthal@oosto.com>

Author: SagiROosto

.circleci/config.yml

@@ -23,7 +23,7 @@ jobs:
           command: |
             cat \<< EOF > prometheus.yml
             global:
-              scrape_interval: 10s
+              scrape_interval: 1s
             scrape_configs:
               - job_name: pushprox
                 proxy_url: http://127.0.0.1:8080

client/client.go

@@ -29,33 +29,30 @@ import (
 	"github.com/cenkalti/backoff/v4"
 	"github.com/prometheus-community/pushprox/util"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
 )
 
 var (
-	scrapeErrorCounter = prometheus.NewCounter(
+	scrapeErrorCounter = promauto.NewCounter(
 		prometheus.CounterOpts{
 			Name: "pushprox_client_scrape_errors_total",
 			Help: "Number of scrape errors",
 		},
 	)
-	pushErrorCounter = prometheus.NewCounter(
+	pushErrorCounter = promauto.NewCounter(
 		prometheus.CounterOpts{
 			Name: "pushprox_client_push_errors_total",
 			Help: "Number of push errors",
 		},
 	)
-	pollErrorCounter = prometheus.NewCounter(
+	pollErrorCounter = promauto.NewCounter(
 		prometheus.CounterOpts{
 			Name: "pushprox_client_poll_errors_total",
 			Help: "Number of poll errors",
 		},
 	)
 )
 
-func init() {
-	prometheus.MustRegister(pushErrorCounter, pollErrorCounter, scrapeErrorCounter)
-}
-
 func DefaultBackoff() backoff.BackOff {
 	b := backoff.NewExponentialBackOff()
 	b.InitialInterval = 1 * time.Second

end-to-end-test.sh

@@ -29,7 +29,7 @@ while ! curl -s -f -L http://localhost:8080/clients; do
   sleep 2
 done
 
-./pushprox-client  --log.level=debug --proxy-url=http://localhost:8080 --fqdn $(hostname) &
+./pushprox-client  --log.level=debug --proxy-url=http://localhost:8080 &
 echo $! > "${tmpdir}/client.pid"
 while [ "$(curl -s -L 'http://localhost:8080/clients' | jq 'length')" != '1' ] ; do
   echo 'Waiting for client'