fix(pubsub): only init batch span if trace enabled (#11193)

duongcongtoai · hongalex · web-flow · commit f843d50f849c · 2024-12-03T13:01:04.000-05:00
Co-authored-by: Alex Hong &lt;9397363+hongalex@users.noreply.github.com&gt;
diff --git a/pubsub/topic.go b/pubsub/topic.go
@@ -993,8 +993,6 @@ func (t *Topic) Publish(ctx context.Context, msg *Message) *PublishResult {
 		fcSpan.End()
 	}
 
-	_, batcherSpan = startSpan(ctx, batcherSpanName, "")
-
 	bmsg := &bundledMessage{
 		msg:        msg,
 		res:        r,
@@ -1003,6 +1001,7 @@ func (t *Topic) Publish(ctx context.Context, msg *Message) *PublishResult {
 	}
 
 	if t.enableTracing {
+		_, batcherSpan = startSpan(ctx, batcherSpanName, "")
 		bmsg.batcherSpan = batcherSpan
 
 		// Inject the context from the first publish span rather than from flow control / batching.

Original file line number	Diff line number	Diff line change
`@@ -993,8 +993,6 @@ func (t Topic) Publish(ctx context.Context, msg Message) *PublishResult {`
`993`	`993`	`fcSpan.End()`
`994`	`994`	`}`
`995`	`995`
`996`		`- _, batcherSpan = startSpan(ctx, batcherSpanName, "")`
`997`		`-`
`998`	`996`	`bmsg := &bundledMessage{`
`999`	`997`	`msg: msg,`
`1000`	`998`	`res: r,`
`@@ -1003,6 +1001,7 @@ func (t Topic) Publish(ctx context.Context, msg Message) *PublishResult {`
`1003`	`1001`	`}`
`1004`	`1002`
`1005`	`1003`	`if t.enableTracing {`
	`1004`	`+ _, batcherSpan = startSpan(ctx, batcherSpanName, "")`
`1006`	`1005`	`bmsg.batcherSpan = batcherSpan`
`1007`	`1006`
`1008`	`1007`	`// Inject the context from the first publish span rather than from flow control / batching.`