Expose method to get default worker options (#1311)

uber-go · Feb 21, 2024 · 6decfc7 · 6decfc7
1 parent d37290d
commit 6decfc7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/internal/internal_worker.go b/internal/internal_worker.go
@@ -971,7 +971,7 @@ func newAggregatedWorker(
 	taskList string,
 	options WorkerOptions,
 ) (worker *aggregatedWorker) {
-	wOptions := augmentWorkerOptions(options)
+	wOptions := AugmentWorkerOptions(options)
 	ctx := wOptions.BackgroundActivityContext
 	if ctx == nil {
 		ctx = context.Background()
@@ -1192,7 +1192,7 @@ func getReadOnlyChannel(c chan struct{}) <-chan struct{} {
 	return c
 }
 
-func augmentWorkerOptions(options WorkerOptions) WorkerOptions {
+func AugmentWorkerOptions(options WorkerOptions) WorkerOptions {
 	if options.MaxConcurrentActivityExecutionSize == 0 {
 		options.MaxConcurrentActivityExecutionSize = defaultMaxConcurrentActivityExecutionSize
 	}

diff --git a/internal/internal_worker_test.go b/internal/internal_worker_test.go
@@ -1360,7 +1360,7 @@ func Test_augmentWorkerOptions(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			assert.Equalf(t, tt.want, augmentWorkerOptions(tt.args.options), "augmentWorkerOptions(%v)", tt.args.options)
+			assert.Equalf(t, tt.want, AugmentWorkerOptions(tt.args.options), "AugmentWorkerOptions(%v)", tt.args.options)
 		})
 	}
 }
diff --git a/internal/internal_workers_test.go b/internal/internal_workers_test.go
@@ -169,7 +169,7 @@ func (s *WorkersTestSuite) TestActivityWorkerStop() {
 	ctx, cancel := context.WithCancel(context.Background())
 	executionParameters := workerExecutionParameters{
 		TaskList: "testTaskList",
-		WorkerOptions: augmentWorkerOptions(
+		WorkerOptions: AugmentWorkerOptions(
 			WorkerOptions{
 				MaxConcurrentActivityTaskPollers:   5,
 				MaxConcurrentActivityExecutionSize: 2,

diff --git a/internal/internal_workflow_testsuite.go b/internal/internal_workflow_testsuite.go
@@ -1175,7 +1175,7 @@ func getRetryBackoffFromThriftRetryPolicy(tp *shared.RetryPolicy, attempt int32,
 
 func (env *testWorkflowEnvironmentImpl) ExecuteLocalActivity(params executeLocalActivityParams, callback laResultHandler) *localActivityInfo {
 	activityID := getStringID(env.nextID())
-	wOptions := augmentWorkerOptions(env.workerOptions)
+	wOptions := AugmentWorkerOptions(env.workerOptions)
 	ae := &activityExecutor{name: getActivityFunctionName(env.registry, params.ActivityFn), fn: params.ActivityFn}
 	if at, _ := getValidatedActivityFunction(params.ActivityFn, params.InputArgs, env.registry); at != nil {
 		// local activity could be registered, if so use the registered name. This name is only used to find a mock.
@@ -1623,7 +1623,7 @@ func (m *mockWrapper) executeMockWithActualArgs(ctx interface{}, inputArgs []int
 }
 
 func (env *testWorkflowEnvironmentImpl) newTestActivityTaskHandler(taskList string, dataConverter DataConverter) ActivityTaskHandler {
-	wOptions := augmentWorkerOptions(env.workerOptions)
+	wOptions := AugmentWorkerOptions(env.workerOptions)
 	wOptions.DataConverter = dataConverter
 	params := workerExecutionParameters{
 		WorkerOptions:     wOptions,

diff --git a/worker/worker.go b/worker/worker.go
@@ -356,3 +356,9 @@ func SetBinaryChecksum(checksum string) {
 func NewAdminJwtAuthorizationProvider(privateKey []byte) AuthorizationProvider {
 	return internal.NewAdminJwtAuthorizationProvider(privateKey)
 }
+
+// AugmentWorkerOptions fill all unset worker Options fields with their default values
+// Use as getter for default worker options
+func AugmentWorkerOptions(options Options) Options {
+	return internal.AugmentWorkerOptions(options)
+}