Merge branch '11.2.x' of github.com:teiid/teiid into 11.2.x

teiid · Nov 9, 2018 · e3f36ff · e3f36ff
2 parents d81c4ff + 2911cfe
commit e3f36ff
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/engine/src/main/java/org/teiid/query/util/TeiidTracingUtil.java b/engine/src/main/java/org/teiid/query/util/TeiidTracingUtil.java
@@ -36,13 +36,11 @@
 
 public class TeiidTracingUtil {
 
-    private Tracer tracer = GlobalTracerInjector.getTracer();
+    private Tracer tracer;
 
     private static TeiidTracingUtil INSTANCE = new TeiidTracingUtil();
 
     public static TeiidTracingUtil getInstance() {
-        //to prevent issues with initialization, get a fresh instance
-        INSTANCE.tracer = GlobalTracerInjector.getTracer();
         return INSTANCE;
     }
 
@@ -64,7 +62,7 @@ public Span buildSpan(Options options, CommandLogMessage msg, String spanContext
             return null;
         }
 
-        Tracer.SpanBuilder spanBuilder = tracer
+        Tracer.SpanBuilder spanBuilder = getTracer()
                 .buildSpan("USER COMMAND") //$NON-NLS-1$
                 .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_SERVER);
 
@@ -102,7 +100,7 @@ public Span buildSpan(Options options, CommandLogMessage msg, String spanContext
      */
     public boolean isTracingEnabled(Options options, String spanContextJson) {
         boolean withActiveSpanOnly = options == null?true:options.isTracingWithActiveSpanOnly();
-        return !withActiveSpanOnly || tracer.activeSpan() != null || spanContextJson != null;
+        return !withActiveSpanOnly || getTracer().activeSpan() != null || spanContextJson != null;
     }
 
     /**
@@ -112,11 +110,12 @@ public boolean isTracingEnabled(Options options, String spanContextJson) {
      * @return
      */
     public Span buildSourceSpan(CommandLogMessage msg, String translatorType) {
-        if (tracer.activeSpan() == null) {
+        Tracer tr = getTracer();
+        if (tr.activeSpan() == null) {
             return null;
         } 
 
-        Tracer.SpanBuilder spanBuilder = tracer
+        Tracer.SpanBuilder spanBuilder = tr
                 .buildSpan("SRC COMMAND") //$NON-NLS-1$
                 .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT);
 
@@ -134,11 +133,19 @@ public Span buildSourceSpan(CommandLogMessage msg, String translatorType) {
     }
 
     public Scope activateSpan(Span span) {
-        if (tracer.activeSpan() == span) {
+        Tracer tr = getTracer(); 
+        if (tr.activeSpan() == span) {
             //when a workitem adds itself to a queue the span will already be active
             return null;
         }
-        return tracer.scopeManager().activate(span, false);
+        return tr.scopeManager().activate(span, false);
+    }
+
+    private Tracer getTracer() {
+        if (tracer != null) {
+            return tracer;
+        }
+        return GlobalTracerInjector.getTracer();
     }
 
     protected SpanContext extractSpanContext(String spanContextJson) {
@@ -147,7 +154,7 @@ protected SpanContext extractSpanContext(String spanContextJson) {
             SimpleContentHandler sch = new SimpleContentHandler();
             parser.parse(spanContextJson, sch);
             Map<String, String> result = (Map<String, String>) sch.getResult();
-            return tracer.extract(Builtin.TEXT_MAP, new TextMapExtractAdapter(result));
+            return getTracer().extract(Builtin.TEXT_MAP, new TextMapExtractAdapter(result));
         } catch (IllegalArgumentException | ClassCastException | ParseException e) {
             LogManager.logDetail(LogConstants.CTX_DQP, e, "Could not extract the span context"); //$NON-NLS-1$
             return null;

diff --git a/.../layers/dv/io/opentracing/main/module.xml → ...layers/dv/io/opentracing/teiid/module.xml b/.../layers/dv/io/opentracing/main/module.xml → ...layers/dv/io/opentracing/teiid/module.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.3" name="io.opentracing">
+<module xmlns="urn:jboss:module:1.3" name="io.opentracing" slot="teiid">
 	<properties>
 		<property name="jboss.api" value="private" />
 	</properties>
 
 	<resources>
-		<artifact name="${io.opentracing.contrib:opentracing-concurrent}"/>
 		<artifact name="${io.opentracing:opentracing-api}"/>
 		<artifact name="${io.opentracing:opentracing-noop}"/>
 		<artifact name="${io.opentracing:opentracing-util}"/>

diff --git a/...e-pack/src/main/resources/modules/system/layers/dv/org/jboss/teiid/client/main/module.xml b/...e-pack/src/main/resources/modules/system/layers/dv/org/jboss/teiid/client/main/module.xml
@@ -16,6 +16,7 @@
         <module name="sun.jdk"/>
         <module name="org.jboss.modules"/>
         <module name="org.hibernate"/>
-        <module name="io.opentracing"/>
+        <module name="io.opentracing.tracer" optional="true"/>
+        <module name="io.opentracing" slot="teiid"/>
     </dependencies>
 </module>
diff --git a/...-feature-pack/src/main/resources/modules/system/layers/dv/org/jboss/teiid/main/module.xml b/...-feature-pack/src/main/resources/modules/system/layers/dv/org/jboss/teiid/main/module.xml
@@ -12,7 +12,8 @@
         <artifact name="${org.teiid:teiid-runtime}"/>
         <artifact name="${org.teiid:teiid-jboss-admin}"/>
         <artifact name="${org.teiid:teiid-data-quality}"/>
-        <resource-root path="deployments" />
+        <artifact name="${io.opentracing.contrib:opentracing-concurrent}"/>
+		<resource-root path="deployments" />
     </resources>
 
     <dependencies>
@@ -67,6 +68,7 @@
         <module name="org.jboss.as.controller-client"/> <!-- Admin -->
         <module name="org.jboss.as.controller"/> <!-- Admin -->
 
-        <module name="io.opentracing"/>
+        <module name="io.opentracing.tracer" optional="true"/>
+        <module name="io.opentracing" slot="teiid"/>
     </dependencies>
 </module>