Merge pull request #113 from nvanbenschoten/avoidDeadlock

Avoid deadlocking when Collector Closed concurrently with Collect call

Author: basvanbeek

collector-http.go

@@ -116,6 +116,9 @@ func NewHTTPCollector(url string, options ...HTTPOption) (Collector, error) {
 func (c *HTTPCollector) Collect(s *zipkincore.Span) error {
 	select {
 	case c.spanc <- s:
+		// Accepted.
+	case <-c.quit:
+		// Collector concurrently closed.
 	default:
 		c.logger.Log("msg", "queue full, disposing spans.", "size", len(c.spanc))
 	}

collector-scribe.go

@@ -113,8 +113,13 @@ func NewScribeCollector(addr string, timeout time.Duration, options ...ScribeOpt
 
 // Collect implements Collector.
 func (c *ScribeCollector) Collect(s *zipkincore.Span) error {
-	c.spanc <- s
-	return nil // accepted
+	select {
+	case c.spanc <- s:
+		// Accepted.
+	case <-c.quit:
+		// Collector concurrently closed.
+	}
+	return nil
 }
 
 // Close implements Collector.