move it to write message

yanmxa · yanmxa · commit 4bcdddaf1596 · 2023-09-13T04:21:18.000Z
Signed-off-by: Meng Yan &lt;myan@redhat.com&gt;
diff --git a/protocol/mqtt_paho/v2/protocol.go b/protocol/mqtt_paho/v2/protocol.go
@@ -90,7 +90,6 @@ func (p *Protocol) Send(ctx context.Context, m binding.Message, transformers ...
 	defer m.Finish(err)
 
 	msg := p.publishOption
-	msg.Properties.User = make(paho.UserProperties, 0)
 	if cecontext.TopicFrom(ctx) != "" {
 		msg.Topic = cecontext.TopicFrom(ctx)
 		cecontext.WithTopic(ctx, "")
diff --git a/protocol/mqtt_paho/v2/write_message.go b/protocol/mqtt_paho/v2/write_message.go
@@ -58,10 +58,10 @@ func (b *pubMessageWriter) SetStructuredEvent(ctx context.Context, f format.Form
 
 func (b *pubMessageWriter) Start(ctx context.Context) error {
 	if b.Properties == nil {
-		b.Properties = &paho.PublishProperties{
-			User: make([]paho.UserProperty, 0),
-		}
+		b.Properties = &paho.PublishProperties{}
 	}
+	// the UserProperties of publish message is used to load event extensions
+	b.Properties.User = make([]paho.UserProperty, 0)
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,10 @@ func (b *pubMessageWriter) SetStructuredEvent(ctx context.Context, f format.Form`
`58`	`58`
`59`	`59`	`func (b *pubMessageWriter) Start(ctx context.Context) error {`
`60`	`60`	`if b.Properties == nil {`
`61`		`- b.Properties = &paho.PublishProperties{`
`62`		`- User: make([]paho.UserProperty, 0),`
`63`		`- }`
	`61`	`+ b.Properties = &paho.PublishProperties{}`
`64`	`62`	`}`
	`63`	`+ // the UserProperties of publish message is used to load event extensions`
	`64`	`+ b.Properties.User = make([]paho.UserProperty, 0)`
`65`	`65`	`return nil`
`66`	`66`	`}`
`67`	`67`