Add NewEventWithOpts and bump pkg/chipingress for resource attributes.

Introduce NewEventWithOpts for variadic EventOpt without changing NewEvent's
exported signature, update beholder call sites, and bump the root module's
pkg/chipingress dependency to include the new API.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: pkcll

go.mod

@@ -43,7 +43,7 @@ require (
 	github.com/scylladb/go-reflectx v1.0.1
 	github.com/shopspring/decimal v1.4.0
 	github.com/smartcontractkit/chain-selectors v1.0.100
-	github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260626151909-052e55e62e62
+	github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20260702050624-0fdeba8160d9
 	github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251024234028-0988426d98f4
 	github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260622152157-c8e129347b8b
 	github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b

go.sum

@@ -138,7 +138,7 @@ func (e *ChipIngressBatchEmitterService) emitInternal(ctx context.Context, body
 
 		attributes := newAttributes(attrKVs...)
 
-		event, err := chipingress.NewEvent(domain, entity, body, attributes, chipingress.WithResourceAttributeExtensions(e.resourceAttrs))
+		event, err := chipingress.NewEventWithOpts(domain, entity, body, attributes, chipingress.WithResourceAttributeExtensions(e.resourceAttrs))
 		if err != nil {
 			return fmt.Errorf("failed to create CloudEvent: %w", err)
 		}

pkg/beholder/batch_emitter_service.go

@@ -70,7 +70,7 @@ func (c *ChipIngressEmitter) Emit(ctx context.Context, body []byte, attrKVs ...a
 		return err
 	}
 
-	event, err := chipingress.NewEvent(sourceDomain, entityType, body, newAttributes(attrKVs...), chipingress.WithResourceAttributeExtensions(c.resourceAttrs))
+	event, err := chipingress.NewEventWithOpts(sourceDomain, entityType, body, newAttributes(attrKVs...), chipingress.WithResourceAttributeExtensions(c.resourceAttrs))
 	if err != nil {
 		return err
 	}

pkg/beholder/chip_ingress_emitter.go

@@ -324,7 +324,13 @@ func WithResourceAttributeExtensions(attrs map[string]string) EventOpt {
 }
 
 // NewEvent creates a new CloudEvent with the specified domain, entity, payload, and optional attributes.
-func NewEvent(domain, entity string, payload []byte, attributes map[string]any, opts ...EventOpt) (CloudEvent, error) {
+func NewEvent(domain, entity string, payload []byte, attributes map[string]any) (CloudEvent, error) {
+	return NewEventWithOpts(domain, entity, payload, attributes)
+}
+
+// NewEventWithOpts creates a new CloudEvent like NewEvent, additionally applying opts (e.g.
+// WithResourceAttributeExtensions) to the event before its data is set.
+func NewEventWithOpts(domain, entity string, payload []byte, attributes map[string]any, opts ...EventOpt) (CloudEvent, error) {
 	event := ce.NewEvent()
 	event.SetSource(domain)
 	event.SetType(entity)

pkg/chipingress/client.go

@@ -189,12 +189,12 @@ func TestSanitizeExtensionName(t *testing.T) {
 	}
 }
 
-func TestNewEvent_WithResourceAttributeExtensions(t *testing.T) {
+func TestNewEventWithOpts_WithResourceAttributeExtensions(t *testing.T) {
 	payload := []byte("body")
 
 	t.Run("sanitized keys/values land on the event", func(t *testing.T) {
 		attrs := map[string]string{"chain_id": "1", "k8s.pod.name": "pod-abc"}
-		event, err := NewEvent("domain", "entity", payload, nil, WithResourceAttributeExtensions(attrs))
+		event, err := NewEventWithOpts("domain", "entity", payload, nil, WithResourceAttributeExtensions(attrs))
 		require.NoError(t, err)
 		ext := event.Extensions()
 		assert.Equal(t, "1", ext["chainid"])
@@ -203,14 +203,14 @@ func TestNewEvent_WithResourceAttributeExtensions(t *testing.T) {
 
 	t.Run("empty sanitized name is dropped", func(t *testing.T) {
 		attrs := map[string]string{"---": "value"}
-		event, err := NewEvent("domain", "entity", payload, nil, WithResourceAttributeExtensions(attrs))
+		event, err := NewEventWithOpts("domain", "entity", payload, nil, WithResourceAttributeExtensions(attrs))
 		require.NoError(t, err)
 		assert.Len(t, event.Extensions(), 1) // only the always-set recordedtime extension
 	})
 
 	t.Run("reserved name is skipped", func(t *testing.T) {
 		attrs := map[string]string{IdempotencyKeyAttr: "should-not-override", "subject": "should-not-override"}
-		event, err := NewEvent("domain", "entity", payload, map[string]any{IdempotencyKeyAttr: "real-key"}, WithResourceAttributeExtensions(attrs))
+		event, err := NewEventWithOpts("domain", "entity", payload, map[string]any{IdempotencyKeyAttr: "real-key"}, WithResourceAttributeExtensions(attrs))
 		require.NoError(t, err)
 		ext := event.Extensions()
 		assert.Equal(t, "real-key", ext[IdempotencyKeyAttr])
@@ -219,19 +219,38 @@ func TestNewEvent_WithResourceAttributeExtensions(t *testing.T) {
 
 	t.Run("duplicate sanitized names resolve deterministically to sorted-first key", func(t *testing.T) {
 		attrs := map[string]string{"service.name": "from-dotted", "service_name": "from-snake"}
-		event, err := NewEvent("domain", "entity", payload, nil, WithResourceAttributeExtensions(attrs))
+		event, err := NewEventWithOpts("domain", "entity", payload, nil, WithResourceAttributeExtensions(attrs))
 		require.NoError(t, err)
 		// sorted order: "service.name" < "service_name" ('.' < '_' in ASCII), so the dotted key wins.
 		assert.Equal(t, "from-dotted", event.Extensions()["servicename"])
 	})
 
-	t.Run("omitting the opt is a no-op", func(t *testing.T) {
-		event, err := NewEvent("domain", "entity", payload, nil)
+	t.Run("omitting all opts is a no-op", func(t *testing.T) {
+		event, err := NewEventWithOpts("domain", "entity", payload, nil)
 		require.NoError(t, err)
 		assert.Len(t, event.Extensions(), 1) // only the always-set recordedtime extension
 	})
 }
 
+// TestNewEvent_UnchangedSignature is a backward-compatibility guard: NewEvent's exported
+// signature must stay exactly as it was before EventOpt/NewEventWithOpts were introduced, and
+// must remain equivalent to calling NewEventWithOpts with no opts.
+func TestNewEvent_UnchangedSignature(t *testing.T) {
+	payload := []byte("body")
+	attributes := map[string]any{"subject": "example-subject"}
+
+	viaNewEvent, err := NewEvent("domain", "entity", payload, attributes)
+	require.NoError(t, err)
+
+	viaNewEventWithOpts, err := NewEventWithOpts("domain", "entity", payload, attributes)
+	require.NoError(t, err)
+
+	assert.Equal(t, viaNewEventWithOpts.Subject(), viaNewEvent.Subject())
+	assert.Equal(t, viaNewEventWithOpts.Extensions()["recordedtime"].(ce.Timestamp).Time.Truncate(time.Second),
+		viaNewEvent.Extensions()["recordedtime"].(ce.Timestamp).Time.Truncate(time.Second))
+	assert.Equal(t, viaNewEventWithOpts.Data(), viaNewEvent.Data())
+}
+
 func TestEventToProto(t *testing.T) {
 	// Create a test protobuf message
 	testProto := pb.PingResponse{Message: "test message"}