fix(pubsub): fix defer call in for loop

Signed-off-by: Koichi Shiraishi <[email protected]>
googleapis · Dec 5, 2024 · 4aea6cf · 4aea6cf
1 parent 9fe6199
commit 4aea6cf
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/pubsub/topic.go b/pubsub/topic.go
@@ -1083,15 +1083,22 @@ func (t *Topic) initBundler() {
 			defer cancel()
 		}
 		bmsgs := bundle.([]*bundledMessage)
+		var fns []func()
 		if t.enableTracing {
-			for _, m := range bmsgs {
+			fns = make([]func(), len(bmsgs))
+			for i, m := range bmsgs {
 				m.batcherSpan.End()
 				m.createSpan.AddEvent(eventPublishStart, trace.WithAttributes(semconv.MessagingBatchMessageCount(len(bmsgs))))
-				defer m.createSpan.End()
-				defer m.createSpan.AddEvent(eventPublishEnd)
+				fns[i] = func() {
+					m.createSpan.AddEvent(eventPublishEnd)
+					m.createSpan.End()
+				}
 			}
 		}
 		t.publishMessageBundle(ctx, bmsgs)
+		for _, fn := range fns {
+			fn()
+		}
 	})
 	t.scheduler.DelayThreshold = t.PublishSettings.DelayThreshold
 	t.scheduler.BundleCountThreshold = t.PublishSettings.CountThreshold