diff --git a/cmd/chirpstack-application-server/cmd/root.go b/cmd/chirpstack-application-server/cmd/root.go index 0f5fcdb2d..999250fb2 100644 --- a/cmd/chirpstack-application-server/cmd/root.go +++ b/cmd/chirpstack-application-server/cmd/root.go @@ -9,7 +9,7 @@ import ( "time" "github.com/brocaar/chirpstack-application-server/internal/config" - "github.com/go-redis/redis/v8" + "github.com/redis/go-redis/v9" "github.com/spf13/viper" log "github.com/sirupsen/logrus" diff --git a/docker-compose.yml b/docker-compose.yml index 8a57fc91d..69edb0e4a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,7 @@ services: - ./.docker-compose/postgresql/initdb:/docker-entrypoint-initdb.d redis: - image: redis:6-alpine + image: redis:7-alpine mosquitto: image: eclipse-mosquitto:1.6 diff --git a/go.mod b/go.mod index 797a0b3f1..9c9670952 100644 --- a/go.mod +++ b/go.mod @@ -25,6 +25,7 @@ require ( github.com/mmcloughlin/geohash v0.9.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.14.0 + github.com/redis/go-redis/v9 v9.0.3 github.com/robertkrimen/otto v0.0.0-20191217063420-37f8e9a2460c github.com/segmentio/kafka-go v0.4.17 github.com/sirupsen/logrus v1.7.0 @@ -52,7 +53,7 @@ require ( github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2 // indirect github.com/caarlos0/ctrlc v1.0.0 // indirect github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/fatih/color v1.7.0 // indirect diff --git a/go.sum b/go.sum index 9799ee386..334ac467e 100644 --- a/go.sum +++ b/go.sum @@ -78,6 +78,10 @@ github.com/brocaar/chirpstack-api/go/v3 v3.12.5 h1:sLV+zSZLUPnNCo2mf+gsw0ektbSiS github.com/brocaar/chirpstack-api/go/v3 v3.12.5/go.mod h1:v8AWP19nOJK4rwJsr1+weDfpUc4UNLbRh8Eygn4Oh00= github.com/brocaar/lorawan v0.0.0-20220715134808-3b283dda1534 h1:vqq/suBJc3KWCDOfJFEMx3t83cBdjldR5yLGps/3DWo= github.com/brocaar/lorawan v0.0.0-20220715134808-3b283dda1534/go.mod h1:Vlf3gOwizqX4y3snWe/i2EqRT83HvYuwBjRu39PevW0= +github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao= +github.com/bsm/ginkgo/v2 v2.7.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w= +github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y= +github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/caarlos0/ctrlc v1.0.0 h1:2DtF8GSIcajgffDFJzyG15vO+1PuBWOMUdFut7NnXhw= github.com/caarlos0/ctrlc v1.0.0/go.mod h1:CdXpj4rmq0q/1Eb44M9zi2nKB0QraNKuRGYGrrHhcQw= github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e h1:V9a67dfYqPLAvzk5hMQOXYJlZ4SLIXgyKIE+ZiHzgGQ= @@ -87,8 +91,9 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -472,6 +477,8 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/redis/go-redis/v9 v9.0.3 h1:+7mmR26M0IvyLxGZUHxu4GiBkJkVDid0Un+j4ScYu4k= +github.com/redis/go-redis/v9 v9.0.3/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk= github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/robertkrimen/otto v0.0.0-20191217063420-37f8e9a2460c h1:3xoaT4/crdgX7KSnwryQVhSMN067lJ2jUSAmlcFPwbM= github.com/robertkrimen/otto v0.0.0-20191217063420-37f8e9a2460c/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY= diff --git a/internal/eventlog/eventlog.go b/internal/eventlog/eventlog.go index 19ffd133f..03c3e107d 100644 --- a/internal/eventlog/eventlog.go +++ b/internal/eventlog/eventlog.go @@ -5,10 +5,10 @@ import ( "encoding/json" "time" - "github.com/go-redis/redis/v8" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/timestamp" "github.com/pkg/errors" + "github.com/redis/go-redis/v9" "github.com/brocaar/chirpstack-api/go/v3/as/integration" "github.com/brocaar/chirpstack-application-server/internal/config" diff --git a/internal/storage/db.go b/internal/storage/db.go index b7828c3ff..fe6c4ecd0 100644 --- a/internal/storage/db.go +++ b/internal/storage/db.go @@ -4,9 +4,9 @@ import ( "database/sql" "time" - "github.com/go-redis/redis/v8" "github.com/jmoiron/sqlx" "github.com/pkg/errors" + "github.com/redis/go-redis/v9" // register postgresql driver _ "github.com/lib/pq" diff --git a/internal/storage/metrics.go b/internal/storage/metrics.go index ddee9f870..4923acc5a 100644 --- a/internal/storage/metrics.go +++ b/internal/storage/metrics.go @@ -7,8 +7,8 @@ import ( "time" "github.com/brocaar/chirpstack-application-server/internal/logging" - "github.com/go-redis/redis/v8" "github.com/pkg/errors" + "github.com/redis/go-redis/v9" log "github.com/sirupsen/logrus" ) @@ -194,7 +194,7 @@ func GetMetrics(ctx context.Context, agg AggregationInterval, name string, start } pipe := RedisClient().Pipeline() - var vals []*redis.StringStringMapCmd + var vals []*redis.MapStringStringCmd for _, k := range keys { vals = append(vals, pipe.HGetAll(ctx, k)) } diff --git a/internal/storage/storage.go b/internal/storage/storage.go index b40f476b7..3c5e34c56 100644 --- a/internal/storage/storage.go +++ b/internal/storage/storage.go @@ -8,13 +8,13 @@ import ( "strings" "time" - "github.com/go-redis/redis/v8" uuid "github.com/gofrs/uuid" "github.com/golang-migrate/migrate/v4" "github.com/golang-migrate/migrate/v4/database/postgres" "github.com/golang-migrate/migrate/v4/source/httpfs" "github.com/jmoiron/sqlx" "github.com/pkg/errors" + "github.com/redis/go-redis/v9" log "github.com/sirupsen/logrus" "github.com/brocaar/chirpstack-application-server/internal/config"