added tracing

fixed bug in mlcp dialog

Author: paxtonhare

marklogic-data-hub/build.gradle

@@ -171,42 +171,3 @@ ext {
         modulePaths = ["marklogic-data-hub/src/main/resources/ml-modules"]
     }
 }
-
-ext {
-    // don't create the REST Api. We will do it manually
-    mlAppDeployer.commands.remove(mlAppDeployer.getCommand("DeployRestApiServersCommand"))
-    mlAppDeployer.commands.remove(mlAppDeployer.getCommand("UpdateRestApiServersCommand"))
-
-    // remove the original deploy content database command
-    // as we do not need it.
-    def deployDbCmd = mlAppDeployer.getCommand("DeployContentDatabasesCommand")
-    mlAppDeployer.commands.remove(deployDbCmd)
-
-    // install the staging database
-    def stagingDbCommand = new com.marklogic.appdeployer.command.databases.DeployDatabaseCommand("staging-database.json")
-    stagingDbCommand.setForestsPerHost(Integer.parseInt(mlStagingForestsPerHost));
-    mlAppDeployer.commands.add(stagingDbCommand)
-    mlDatabaseCommands.add(stagingDbCommand)
-
-    // install the final database
-    def finalDbCommand = new com.marklogic.appdeployer.command.databases.DeployDatabaseCommand("final-database.json")
-    finalDbCommand.setForestsPerHost(Integer.parseInt(mlFinalForestsPerHost));
-    mlAppDeployer.commands.add(finalDbCommand)
-    mlDatabaseCommands.add(finalDbCommand)
-
-    // install the trace database
-    def traceDbCommand = new com.marklogic.appdeployer.command.databases.DeployDatabaseCommand("trace-database.json")
-    traceDbCommand.setForestsPerHost(Integer.parseInt(mlTraceForestsPerHost));
-    mlAppDeployer.commands.add(traceDbCommand)
-    mlDatabaseCommands.add(traceDbCommand)
-
-    // install the modules database
-    def modulesDbCommand = new com.marklogic.appdeployer.command.databases.DeployDatabaseCommand("modules-database.json")
-    mlAppDeployer.commands.add(modulesDbCommand)
-    mlDatabaseCommands.add(modulesDbCommand)
-
-    // temp workaround for ml-gradle issue #78
-    // https://github.com/rjrudin/ml-gradle/issues/78
-    def lmc = mlAppDeployer.getCommand("LoadModulesCommand")
-    lmc.setModulesLoader(new com.marklogic.client.modulesloader.impl.DefaultModulesLoader(mlAppConfig.newXccAssetLoader()))
-}

marklogic-data-hub/src/main/java/com/marklogic/hub/TraceManager.java

@@ -4,7 +4,9 @@
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.MarkLogicIOException;
 import com.marklogic.client.document.GenericDocumentManager;
+import com.marklogic.client.document.ServerTransform;
 import com.marklogic.client.helper.LoggingObject;
+import com.marklogic.client.io.Format;
 import com.marklogic.client.io.SearchHandle;
 import com.marklogic.client.io.StringHandle;
 import com.marklogic.client.query.QueryManager;
@@ -83,8 +85,9 @@ private String serializeQuery(StructuredQueryBuilder sb, StructuredQueryBuilder.
         return result;
     }
 
-    public SearchHandle getTraces(String query, long start, long count) {
+    public StringHandle getTraces(String query, long start, long count) {
         QueryManager queryMgr = databaseClient.newQueryManager();
+        queryMgr.setPageLength(count);
 
         StructuredQueryBuilder sb = queryMgr.newStructuredQueryBuilder(SEARCH_OPTIONS_NAME);
 
@@ -99,13 +102,15 @@ public SearchHandle getTraces(String query, long start, long count) {
         String searchXml = serializeQuery(sb, sqd, sort);
 
         RawCombinedQueryDefinition querydef = queryMgr.newRawCombinedQueryDefinition(new StringHandle(searchXml), SEARCH_OPTIONS_NAME);
-        queryMgr.setPageLength(count);
-        SearchHandle results = queryMgr.search(querydef, new SearchHandle(), start);
+        querydef.setResponseTransform(new ServerTransform("trace-search"));
+        StringHandle sh = new StringHandle();
+        sh.setFormat(Format.JSON);
+        StringHandle results = queryMgr.search(querydef, sh, start);
         return results;
     }
 
     public JsonNode getTrace(String traceId) {
         GenericDocumentManager docMgr = databaseClient.newDocumentManager();
-        return docMgr.readAs("/" + traceId, JsonNode.class);
+        return docMgr.readAs("/" + traceId, JsonNode.class, new ServerTransform("trace-json"));
     }
 }

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

@@ -55,9 +55,9 @@ declare function trace:enabled() as xs:boolean
       fn:false()
 };
 
-declare function trace:has-errors()
+declare function trace:has-errors() as xs:boolean
 {
-  map:get($current-trace-settings, "_has_errors") eq fn:true()
+  (map:get($current-trace-settings, "_has_errors"), fn:false())[1] eq fn:true()
 };
 
 declare function trace:init-trace($format as xs:string)
