Fix consumer cannot end the span of the last message

open-telemetry · Jul 15, 2020 · 8e48209 · 8e48209
1 parent 6cd294b
commit 8e48209
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/instrumentation/github.com/Shopify/sarama/consumer.go b/instrumentation/github.com/Shopify/sarama/consumer.go
@@ -48,7 +48,6 @@ func WrapPartitionConsumer(serviceName string, pc sarama.PartitionConsumer, opts
 	go func() {
 		msgs := pc.Messages()
 
-		var prevSpan trace.Span
 		for msg := range msgs {
 			// Extract a span context from message to link.
 			carrier := NewConsumerMessageCarrier(msg)
@@ -79,15 +78,7 @@ func WrapPartitionConsumer(serviceName string, pc sarama.PartitionConsumer, opts
 			// Send messages back to user.
 			wrapped.messages <- msg
 
-			// Finish the previous span.
-			if prevSpan != nil {
-				prevSpan.End()
-			}
-			prevSpan = span
-		}
-		// Finish any remaining span.
-		if prevSpan != nil {
-			prevSpan.End()
+			span.End()
 		}
 		close(wrapped.messages)
 	}()