diff --git a/README.md b/README.md index ae1e772..5141504 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ go get -u github.com/sevenNt/echo-pprof package main import ( - "github.com/labstack/echo/v4" + "github.com/labstack/echo/v5" "github.com/sevenNt/echo-pprof" ) diff --git a/example/example.go b/example/example.go index 251a28a..8af698b 100644 --- a/example/example.go +++ b/example/example.go @@ -2,13 +2,13 @@ package main import ( echopprof "github.com/sevenNt/echo-pprof" - "github.com/labstack/echo/v4" + "github.com/labstack/echo/v5" ) func main() { e := echo.New() - e.GET("/ping", func(c echo.Context) error { + e.GET("/ping", func(c *echo.Context) error { return c.String(200, "pong") }) diff --git a/go.mod b/go.mod index fef4374..af550e3 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,5 @@ module github.com/sevenNt/echo-pprof -go 1.17 +go 1.25.0 -require github.com/labstack/echo/v4 v4.9.1 - -require ( - github.com/labstack/gommon v0.4.0 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect - github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasttemplate v1.2.2 // indirect - golang.org/x/crypto v0.3.0 // indirect - golang.org/x/net v0.2.0 // indirect - golang.org/x/sys v0.2.0 // indirect - golang.org/x/text v0.4.0 // indirect -) +require github.com/labstack/echo/v5 v5.0.4 diff --git a/go.sum b/go.sum index de70b27..eb618a9 100644 --- a/go.sum +++ b/go.sum @@ -1,67 +1,14 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= -github.com/labstack/echo/v4 v4.9.0 h1:wPOF1CE6gvt/kmbMR4dGzWvHMPT+sAEUJOwOTtvITVY= -github.com/labstack/echo/v4 v4.9.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks= -github.com/labstack/echo/v4 v4.9.1 h1:GliPYSpzGKlyOhqIbG8nmHBo3i1saKWFOgh41AN3b+Y= -github.com/labstack/echo/v4 v4.9.1/go.mod h1:Pop5HLc+xoc4qhTZ1ip6C0RtP7Z+4VzRLWZZFKqbbjo= -github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o= -github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= -github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8= -github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= -github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/labstack/echo/v5 v5.0.4 h1:ll3I/O8BifjMztj9dD1vx/peZQv8cR2CTUdQK6QxGGc= +github.com/labstack/echo/v5 v5.0.4/go.mod h1:SyvlSdObGjRXeQfCCXW/sybkZdOOQZBmpKF0bvALaeo= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= -github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= -github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A= -golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= -golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220926192436-02166a98028e h1:I51lVG9ykW5AQeTE50sJ0+gJCAF0J78Hf1+1VUCGxDI= -golang.org/x/net v0.0.0-20220926192436-02166a98028e/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= -golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25 h1:nwzwVf0l2Y/lkov/+IYgMMbFyI+QypZDds9RxlSmsFQ= -golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= +golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= +golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE= +golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/pprof.go b/pprof.go index d52d8c0..0503423 100644 --- a/pprof.go +++ b/pprof.go @@ -4,7 +4,7 @@ import ( "net/http/pprof" "strings" - "github.com/labstack/echo/v4" + "github.com/labstack/echo/v5" ) // Wrap adds several routes from package `net/http/pprof` to *echo.Echo object. @@ -48,15 +48,15 @@ func WrapGroup(prefix string, g *echo.Group) { // IndexHandler will pass the call from /debug/pprof to pprof. func IndexHandler() echo.HandlerFunc { - return func(ctx echo.Context) error { - pprof.Index(ctx.Response().Writer, ctx.Request()) + return func(ctx *echo.Context) error { + pprof.Index(ctx.Response(), ctx.Request()) return nil } } // HeapHandler will pass the call from /debug/pprof/heap to pprof. func HeapHandler() echo.HandlerFunc { - return func(ctx echo.Context) error { + return func(ctx *echo.Context) error { pprof.Handler("heap").ServeHTTP(ctx.Response(), ctx.Request()) return nil } @@ -64,64 +64,64 @@ func HeapHandler() echo.HandlerFunc { // GoroutineHandler will pass the call from /debug/pprof/goroutine to pprof. func GoroutineHandler() echo.HandlerFunc { - return func(ctx echo.Context) error { - pprof.Handler("goroutine").ServeHTTP(ctx.Response().Writer, ctx.Request()) + return func(ctx *echo.Context) error { + pprof.Handler("goroutine").ServeHTTP(ctx.Response(), ctx.Request()) return nil } } // BlockHandler will pass the call from /debug/pprof/block to pprof. func BlockHandler() echo.HandlerFunc { - return func(ctx echo.Context) error { - pprof.Handler("block").ServeHTTP(ctx.Response().Writer, ctx.Request()) + return func(ctx *echo.Context) error { + pprof.Handler("block").ServeHTTP(ctx.Response(), ctx.Request()) return nil } } // ThreadCreateHandler will pass the call from /debug/pprof/threadcreate to pprof. func ThreadCreateHandler() echo.HandlerFunc { - return func(ctx echo.Context) error { - pprof.Handler("threadcreate").ServeHTTP(ctx.Response().Writer, ctx.Request()) + return func(ctx *echo.Context) error { + pprof.Handler("threadcreate").ServeHTTP(ctx.Response(), ctx.Request()) return nil } } // CmdlineHandler will pass the call from /debug/pprof/cmdline to pprof. func CmdlineHandler() echo.HandlerFunc { - return func(ctx echo.Context) error { - pprof.Cmdline(ctx.Response().Writer, ctx.Request()) + return func(ctx *echo.Context) error { + pprof.Cmdline(ctx.Response(), ctx.Request()) return nil } } // ProfileHandler will pass the call from /debug/pprof/profile to pprof. func ProfileHandler() echo.HandlerFunc { - return func(ctx echo.Context) error { - pprof.Profile(ctx.Response().Writer, ctx.Request()) + return func(ctx *echo.Context) error { + pprof.Profile(ctx.Response(), ctx.Request()) return nil } } // SymbolHandler will pass the call from /debug/pprof/symbol to pprof. func SymbolHandler() echo.HandlerFunc { - return func(ctx echo.Context) error { - pprof.Symbol(ctx.Response().Writer, ctx.Request()) + return func(ctx *echo.Context) error { + pprof.Symbol(ctx.Response(), ctx.Request()) return nil } } // TraceHandler will pass the call from /debug/pprof/trace to pprof. func TraceHandler() echo.HandlerFunc { - return func(ctx echo.Context) error { - pprof.Trace(ctx.Response().Writer, ctx.Request()) + return func(ctx *echo.Context) error { + pprof.Trace(ctx.Response(), ctx.Request()) return nil } } // MutexHandler will pass the call from /debug/pprof/mutex to pprof. func MutexHandler() echo.HandlerFunc { - return func(ctx echo.Context) error { - pprof.Handler("mutex").ServeHTTP(ctx.Response().Writer, ctx.Request()) + return func(ctx *echo.Context) error { + pprof.Handler("mutex").ServeHTTP(ctx.Response(), ctx.Request()) return nil } } diff --git a/pprof_test.go b/pprof_test.go index f06a220..fe414b7 100644 --- a/pprof_test.go +++ b/pprof_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/labstack/echo/v4" + "github.com/labstack/echo/v5" ) func newServer() *echo.Echo { @@ -12,17 +12,26 @@ func newServer() *echo.Echo { return e } -func checkRouters(routers []*echo.Route, t *testing.T, expectedRouters map[string]string) { +func checkRouters(routers echo.Routes, t *testing.T, expectedRouters map[string]string) { for _, router := range routers { if (router.Method != "GET" && router.Method != "POST") || strings.HasSuffix(router.Path, "/*") { continue } - name, ok := expectedRouters[router.Path] + _, ok := expectedRouters[router.Path] if !ok { - t.Errorf("missing router %s", router.Path) + t.Errorf("unexpected router %s %s", router.Method, router.Path) } - if !strings.Contains(router.Name, name) { - t.Errorf("handler for %s should contain %s, got %s", router.Path, name, router.Name) + } + for expectedPath := range expectedRouters { + found := false + for _, router := range routers { + if router.Path == expectedPath && (router.Method == "GET" || router.Method == "POST") { + found = true + break + } + } + if !found { + t.Errorf("missing router for path %s", expectedPath) } } } @@ -46,7 +55,7 @@ func TestWrap(t *testing.T) { "/debug/pprof/mutex": "MutexHandler", } - checkRouters(e.Routes(), t, expectedRouters) + checkRouters(e.Router().Routes(), t, expectedRouters) } // go test github.com/sevenNt/echo-pprof -v -run=TestWrapGroup\$ @@ -72,6 +81,6 @@ func TestWrapGroup(t *testing.T) { for r, h := range baseRouters { expectedRouters[prefix+r] = h } - checkRouters(e.Routes(), t, expectedRouters) + checkRouters(e.Router().Routes(), t, expectedRouters) } }