From e9a4b875069aa12cf6c05323bcbf1123cac863a7 Mon Sep 17 00:00:00 2001 From: Jonathan VUILLEMIN Date: Fri, 22 Mar 2024 14:13:40 +0100 Subject: [PATCH] feat(fxcore): Updated dependencies (#186) --- docs/modules/fxhttpserver.md | 2 +- fxcore/go.mod | 6 +++--- fxcore/go.sum | 13 +++++++------ fxcore/module.go | 2 +- fxcore/module_test.go | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/docs/modules/fxhttpserver.md b/docs/modules/fxhttpserver.md index 2a6bd40..2f9409c 100644 --- a/docs/modules/fxhttpserver.md +++ b/docs/modules/fxhttpserver.md @@ -561,7 +561,7 @@ import ( "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" "go.opentelemetry.io/otel/attribute" - semconv "go.opentelemetry.io/otel/semconv/v1.17.0" + semconv "go.opentelemetry.io/otel/semconv/v1.20.0" "go.opentelemetry.io/otel/trace" "go.uber.org/fx" ) diff --git a/fxcore/go.mod b/fxcore/go.mod index d62523a..8975395 100644 --- a/fxcore/go.mod +++ b/fxcore/go.mod @@ -8,11 +8,11 @@ require ( github.com/ankorstore/yokai/fxgenerate v1.1.0 github.com/ankorstore/yokai/fxhealthcheck v1.1.0 github.com/ankorstore/yokai/fxlog v1.1.0 - github.com/ankorstore/yokai/fxmetrics v1.1.0 + github.com/ankorstore/yokai/fxmetrics v1.2.0 github.com/ankorstore/yokai/fxtrace v1.2.0 github.com/ankorstore/yokai/generate v1.1.0 github.com/ankorstore/yokai/healthcheck v1.1.0 - github.com/ankorstore/yokai/httpserver v1.3.0 + github.com/ankorstore/yokai/httpserver v1.4.1 github.com/ankorstore/yokai/log v1.2.0 github.com/ankorstore/yokai/trace v1.2.0 github.com/arl/statsviz v0.6.0 @@ -45,7 +45,7 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/pelletier/go-toml/v2 v2.1.1 // indirect + github.com/pelletier/go-toml/v2 v2.2.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/common v0.48.0 // indirect diff --git a/fxcore/go.sum b/fxcore/go.sum index 1798a20..4c2c3c4 100644 --- a/fxcore/go.sum +++ b/fxcore/go.sum @@ -8,16 +8,16 @@ github.com/ankorstore/yokai/fxhealthcheck v1.1.0 h1:E/ADes6EC49kPwQlOel5BUyWNv45 github.com/ankorstore/yokai/fxhealthcheck v1.1.0/go.mod h1:j8ki4ZHL/G5zaD3GwVX3j5/xFyuQNNvsZPnoSG7E/AY= github.com/ankorstore/yokai/fxlog v1.1.0 h1:vLI8Qd9KfCzAH9IvzGJTvFYmlE1jtMnjvA4z/vxJpYg= github.com/ankorstore/yokai/fxlog v1.1.0/go.mod h1:VHlj/FNGAuLNqTyRCCx3iGUi9IZXv7qVNrDLUQng1cE= -github.com/ankorstore/yokai/fxmetrics v1.1.0 h1:S0bLCwO37oiDG+5kQFGYt2g2FNGQLu/OSEx7AIijidQ= -github.com/ankorstore/yokai/fxmetrics v1.1.0/go.mod h1:WBr76IIdlSZIpBsjKSdXCAJBWF0HCp46bwFX8bt0tFk= +github.com/ankorstore/yokai/fxmetrics v1.2.0 h1:B4vwfOxsUeFXC5rn0bDHsFnOhEFhRq9aUEWpEayEOCY= +github.com/ankorstore/yokai/fxmetrics v1.2.0/go.mod h1:WBr76IIdlSZIpBsjKSdXCAJBWF0HCp46bwFX8bt0tFk= github.com/ankorstore/yokai/fxtrace v1.2.0 h1:SXlWbjKSsb2wVH+hXSE9OD2VwyqkznwwW+kiQcNvEAU= github.com/ankorstore/yokai/fxtrace v1.2.0/go.mod h1:ch72eVTlIedETOApK7SXk2NEWpn3yYeM018dNRccocg= github.com/ankorstore/yokai/generate v1.1.0 h1:tu3S+uEYh+2qNo8Rf/WxWneDjh49YgDPzSnJfF8JkXA= github.com/ankorstore/yokai/generate v1.1.0/go.mod h1:gqS/i20wnvCOhcXydYdiGcASzBaeuW7GK6YYg/kkuY4= github.com/ankorstore/yokai/healthcheck v1.1.0 h1:PXkEccym7iaVnQltpM5UFi0Xl0n+5rZDzlQju6HmGms= github.com/ankorstore/yokai/healthcheck v1.1.0/go.mod h1:IiYgjRa4G3OLZMwAuacuryZZAfDHsBH8PQoK4PgRdZ4= -github.com/ankorstore/yokai/httpserver v1.3.0 h1:Zk619uJxhWMqzuQJ/E0P6HRqdjtocnTKPEprQfVWw/Q= -github.com/ankorstore/yokai/httpserver v1.3.0/go.mod h1:N6SR5xf9A4xUTgSL/jEo2A8kUXKgmEBloO9wUQOg7hY= +github.com/ankorstore/yokai/httpserver v1.4.1 h1:Zz25h6fYvRsJ+1TtnbJP2fO4Dt/tD3+Kgqs2QkpCJzw= +github.com/ankorstore/yokai/httpserver v1.4.1/go.mod h1:AOCL4cK2bPKrtGFULvOvc8mKHAOw2bLW30CKJra2BB0= github.com/ankorstore/yokai/log v1.2.0 h1:jiuDiC0dtqIGIOsFQslUHYoFJ1qjI+rOMa6dI1LBf2Y= github.com/ankorstore/yokai/log v1.2.0/go.mod h1:MVvUcms1AYGo0BT6l88B9KJdvtK6/qGKdgyKVXfbmyc= github.com/ankorstore/yokai/trace v1.2.0 h1:Jnl++IGNpDYumsZJXP3qjhMdvyHbejiajQwIlU604w0= @@ -75,8 +75,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= -github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pelletier/go-toml/v2 v2.2.0 h1:QLgLl2yMN7N+ruc31VynXs1vhMZa7CeHHejIeBAsoHo= +github.com/pelletier/go-toml/v2 v2.2.0/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= @@ -111,6 +111,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= diff --git a/fxcore/module.go b/fxcore/module.go index c75235d..fb8f892 100644 --- a/fxcore/module.go +++ b/fxcore/module.go @@ -186,7 +186,7 @@ func withMiddlewares(coreServer *echo.Echo, p FxCoreParam) *echo.Echo { coreServer.Use(httpservermiddleware.RequestTracerMiddlewareWithConfig( p.Config.AppName(), httpservermiddleware.RequestTracerMiddlewareConfig{ - TracerProvider: p.TracerProvider, + TracerProvider: httpserver.AnnotateTracerProvider(p.TracerProvider), RequestUriPrefixesToExclude: p.Config.GetStringSlice("modules.core.server.trace.exclude"), }, )) diff --git a/fxcore/module_test.go b/fxcore/module_test.go index a4607de..3401bac 100644 --- a/fxcore/module_test.go +++ b/fxcore/module_test.go @@ -16,7 +16,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" - semconv "go.opentelemetry.io/otel/semconv/v1.17.0" + semconv "go.opentelemetry.io/otel/semconv/v1.20.0" "go.uber.org/fx" )