Merge branch 'main' into log-docs

smartcontractkit · Jan 9, 2025 · 305a83c · 305a83c
2 parents ac66997 + 2ebd63b
commit 305a83c
Show file tree

Hide file tree

Showing 8 changed files with 233 additions and 202 deletions.
diff --git a/pkg/capabilities/capabilities.go b/pkg/capabilities/capabilities.go
@@ -67,6 +67,8 @@ type RequestMetadata struct {
 	WorkflowDonConfigVersion uint32
 	// The step reference ID of the workflow
 	ReferenceID string
+	// Use DecodedWorkflowName if the human readable name needs to be exposed, such as for logging purposes.
+	DecodedWorkflowName string
 }
 
 type RegistrationMetadata struct {

diff --git a/pkg/capabilities/pb/capabilities.pb.go b/pkg/capabilities/pb/capabilities.pb.go
diff --git a/pkg/capabilities/pb/capabilities.proto b/pkg/capabilities/pb/capabilities.proto
@@ -36,6 +36,7 @@ message RequestMetadata {
   uint32 workflow_don_id = 6;
   uint32 workflow_don_config_version = 7;
   string reference_id = 8;
+  string decoded_workflow_name = 9;
 }
 
 message CapabilityRequest {

diff --git a/pkg/capabilities/pb/capabilities_helpers.go b/pkg/capabilities/pb/capabilities_helpers.go
@@ -60,6 +60,7 @@ func CapabilityRequestToProto(req capabilities.CapabilityRequest) *CapabilityReq
 			WorkflowDonId:            req.Metadata.WorkflowDonID,
 			WorkflowDonConfigVersion: req.Metadata.WorkflowDonConfigVersion,
 			ReferenceId:              req.Metadata.ReferenceID,
+			DecodedWorkflowName:      req.Metadata.DecodedWorkflowName,
 		},
 		Inputs: values.ProtoMap(inputs),
 		Config: values.ProtoMap(config),
@@ -101,6 +102,7 @@ func CapabilityRequestFromProto(pr *CapabilityRequest) (capabilities.CapabilityR
 			WorkflowDonID:            md.WorkflowDonId,
 			WorkflowDonConfigVersion: md.WorkflowDonConfigVersion,
 			ReferenceID:              md.ReferenceId,
+			DecodedWorkflowName:      md.DecodedWorkflowName,
 		},
 		Config: config,
 		Inputs: inputs,

diff --git a/pkg/capabilities/pb/capabilities_helpers_test.go b/pkg/capabilities/pb/capabilities_helpers_test.go
@@ -80,6 +80,7 @@ func TestMarshalUnmarshalRequest(t *testing.T) {
 			WorkflowDonID:            1,
 			WorkflowDonConfigVersion: 1,
 			ReferenceID:              anyReferenceID,
+			DecodedWorkflowName:      "test-workflow-name",
 		},
 		Config: &values.Map{Underlying: map[string]values.Value{
 			testConfigKey: &values.String{Underlying: testConfigValue},

diff --git a/pkg/workflows/wasm/pb/wasm.pb.go b/pkg/workflows/wasm/pb/wasm.pb.go
diff --git a/pkg/workflows/wasm/pb/wasm.proto b/pkg/workflows/wasm/pb/wasm.proto
@@ -65,6 +65,7 @@ message FetchRequestMetadata {
   string workflowName = 2;
   string workflowOwner = 3;
   string workflowExecutionId = 4;
+  string decodedWorkflowName = 5;
 }
 
 message FetchRequest {

diff --git a/pkg/workflows/wasm/sdk.go b/pkg/workflows/wasm/sdk.go
@@ -183,6 +183,7 @@ func createFetchFn(
 				WorkflowName:        sdkConfig.Metadata.WorkflowName,
 				WorkflowOwner:       sdkConfig.Metadata.WorkflowOwner,
 				WorkflowExecutionId: sdkConfig.Metadata.WorkflowExecutionID,
+				DecodedWorkflowName: sdkConfig.Metadata.DecodedWorkflowName,
 			},
 		})
 		if err != nil {