From 3138e4993555ba7c62db7f818bb0a25472419bc1 Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Wed, 3 Jul 2024 17:36:31 +0200 Subject: [PATCH] chore(deps): update dependencies --- go.mod | 4 ++-- go.sum | 2 ++ go.work.sum | 3 +++ plugin.go | 4 ++-- tests/go.mod | 8 ++++---- tests/go.sum | 8 ++++---- tests/jobs_memory_test.go | 2 +- tests/kv_memory_test.go | 2 +- tests/pkgs.txt | 2 +- 9 files changed, 20 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 14af093..a95444a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/roadrunner-server/memory/v4 +module github.com/roadrunner-server/memory/v5 go 1.22.5 @@ -7,7 +7,7 @@ require ( github.com/roadrunner-server/api/v4 v4.15.0 github.com/roadrunner-server/endure/v2 v2.4.5 github.com/roadrunner-server/errors v1.4.0 - go.opentelemetry.io/contrib/propagators/jaeger v1.27.0 + go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 go.opentelemetry.io/otel v1.28.0 go.opentelemetry.io/otel/sdk v1.28.0 go.opentelemetry.io/otel/trace v1.28.0 diff --git a/go.sum b/go.sum index 88b0546..05430f1 100644 --- a/go.sum +++ b/go.sum @@ -23,6 +23,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= go.opentelemetry.io/contrib/propagators/jaeger v1.27.0 h1:tJPpZAEsihJgRTnXrPjY3rjED8Av3EJdi1kvKCi1yMc= go.opentelemetry.io/contrib/propagators/jaeger v1.27.0/go.mod h1:5uPAMHJnlTktQbCCdWSX5PfK8CocD25mycIsZV/iFiU= +go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 h1:xQ3ktSVS128JWIaN1DiPGIjcH+GsvkibIAVRWFjS9eM= +go.opentelemetry.io/contrib/propagators/jaeger v1.28.0/go.mod h1:O9HIyI2kVBrFoEwQZ0IN6PHXykGoit4mZV2aEjkTRH4= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= diff --git a/go.work.sum b/go.work.sum index 277b5b9..3c437f8 100644 --- a/go.work.sum +++ b/go.work.sum @@ -507,6 +507,7 @@ github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNV github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-pdf/fpdf v0.6.0 h1:MlgtGIfsdMEEQJr2le6b/HNr1ZlQwxyWr77r2aj2U/8= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= @@ -680,6 +681,8 @@ github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/roadrunner-server/memory/v4 v4.6.16 h1:mQnXn0HTDbXiJt1dVH7pD7VqU1wNH2yrGi7tSaS9l+I= +github.com/roadrunner-server/memory/v4 v4.6.16/go.mod h1:EBz82pghK9Cfcgn96sPL2B+NRbeX6MMfD+mk0VG6GTE= github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245 h1:K1Xf3bKttbF+koVGaX5xngRIZ5bVjbmPnaxE/dR08uY= diff --git a/plugin.go b/plugin.go index 1e9a588..9ae0306 100644 --- a/plugin.go +++ b/plugin.go @@ -4,8 +4,8 @@ import ( "github.com/roadrunner-server/api/v4/plugins/v1/kv" "github.com/roadrunner-server/api/v4/plugins/v4/jobs" "github.com/roadrunner-server/endure/v2/dep" - "github.com/roadrunner-server/memory/v4/memoryjobs" - "github.com/roadrunner-server/memory/v4/memorykv" + "github.com/roadrunner-server/memory/v5/memoryjobs" + "github.com/roadrunner-server/memory/v5/memorykv" sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.uber.org/zap" ) diff --git a/tests/go.mod b/tests/go.mod index 9d3da15..c089600 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -14,7 +14,7 @@ require ( github.com/roadrunner-server/jobs/v4 v4.10.0 github.com/roadrunner-server/kv/v4 v4.6.5 github.com/roadrunner-server/logger/v4 v4.4.5 - github.com/roadrunner-server/memory/v4 v4.6.16 + github.com/roadrunner-server/memory/v5 v5.0.0 github.com/roadrunner-server/otel/v4 v4.5.5 github.com/roadrunner-server/resetter/v4 v4.3.5 github.com/roadrunner-server/rpc/v4 v4.4.5 @@ -23,7 +23,7 @@ require ( go.uber.org/zap v1.27.0 ) -replace github.com/roadrunner-server/memory/v4 => ../ +replace github.com/roadrunner-server/memory/v5 => ../ require ( github.com/beorn7/perks v1.0.1 // indirect @@ -88,8 +88,8 @@ require ( github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect github.com/zeebo/blake3 v0.2.3 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect - go.opentelemetry.io/contrib/propagators/jaeger v1.27.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect + go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect diff --git a/tests/go.sum b/tests/go.sum index f6dbcc0..c21aa10 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -224,10 +224,10 @@ github.com/zeebo/blake3 v0.2.3 h1:TFoLXsjeXqRNFxSbk35Dk4YtszE/MQQGK10BH4ptoTg= github.com/zeebo/blake3 v0.2.3/go.mod h1:mjJjZpnsyIVtVgTOSpJ9vmRE4wgDeyt2HU3qXvvKCaQ= github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= -go.opentelemetry.io/contrib/propagators/jaeger v1.27.0 h1:tJPpZAEsihJgRTnXrPjY3rjED8Av3EJdi1kvKCi1yMc= -go.opentelemetry.io/contrib/propagators/jaeger v1.27.0/go.mod h1:5uPAMHJnlTktQbCCdWSX5PfK8CocD25mycIsZV/iFiU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= +go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 h1:xQ3ktSVS128JWIaN1DiPGIjcH+GsvkibIAVRWFjS9eM= +go.opentelemetry.io/contrib/propagators/jaeger v1.28.0/go.mod h1:O9HIyI2kVBrFoEwQZ0IN6PHXykGoit4mZV2aEjkTRH4= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= diff --git a/tests/jobs_memory_test.go b/tests/jobs_memory_test.go index 48b9861..3c70db7 100644 --- a/tests/jobs_memory_test.go +++ b/tests/jobs_memory_test.go @@ -25,7 +25,7 @@ import ( goridgeRpc "github.com/roadrunner-server/goridge/v3/pkg/rpc" "github.com/roadrunner-server/informer/v4" "github.com/roadrunner-server/jobs/v4" - "github.com/roadrunner-server/memory/v4" + "github.com/roadrunner-server/memory/v5" "github.com/roadrunner-server/otel/v4" "github.com/roadrunner-server/resetter/v4" rpcPlugin "github.com/roadrunner-server/rpc/v4" diff --git a/tests/kv_memory_test.go b/tests/kv_memory_test.go index ab87dba..2a2d0e7 100644 --- a/tests/kv_memory_test.go +++ b/tests/kv_memory_test.go @@ -18,7 +18,7 @@ import ( "github.com/roadrunner-server/http/v4" "github.com/roadrunner-server/kv/v4" "github.com/roadrunner-server/logger/v4" - "github.com/roadrunner-server/memory/v4" + "github.com/roadrunner-server/memory/v5" "github.com/roadrunner-server/otel/v4" rpcPlugin "github.com/roadrunner-server/rpc/v4" "github.com/roadrunner-server/server/v4" diff --git a/tests/pkgs.txt b/tests/pkgs.txt index a812f62..b53e695 100644 --- a/tests/pkgs.txt +++ b/tests/pkgs.txt @@ -1 +1 @@ -github.com/roadrunner-server/amqp/v4,github.com/roadrunner-server/app-logger/v4,github.com/roadrunner-server/beanstalk/v4,github.com/roadrunner-server/boltdb/v4,github.com/roadrunner-server/centrifuge/v4,github.com/roadrunner-server/config/v4,github.com/roadrunner-server/fileserver/v4,github.com/roadrunner-server/grpc/v4,github.com/roadrunner-server/gzip/v4,github.com/roadrunner-server/headers/v4,github.com/roadrunner-server/http/v4,github.com/roadrunner-server/informer/v4,github.com/roadrunner-server/jobs/v4,github.com/roadrunner-server/kafka/v4,github.com/roadrunner-server/kv/v4,github.com/roadrunner-server/logger/v4,github.com/roadrunner-server/lock/v4,github.com/roadrunner-server/memcached/v4,github.com/roadrunner-server/memory/v4,github.com/roadrunner-server/metrics/v4,github.com/roadrunner-server/nats/v4,github.com/roadrunner-server/otel/v4,github.com/roadrunner-server/prometheus/v4,github.com/roadrunner-server/proxy_ip_parser/v4,github.com/roadrunner-server/redis/v4,github.com/roadrunner-server/resetter/v4,github.com/roadrunner-server/rpc/v4,github.com/roadrunner-server/send/v4,github.com/roadrunner-server/server/v4,github.com/roadrunner-server/service/v4,github.com/roadrunner-server/sqs/v4,github.com/roadrunner-server/static/v4,github.com/roadrunner-server/status/v4,github.com/roadrunner-server/tcp/v4 +github.com/roadrunner-server/amqp/v5,github.com/roadrunner-server/app-logger/v5,github.com/roadrunner-server/beanstalk/v5,github.com/roadrunner-server/boltdb/v5,github.com/roadrunner-server/centrifuge/v5,github.com/roadrunner-server/config/v5,github.com/roadrunner-server/fileserver/v5,github.com/roadrunner-server/grpc/v5,github.com/roadrunner-server/gzip/v5,github.com/roadrunner-server/headers/v5,github.com/roadrunner-server/http/v5,github.com/roadrunner-server/informer/v5,github.com/roadrunner-server/jobs/v5,github.com/roadrunner-server/kafka/v5,github.com/roadrunner-server/kv/v5,github.com/roadrunner-server/logger/v5,github.com/roadrunner-server/lock/v5,github.com/roadrunner-server/memcached/v5,github.com/roadrunner-server/memory/v5,github.com/roadrunner-server/metrics/v5,github.com/roadrunner-server/nats/v5,github.com/roadrunner-server/otel/v5,github.com/roadrunner-server/prometheus/v5,github.com/roadrunner-server/proxy_ip_parser/v5,github.com/roadrunner-server/redis/v5,github.com/roadrunner-server/resetter/v5,github.com/roadrunner-server/rpc/v5,github.com/roadrunner-server/send/v5,github.com/roadrunner-server/server/v5,github.com/roadrunner-server/service/v5,github.com/roadrunner-server/sqs/v5,github.com/roadrunner-server/static/v5,github.com/roadrunner-server/status/v5,github.com/roadrunner-server/tcp/v5