Skip to content

Commit 81ee94e

Browse files
committed
fix: increase taskq timeout, add tracing
1 parent 96b28e8 commit 81ee94e

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ require (
3131
github.com/swaggo/echo-swagger v1.1.4
3232
github.com/swaggo/swag v1.7.6
3333
github.com/vektah/gqlparser/v2 v2.2.0
34+
github.com/vmihailenco/taskq/extra/taskqotel/v3 v3.2.8
3435
github.com/vmihailenco/taskq/v3 v3.2.8
3536
github.com/xeipuuv/gojsonschema v1.2.0
3637
go.opentelemetry.io/contrib v1.2.0

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,8 @@ github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9
732732
github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
733733
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
734734
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
735+
github.com/vmihailenco/taskq/extra/taskqotel/v3 v3.2.8 h1:keHd+7LCPUPyQMb+DsO/OiZJuMoBEsOiBdONm+1nmPI=
736+
github.com/vmihailenco/taskq/extra/taskqotel/v3 v3.2.8/go.mod h1:svFuw6AcsvxQdwFiZF0BYk2XSfgXy1tSWE6L6sOJVeo=
735737
github.com/vmihailenco/taskq/v3 v3.2.8 h1:Smrz4Fhqi+29fALjcjlETACVbzlra/MbmFY9YKfvjQI=
736738
github.com/vmihailenco/taskq/v3 v3.2.8/go.mod h1:IFuypxi7Y0h+PcactlQOPf92Ssxg0FWxQZ8ptxYW/Zk=
737739
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
@@ -772,6 +774,7 @@ go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0
772774
go.opentelemetry.io/contrib/propagators/b3 v1.2.0 h1:+zQjl3DBSOle9GEhHuhqzDUKtYcVSfbHSNv24hsoOJ0=
773775
go.opentelemetry.io/contrib/propagators/b3 v1.2.0/go.mod h1:kO8hNKCfa1YmQJ0lM7pzfJGvbXEipn/S7afbOfaw2Kc=
774776
go.opentelemetry.io/otel v0.11.0/go.mod h1:G8UCk+KooF2HLkgo8RHX9epABH/aRGYET7gQOqBVdB0=
777+
go.opentelemetry.io/otel v1.0.0-RC2/go.mod h1:w1thVQ7qbAy8MHb0IFj8a5Q2QU0l2ksf8u/CN8m3NOM=
775778
go.opentelemetry.io/otel v1.2.0 h1:YOQDvxO1FayUcT9MIhJhgMyNO1WqoduiyvQHzGN0kUQ=
776779
go.opentelemetry.io/otel v1.2.0/go.mod h1:aT17Fk0Z1Nor9e0uisf98LrntPGMnk4frBO9+dkf69I=
777780
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.2.0 h1:xzbcGykysUh776gzD1LUPsNNHKWN0kQWDnJhn1ddUuk=
@@ -780,6 +783,7 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.2.0 h1:j/jXNz
780783
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.2.0/go.mod h1:k5GnE4m4Jyy2DNh6UAzG6Nml51nuqQyszV7O1ksQAnE=
781784
go.opentelemetry.io/otel/sdk v1.2.0 h1:wKN260u4DesJYhyjxDa7LRFkuhH7ncEVKU37LWcyNIo=
782785
go.opentelemetry.io/otel/sdk v1.2.0/go.mod h1:jNN8QtpvbsKhgaC6V5lHiejMoKD+V8uadoSafgHPx1U=
786+
go.opentelemetry.io/otel/trace v1.0.0-RC2/go.mod h1:JPQ+z6nNw9mqEGT8o3eoPTdnNI+Aj5JcxEsVGREIAy4=
783787
go.opentelemetry.io/otel/trace v1.2.0 h1:Ys3iqbqZhcf28hHzrm5WAquMkDHNZTUkw7KHbuNjej0=
784788
go.opentelemetry.io/otel/trace v1.2.0/go.mod h1:N5FLswTubnxKxOJHM7XZC074qpeEdLy3CgAVsdMucK0=
785789
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=

redis/jobs/jobs.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7+
"time"
78

8-
"github.com/satisfactorymodding/smr-api/redis/jobs/tasks"
9+
"github.com/vmihailenco/taskq/extra/taskqotel/v3"
910

1011
"github.com/go-redis/redis/v8"
1112
"github.com/rs/zerolog/log"
13+
"github.com/satisfactorymodding/smr-api/redis/jobs/tasks"
1214
"github.com/spf13/viper"
1315
"github.com/vmihailenco/taskq/v3"
1416
"github.com/vmihailenco/taskq/v3/redisq"
@@ -28,8 +30,15 @@ func InitializeJobs(ctx context.Context) {
2830
QueueFactory := redisq.NewFactory()
2931

3032
queue = QueueFactory.RegisterQueue(&taskq.QueueOptions{
31-
Name: "api-worker",
32-
Redis: connection,
33+
Name: "api-worker",
34+
Redis: connection,
35+
ReservationTimeout: time.Hour,
36+
})
37+
38+
QueueFactory.Range(func(q taskq.Queue) bool {
39+
consumer := q.Consumer()
40+
consumer.AddHook(&taskqotel.OpenTelemetryHook{})
41+
return true
3342
})
3443

3544
if err := QueueFactory.StartConsumers(ctx); err != nil {

0 commit comments

Comments
 (0)