Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require (
github.com/go-sql-driver/mysql v1.9.3
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3
github.com/iancoleman/strcase v0.3.0
github.com/labstack/echo/v4 v4.15.1
github.com/labstack/echo/v5 v5.1.0
github.com/stretchr/testify v1.11.1
go.uber.org/mock v0.6.0
golang.org/x/sync v0.20.0
Expand Down Expand Up @@ -69,6 +69,7 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.18.4 // indirect
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
github.com/labstack/echo/v4 v4.13.3 // indirect
github.com/labstack/gommon v0.5.0 // indirect
github.com/linkdata/deadlock v0.5.5 // indirect
github.com/lufia/plan9stats v0.0.0-20260216142805-b3301c5f2a88 // indirect
Expand Down
6 changes: 4 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,10 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/labstack/echo/v4 v4.15.1 h1:S9keusg26gZpjMmPqB5hOEvNKnmd1lNmcHrbbH2lnFs=
github.com/labstack/echo/v4 v4.15.1/go.mod h1:xmw1clThob0BSVRX1CRQkGQ/vjwcpOMjQZSZa9fKA/c=
github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY=
github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g=
github.com/labstack/echo/v5 v5.1.0 h1:MvIRydoN+p9cx/zq8Lff6YXqUW2ZaEsOMISzEGSMrBI=
github.com/labstack/echo/v5 v5.1.0/go.mod h1:SyvlSdObGjRXeQfCCXW/sybkZdOOQZBmpKF0bvALaeo=
github.com/labstack/gommon v0.5.0 h1:6VSQ2NOzsnEJ5W6+84E0RbcaDDmgB6NIAzWCczTEe6c=
github.com/labstack/gommon v0.5.0/go.mod h1:Rzlg7HHy1maLfzBYGg9NZcVuz1sA68HHhLjhcEllYE0=
github.com/lib/pq v1.11.1 h1:wuChtj2hfsGmmx3nf1m7xC2XpK6OtelS2shMY+bGMtI=
Expand Down
2 changes: 1 addition & 1 deletion internal/generated/mocks/labstack/echo/v4/context.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion middleware/echo/echo.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import (
ddEcho "github.com/DataDog/dd-trace-go/contrib/labstack/echo.v4/v2"
"github.com/coopnorge/go-datadog-lib/v2/internal"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v5"
)

// Wrap configures the provided [echo.Echo] and returns it. This is a
Expand All @@ -16,7 +16,7 @@
return e
}

e = ddEcho.Wrap(e)

Check failure on line 19 in middleware/echo/echo.go

View workflow job for this annotation

GitHub Actions / mage / mage

cannot use e (variable of type *"github.com/labstack/echo/v5".Echo) as *"github.com/labstack/echo/v4".Echo value in argument to ddEcho.Wrap

Check failure on line 19 in middleware/echo/echo.go

View workflow job for this annotation

GitHub Actions / mage / mage

cannot use ddEcho.Wrap(e) (value of type *"github.com/labstack/echo/v4".Echo) as *"github.com/labstack/echo/v5".Echo value in assignment
return e
}

Expand All @@ -29,13 +29,13 @@
return noOpMiddlewareFunc()
}

return ddEcho.Middleware() // nolint:staticcheck

Check failure on line 32 in middleware/echo/echo.go

View workflow job for this annotation

GitHub Actions / mage / mage

cannot use ddEcho.Middleware() (value of func type "github.com/labstack/echo/v4".MiddlewareFunc) as "github.com/labstack/echo/v5".MiddlewareFunc value in return statement
}

func noOpMiddlewareFunc() echo.MiddlewareFunc {
return func(next echo.HandlerFunc) echo.HandlerFunc {
return func(c echo.Context) error {

Check failure on line 37 in middleware/echo/echo.go

View workflow job for this annotation

GitHub Actions / mage / mage

cannot use func(c echo.Context) error {…} (value of type func(c "github.com/labstack/echo/v5".Context) error) as "github.com/labstack/echo/v5".HandlerFunc value in return statement
return next(c)

Check failure on line 38 in middleware/echo/echo.go

View workflow job for this annotation

GitHub Actions / mage / mage

cannot use c (variable of struct type "github.com/labstack/echo/v5".Context) as *"github.com/labstack/echo/v5".Context value in argument to next
}
}
}
2 changes: 1 addition & 1 deletion middleware/echo/echo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/coopnorge/go-datadog-lib/v2/internal/testhelpers"

coopEchoDatadog "github.com/coopnorge/go-datadog-lib/v2/middleware/echo"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
gomock "go.uber.org/mock/gomock"
Expand Down
2 changes: 1 addition & 1 deletion middleware/echo/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

coopdatadog "github.com/coopnorge/go-datadog-lib/v2"
coopEchoDatadog "github.com/coopnorge/go-datadog-lib/v2/middleware/echo"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v5"
)

func ExampleWrap() {
Expand Down
Loading