Merge pull request #1497 from ripienaar/trace_body

Correctly read the trace message body from user input

Author: ripienaar

cli/trace_command.go

@@ -23,7 +23,6 @@ import (
 	"time"
 
 	"github.com/choria-io/fisk"
-	"github.com/choria-io/fisk/units"
 	"github.com/nats-io/jsm.go"
 	"github.com/nats-io/jsm.go/api/server/tracing"
 	"github.com/nats-io/nats-server/v2/server"
@@ -36,7 +35,7 @@ type traceCmd struct {
 	deliver bool
 	showTs  bool
 	header  map[string]string
-	payload units.Base2Bytes
+	payload string
 }
 
 type traceStats struct {
@@ -68,7 +67,7 @@ func configureTraceCommand(app commandHost) {
 
 	trace := app.Command("trace", "Trace message delivery within an NATS network").Action(c.traceAction)
 	trace.Arg("subject", "The subject to publish to").Required().StringVar(&c.subject)
-	trace.Arg("payload", "The message body to send").BytesVar(&c.payload)
+	trace.Arg("payload", "The message body to send").StringVar(&c.payload)
 	trace.Flag("deliver", "Deliver the message to the final destination").UnNegatableBoolVar(&c.deliver)
 	trace.Flag("timestamp", "Show event timestamps").Short('T').UnNegatableBoolVar(&c.showTs)
 	trace.Flag("header", "Adds headers to the trace message using K:V format").Short('H').StringMapVar(&c.header)
@@ -92,10 +91,7 @@ func (c *traceCmd) traceAction(_ *fisk.ParseContext) error {
 	for k, v := range c.header {
 		msg.Header.Set(k, v)
 	}
-	msg.Data, err = c.payload.MarshalText()
-	if err != nil {
-		return err
-	}
+	msg.Data = []byte(c.payload)
 
 	deliver := ""
 	if c.deliver {

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/jedib0t/go-pretty/v6 v6.6.8
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/klauspost/compress v1.18.0
-	github.com/nats-io/jsm.go v0.2.5-0.20250918105311-ea5c3082c339
+	github.com/nats-io/jsm.go v0.2.5-0.20250919104130-fa5c81909624
 	github.com/nats-io/jwt/v2 v2.8.0
 	github.com/nats-io/nats-server/v2 v2.12.0-preview.2.0.20250917115845-b2e3354fc02f
 	github.com/nats-io/nats.go v1.45.0

go.sum

@@ -105,10 +105,9 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nats-io/jsm.go v0.2.5-0.20250917123041-2d2eb6713d63 h1:eZMqlSr2pqFDENpi/bVkvAgNFAuBybLOp5D52OLh75o=
-github.com/nats-io/jsm.go v0.2.5-0.20250917123041-2d2eb6713d63/go.mod h1:XchaF3GV+nNpFH8+ogfYypH81yq+Llq+DkGEqV68EPs=
-github.com/nats-io/jsm.go v0.2.5-0.20250918105311-ea5c3082c339 h1:1cT+PddDjJaHorIeypUjAUGe0F04xeWbLydjh2+IZeI=
 github.com/nats-io/jsm.go v0.2.5-0.20250918105311-ea5c3082c339/go.mod h1:XchaF3GV+nNpFH8+ogfYypH81yq+Llq+DkGEqV68EPs=
+github.com/nats-io/jsm.go v0.2.5-0.20250919104130-fa5c81909624 h1:oQwgv2Ce6OHPUDHZBHO9CwfXr4f1RCh7xuYyXixBI6k=
+github.com/nats-io/jsm.go v0.2.5-0.20250919104130-fa5c81909624/go.mod h1:XchaF3GV+nNpFH8+ogfYypH81yq+Llq+DkGEqV68EPs=
 github.com/nats-io/jwt/v2 v2.8.0 h1:K7uzyz50+yGZDO5o772eRE7atlcSEENpL7P+b74JV1g=
 github.com/nats-io/jwt/v2 v2.8.0/go.mod h1:me11pOkwObtcBNR8AiMrUbtVOUGkqYjMQZ6jnSdVUIA=
 github.com/nats-io/nats-server/v2 v2.12.0-preview.2.0.20250917115845-b2e3354fc02f h1:4uzVTq8yy2fB6H5jpYhc+Mq/OihZFYY0IkIbcqhHk1M=