Skip to content
Closed
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
39 changes: 20 additions & 19 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@ import (
"fmt"
"net/http"

"github.com/formancehq/go-libs/v3/auth"
"github.com/formancehq/go-libs/v3/bun/bunconnect"
"github.com/formancehq/go-libs/v3/bun/bunmigrate"
"github.com/formancehq/go-libs/v3/licence"
"github.com/formancehq/go-libs/v3/otlp"
"github.com/formancehq/go-libs/v3/otlp/otlpmetrics"
"github.com/formancehq/go-libs/v3/otlp/otlptraces"
"github.com/formancehq/go-libs/v3/publish"
"github.com/formancehq/go-libs/v3/service"
"github.com/formancehq/go-libs/v3/temporal"
"github.com/formancehq/go-libs/v5/pkg/fx/authnfx"
"github.com/formancehq/go-libs/v5/pkg/fx/messagingfx"
"github.com/formancehq/go-libs/v5/pkg/fx/observefx"
"github.com/formancehq/go-libs/v5/pkg/fx/storagefx"
"github.com/formancehq/go-libs/v5/pkg/fx/workflowfx"
otlp "github.com/formancehq/go-libs/v5/pkg/observe"
otlptraces "github.com/formancehq/go-libs/v5/pkg/observe/traces"
"github.com/formancehq/go-libs/v5/pkg/service"
bunconnect "github.com/formancehq/go-libs/v5/pkg/storage/bun/connect"
bunmigrate "github.com/formancehq/go-libs/v5/pkg/storage/bun/migrate"
"github.com/formancehq/go-libs/v5/pkg/workflow/temporal"
"github.com/formancehq/orchestration/internal/storage"
"github.com/formancehq/orchestration/internal/temporalworker"
"github.com/formancehq/orchestration/internal/tracer"
Expand Down Expand Up @@ -70,7 +71,7 @@ func Execute() {
}

func commonOptions(cmd *cobra.Command) (fx.Option, error) {
connectionOptions, err := bunconnect.ConnectionOptionsFromFlags(cmd)
connectionOptions, err := bunconnect.ConnectionOptionsFromFlags(cmd.Flags(), cmd.Context())
if err != nil {
return nil, err
}
Expand All @@ -79,9 +80,9 @@ func commonOptions(cmd *cobra.Command) (fx.Option, error) {
temporalTaskQueue, _ := cmd.Flags().GetString(temporal.TemporalTaskQueueFlag)

return fx.Options(
otlp.FXModuleFromFlags(cmd),
otlptraces.FXModuleFromFlags(cmd),
temporal.FXModuleFromFlags(
observefx.ResourceModuleFromFlags(cmd),
observefx.TracesModuleFromFlags(cmd),
workflowfx.TemporalClientModuleFromFlags(
cmd,
tracer.Tracer,
temporal.SearchAttributes{
Expand All @@ -91,11 +92,11 @@ func commonOptions(cmd *cobra.Command) (fx.Option, error) {
),
},
),
otlpmetrics.FXModuleFromFlags(cmd),
bunconnect.Module(*connectionOptions, service.IsDebug(cmd)),
publish.FXModuleFromFlags(cmd, service.IsDebug(cmd)),
auth.FXModuleFromFlags(cmd),
licence.FXModuleFromFlags(cmd, ServiceName),
observefx.MetricsModuleFromFlags(cmd),
storagefx.BunConnectModule(*connectionOptions, service.IsDebug(cmd)),
messagingfx.PublishModuleFromFlags(cmd, service.IsDebug(cmd)),
authnfx.JWTModuleFromFlags(cmd),
authnfx.LicenceModuleFromFlags(cmd, ServiceName),
workflow.NewModule(stack, temporalTaskQueue),
triggers.NewModule(stack, temporalTaskQueue),
fx.Provide(func() *bunconnect.ConnectionOptions {
Expand Down
28 changes: 15 additions & 13 deletions cmd/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@ package cmd
import (
"context"

"github.com/formancehq/go-libs/v3/auth"
"github.com/formancehq/go-libs/v3/aws/iam"
"github.com/formancehq/go-libs/v3/bun/bunconnect"
"github.com/formancehq/go-libs/v3/health"
"github.com/formancehq/go-libs/v3/httpserver"
"github.com/formancehq/go-libs/v3/licence"
"github.com/formancehq/go-libs/v3/otlp/otlpmetrics"
"github.com/formancehq/go-libs/v3/publish"
"github.com/formancehq/go-libs/v3/service"
"github.com/formancehq/go-libs/v3/temporal"
auth "github.com/formancehq/go-libs/v5/pkg/authn/jwt"
"github.com/formancehq/go-libs/v5/pkg/authn/licence"
"github.com/formancehq/go-libs/v5/pkg/cloud/aws/iam"
"github.com/formancehq/go-libs/v5/pkg/fx/servicefx"
"github.com/formancehq/go-libs/v5/pkg/fx/transportfx"
"github.com/formancehq/go-libs/v5/pkg/messaging/publish"
otlpmetrics "github.com/formancehq/go-libs/v5/pkg/observe/metrics"
"github.com/formancehq/go-libs/v5/pkg/service"
"github.com/formancehq/go-libs/v5/pkg/service/health"
bunconnect "github.com/formancehq/go-libs/v5/pkg/storage/bun/connect"
"github.com/formancehq/go-libs/v5/pkg/transport/httpserver"
"github.com/formancehq/go-libs/v5/pkg/workflow/temporal"
"github.com/formancehq/orchestration/internal/api"
v1 "github.com/formancehq/orchestration/internal/api/v1"
v2 "github.com/formancehq/orchestration/internal/api/v2"
Expand All @@ -25,8 +27,8 @@ import (

func healthCheckModule() fx.Option {
return fx.Options(
health.Module(),
health.ProvideHealthCheck(func() health.NamedCheck {
servicefx.HealthModule(),
servicefx.ProvideHealthCheck(func() health.NamedCheck {
return health.NewNamedCheck("default", health.CheckFn(func(ctx context.Context) error {
return nil
}))
Expand Down Expand Up @@ -64,7 +66,7 @@ func newServeCommand() *cobra.Command {
}),
api.NewModule(service.IsDebug(cmd)),
fx.Invoke(func(lc fx.Lifecycle, router *chi.Mux) {
lc.Append(httpserver.NewHook(router, httpserver.WithAddress(listen)))
lc.Append(transportfx.FXHook(httpserver.NewHook(router, httpserver.WithAddress(listen))))
}),
}
worker, _ := cmd.Flags().GetBool(workerFlag)
Expand Down
18 changes: 9 additions & 9 deletions cmd/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import (
"net/http"

sdk "github.com/formancehq/formance-sdk-go/v3"
"github.com/formancehq/go-libs/v3/aws/iam"
"github.com/formancehq/go-libs/v3/bun/bunconnect"
"github.com/formancehq/go-libs/v3/licence"
"github.com/formancehq/go-libs/v3/otlp/otlpmetrics"
"github.com/formancehq/go-libs/v3/publish"
"github.com/formancehq/go-libs/v3/service"
"github.com/formancehq/go-libs/v3/temporal"
"github.com/formancehq/go-libs/v5/pkg/authn/licence"
"github.com/formancehq/go-libs/v5/pkg/cloud/aws/iam"
"github.com/formancehq/go-libs/v5/pkg/messaging/publish"
otlpmetrics "github.com/formancehq/go-libs/v5/pkg/observe/metrics"
"github.com/formancehq/go-libs/v5/pkg/service"
bunconnect "github.com/formancehq/go-libs/v5/pkg/storage/bun/connect"
"github.com/formancehq/go-libs/v5/pkg/workflow/temporal"
"github.com/formancehq/orchestration/internal/temporalworker"
"github.com/formancehq/orchestration/internal/triggers"
"github.com/spf13/cobra"
Expand All @@ -35,13 +35,13 @@ func workerOptions(cmd *cobra.Command) fx.Option {

stack, _ := cmd.Flags().GetString(stackFlag)
temporalTaskQueue, _ := cmd.Flags().GetString(temporal.TemporalTaskQueueFlag)
temporalMaxParallelActivities, _ := cmd.Flags().GetInt(temporal.TemporalMaxParallelActivitiesFlag)
temporalMaxParallelActivities, _ := cmd.Flags().GetFloat64(temporal.TemporalMaxParallelActivitiesFlag)
topics, _ := cmd.Flags().GetStringSlice(topicsFlag)

return fx.Options(
stackClientModule(cmd),
temporalworker.NewWorkerModule(temporalTaskQueue, worker.Options{
TaskQueueActivitiesPerSecond: float64(temporalMaxParallelActivities),
TaskQueueActivitiesPerSecond: temporalMaxParallelActivities,

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now successfully reads temporal-max-parallel-activities, but it still wires that value to TaskQueueActivitiesPerSecond. The flag is documented as a concurrency limit, while this field is a queue-wide rate limit; with the v5 migration this starts enforcing the default 10 as 10 activities/second instead of 10 parallel activities. Please map it to MaxConcurrentActivityExecutionSize (with an integer value) so the upgrade does not introduce an unintended throughput cap.

}),
triggers.NewListenerModule(
stack,
Expand Down
25 changes: 6 additions & 19 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ require (
github.com/ThreeDotsLabs/watermill v1.5.1
github.com/expr-lang/expr v1.17.7
github.com/formancehq/formance-sdk-go/v3 v3.2.0
github.com/formancehq/go-libs/v3 v3.3.0
github.com/formancehq/go-libs/v5 v5.1.1-0.20260522083443-d2a60ed2e0dd
github.com/formancehq/go-libs/v5 v5.3.0
github.com/go-chi/chi/v5 v5.2.5
github.com/go-playground/validator/v10 v10.24.0
github.com/google/uuid v1.6.0
Expand Down Expand Up @@ -42,15 +41,20 @@ require (
github.com/ajg/form v1.7.1 // indirect
github.com/aws/aws-msk-iam-sasl-signer-go v1.0.4 // indirect
github.com/aws/aws-sdk-go-v2 v1.41.5 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect
github.com/aws/aws-sdk-go-v2/config v1.32.12 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.19.12 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.20 // indirect
github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.6.20 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.0.8 // indirect
github.com/aws/aws-sdk-go-v2/service/sns v1.39.14 // indirect
github.com/aws/aws-sdk-go-v2/service/sqs v1.42.24 // indirect
Expand All @@ -67,7 +71,6 @@ require (
github.com/containerd/errdefs v1.0.0 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/dnwe/otelsarama v0.0.0-20240308230250-9388d9d40bc0 // indirect
github.com/docker/cli v29.3.0+incompatible // indirect
Expand All @@ -79,7 +82,6 @@ require (
github.com/ebitengine/purego v0.10.0 // indirect
github.com/ericlagergren/decimal v0.0.0-20240411145413-00de7ca16731 // indirect
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
github.com/fatih/color v1.18.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
github.com/getkin/kin-openapi v0.134.0 // indirect
Expand All @@ -96,21 +98,18 @@ require (
github.com/go-sql-driver/mysql v1.9.3 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
github.com/goccy/go-json v0.10.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
github.com/golang/mock v1.7.0-rc.1 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/gorilla/schema v1.4.1 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.6.3 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
Expand All @@ -131,25 +130,16 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/klauspost/compress v1.18.4 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
github.com/lestrrat-go/iter v1.0.2 // indirect
github.com/lestrrat-go/jwx v1.2.31 // indirect
github.com/lestrrat-go/option v1.0.1 // indirect
github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
github.com/lufia/plan9stats v0.0.0-20260216142805-b3301c5f2a88 // indirect
github.com/mailru/easyjson v0.9.2 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/moby/api v1.54.0 // indirect
github.com/moby/moby/client v0.3.0 // indirect
github.com/moby/sys/user v0.4.0 // indirect
github.com/moby/term v0.5.2 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/muhlemmer/gu v0.3.1 // indirect
github.com/muhlemmer/httpforwarded v0.1.0 // indirect
github.com/nats-io/nats.go v1.49.0 // indirect
github.com/nats-io/nkeys v0.4.15 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
Expand All @@ -171,7 +161,6 @@ require (
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
github.com/riandyrn/otelchi v0.12.2 // indirect
github.com/robfig/cron v1.2.0 // indirect
github.com/rs/cors v1.11.1 // indirect
github.com/shirou/gopsutil/v4 v4.26.2 // indirect
github.com/sirupsen/logrus v1.9.4 // indirect
github.com/stretchr/objx v0.5.3 // indirect
Expand All @@ -195,7 +184,6 @@ require (
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/xo/dburl v0.24.2 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
github.com/zitadel/oidc/v2 v2.12.2 // indirect
github.com/zitadel/oidc/v3 v3.45.3 // indirect
github.com/zitadel/schema v1.3.2 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
Expand Down Expand Up @@ -232,5 +220,4 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
google.golang.org/grpc v1.80.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
)
Loading
Loading