Merge branch 'main' into copilot/fix-400

Author: cschleiden

backend/options.go

@@ -124,6 +124,22 @@ func WithWorkerName(workerName string) BackendOption {
 	}
 }
 
+// WithWorkflowLockTimeout sets the timeout for workflow task locks. If a workflow task is not completed
+// within this timeframe, it's considered abandoned and another worker might pick it up.
+func WithWorkflowLockTimeout(timeout time.Duration) BackendOption {
+	return func(o *Options) {
+		o.WorkflowLockTimeout = timeout
+	}
+}
+
+// WithActivityLockTimeout sets the timeout for activity task locks. If an activity task is not completed
+// within this timeframe, it's considered abandoned and another worker might pick it up.
+func WithActivityLockTimeout(timeout time.Duration) BackendOption {
+	return func(o *Options) {
+		o.ActivityLockTimeout = timeout
+	}
+}
+
 func ApplyOptions(opts ...BackendOption) *Options {
 	options := DefaultOptions
 

backend/options_test.go

@@ -0,0 +1,67 @@
+package backend
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestWithWorkflowLockTimeout(t *testing.T) {
+	timeout := 5 * time.Minute
+	option := WithWorkflowLockTimeout(timeout)
+
+	opts := ApplyOptions(option)
+
+	assert.Equal(t, timeout, opts.WorkflowLockTimeout)
+}
+
+func TestWithActivityLockTimeout(t *testing.T) {
+	timeout := 3 * time.Minute
+	option := WithActivityLockTimeout(timeout)
+
+	opts := ApplyOptions(option)
+
+	assert.Equal(t, timeout, opts.ActivityLockTimeout)
+}
+
+func TestWithWorkflowAndActivityLockTimeout(t *testing.T) {
+	workflowTimeout := 2 * time.Minute
+	activityTimeout := 4 * time.Minute
+
+	opts := ApplyOptions(
+		WithWorkflowLockTimeout(workflowTimeout),
+		WithActivityLockTimeout(activityTimeout),
+	)
+
+	assert.Equal(t, workflowTimeout, opts.WorkflowLockTimeout)
+	assert.Equal(t, activityTimeout, opts.ActivityLockTimeout)
+}
+
+func TestDefaultValues(t *testing.T) {
+	opts := ApplyOptions()
+
+	// Verify default values are preserved when no options are provided
+	assert.Equal(t, time.Minute, opts.WorkflowLockTimeout)
+	assert.Equal(t, time.Minute*2, opts.ActivityLockTimeout)
+}
+
+// TestIntegrationWithOtherOptions ensures the new timeout functions can be combined with existing options
+func TestIntegrationWithOtherOptions(t *testing.T) {
+	workflowTimeout := 30 * time.Second
+	activityTimeout := 45 * time.Second
+	stickyTimeout := 10 * time.Second
+	maxHistorySize := int64(5000)
+
+	opts := ApplyOptions(
+		WithWorkflowLockTimeout(workflowTimeout),
+		WithActivityLockTimeout(activityTimeout),
+		WithStickyTimeout(stickyTimeout),
+		WithMaxHistorySize(maxHistorySize),
+	)
+
+	assert.Equal(t, workflowTimeout, opts.WorkflowLockTimeout)
+	assert.Equal(t, activityTimeout, opts.ActivityLockTimeout)
+	assert.Equal(t, stickyTimeout, opts.StickyTimeout)
+	assert.Equal(t, maxHistorySize, opts.MaxHistorySize)
+}

docs/source/includes/_backends.md

@@ -3,6 +3,8 @@
 There are three backend implementations maintained in this repository. Some backend implementations have custom options and all of them accept:
 
 - `WithStickyTimeout(timeout time.Duration)` - Set the timeout for sticky tasks. Defaults to 30 seconds
+- `WithWorkflowLockTimeout(timeout time.Duration)` - Set the timeout for workflow task locks. Defaults to 1 minute
+- `WithActivityLockTimeout(timeout time.Duration)` - Set the timeout for activity task locks. Defaults to 2 minutes
 - `WithLogger(logger *slog.Logger)` - Set the logger implementation
 - `WithMetrics(client metrics.Client)` - Set the metrics client
 - `WithTracerProvider(tp trace.TracerProvider)` - Set the OpenTelemetry tracer provider