Apache Solr open-source search software
SOLR-15367 Convert rid functionality into a default Tracer (#1865)
Alex Dbee3accb8a38
diff --git a/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java b/solr/core/src/java/org/apache/solr/core/TracerConfigurator.javaindex f9a6846ca91..633201db82f 100644--- a/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java+++ b/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java@@ -26,7 +26,7 @@ import org.apache.solr.util.tracing.TraceUtils;public abstract class TracerConfigurator implements NamedListInitializedPlugin {public static final boolean TRACE_ID_GEN_ENABLED =- !Boolean.getBoolean("solr.disable.alwaysOnTraceId");+ Boolean.parseBoolean(System.getProperty("solr.alwaysOnTraceId", "true"));public static Tracer loadTracer(SolrResourceLoader loader, PluginInfo info) {if (info != null && info.isEnabled()) {diff --git a/solr/server/resources/log4j2.xml b/solr/server/resources/log4j2.xmlindex 186e86bd8cc..752c740514a 100644--- a/solr/server/resources/log4j2.xml+++ b/solr/server/resources/log4j2.xml@@ -23,7 +23,7 @@<Console name="STDOUT" target="SYSTEM_OUT"><PatternLayout><Pattern>- %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n+ %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{t:%X{trace_id}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n</Pattern></PatternLayout></Console>@@ -34,7 +34,7 @@filePattern="${sys:solr.log.dir}/solr.log.%i" ><PatternLayout><Pattern>- %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n+ %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{t:%X{trace_id}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n</Pattern></PatternLayout><Policies>@@ -50,7 +50,7 @@filePattern="${sys:solr.log.dir}/solr_slow_requests.log.%i" ><PatternLayout><Pattern>- %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n+ %maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{t:%X{trace_id}}%notEmpty{ c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.} %m%notEmpty{ =>%ex{short}}}{10240}%n</Pattern></PatternLayout><Policies>