Apache Solr open-source search software
SOLR-15283: fix tracing when cores is null
David Smiley42291b706586
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.javaindex 87ad3d5abde..05d4be42f77 100644--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java@@ -62,6 +62,7 @@ import io.opentracing.Span;import io.opentracing.Tracer;import io.opentracing.propagation.Format;import io.opentracing.tag.Tags;+import io.opentracing.util.GlobalTracer;import org.apache.commons.lang3.StringUtils;import org.apache.http.HttpHeaders;import org.apache.http.client.HttpClient;@@ -447,7 +448,7 @@ public class SolrDispatchFilter extends BaseSolrFilter {}}- Tracer tracer = cores.getTracer();+ Tracer tracer = cores == null ? GlobalTracer.get() : cores.getTracer();String hostAndPort = request.getServerName() + "_" + request.getServerPort();Span span = tracer.buildSpan(request.getMethod() + ":" + hostAndPort).asChildOf(tracer.extract(Format.Builtin.HTTP_HEADERS, new HttpServletCarrier(request)))