fixing tracing issue with speed up fix

back to tomcat
suppress cache warnings

Author: paxtonhare

marklogic-data-hub/src/main/resources/ml-modules/root/com.marklogic.hub/lib/trace-lib.xqy

@@ -33,10 +33,15 @@ declare variable $FORMAT-JSON := "json";
 
 declare %private variable $current-trace-settings := map:map();
 
-declare %private variable $current-trace := map:new((
-  map:entry("traceId", xdmp:random()),
-  map:entry("created", fn:current-dateTime())
-));
+declare %private variable $current-trace := trace:new-trace();
+
+declare function trace:new-trace()
+{
+  map:new((
+    map:entry("traceId", xdmp:random()),
+    map:entry("created", fn:current-dateTime())
+  ))
+};
 
 declare function trace:enable-tracing($enabled as xs:boolean)
 {
@@ -77,7 +82,7 @@ declare function trace:init-trace($format as xs:string)
 
 declare function trace:write-trace()
 {
-  if (trace:enabled() or trace:has-errors()) then
+  if (trace:enabled() or trace:has-errors()) then (
     let $format := map:get($current-trace-settings, "data-format")
     let $trace :=
       if ($format eq $FORMAT-JSON) then
@@ -145,7 +150,9 @@ declare function trace:write-trace()
       map:new((
         map:entry("database", xdmp:database($config:TRACING-DATABASE)),
         map:entry("transactionMode", "update-auto-commit")
-      )))
+      ))),
+    xdmp:set($current-trace, trace:new-trace())
+  )
   else ()
 };
 

quick-start/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        springBootVersion = '1.4.0.RELEASE'
+        springBootVersion = '1.4.1.RELEASE'
     }
     repositories {
         jcenter()
@@ -38,7 +38,6 @@ targetCompatibility = 1.8
 dependencies {
     compile("org.springframework.boot:spring-boot-starter:${springBootVersion}")
     compile("org.springframework.boot:spring-boot-starter-web:${springBootVersion}")
-    compile("org.springframework.boot:spring-boot-starter-jetty:${springBootVersion}")
     compile("org.springframework.boot:spring-boot-starter-websocket:${springBootVersion}")
     compile("org.springframework.boot:spring-boot-starter-thymeleaf:${springBootVersion}")
     compile("org.aspectj:aspectjweaver:1.8.9")
@@ -59,7 +58,6 @@ dependencies {
 configurations {
     all*.exclude group: 'xml-apis'
     all*.exclude group: 'xerces'
-    compile.exclude module: "spring-boot-starter-tomcat"
 }
 
 task cleanUI(type: Delete) {

quick-start/src/main/resources/application.properties

@@ -3,7 +3,7 @@ server.port=8080
 server.contextPath=/
 # server.error.whitelabel.enabled=false
 logging.level.com.marklogic.hub: INFO
-
+logging.level.org.apache.catalina.webresources.Cache: ERROR
 spring.mvc.favicon.enabled=false
 
 # By default, enable the dev profile

quick-start/src/main/resources/logback.xml renamed to quick-start/src/main/resources/logback-spring.xml

@@ -7,16 +7,17 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpSession;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 import static org.junit.Assert.*;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(Application.class)
-@WebAppConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest()
 public class FlowManagerServiceTest {
 
     @Autowired