Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
php: [ "8.4" ]
php: [ "8.3" ]
go: [ stable ]
os: [ "ubuntu-latest" ]
steps:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
php: [ "8.4" ]
php: [ "8.3" ]
go: [ stable ]
os: [ "ubuntu-latest" ]
steps:
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
php: [ "8.4" ]
php: [ "8.3" ]
go: [ stable ]
os: [ "ubuntu-latest" ]
steps:
Expand Down
10 changes: 5 additions & 5 deletions aggregatedpool/activity.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/roadrunner-server/errors"
"github.com/roadrunner-server/goridge/v3/pkg/frame"
"github.com/roadrunner-server/pool/payload"
"github.com/temporalio/roadrunner-temporal/v5/common"
"github.com/temporalio/roadrunner-temporal/v5/api"
"github.com/temporalio/roadrunner-temporal/v5/internal"
commonpb "go.temporal.io/api/common/v1"
tActivity "go.temporal.io/sdk/activity"
Expand All @@ -24,8 +24,8 @@ const (
)

type Activity struct {
codec common.Codec
pool common.Pool
codec api.Codec
pool api.Pool
log *zap.Logger
seqID uint64
running sync.Map
Expand All @@ -34,7 +34,7 @@ type Activity struct {
disableActivityWorkers bool
}

func NewActivityDefinition(ac common.Codec, p common.Pool, log *zap.Logger, disableActivityWorkers bool) *Activity {
func NewActivityDefinition(ac api.Codec, p api.Pool, log *zap.Logger, disableActivityWorkers bool) *Activity {
return &Activity{
log: log,
codec: ac,
Expand Down Expand Up @@ -86,7 +86,7 @@ func (a *Activity) execute(ctx context.Context, args *commonpb.Payloads) (*commo
HeartbeatDetails: len(heartbeatDetails.Payloads),
},
Payloads: args,
Header: common.ActivityHeadersFromCtx(ctx),
Header: api.ActivityHeadersFromCtx(ctx),
}

if len(heartbeatDetails.Payloads) != 0 {
Expand Down
4 changes: 2 additions & 2 deletions aggregatedpool/interceptor.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package aggregatedpool
import (
"context"

"github.com/temporalio/roadrunner-temporal/v5/common"
"github.com/temporalio/roadrunner-temporal/v5/api"
"go.temporal.io/sdk/interceptor"
)

Expand Down Expand Up @@ -34,7 +34,7 @@ func (a *activityInboundInterceptor) Init(outbound interceptor.ActivityOutboundI

func (a *activityInboundInterceptor) ExecuteActivity(ctx context.Context, in *interceptor.ExecuteActivityInput) (any, error) {
// re-store headers under the RR context key
ctx = context.WithValue(ctx, common.HeaderContextKey, interceptor.Header(ctx))
ctx = context.WithValue(ctx, api.HeaderContextKey, interceptor.Header(ctx))
return a.Next.ExecuteActivity(ctx, in)
}

Expand Down
8 changes: 4 additions & 4 deletions aggregatedpool/local_activity.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/roadrunner-server/errors"
"github.com/roadrunner-server/goridge/v3/pkg/frame"
"github.com/roadrunner-server/pool/payload"
"github.com/temporalio/roadrunner-temporal/v5/common"
"github.com/temporalio/roadrunner-temporal/v5/api"
"github.com/temporalio/roadrunner-temporal/v5/internal"
commonpb "go.temporal.io/api/common/v1"
tActivity "go.temporal.io/sdk/activity"
Expand All @@ -18,13 +18,13 @@ import (
)

type LocalActivityFn struct {
codec common.Codec
pool common.Pool
codec api.Codec
pool api.Pool
log *zap.Logger
seqID uint64
}

func NewLocalActivityFn(codec common.Codec, pool common.Pool, log *zap.Logger) *LocalActivityFn {
func NewLocalActivityFn(codec api.Codec, pool api.Pool, log *zap.Logger) *LocalActivityFn {
return &LocalActivityFn{
codec: codec,
pool: pool,
Expand Down
4 changes: 2 additions & 2 deletions aggregatedpool/workers.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

"github.com/google/uuid"
"github.com/temporalio/roadrunner-temporal/v5/common"
"github.com/temporalio/roadrunner-temporal/v5/api"
"github.com/temporalio/roadrunner-temporal/v5/internal"
tActivity "go.temporal.io/sdk/activity"
temporalClient "go.temporal.io/sdk/client"
Expand All @@ -15,7 +15,7 @@ import (

const tq = "taskqueue"

func TemporalWorkers(wDef *Workflow, actDef *Activity, wi []*internal.WorkerInfo, log *zap.Logger, tc temporalClient.Client, interceptors map[string]common.Interceptor) ([]worker.Worker, error) {
func TemporalWorkers(wDef *Workflow, actDef *Activity, wi []*internal.WorkerInfo, log *zap.Logger, tc temporalClient.Client, interceptors map[string]api.Interceptor) ([]worker.Worker, error) {
workers := make([]worker.Worker, 0, 1)

for i := 0; i < len(wi); i++ {
Expand Down
8 changes: 4 additions & 4 deletions aggregatedpool/workflow.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/google/uuid"
"github.com/roadrunner-server/pool/payload"
"github.com/temporalio/roadrunner-temporal/v5/api"
"github.com/temporalio/roadrunner-temporal/v5/canceller"
"github.com/temporalio/roadrunner-temporal/v5/common"
"github.com/temporalio/roadrunner-temporal/v5/internal"
"github.com/temporalio/roadrunner-temporal/v5/queue"
"github.com/temporalio/roadrunner-temporal/v5/registry"
Expand Down Expand Up @@ -45,8 +45,8 @@ func seq() uint64 {
}

type Workflow struct {
codec common.Codec
pool common.Pool
codec api.Codec
pool api.Pool
rrID string

// LocalActivityFn
Expand Down Expand Up @@ -75,7 +75,7 @@ type Workflow struct {
}

// NewWorkflowDefinition ... WorkflowDefinition Constructor
func NewWorkflowDefinition(codec common.Codec, la LaFn, pool common.Pool, log *zap.Logger) *Workflow {
func NewWorkflowDefinition(codec api.Codec, la LaFn, pool api.Pool, log *zap.Logger) *Workflow {
return &Workflow{
rrID: uuid.NewString(),
log: log,
Expand Down
2 changes: 1 addition & 1 deletion common/context.go → api/context.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package common
package api

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion common/interfaces.go → api/interfaces.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package common
package api

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion data_converter/converter.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package data_converter //nolint:revive
package data_converter

import (
commonpb "go.temporal.io/api/common/v1"
Expand Down
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/temporalio/roadrunner-temporal/v5

go 1.24
go 1.24.1

toolchain go1.24.4

Expand All @@ -13,11 +13,11 @@ require (
github.com/roadrunner-server/events v1.0.1
github.com/roadrunner-server/pool v1.1.3
github.com/stretchr/testify v1.10.0
github.com/uber-go/tally/v4 v4.1.17-0.20240412215630-22fe011f5ff0
github.com/uber-go/tally/v4 v4.1.17
go.temporal.io/api v1.50.0
go.temporal.io/sdk v1.34.0
go.temporal.io/sdk/contrib/tally v0.2.0
go.temporal.io/server v1.27.2
go.temporal.io/server v1.28.0
go.uber.org/zap v1.27.0
google.golang.org/protobuf v1.36.6
)
Expand All @@ -40,15 +40,15 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/mock v1.7.0-rc.1 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nexus-rpc/sdk-go v0.4.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.22.0
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.64.0 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/prometheus/common v0.65.0 // indirect
github.com/prometheus/procfs v0.17.0 // indirect
github.com/roadrunner-server/goridge/v3 v3.8.3
github.com/robfig/cron v1.2.0 // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
Expand Down
22 changes: 14 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
Expand Down Expand Up @@ -102,8 +103,8 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
Expand Down Expand Up @@ -163,14 +164,14 @@ github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvM
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
github.com/prometheus/common v0.64.0 h1:pdZeA+g617P7oGv1CzdTzyeShxAGrTBsolKNOLQPGO4=
github.com/prometheus/common v0.64.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
github.com/roadrunner-server/api/v4 v4.20.0 h1:/KzzkIErTZOCPL45vfE/JBN308QzsRIv7jgiCI9F+rI=
github.com/roadrunner-server/api/v4 v4.20.0/go.mod h1:XOcFp2aTQGo0per+Y0MXLhVNBYnDgc9sOMQb4KU1X7M=
github.com/roadrunner-server/endure/v2 v2.6.2 h1:sIB4kTyE7gtT3fDhuYWUYn6Vt/dcPtiA6FoNS1eS+84=
Expand Down Expand Up @@ -227,10 +228,15 @@ github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis=
go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.temporal.io/api v1.5.0/go.mod h1:BqKxEJJYdxb5dqf0ODfzfMxh8UEQ5L3zKS51FiIYYkA=
go.temporal.io/api v1.50.0 h1:7s8Cn+fKfNx9G0v2Ge9We6X2WiCA3JvJ9JryeNbx1Bc=
Expand All @@ -240,8 +246,8 @@ go.temporal.io/sdk v1.34.0 h1:VLg/h6ny7GvLFVoQPqz2NcC93V9yXboQwblkRvZ1cZE=
go.temporal.io/sdk v1.34.0/go.mod h1:iE4U5vFrH3asOhqpBBphpj9zNtw8btp8+MSaf5A0D3w=
go.temporal.io/sdk/contrib/tally v0.2.0 h1:XnTJIQcjOv+WuCJ1u8Ve2nq+s2H4i/fys34MnWDRrOo=
go.temporal.io/sdk/contrib/tally v0.2.0/go.mod h1:1kpSuCms/tHeJQDPuuKkaBsMqfHnIIRnCtUYlPNXxuE=
go.temporal.io/server v1.27.2 h1:EJBatFezrKinkebV8KZKidYEr8DZdFaoL0FvC4LSlU8=
go.temporal.io/server v1.27.2/go.mod h1:6v5/iYPKipHW9dw4B48IeYoLlr2WsBHESXDQ4D8F3ys=
go.temporal.io/server v1.28.0 h1:1rLPrT21ZwpsRjElJqSgThj1NZSAtAPyi8nKX+EAkgo=
go.temporal.io/server v1.28.0/go.mod h1:yri8PdZoAtwI9p65hzvABf11WqXelHl/HabbrnJSu+g=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
Expand Down
4 changes: 2 additions & 2 deletions go.work
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
go 1.24
go 1.24.1

toolchain go1.24.0
toolchain go1.24.4

use (
.
Expand Down
Loading
Loading