@@ -242,6 +242,8 @@ declare function trace:_walk_json($nodes as node()* ,$o)
         map:put($o, fn:local-name($n), xdmp:quote($n/node(), $quote-options))
       case element(duration) return
         map:put($o, "duration", fn:seconds-from-duration(xs:dayTimeDuration($n)))
+      case element(hasError) return
+        map:put($o, "hasError", xs:boolean($n))
       case element() return
         if ($n/*) then
           let $oo := json:object()

marklogic-data-hub/src/main/resources/ml-modules/transforms/trace-json.xqy

@@ -0,0 +1,26 @@
+xquery version "1.0-ml";
+
+module namespace transform = "http://marklogic.com/rest-api/transform/trace-json";
+
+import module namespace perf = "http://marklogic.com/data-hub/perflog-lib"
+  at "/com.marklogic.hub/lib/perflog-lib.xqy";
+
+import module namespace trace = "http://marklogic.com/data-hub/trace"
+  at "/com.marklogic.hub/lib/trace-lib.xqy";
+
+declare namespace envelope = "http://marklogic.com/data-hub/envelope";
+
+declare function transform(
+  $context as map:map,
+  $params as map:map,
+  $content as document-node()
+  ) as document-node()
+{
+  perf:log('/transforms/trace-json:transform', function() {
+
+    document {
+      map:put($context, "output-types", "application/json"),
+      xdmp:to-json(trace:trace-to-json($content/trace))
+    }
+  })
+};

marklogic-data-hub/src/main/resources/ml-modules/transforms/trace-search.sjs

@@ -0,0 +1,17 @@
+var trace = require("/com.marklogic.hub/lib/trace-lib.xqy");
+
+
+function transform(contenxt, params, content) {
+  var response = content.toObject();
+
+  for (var i = 0; i < response.results.length; i++) {
+    var result = response.results[i];
+    var doc = cts.doc(result.uri).root;
+    xdmp.log(doc);
+    result.content = trace.traceToJson(doc);
+    response.pageLength = response['page-length'];
+  }
+  return response;
+}
+
+exports.transform = transform;

marklogic-data-hub/src/trace-ui/webpack.config.js

@@ -13,7 +13,7 @@ var modulePackage;
 for (dependency in packageJson.dependencies) {
   if (packageJson.dependencies.hasOwnProperty(dependency)) {
     modulePackage = require(pathUtil.join(dependency, 'package.json'));
-    if (pathUtil.extname(modulePackage.main) === '.js') {
+    if (modulePackage.main && pathUtil.extname(modulePackage.main) === '.js') {
       vendors.push(dependency);
     }
   }

quick-start/src/main/java/com/marklogic/quickstart/web/TracesController.java

@@ -32,11 +32,7 @@ TraceManager traceManager() {
     @ResponseBody
     public String getTraces(@RequestParam(required = false) String query, @RequestParam long start, @RequestParam long count) throws JsonProcessingException {
         requireAuth();
-        ObjectMapper om = new ObjectMapper();
-        SimpleModule module = new SimpleModule();
-        module.addSerializer(SearchHandle.class, new SearchHandleSerializer());
-        om.registerModule(module);
-        return om.writeValueAsString(traceManager.getTraces(query, start, count));
+        return traceManager.getTraces(query, start, count).get();
     }
 
     @RequestMapping(value = "/{traceId}", method = RequestMethod.GET)

quick-start/src/main/ui/app/mlcp-ui/mlcp-ui.html

@@ -33,7 +33,7 @@ <h3 (click)="toggleSection(group.category)"><i class="fa fa-caret-right" [ngClas
                 [labelText]="setting.label"
                 [items]="setting.options"
                 [initialSelectedItem]="setting.value"
-                (selectedItem)="setting.value = $event"
+                (selectedItem)="updateSetting(setting, $event)"
                 *ngIf="setting.type === 'type'"
                 [tooltip]="setting.description"
                 label="label"

quick-start/src/main/ui/app/mlcp-ui/mlcp-ui.ts

@@ -57,6 +57,7 @@ export class MlcpUi {
   startY: number = 0;
 
   vizState: string = 'hidden';
+  isVisible: boolean = false;
 
   groups: Array<any>;
 
@@ -97,6 +98,7 @@ export class MlcpUi {
       this.startY = $event.clientY;
     }
     this.vizState = 'active';
+    this.isVisible = true;
     return this.finishedEvent;
   }
 
@@ -506,6 +508,7 @@ export class MlcpUi {
 
   hide() {
     this.vizState = 'hidden';
+    this.isVisible = false;
   }
 
   private cancel() {

quick-start/src/main/ui/app/pagination/pagination.component.ts

@@ -40,7 +40,7 @@ export class Pagination implements OnInit, OnChanges {
     if (this.start && this.pageLength) {
       this.end = Math.min(this.start + this.pageLength - 1, this.total);
       this.currentPage = (this.start - 1) / this.pageLength + 1;
-      this.totalPages = Math.floor(this.total / this.pageLength);
+      this.totalPages = Math.ceil(this.total / this.pageLength);
       s = this.currentPage - 4;
       s = (s < 1) ? 1 : s;
       e = s + 8;