fix multiple args in workflow

README.md

@@ -148,10 +148,10 @@ You can tweak the parameters of the benchmark scenario by adjusting the JSON fil
     "workflow": {
         "name": "basic-workflow",
         "taskQueue": "temporal-basic",
-        "args": {
+        "args": [{
             "sequenceCount": 3,
             "parallelCount": 1
-        }
+        }]
     },
     "report": {
         "intervalInSeconds": 10
@@ -181,11 +181,11 @@ Here is the definition of the workflow in `./scenarios/basic-payload.json`:
 "workflow": {
     "name": "basic-workflow",
     "taskQueue": "temporal-basic",
-    "args": {
+    "args": [{
         "sequenceCount": 3,
         "payload": "$RANDOM(100)",
         "resultPayload": "$RANDOM_NORM(80,10)"
-    }
+    }]
 }
 ```
 

scenarios/basic-const12k.json

@@ -7,9 +7,9 @@
     "workflow": {
         "name": "basic-workflow",
         "taskQueue": "temporal-basic",
-        "args": {
+        "args": [{
             "sequenceCount": 3
-        }
+        }]
     },
     "report": {
         "intervalInSeconds": 10

scenarios/basic-payload.json

@@ -6,10 +6,10 @@
     "workflow": {
         "name": "basic-workflow",
         "taskQueue": "temporal-basic",
-        "args": {
+        "args": [{
             "sequenceCount": 3,
             "payload": "$RANDOM(100)",
             "resultPayload": "$RANDOM_NORM(80,10)"
-        }
+        }]
     }
 }

scenarios/basic-spike.json

@@ -13,9 +13,9 @@
     "workflow": {
         "name": "basic-workflow",
         "taskQueue": "temporal-basic",
-        "args": {
+        "args": [{
             "sequenceCount": 3
-        }
+        }]
     },
     "report": {
         "intervalInSeconds": 5

scenarios/basic-test.json

@@ -6,8 +6,8 @@
     "workflow": {
         "name": "basic-workflow",
         "taskQueue": "temporal-basic",
-        "args": {
+        "args": [{
             "sequenceCount": 3
-        }
+        }]
     }
 }

worker/bench/driver_activity.go

@@ -25,12 +25,13 @@ package bench
 import (
 	"context"
 	"fmt"
+	"time"
+
 	"github.com/pkg/errors"
 	"go.temporal.io/sdk/activity"
 	"go.temporal.io/sdk/client"
 	"go.temporal.io/sdk/log"
 	"golang.org/x/time/rate"
-	"time"
 )
 
 func (a *Activities) DriverActivity(ctx context.Context, request benchDriverActivityRequest) error {
@@ -51,7 +52,7 @@ type (
 		BaseID        string
 		BatchSize     int
 		Rate          int
-		Parameters    interface{}
+		Parameters    []interface{}
 	}
 	benchDriver struct {
 		ctx     context.Context
@@ -118,7 +119,7 @@ func (d *benchDriver) execute(iterationID int) error {
 		WorkflowExecutionTimeout: 30 * time.Minute,
 		WorkflowTaskTimeout:      defaultWorkflowTaskStartToCloseTimeoutDuration,
 	}
-	_, err := d.client.ExecuteWorkflow(d.ctx, startOptions, d.request.WorkflowName, buildPayload(d.request.Parameters))
+	_, err := d.client.ExecuteWorkflow(d.ctx, startOptions, d.request.WorkflowName, buildPayload(d.request.Parameters)...)
 	if err != nil {
 		d.logger.Error("failed to start workflow", "Error", err, "ID", workflowID)
 	}

worker/bench/payload.go

@@ -28,22 +28,27 @@ import (
 	"strconv"
 )
 
-func buildPayload(params interface{}) interface{} {
-	olds, ok := params.(map[string]interface{})
-	if !ok {
-		return params
-	}
-	news := map[string]interface{}{}
-	for k, v := range olds {
-		if str, ok := v.(string); ok {
-			if newValue, ok := eval(str); ok {
-				news[k] = newValue
-				continue
+func buildPayload(paramsArr []interface{}) []interface{} {
+	output := []interface{}{}
+	for _, params := range paramsArr {
+		olds, ok := params.(map[string]interface{})
+		if !ok {
+			output = append(output, params)
+			continue
+		}
+		news := map[string]interface{}{}
+		for k, v := range olds {
+			if str, ok := v.(string); ok {
+				if newValue, ok := eval(str); ok {
+					news[k] = newValue
+					continue
+				}
 			}
+			news[k] = v
 		}
-		news[k] = v
+		output = append(output, news)
 	}
-	return news
+	return output
 }
 
 var randomRegex = regexp.MustCompile(`\$RANDOM\(([0-9]+)\)`)

worker/bench/payload_test.go

@@ -28,28 +28,34 @@ import (
 )
 
 func TestBuildParametersNoChangeInUnrelatedStruct(t *testing.T) {
-	x := map[string]interface{}{"Hello": 123}
+	input := map[string]interface{}{"Hello": 123}
+	x := []interface{}{input}
 	actual := buildPayload(x)
 	assert.Equal(t, x, actual)
 }
 
 func TestBuildParametersNoChangeInFixedPayload(t *testing.T) {
-	x := map[string]interface{}{"payload": "123"}
+	input := map[string]interface{}{"payload": "123"}
+	x := []interface{}{input}
 	actual := buildPayload(x)
 	assert.Equal(t, x, actual)
 }
 
 func TestBuildParametersRandomPayload(t *testing.T) {
-	x := map[string]interface{}{"payload": "$RANDOM(10)"}
-	y := buildPayload(x).(map[string]interface{})
-	assert.NotEqual(t, x["payload"], y["payload"])
+	input := map[string]interface{}{"payload": "$RANDOM(10)"}
+	x := []interface{}{input}
+	temp := buildPayload(x)
+	y := temp[0].(map[string]interface{})
+	assert.NotEqual(t, input["payload"], y["payload"])
 	assert.Equal(t, 10, len(y["payload"].(string)))
 }
 
 func TestBuildParametersRandomNormalPayload(t *testing.T) {
-	x := map[string]interface{}{"payload": "$RANDOM_NORM(80,10)"}
-	y := buildPayload(x).(map[string]interface{})
-	assert.NotEqual(t, x["payload"], y["payload"])
+	input := map[string]interface{}{"payload": "$RANDOM_NORM(80,10)"}
+	x := []interface{}{input}
+	temp := buildPayload(x)
+	y := temp[0].(map[string]interface{})
+	assert.NotEqual(t, input["payload"], y["payload"])
 	actual := len(y["payload"].(string))
 	assert.Greater(t, actual, 0)
 	assert.Less(t, actual, 160)

worker/bench/workflow.go

@@ -70,7 +70,7 @@ type (
 		// TaskQueue is the name of the task queue to use when executing the workflow.
 		TaskQueue string `json:"taskqueue"`
 		// Args is the argument that should be the input of all executions of the workflow under test.
-		Args interface{} `json:"args"`
+		Args []interface{} `json:"args"`
 	}
 	benchWorkflowRequestReporting struct {
 		// IntervalInSeconds defines the granularity of the result histogram.