SOLR-15283: fix tracing when cores is null

epugh · May 26, 2021 · 42291b7 · 42291b7
1 parent abc87c7
commit 42291b7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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.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 void doFilter(ServletRequest _request, ServletResponse _response, FilterC
       }
     }
 
-    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)))