Merge branch '1.3.x'

This commit is contained in:
Marcin Grzejszczak
2018-03-07 09:08:01 -05:00

View File

@@ -80,17 +80,11 @@ public class ZipkinAutoConfiguration {
ZipkinProperties zipkin,
Sender sender
) {
final AsyncReporter<Span> reporter = AsyncReporter.builder(sender).queuedMaxSpans(
1000) // historical constraint. Note: AsyncReporter supports memory bounds
return AsyncReporter.builder(sender)
.queuedMaxSpans(1000) // historical constraint. Note: AsyncReporter supports memory bounds
.messageTimeout(zipkin.getMessageTimeout(), TimeUnit.SECONDS)
.metrics(reporterMetrics)
.build(zipkin.getEncoder());
return new Reporter<Span>() {
@Override public void report(Span span) {
reporter.report(span);
reporter.flush();
}
};
}
@Bean