Apache Solr open-source search software
SOLR-17035 Add trace id to jetty thread names to improve debuggability (#2019)
Alex D9eb0466472c2
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex cbf1e020914..fca3e1fecfa 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -101,6 +101,8 @@ Improvements* SOLR-16397: The rename-core v2 endpoint has been updated to be more REST-ful.RENAME is now available at `POST /api/cores/coreName/rename` (Sanjay Dutt via Jason Gerlowski)+* SOLR-17035: Add trace id to jetty thread names to improve debuggability via stack traces (Alex Deparvu)+Optimizations---------------------(No changes)diff --git a/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java b/solr/core/src/java/org/apache/solr/servlet/ServletUtils.javaindex 2de3b3f2582..83d88b65716 100644--- a/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java+++ b/solr/core/src/java/org/apache/solr/servlet/ServletUtils.java@@ -233,11 +233,17 @@ public abstract class ServletUtils {Context context = TraceUtils.extractContext(request);Span span = TraceUtils.startHttpRequestSpan(request, context);+ final Thread currentThread = Thread.currentThread();+ final String oldThreadName = currentThread.getName();try (var scope = context.with(span).makeCurrent()) {assert scope != null; // prevent javac warning about scope being unusedTraceUtils.setSpan(request, span);TraceUtils.ifValidTraceId(span, s -> MDCLoggingContext.setTracerId(s.getSpanContext().getTraceId()));+ String traceId = MDCLoggingContext.getTraceId();+ if (traceId != null) {+ currentThread.setName(oldThreadName + "-" + traceId);+ }tracedExecution.run();} catch (ExceptionWhileTracing e) {if (e.e instanceof SolrAuthenticationException) {@@ -256,6 +262,7 @@ public abstract class ServletUtils {throw new RuntimeException(e.e);}} finally {+ currentThread.setName(oldThreadName);TraceUtils.setHttpStatus(span, response.getStatus());span.end();}