Remove observers from client

Author: stuartnelson3

prometheus/promhttp/client.go

@@ -19,20 +19,14 @@
 
 package promhttp
 
-import (
-	"net/http"
-
-	"github.com/prometheus/client_golang/prometheus"
-)
+import "net/http"
 
 type Client struct {
 	// Do we want to allow users to modify the underlying client after creating the wrapping client?
 	// c defaults to the http DefaultClient. We use a pointer to support
 	// the user relying on modifying this behavior globally.
 	c *http.Client
 
-	observers []prometheus.Observer
-
 	middleware Middleware
 }
 
@@ -62,15 +56,6 @@ func (c *Client) do(r *http.Request, _ middlewareFunc) (*http.Response, error) {
 	return c.c.Do(r)
 }
 
-// SetObservers sets the observers on Client. Each Observer has Observe called
-// at the conclusion of an HTTP roundtrip.
-func SetObservers(obs []prometheus.Observer) ConfigFunc {
-	return func(c *Client) error {
-		c.observers = obs
-		return nil
-	}
-}
-
 func SetMiddleware(middlewares ...middlewareFunc) ConfigFunc {
 	return func(c *Client) error {
 		c.middleware = build(c, middlewares...)

prometheus/promhttp/client_test.go

@@ -69,49 +69,33 @@ func TestMiddlewareWrapsFirstToLast(t *testing.T) {
 }
 
 func TestMiddlewareAPI(t *testing.T) {
-	var (
-		his   = prometheus.NewHistogram(prometheus.HistogramOpts{Name: "test_histogram"})
-		sum   = prometheus.NewSummary(prometheus.SummaryOpts{Name: "test_summary"})
-		gauge = prometheus.NewGauge(prometheus.GaugeOpts{Name: "test_gauge"})
-	)
-
-	obs := []prometheus.Observer{
-		his,
-		sum,
-		prometheus.ObserverFunc(gauge.Set),
-	}
-
 	client := *http.DefaultClient
 	client.Timeout = 300 * time.Millisecond
 
 	inFlightGauge := prometheus.NewGauge(prometheus.GaugeOpts{Name: "inFlight"})
 	inFlight := func(r *http.Request, next Middleware) (*http.Response, error) {
-		log.Println("1st")
 		inFlightGauge.Inc()
 
 		resp, err := next(r)
 
 		inFlightGauge.Dec()
 
-		log.Println("last")
 		return resp, err
 	}
 
 	counter := prometheus.NewCounter(prometheus.CounterOpts{Name: "test_counter"})
-	bytesSent := func(req *http.Request, next Middleware) (*http.Response, error) {
+	addFortyTwo := func(req *http.Request, next Middleware) (*http.Response, error) {
 		counter.Add(42)
-		log.Println("2nd")
-		// counter.Add(float64(req.ContentLength))
 
 		return next(req)
 	}
 
 	logging := func(req *http.Request, next Middleware) (*http.Response, error) {
-		log.Println("3rd")
+		log.Println("log something interesting")
 		return next(req)
 	}
 
-	promclient, err := NewClient(SetClient(client), SetObservers(obs), SetMiddleware(inFlight, bytesSent, logging))
+	promclient, err := NewClient(SetClient(client), SetMiddleware(inFlight, addFortyTwo, logging))
 	if err != nil {
 		t.Fatalf("%v", err)
 	}