fixing bug in trace for errors

Author: paxtonhare

.gitignore

@@ -14,3 +14,4 @@ assetInstallTime.properties
 /quick-start/input
 /quick-start/plugins
 flow.properties
+node_modules/

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

@@ -410,7 +410,7 @@ declare function flow:run-collector(
     }
     catch($ex) {
       xdmp:log($ex),
-      trace:create-trace(
+      trace:log-error-trace(
         trace:error-trace(
           (),
           $module-uri,
@@ -425,7 +425,7 @@ declare function flow:run-collector(
       xdmp:rethrow()
     }
   let $_ :=
-    trace:create-trace(
+    trace:log-trace(
       trace:plugin-trace(
         null-node {},
         $module-uri,
@@ -647,7 +647,7 @@ declare function flow:run-plugin(
         }
         catch($ex) {
           xdmp:log($ex),
-          trace:create-trace(
+          trace:log-error-trace(
             trace:error-trace(
               $identifier,
               $module-uri,
@@ -689,7 +689,7 @@ declare function flow:run-plugin(
             $resp
       let $_ :=
         if (trace:enabled()) then
-          trace:create-trace(
+          trace:log-trace(
             trace:plugin-trace(
               $identifier,
               $module-uri,
@@ -738,7 +738,7 @@ declare function flow:run-writer(
     }
     catch($ex) {
       xdmp:log($ex),
-      trace:create-trace(
+      trace:log-error-trace(
         trace:error-trace(
           $identifier,
           $module-uri,
@@ -755,7 +755,7 @@ declare function flow:run-writer(
     }
   let $duration := xdmp:elapsed-time() - $before
   let $_ :=
-    trace:create-trace(
+    trace:log-trace(
       trace:plugin-trace(
         $identifier,
         $module-uri,

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

@@ -38,10 +38,24 @@ declare function trace:enabled() as xs:boolean
   xdmp:get-server-field("HUB-TRACING-ENABLED", fn:false())
 };
 
-declare function trace:create-trace($trace)
+declare function trace:log-trace($trace)
 {
-  if (trace:enabled()) then
+  trace:create-trace($trace, fn:false())
+};
+
+declare function trace:log-error-trace($trace)
+{
+  trace:create-trace($trace, fn:true())
+};
+
+declare %private function trace:create-trace($trace, $force as xs:boolean)
+{
+  if ($force or trace:enabled()) then
     xdmp:eval('
+      xquery version "1.0-ml";
+
+      declare option xdmp:mapping "false";
+
       declare variable $trace external;
 
       xdmp:document-insert(
@@ -115,7 +129,7 @@ declare function trace:error-trace(
       let $_ := map:put($config, "ignore-attribute-names", xs:QName("xsi:schemaLocation"))
       let $_ := map:put($config, "whitespace", "ignore")
       return
-        json:transform-to-json($error, $config)
+        json:transform-to-json($error, $config)/object-node()
     return
       object-node {
         "trace": object-node {
@@ -125,7 +139,7 @@ declare function trace:error-trace(
           "plugin-type": $plugin-type,
           "flow-type": $flow-type,
           "error": $error,
-          "input": $input,
+          "input": ($input, null-node{})[1],
           "duration": $duration
         }
       }