Range operators (#478)

* update idl

* update autosuggest to allow range operands when whitelisted key is enabled for range query

* bring in idl changes to support isRangeQuery metadata on field names, refactor usb code to reflect changes

* fix backend, fix front end, adjust data format for chips, improve logic in places for handling chips

* test for period key/values and range operators

* fix logic to display tabs #472

* fix grpc bug

* fix issue with duration operator drop down not showing, set > as first option

* fix bug with merging names and metadata

Author: Jason Bulicek

haystack-idl

@@ -14,11 +14,28 @@
  *         limitations under the License.
  */
 
-const requestBuilder = {};
+const expressionTreeBuilder = {};
 const messages = require('../../../../static_codegen/traceReader_pb');
 
 const reservedField = ['startTime', 'endTime', 'limit', 'useExpressionTree', 'spanLevelFilters', 'granularity'];
 
+expressionTreeBuilder.createFieldFromKeyValue = (key, value) => {
+    const field = new messages.Field();
+    field.setName(key);
+    let fieldValue = value;
+    let operator = messages.Field.Operator.EQUAL;
+
+    // check for custom operator at beginning of value string
+    if (value[0] === '>' || value[0] === '<') {
+        operator = value[0] === '>' ? messages.Field.Operator.GREATER_THAN : messages.Field.Operator.LESS_THAN;
+        fieldValue = value.substr(1, value.length);
+    }
+    field.setValue(fieldValue);
+    field.setOperator(operator);
+
+    return field;
+};
+
 function createSpanLevelExpression(spanLevelFilters) {
     return spanLevelFilters.map((filterJson) => {
        const filter = JSON.parse(filterJson);
@@ -31,9 +48,7 @@ function createSpanLevelExpression(spanLevelFilters) {
         .map((key) => {
             const op = new messages.Operand();
 
-            const field = new messages.Field();
-            field.setName(key);
-            field.setValue(filter[key]);
+            const field = expressionTreeBuilder.createFieldFromKeyValue(key, filter[key]);
 
             op.setField(field);
 
@@ -53,9 +68,7 @@ function createTraceLevelOperands(query) {
     .map((key) => {
         const operand = new messages.Operand();
 
-        const field = new messages.Field();
-        field.setName(key);
-        field.setValue(query[key]);
+        const field = expressionTreeBuilder.createFieldFromKeyValue(key, query[key]);
 
         operand.setField(field);
 
@@ -64,7 +77,7 @@ function createTraceLevelOperands(query) {
 }
 
 
-requestBuilder.createFilterExpression = (query) => {
+expressionTreeBuilder.createFilterExpression = (query) => {
     const expressionTree = new messages.ExpressionTree();
 
     expressionTree.setOperator(messages.ExpressionTree.Operator.AND);
@@ -81,4 +94,4 @@ requestBuilder.createFilterExpression = (query) => {
     return expressionTree;
 };
 
-module.exports = requestBuilder;
+module.exports = expressionTreeBuilder;

server/connectors/traces/haystack/expressionTreeBuilder.js

@@ -14,7 +14,7 @@
  *         limitations under the License.
  */
 
-const createFilterExpression = require('../expressionTreeBuilder').createFilterExpression;
+const expressionTreeBuilder = require('../expressionTreeBuilder');
 
 const requestBuilder = {};
 const messages = require('../../../../../static_codegen/traceReader_pb');
@@ -25,20 +25,14 @@ const DEFAULT_RESULTS_LIMIT = 25;
 function createFieldsList(query) {
     return Object.keys(query)
     .filter(key => query[key] && !reservedField.includes(key))
-    .map((key) => {
-        const field = new messages.Field();
-        field.setName(key);
-        field.setValue(query[key]);
-
-        return field;
-    });
+    .map(key => expressionTreeBuilder(key, query[key]));
 }
 
 requestBuilder.buildRequest = (query) => {
     const request = new messages.TracesSearchRequest();
 
     if (query.useExpressionTree) {
-        request.setFilterexpression(createFilterExpression(query));
+        request.setFilterexpression(expressionTreeBuilder.createFilterExpression(query));
     } else {
         request.setFieldsList(createFieldsList(query));
     }

server/connectors/traces/haystack/search/searchRequestBuilder.js

@@ -79,10 +79,22 @@ connector.getSearchableKeys = () => {
     return fieldNameFetcher
         .fetch(request)
         .then((result) => {
-            const keys = result.getNamesList();
+            const fieldNamesWithMetadata = {};
+            const names = result.getNamesList();
+            const metadata = result.getFieldMetadataList();
+
+            // create map with key as whitelisted field name
+            names.forEach((name, index) => {
+                fieldNamesWithMetadata[name] = {isRangeQuery: metadata[index] ? metadata[index].getIsrangequery() : false};
+            });
+
             // additional keys which are not part of Index
-            keys.push('traceId', 'serviceName', 'operationName');
-            return keys;
+            fieldNamesWithMetadata.traceId = {isRangeQuery: false};
+            fieldNamesWithMetadata.serviceName = {isRangeQuery: false};
+            fieldNamesWithMetadata.operationName = {isRangeQuery: false};
+            fieldNamesWithMetadata.duration = {isRangeQuery: true};
+
+            return fieldNamesWithMetadata;
         });
 };
 

server/connectors/traces/haystack/tracesConnector.js

@@ -276,7 +276,15 @@ connector.getTimeline = query => Q.fcall(() => {
     return getRandomValues(granularity, points, parseInt(query.startTime, 10));
 });
 
-connector.getSearchableKeys = () => Q.fcall(() => ['serviceName', 'operationName', 'traceId', 'error', 'minDuration', 'guid', 'testid']);
+connector.getSearchableKeys = () => Q.fcall(() => ({
+    serviceName: {isRangeQuery: false},
+    operationName: {isRangeQuery: false},
+    traceId: {isRangeQuery: false},
+    error: {isRangeQuery: false, values: ['true', 'false']},
+    duration: {isRangeQuery: true},
+    guid: {isRangeQuery: false},
+    testid: {isRangeQuery: false}
+}));
 
 const latencyCost = {
     latencyCost: [{