Skip to content
Open
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
16 changes: 8 additions & 8 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:
cd tests
docker compose -f env/docker-compose-temporal-updates.yaml up -d --remove-orphans

go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/temporalio/roadrunner-temporal/v5/... -coverprofile=./coverage-ci/rrt_upd.out -covermode=atomic ./updates
go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/temporalio/roadrunner-temporal/v6/... -coverprofile=./coverage-ci/rrt_upd.out -covermode=atomic ./updates

docker compose -f env/docker-compose-temporal-updates.yaml up -d --remove-orphans

Expand Down Expand Up @@ -224,22 +224,22 @@ jobs:

- name: Run Temporal canceller module tests
run: |
go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/temporalio/roadrunner-temporal/v5/... -coverprofile=./tests/coverage-ci/rrt_c.out -covermode=atomic ./canceller/...
go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/temporalio/roadrunner-temporal/v6/... -coverprofile=./tests/coverage-ci/rrt_c.out -covermode=atomic ./canceller/...

- name: Run Temporal dataconverter module tests
run: |
go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/temporalio/roadrunner-temporal/v5/... -coverprofile=./tests/coverage-ci/rrt_dc.out -covermode=atomic ./dataconverter/...
go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/temporalio/roadrunner-temporal/v6/... -coverprofile=./tests/coverage-ci/rrt_dc.out -covermode=atomic ./dataconverter/...

- name: Run Temporal queue module tests
run: |
go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/temporalio/roadrunner-temporal/v5/... -coverprofile=./tests/coverage-ci/rrt_q.out -covermode=atomic ./queue/...
go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/temporalio/roadrunner-temporal/v6/... -coverprofile=./tests/coverage-ci/rrt_q.out -covermode=atomic ./queue/...

- name: Run Temporal tests with coverage
run: |
cd tests
docker compose -f env/docker-compose-temporal.yaml up -d --remove-orphans

go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/temporalio/roadrunner-temporal/v5/... -coverprofile=./coverage-ci/rrt.out -covermode=atomic ./general
go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/temporalio/roadrunner-temporal/v6/... -coverprofile=./coverage-ci/rrt.out -covermode=atomic ./general

docker compose -f env/docker-compose-temporal.yaml up -d --remove-orphans

Expand Down Expand Up @@ -313,7 +313,7 @@ jobs:
docker compose -f env/temporal_tls/docker-compose.yml up -d --remove-orphans
sleep 60

go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/temporalio/roadrunner-temporal/v5/... -coverprofile=./coverage-ci/rrt_tls.out -covermode=atomic ./tls
go test -timeout 20m -v -race -cover -tags=debug -failfast -coverpkg=github.com/temporalio/roadrunner-temporal/v6/... -coverprofile=./coverage-ci/rrt_tls.out -covermode=atomic ./tls

docker compose -f env/temporal_tls/docker-compose.yml down

Expand Down Expand Up @@ -342,8 +342,8 @@ jobs:
tail -q -n +2 *.out >> summary.txt
awk '
NR == 1 { print; next }
/^github\.com\/temporalio\/roadrunner-temporal\/v5\// {
sub(/^github\.com\/temporalio\/roadrunner-temporal\/v5\//, "", $0)
/^github\.com\/temporalio\/roadrunner-temporal\/v6\// {
sub(/^github\.com\/temporalio\/roadrunner-temporal\/v6\//, "", $0)
print
}
' summary.txt > summary.filtered.txt
Expand Down
14 changes: 7 additions & 7 deletions aggregatedpool/activity.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ package aggregatedpool

import (
"context"
"log/slog"
"sync"
"sync/atomic"
"unsafe"

"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/api"
"github.com/temporalio/roadrunner-temporal/v5/internal"
"github.com/roadrunner-server/goridge/v4/pkg/frame"
"github.com/roadrunner-server/pool/v2/payload"
"github.com/temporalio/roadrunner-temporal/v6/api"
"github.com/temporalio/roadrunner-temporal/v6/internal"
commonpb "go.temporal.io/api/common/v1"
tActivity "go.temporal.io/sdk/activity"
"go.temporal.io/sdk/temporal"
"go.uber.org/zap"
)

const (
Expand All @@ -26,15 +26,15 @@ const (
type Activity struct {
codec api.Codec
pool api.Pool
log *zap.Logger
log *slog.Logger
seqID uint64
running sync.Map

pldPool *sync.Pool
disableActivityWorkers bool
}

func NewActivityDefinition(ac api.Codec, p api.Pool, log *zap.Logger, disableActivityWorkers bool) *Activity {
func NewActivityDefinition(ac api.Codec, p api.Pool, log *slog.Logger, disableActivityWorkers bool) *Activity {
return &Activity{
log: log,
codec: ac,
Expand Down
Loading
Loading