Adjust tracing spi for batch calls
Merge remote-tracking branch 'upstream/master' into zipkin