Merge branch 'main' into will/kill-common

pkg/beholder/pb/base_message.proto

@@ -13,5 +13,5 @@ message BaseMessage {
   string msg=1;
   // https://protobuf.dev/programming-guides/proto3/#maps
   // In go: if Value is empty for a key, nothing will be serialized
-  map<string, values.Value> labels=2;
-}
+  values.Map labels = 2;
+}

pkg/capabilities/events/events.go

@@ -8,7 +8,7 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/beholder"
-	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/events/pb"
+	"github.com/smartcontractkit/chainlink-common/pkg/beholder/pb"
 	"github.com/smartcontractkit/chainlink-common/pkg/values"
 )
 
@@ -174,9 +174,9 @@ func (e *Emitter) Emit(ctx context.Context, msg Message) error {
 
 	pm := values.ProtoMap(wm)
 
-	bytes, err := proto.Marshal(&pb.OperationalEvent{
-		Labels:  pm,
-		Message: msg.Msg,
+	bytes, err := proto.Marshal(&pb.BaseMessage{
+		Labels: pm,
+		Msg:    msg.Msg,
 	})
 	if err != nil {
 		return fmt.Errorf("could not marshal operational event: %w", err)

pkg/capabilities/events/events_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 
-	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/events/pb"
+	"github.com/smartcontractkit/chainlink-common/pkg/beholder/pb"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
 )
 
@@ -47,11 +47,11 @@ func TestEmitter(t *testing.T) {
 	err = emitter.Emit(tests.Context(t), message)
 	require.NoError(t, err)
 
-	event := &pb.OperationalEvent{}
+	event := &pb.BaseMessage{}
 	err = proto.Unmarshal(client.payload, event)
 	require.NoError(t, err)
 
-	assert.Equal(t, event.Message, msg)
+	assert.Equal(t, event.Msg, msg)
 }
 
 func assertHasKey(t *testing.T, attrs []any, keyName, keyValue string) {