Return to the past API so we don't break all libraries/framework implementations

Signed-off-by: Xabier Larrakoetxea <[email protected]>

Author: slok

examples/custom/main.go

@@ -51,10 +51,10 @@ func main() {
 	// Wrape our middleware on each of the different handlers with the ID of the handler
 	// this way we reduce the cardinality, for example: `/test/2` and `/test/4` will
 	// have the same `handler` label on the metric: `/test/:testID`
-	mux.Handle("/", std.Measure("/", mdlw, rooth))
-	mux.Handle("/test/1", std.Measure("/test/:testID", mdlw, testh))
-	mux.Handle("/test/2", std.Measure("/test/:testID", mdlw, testh2))
-	mux.Handle("/other-test", std.Measure("/other-test", mdlw, othetesth))
+	mux.Handle("/", std.Handler("/", mdlw, rooth))
+	mux.Handle("/test/1", std.Handler("/test/:testID", mdlw, testh))
+	mux.Handle("/test/2", std.Handler("/test/:testID", mdlw, testh2))
+	mux.Handle("/other-test", std.Handler("/other-test", mdlw, othetesth))
 
 	// Serve our handler.
 	go func() {

examples/default/main.go

@@ -46,7 +46,7 @@ func main() {
 
 	// Wrap our main handler, we pass empty handler ID so the middleware inferes
 	// the handler label from the URL.
-	h := std.Measure("", mdlw, mux)
+	h := std.Handler("", mdlw, mux)
 
 	// Serve our handler.
 	go func() {

examples/echo/main.go

@@ -28,7 +28,7 @@ func main() {
 
 	// Create Echo instance and global middleware.
 	e := echo.New()
-	e.Use(echomiddleware.Measure("", mdlw))
+	e.Use(echomiddleware.Handler("", mdlw))
 
 	// Add our handler.
 	e.GET("/", func(c echo.Context) error {

examples/gin/main.go

@@ -27,7 +27,7 @@ func main() {
 
 	// Create Gin engine and global middleware.
 	engine := gin.New()
-	engine.Use(ginmiddleware.Measure("", mdlw))
+	engine.Use(ginmiddleware.Handler("", mdlw))
 
 	// Add our handler.
 	engine.GET("/", func(c *gin.Context) {

examples/gorestful/main.go

@@ -29,7 +29,7 @@ func main() {
 	c := gorestful.NewContainer()
 
 	// Add the middleware for all routes.
-	c.Filter(gorestfulmiddleware.Measure("", mdlw))
+	c.Filter(gorestfulmiddleware.Handler("", mdlw))
 
 	// Add our handler.
 	ws := &gorestful.WebService{}

examples/httprouter/main.go

@@ -46,9 +46,9 @@ func main() {
 	r := httprouter.New()
 
 	// Add the middleware to each route.
-	r.GET("/", httproutermiddleware.Measure("/", h, mdlw))
-	r.GET("/test/:id", httproutermiddleware.Measure("/test/:id", h1, mdlw))
-	r.GET("/test2/:id", httproutermiddleware.Measure("/test2/:id", h2, mdlw))
+	r.GET("/", httproutermiddleware.Handler("/", h, mdlw))
+	r.GET("/test/:id", httproutermiddleware.Handler("/test/:id", h1, mdlw))
+	r.GET("/test2/:id", httproutermiddleware.Handler("/test2/:id", h2, mdlw))
 
 	// Serve our handler.
 	go func() {

examples/negroni/main.go

@@ -36,7 +36,7 @@ func main() {
 	n := negroni.Classic()
 
 	// Add the middleware to negroni.
-	n.Use(negronimiddleware.Measure("", mdlw))
+	n.Use(negronimiddleware.Handler("", mdlw))
 
 	// Finally set our router on negroni.
 	n.UseHandler(mux)

examples/opencensus/main.go

@@ -54,7 +54,7 @@ func main() {
 
 	// Wrap our main handler, we pass empty handler ID so the middleware inferes
 	// the handler label from the URL.
-	h := std.Measure("", mdlw, mux)
+	h := std.Handler("", mdlw, mux)
 
 	// Serve our handler.
 	go func() {

middleware/echo/echo.go

@@ -9,8 +9,8 @@ import (
 	"github.com/slok/go-http-metrics/middleware"
 )
 
-// Measure returns a Echo measure middleware.
-func Measure(handlerID string, m middleware.Middleware) echo.MiddlewareFunc {
+// Handler returns a Echo measuring middleware.
+func Handler(handlerID string, m middleware.Middleware) echo.MiddlewareFunc {
 	return func(h echo.HandlerFunc) echo.HandlerFunc {
 		return echo.HandlerFunc(func(c echo.Context) error {
 			r := &reporter{c: c}

middleware/echo/echo_test.go

@@ -21,7 +21,7 @@ func getTestHandler(statusCode int) echo.HandlerFunc {
 	}
 }
 
-func TestMiddlewareIntegration(t *testing.T) {
+func TestMiddleware(t *testing.T) {
 	tests := map[string]struct {
 		handlerID     string
 		statusCode    int
@@ -65,7 +65,7 @@ func TestMiddlewareIntegration(t *testing.T) {
 			// Create our echo instance with the middleware.
 			mdlw := middleware.New(middleware.Config{Recorder: mr})
 			e := echo.New()
-			e.POST("/test", getTestHandler(test.statusCode), echoMiddleware.Measure("", mdlw))
+			e.POST("/test", getTestHandler(test.statusCode), echoMiddleware.Handler("", mdlw))
 
 			// Make the request.
 			resp := httptest.NewRecorder()

middleware/echo/example_test.go

@@ -27,7 +27,7 @@ func Example_echoMiddleware() {
 	h := func(c echo.Context) error {
 		return c.String(http.StatusOK, "Hello world")
 	}
-	e.GET("/", h, echoMiddleware.Measure("", mdlw))
+	e.GET("/", h, echoMiddleware.Handler("", mdlw))
 
 	// Serve metrics from the default prometheus registry.
 	log.Printf("serving metrics at: %s", ":8081")

middleware/gin/example_test.go

@@ -27,7 +27,7 @@ func Example_ginMiddleware() {
 	h := func(c *gin.Context) {
 		c.String(http.StatusOK, "Hello world")
 	}
-	engine.GET("/", ginmiddleware.Measure("", mdlw), h)
+	engine.GET("/", ginmiddleware.Handler("", mdlw), h)
 
 	// Serve metrics from the default prometheus registry.
 	log.Printf("serving metrics at: %s", ":8081")

middleware/gin/gin.go

@@ -10,8 +10,8 @@ import (
 	"github.com/slok/go-http-metrics/middleware"
 )
 
-// Measure returns a Gin measure middleware.
-func Measure(handlerID string, m middleware.Middleware) gin.HandlerFunc {
+// Handler returns a Gin measuring middleware.
+func Handler(handlerID string, m middleware.Middleware) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		r := &reporter{c: c}
 		m.Measure(handlerID, r, func() {

middleware/gin/gin_test.go

@@ -21,7 +21,7 @@ func getTestHandler(statusCode int) gin.HandlerFunc {
 	}
 }
 
-func TestMiddlewareIntegration(t *testing.T) {
+func TestMiddleware(t *testing.T) {
 	tests := map[string]struct {
 		handlerID     string
 		statusCode    int
@@ -66,7 +66,7 @@ func TestMiddlewareIntegration(t *testing.T) {
 			mdlw := middleware.New(middleware.Config{Recorder: mr})
 			engine := gin.New()
 			engine.POST("/test",
-				ginmiddleware.Measure("", mdlw),
+				ginmiddleware.Handler("", mdlw),
 				getTestHandler(test.statusCode))
 
 			// Make the request.

middleware/gorestful/example_test.go

@@ -24,7 +24,7 @@ func Example_gorestfulMiddleware() {
 	c := gorestful.NewContainer()
 
 	// Add the middleware for all routes.
-	c.Filter(gorestfulmiddleware.Measure("", mdlw))
+	c.Filter(gorestfulmiddleware.Handler("", mdlw))
 
 	// Add our handler,
 	ws := &gorestful.WebService{}

middleware/gorestful/gorestful.go

@@ -10,8 +10,8 @@ import (
 	"github.com/slok/go-http-metrics/middleware"
 )
 
-// Measure returns a gorestful measure middleware.
-func Measure(handlerID string, m middleware.Middleware) gorestful.FilterFunction {
+// Handler returns a gorestful measuring middleware.
+func Handler(handlerID string, m middleware.Middleware) gorestful.FilterFunction {
 	return func(req *gorestful.Request, resp *gorestful.Response, chain *gorestful.FilterChain) {
 		r := &reporter{req: req, resp: resp}
 		m.Measure(handlerID, r, func() {

middleware/gorestful/gorestful_test.go

@@ -21,7 +21,7 @@ func getTestHandler(statusCode int) gorestful.RouteFunction {
 	})
 }
 
-func TestMiddlewareIntegration(t *testing.T) {
+func TestMiddleware(t *testing.T) {
 	tests := map[string]struct {
 		handlerID     string
 		statusCode    int
@@ -65,7 +65,7 @@ func TestMiddlewareIntegration(t *testing.T) {
 			// Create our instance with the middleware.
 			mdlw := middleware.New(middleware.Config{Recorder: mr})
 			c := gorestful.NewContainer()
-			c.Filter(gorestfulmiddleware.Measure("", mdlw))
+			c.Filter(gorestfulmiddleware.Handler("", mdlw))
 			ws := &gorestful.WebService{}
 			ws.Produces(gorestful.MIME_JSON)
 			ws.Route(ws.POST("/test").To(getTestHandler(test.statusCode)))

middleware/httprouter/example_test.go

@@ -32,8 +32,8 @@ func Example_httprouterMiddlewareByHandler() {
 		Recorder: metrics.NewRecorder(metrics.Config{}),
 	})
 	// Add the middleware.
-	r.GET("/test/:id", httproutermiddleware.Measure("/test/:id", myHandler, mdlw))
-	r.GET("/test2/:id", httproutermiddleware.Measure("/test2/:id", myHandler, mdlw))
+	r.GET("/test/:id", httproutermiddleware.Handler("/test/:id", myHandler, mdlw))
+	r.GET("/test2/:id", httproutermiddleware.Handler("/test2/:id", myHandler, mdlw))
 
 	// Serve metrics from the default prometheus registry.
 	log.Printf("serving metrics at: %s", ":8081")
@@ -76,7 +76,7 @@ func Example_httprouterMiddlewareOnRouter() {
 	}()
 
 	// Wrap the router with the middleware.
-	h := stdmiddleware.Measure("", mdlw, r)
+	h := stdmiddleware.Handler("", mdlw, r)
 
 	// Serve our handler.
 	log.Printf("listening at: %s", ":8080")

middleware/httprouter/httprouter.go

@@ -11,14 +11,14 @@ import (
 	"github.com/slok/go-http-metrics/middleware/std"
 )
 
-// Measure returns a httprouter.Handler measured middlware.
-func Measure(handlerID string, next httprouter.Handle, m middleware.Middleware) httprouter.Handle {
+// Handler returns a httprouter.Handler measuring middleware.
+func Handler(handlerID string, next httprouter.Handle, m middleware.Middleware) httprouter.Handle {
 	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
 		// Dummy handler to wrap httprouter Handle type
 		h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			next(w, r, p)
 		})
 
-		std.Measure(handlerID, m, h).ServeHTTP(w, r)
+		std.Handler(handlerID, m, h).ServeHTTP(w, r)
 	}
 }

middleware/httprouter/httprouter_test.go

@@ -21,7 +21,7 @@ func getTestHandler(statusCode int) httprouter.Handle {
 	})
 }
 
-func TestMiddlewareIntegration(t *testing.T) {
+func TestMiddleware(t *testing.T) {
 	tests := map[string]struct {
 		handlerID     string
 		statusCode    int
@@ -65,7 +65,7 @@ func TestMiddlewareIntegration(t *testing.T) {
 			// Create our instance with the middleware.
 			mdlw := middleware.New(middleware.Config{Recorder: mr})
 			r := httprouter.New()
-			r.POST("/test", httproutermiddleware.Measure("", getTestHandler(test.statusCode), mdlw))
+			r.POST("/test", httproutermiddleware.Handler("", getTestHandler(test.statusCode), mdlw))
 
 			// Make the request.
 			resp := httptest.NewRecorder()

middleware/negroni/example_test.go

@@ -29,7 +29,7 @@ func Example_negroniMiddleware() {
 		Recorder: metrics.NewRecorder(metrics.Config{}),
 	})
 	// Add the middleware to negroni.
-	n.Use(negronimiddleware.Measure("", mdlw))
+	n.Use(negronimiddleware.Handler("", mdlw))
 
 	// Finally set our router on negroni.
 	n.UseHandler(myHandler)

middleware/negroni/negroni.go

@@ -11,9 +11,9 @@ import (
 	"github.com/slok/go-http-metrics/middleware/std"
 )
 
-// Measure returns a Negroni measuring middleware from a Middleware instance.
-func Measure(handlerID string, m middleware.Middleware) negroni.Handler {
+// Handler returns a Negroni measuring middleware.
+func Handler(handlerID string, m middleware.Middleware) negroni.Handler {
 	return negroni.HandlerFunc(func(rw http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
-		std.Measure(handlerID, m, next).ServeHTTP(rw, r)
+		std.Handler(handlerID, m, next).ServeHTTP(rw, r)
 	})
 }

middleware/negroni/negroni_test.go

@@ -21,7 +21,7 @@ func getTestHandler(statusCode int) http.Handler {
 	})
 }
 
-func TestMiddlewareIntegration(t *testing.T) {
+func TestMiddleware(t *testing.T) {
 	tests := map[string]struct {
 		handlerID     string
 		statusCode    int
@@ -65,7 +65,7 @@ func TestMiddlewareIntegration(t *testing.T) {
 			// Create our negroni instance with the middleware.
 			mdlw := middleware.New(middleware.Config{Recorder: mr})
 			n := negroni.Classic()
-			n.Use(negronimiddleware.Measure("", mdlw))
+			n.Use(negronimiddleware.Handler("", mdlw))
 			n.UseHandler(getTestHandler(test.statusCode))
 
 			// Make the request.

middleware/std/example_test.go

@@ -26,7 +26,7 @@ func Example_stdMiddleware() {
 	})
 
 	// Wrap our handler with the middleware.
-	h := stdmiddleware.Measure("", mdlw, myHandler)
+	h := stdmiddleware.Handler("", mdlw, myHandler)
 
 	// Serve metrics from the default prometheus registry.
 	log.Printf("serving metrics at: %s", ":8081")

middleware/std/std.go

@@ -10,8 +10,8 @@ import (
 	"github.com/slok/go-http-metrics/middleware"
 )
 
-// Measure returns an measured standard http.Handler.
-func Measure(handlerID string, m middleware.Middleware, h http.Handler) http.Handler {
+// Handler returns an measuring standard http.Handler.
+func Handler(handlerID string, m middleware.Middleware, h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		wi := &responseWriterInterceptor{
 			statusCode:     http.StatusOK,

middleware/std/std_test.go

@@ -20,7 +20,7 @@ func getFakeHandler(statusCode int, responseBody string) http.Handler {
 	})
 }
 
-func TestMiddlewareIntegraation(t *testing.T) {
+func TestMiddleware(t *testing.T) {
 	tests := map[string]struct {
 		handlerID     string
 		body          string
@@ -101,7 +101,7 @@ func TestMiddlewareIntegraation(t *testing.T) {
 			// Make the request.
 			test.config.Recorder = mr
 			m := middleware.New(test.config)
-			h := stdmiddleware.Measure(test.handlerID, m, getFakeHandler(test.statusCode, test.body))
+			h := stdmiddleware.Handler(test.handlerID, m, getFakeHandler(test.statusCode, test.body))
 			h.ServeHTTP(httptest.NewRecorder(), test.req)
 
 			mr.AssertExpectations(t)

test/integration/integration_test.go

@@ -39,7 +39,7 @@ type handlerConfig struct {
 	sleepDuration time.Duration
 }
 
-func TestMiddleware(t *testing.T) {
+func TestMiddlewarePrometheus(t *testing.T) {
 	tests := map[string]struct {
 		handler func(m middleware.Middleware, hc []handlerConfig) http.Handler
 	}{
@@ -142,7 +142,7 @@ func prepareHandlerSTD(m middleware.Middleware, hc []handlerConfig) http.Handler
 	}
 
 	// Setup server and middleware.
-	h := stdmiddleware.Measure("", m, mux)
+	h := stdmiddleware.Handler("", m, mux)
 
 	return h
 }
@@ -167,7 +167,7 @@ func prepareHandlerNegroni(m middleware.Middleware, hc []handlerConfig) http.Han
 
 	// Setup server and middleware.
 	n := negroni.Classic()
-	n.Use(negronimiddleware.Measure("", m))
+	n.Use(negronimiddleware.Handler("", m))
 	n.UseHandler(mux)
 
 	return n
@@ -187,7 +187,7 @@ func prepareHandlerHTTPRouter(m middleware.Middleware, hc []handlerConfig) http.
 		}
 
 		// Setup middleware on each of the routes.
-		r.Handle(h.Method, h.Path, httproutermiddleware.Measure("", hr, m))
+		r.Handle(h.Method, h.Path, httproutermiddleware.Handler("", hr, m))
 	}
 
 	return r
@@ -196,7 +196,7 @@ func prepareHandlerHTTPRouter(m middleware.Middleware, hc []handlerConfig) http.
 func prepareHandlerGorestful(m middleware.Middleware, hc []handlerConfig) http.Handler {
 	// Setup server and middleware.
 	c := gorestful.NewContainer()
-	c.Filter(gorestfulmiddleware.Measure("", m))
+	c.Filter(gorestfulmiddleware.Handler("", m))
 
 	// Setup handlers.
 	ws := &gorestful.WebService{}
@@ -217,7 +217,7 @@ func prepareHandlerGorestful(m middleware.Middleware, hc []handlerConfig) http.H
 func prepareHandlerGin(m middleware.Middleware, hc []handlerConfig) http.Handler {
 	// Setup server and middleware.
 	e := gin.New()
-	e.Use(ginmiddleware.Measure("", m))
+	e.Use(ginmiddleware.Handler("", m))
 
 	// Setup handlers.
 	for _, h := range hc {
@@ -234,7 +234,7 @@ func prepareHandlerGin(m middleware.Middleware, hc []handlerConfig) http.Handler
 func prepareHandlerEcho(m middleware.Middleware, hc []handlerConfig) http.Handler {
 	// Setup server and middleware.
 	e := echo.New()
-	e.Use(echomiddleware.Measure("", m))
+	e.Use(echomiddleware.Handler("", m))
 
 	// Setup handlers.
 	for _, h := range hc {