updating entity name to include proto pkg prefix

Author: patrickhuie19

core/services/workflows/engine.go

@@ -1550,6 +1550,9 @@ func emitProtoMessage(ctx context.Context, msg proto.Message) error {
 		return fmt.Errorf("unknown message type: %T", msg)
 	}
 
+	// entity must be prefixed with the proto package name
+	entity = fmt.Sprintf("%s.%s", EventsProtoPkg, entity)
+
 	return beholder.GetEmitter().Emit(ctx, b,
 		"beholder_data_schema", schema, // required
 		"beholder_domain", "platform", // required

core/services/workflows/engine_test.go

@@ -259,7 +259,8 @@ func newTestEngine(t *testing.T, reg *coreCap.Registry, sdkSpec sdk.WorkflowSpec
 			detail := report.Description()
 			bClient := beholder.GetClient()
 			// kvAttrs is what the test client matches on, view pkg/utils/test in common for more detail
-			kvAttrs := []any{"beholder_data_schema", detail.Schema, "beholder_domain", detail.Domain, "beholder_entity", detail.Entity,
+			kvAttrs := []any{"beholder_data_schema", detail.Schema, "beholder_domain", detail.Domain,
+				"beholder_entity", fmt.Sprintf("%s.%s", MeteringProtoPkg, detail.Entity),
 				platform.KeyWorkflowName, name, platform.KeyWorkflowID, ID, platform.KeyWorkflowExecutionID, execID}
 
 			data, mErr := proto.Marshal(report.Message())
@@ -399,11 +400,11 @@ func TestEngineWithHardcodedWorkflow(t *testing.T) {
 
 	assert.Equal(t, store.StatusCompleted, state.Status)
 
-	assert.Equal(t, 1, beholderTester.Len(t, "beholder_entity", MeteringReportEntity))
-	assert.Equal(t, 1, beholderTester.Len(t, "beholder_entity", EventWorkflowExecutionStarted))
-	assert.Equal(t, 1, beholderTester.Len(t, "beholder_entity", EventWorkflowExecutionFinished))
-	assert.Equal(t, 3, beholderTester.Len(t, "beholder_entity", EventCapabilityExecutionStarted))
-	assert.Equal(t, 3, beholderTester.Len(t, "beholder_entity", EventCapabilityExecutionFinished))
+	assert.Equal(t, 1, beholderTester.Len(t, "beholder_entity", fmt.Sprintf("%s.%s", MeteringProtoPkg, MeteringReportEntity)))
+	assert.Equal(t, 1, beholderTester.Len(t, "beholder_entity", fmt.Sprintf("%s.%s", EventsProtoPkg, EventWorkflowExecutionStarted)))
+	assert.Equal(t, 1, beholderTester.Len(t, "beholder_entity", fmt.Sprintf("%s.%s", EventsProtoPkg, EventWorkflowExecutionFinished)))
+	assert.Equal(t, 3, beholderTester.Len(t, "beholder_entity", fmt.Sprintf("%s.%s", EventsProtoPkg, EventCapabilityExecutionStarted)))
+	assert.Equal(t, 3, beholderTester.Len(t, "beholder_entity", fmt.Sprintf("%s.%s", EventsProtoPkg, EventCapabilityExecutionFinished)))
 }
 
 const (

core/services/workflows/events.go

@@ -1,6 +1,7 @@
 package workflows
 
 const (
+	EventsProtoPkg = "pb"
 	// EventWorkflowExecutionStarted represents a workflow execution started event
 	EventWorkflowExecutionStarted string = "WorkflowExecutionStarted"
 	// EventWorkflowExecutionFinished represents a workflow execution finished event

core/services/workflows/metering.go

@@ -15,6 +15,7 @@ const (
 	MeteringReportSchema string = "github.com/smartcontractkit/chainlink-common/pkg/capabilities/pb/capabilities.proto"
 	MeteringReportDomain string = "platform"
 	MeteringReportEntity string = "MeteringReport"
+	MeteringProtoPkg     string = "pb"
 )
 
 type MeteringReportStepRef string