diff --git a/logging/logrus/go.mod b/logging/logrus/go.mod index f03b696..6b52812 100644 --- a/logging/logrus/go.mod +++ b/logging/logrus/go.mod @@ -3,7 +3,7 @@ module github.com/hertz-contrib/obs-opentelemetry/logging/logrus go 1.19 require ( - github.com/cloudwego/hertz v0.7.1 + github.com/cloudwego/hertz v0.9.0 github.com/hertz-contrib/logger/logrus v1.0.0 github.com/sirupsen/logrus v1.9.3 go.opentelemetry.io/otel v1.19.0 diff --git a/logging/logrus/go.sum b/logging/logrus/go.sum index 3af88ab..b44309f 100644 --- a/logging/logrus/go.sum +++ b/logging/logrus/go.sum @@ -5,8 +5,8 @@ github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1 github.com/bytedance/sonic v1.8.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= -github.com/cloudwego/hertz v0.7.1 h1:4M8l4zvAE6yNxzfozpxHLMnRSRRPslKNw/McH5/qFns= -github.com/cloudwego/hertz v0.7.1/go.mod h1:WliNtVbwihWHHgAaIQEbVXl0O3aWj0ks1eoPrcEAnjs= +github.com/cloudwego/hertz v0.9.0 h1:vmgSMSBx3qgB+ZnqbuEwfy+BFMS1cMr1ZSddif9zZ3A= +github.com/cloudwego/hertz v0.9.0/go.mod h1:WliNtVbwihWHHgAaIQEbVXl0O3aWj0ks1eoPrcEAnjs= github.com/cloudwego/netpoll v0.5.0/go.mod h1:xVefXptcyheopwNDZjDPcfU6kIjZXZ4nY550k1yH9eQ= 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= diff --git a/logging/zap/go.mod b/logging/zap/go.mod index f5067a1..235693e 100644 --- a/logging/zap/go.mod +++ b/logging/zap/go.mod @@ -3,7 +3,7 @@ module github.com/hertz-contrib/obs-opentelemetry/logging/zap go 1.19 require ( - github.com/cloudwego/hertz v0.7.1 + github.com/cloudwego/hertz v0.9.0 github.com/hertz-contrib/logger/zap v1.1.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/otel v1.19.0 diff --git a/logging/zap/go.sum b/logging/zap/go.sum index c1b51f4..8e09c47 100644 --- a/logging/zap/go.sum +++ b/logging/zap/go.sum @@ -5,8 +5,8 @@ github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1 github.com/bytedance/sonic v1.8.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= -github.com/cloudwego/hertz v0.7.1 h1:4M8l4zvAE6yNxzfozpxHLMnRSRRPslKNw/McH5/qFns= -github.com/cloudwego/hertz v0.7.1/go.mod h1:WliNtVbwihWHHgAaIQEbVXl0O3aWj0ks1eoPrcEAnjs= +github.com/cloudwego/hertz v0.9.0 h1:vmgSMSBx3qgB+ZnqbuEwfy+BFMS1cMr1ZSddif9zZ3A= +github.com/cloudwego/hertz v0.9.0/go.mod h1:WliNtVbwihWHHgAaIQEbVXl0O3aWj0ks1eoPrcEAnjs= github.com/cloudwego/netpoll v0.5.0/go.mod h1:xVefXptcyheopwNDZjDPcfU6kIjZXZ4nY550k1yH9eQ= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/logging/zerolog/go.mod b/logging/zerolog/go.mod index b29f1c1..77b262f 100644 --- a/logging/zerolog/go.mod +++ b/logging/zerolog/go.mod @@ -3,7 +3,7 @@ module github.com/hertz-contrib/obs-opentelemetry/logging/zerolog go 1.19 require ( - github.com/cloudwego/hertz v0.8.0 + github.com/cloudwego/hertz v0.9.0 github.com/hertz-contrib/logger/zerolog v0.0.0-20231211035138-acc7b4e2984b github.com/rs/zerolog v1.31.0 github.com/stretchr/testify v1.8.4 diff --git a/logging/zerolog/go.sum b/logging/zerolog/go.sum index 00c27dc..8636a4b 100644 --- a/logging/zerolog/go.sum +++ b/logging/zerolog/go.sum @@ -8,8 +8,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0= github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo= -github.com/cloudwego/hertz v0.8.0 h1:rjALfbD/E3IkaNDksQ4oF0nA5d03FfSEx3yc2PkJklo= -github.com/cloudwego/hertz v0.8.0/go.mod h1:WliNtVbwihWHHgAaIQEbVXl0O3aWj0ks1eoPrcEAnjs= +github.com/cloudwego/hertz v0.9.0 h1:vmgSMSBx3qgB+ZnqbuEwfy+BFMS1cMr1ZSddif9zZ3A= +github.com/cloudwego/hertz v0.9.0/go.mod h1:WliNtVbwihWHHgAaIQEbVXl0O3aWj0ks1eoPrcEAnjs= github.com/cloudwego/netpoll v0.5.0/go.mod h1:xVefXptcyheopwNDZjDPcfU6kIjZXZ4nY550k1yH9eQ= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= diff --git a/provider/go.mod b/provider/go.mod index 3f07424..e5cdc80 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -3,7 +3,7 @@ module github.com/hertz-contrib/obs-opentelemetry/provider go 1.19 require ( - github.com/cloudwego/hertz v0.7.1 + github.com/cloudwego/hertz v0.9.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/contrib/instrumentation/runtime v0.45.0 go.opentelemetry.io/contrib/propagators/b3 v1.20.0 diff --git a/provider/go.sum b/provider/go.sum index e1c4a1a..73bed17 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -7,8 +7,8 @@ github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqy github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= -github.com/cloudwego/hertz v0.7.1 h1:4M8l4zvAE6yNxzfozpxHLMnRSRRPslKNw/McH5/qFns= -github.com/cloudwego/hertz v0.7.1/go.mod h1:WliNtVbwihWHHgAaIQEbVXl0O3aWj0ks1eoPrcEAnjs= +github.com/cloudwego/hertz v0.9.0 h1:vmgSMSBx3qgB+ZnqbuEwfy+BFMS1cMr1ZSddif9zZ3A= +github.com/cloudwego/hertz v0.9.0/go.mod h1:WliNtVbwihWHHgAaIQEbVXl0O3aWj0ks1eoPrcEAnjs= github.com/cloudwego/netpoll v0.5.0/go.mod h1:xVefXptcyheopwNDZjDPcfU6kIjZXZ4nY550k1yH9eQ= 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= diff --git a/provider/options.go b/provider/options.go index 4f49c28..d25e4b3 100644 --- a/provider/options.go +++ b/provider/options.go @@ -74,12 +74,10 @@ func defaultConfig() *config { enableMetrics: true, sampler: sdktrace.AlwaysSample(), textMapPropagator: propagation.NewCompositeTextMapPropagator( - propagation.NewCompositeTextMapPropagator( - b3.New(), - ot.OT{}, - propagation.Baggage{}, - propagation.TraceContext{}, - ), + b3.New(), + ot.OT{}, + propagation.Baggage{}, + propagation.TraceContext{}, ), } } diff --git a/tracing/go.mod b/tracing/go.mod index 8a845fc..b5f71e9 100644 --- a/tracing/go.mod +++ b/tracing/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/bytedance/gopkg v0.0.0-20230728082804-614d0af6619b - github.com/cloudwego/hertz v0.7.1 + github.com/cloudwego/hertz v0.9.0 github.com/prometheus/client_golang v1.17.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/contrib/propagators/b3 v1.20.0 diff --git a/tracing/go.sum b/tracing/go.sum index f91b19e..d07e44c 100644 --- a/tracing/go.sum +++ b/tracing/go.sum @@ -15,8 +15,8 @@ github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= -github.com/cloudwego/hertz v0.7.1 h1:4M8l4zvAE6yNxzfozpxHLMnRSRRPslKNw/McH5/qFns= -github.com/cloudwego/hertz v0.7.1/go.mod h1:WliNtVbwihWHHgAaIQEbVXl0O3aWj0ks1eoPrcEAnjs= +github.com/cloudwego/hertz v0.9.0 h1:vmgSMSBx3qgB+ZnqbuEwfy+BFMS1cMr1ZSddif9zZ3A= +github.com/cloudwego/hertz v0.9.0/go.mod h1:WliNtVbwihWHHgAaIQEbVXl0O3aWj0ks1eoPrcEAnjs= github.com/cloudwego/netpoll v0.5.0 h1:oRrOp58cPCvK2QbMozZNDESvrxQaEHW2dCimmwH1lcU= github.com/cloudwego/netpoll v0.5.0/go.mod h1:xVefXptcyheopwNDZjDPcfU6kIjZXZ4nY550k1yH9eQ= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/tracing/propagator_test.go b/tracing/propagator_test.go index c346e70..aeb9abe 100644 --- a/tracing/propagator_test.go +++ b/tracing/propagator_test.go @@ -75,12 +75,10 @@ func TestExtract(t *testing.T) { func TestInject(t *testing.T) { cfg := newConfig([]Option{WithTextMapPropagator(propagation.NewCompositeTextMapPropagator( - propagation.NewCompositeTextMapPropagator( - b3.New(), - ot.OT{}, - propagation.Baggage{}, - propagation.TraceContext{}, - ), + b3.New(), + ot.OT{}, + propagation.Baggage{}, + propagation.TraceContext{}, ))}) ctx := context.Background()