Revert to traceGroup from traceGroupFields (#37)

* Revert "Add null check for service map, fix percentile filter (#35)" This reverts commit 126c3db. * Revert "Merge pull request #34 from wrijeff/main" This reverts commit 66a9dcc, reversing changes made to 1cfd7b0. * Revert "Merge pull request #33 from wrijeff/main" This reverts commit 1cfd7b0, reversing changes made to e914162. * pick: Merge pull request #34 from wrijeff/main Fixed getTracesQuery, was returning 0 unexpectedly. * Add null check for service map, fix percentile filter (#35) * Add null check for service map query * Loop through filters when switching percentile filters * Add check before changing percentile filter * Change to traceGroup Co-authored-by: Jeff Wright <[email protected]>
opendistro-for-elasticsearch · Apr 23, 2021 · c84ecb4 · c84ecb4
1 parent 126c3db
commit c84ecb4
Show file tree

Hide file tree

Showing 15 changed files with 559 additions and 559 deletions.
diff --git a/.cypress/integration/dashboard.spec.js b/.cypress/integration/dashboard.spec.js
@@ -74,12 +74,12 @@ describe('Testing dashboard table', () => {
 
     cy.get('h2.euiTitle').contains('Traces').should('exist');
     cy.contains(' (7)').should('exist');
-    cy.contains('traceGroup: HTTP GET').should('exist');
+    cy.contains('traceGroup.name: HTTP GET').should('exist');
 
     cy.get('.euiSideNavItemButton__label').contains('Dashboard').click();
     cy.wait(delay);
 
-    cy.contains('traceGroup: HTTP GET').should('exist');
+    cy.contains('traceGroup.name: HTTP GET').should('exist');
   });
 });
 

diff --git a/.cypress/utils/otel-v1-apm-span-000001.json b/.cypress/utils/otel-v1-apm-span-000001.json
diff --git a/public/components/common/__tests__/helper_functions.test.tsx b/public/components/common/__tests__/helper_functions.test.tsx
@@ -117,13 +117,13 @@ describe('Helper functions', () => {
     );
     expect(DSL).toEqual(
       JSON.parse(
-        `{"field":"Latency percentile within trace group","operator":"","value":">= 95th","inverted":false,"disabled":false,"custom":{"query":{"bool":{"must":[],"filter":[],"should":[{"bool":{"must":[{"term":{"traceGroup":{"value":"order"}}},{"range":{"traceGroupFields.durationInNanos":{"gte":1000}}}]}}],"must_not":[],"minimum_should_match":1}}}}`
+        `{"field":"Latency percentile within trace group","operator":"","value":">= 95th","inverted":false,"disabled":false,"custom":{"query":{"bool":{"must":[],"filter":[],"should":[{"bool":{"must":[{"term":{"traceGroup.name":{"value":"order"}}},{"range":{"traceGroup.durationInNanos":{"gte":1000}}}]}}],"must_not":[],"minimum_should_match":1}}}}`
       )
     );
   });
 
   it('converts filters to DSL', () => {
-    const getTestFilters = (field = 'traceGroup', operator = 'exists') => [
+    const getTestFilters = (field = 'traceGroup.name', operator = 'exists') => [
       [
         {
           field,
@@ -139,12 +139,12 @@ describe('Helper functions', () => {
     ];
     const existsDSL = filtersToDsl(...getTestFilters());
     expect(JSON.stringify(existsDSL)).toEqual(
-      "{\"query\":{\"bool\":{\"must\":[{\"range\":{\"startTime\":{\"gte\":\"now-5m\",\"lte\":\"now\"}}},{\"query_string\":{\"query\":\"order\"}},{\"exists\":{\"field\":\"traceGroup\"}}],\"filter\":[],\"should\":[],\"must_not\":[]}},\"custom\":{\"timeFilter\":[{\"range\":{\"startTime\":{\"gte\":\"now-5m\",\"lte\":\"now\"}}}],\"serviceNames\":[],\"serviceNamesExclude\":[],\"traceGroup\":[],\"traceGroupExclude\":[],\"percentiles\":{\"query\":{\"bool\":{\"should\":[]}}}}}"
+      "{\"query\":{\"bool\":{\"must\":[{\"range\":{\"startTime\":{\"gte\":\"now-5m\",\"lte\":\"now\"}}},{\"query_string\":{\"query\":\"order\"}},{\"exists\":{\"field\":\"traceGroup.name\"}}],\"filter\":[],\"should\":[],\"must_not\":[]}},\"custom\":{\"timeFilter\":[{\"range\":{\"startTime\":{\"gte\":\"now-5m\",\"lte\":\"now\"}}}],\"serviceNames\":[],\"serviceNamesExclude\":[],\"traceGroup\":[],\"traceGroupExclude\":[],\"percentiles\":{\"query\":{\"bool\":{\"should\":[]}}}}}"
     );
 
-    const isDSL = filtersToDsl(...getTestFilters('traceGroup', 'is'));
+    const isDSL = filtersToDsl(...getTestFilters('traceGroup.name', 'is'));
     expect(JSON.stringify(isDSL)).toEqual(
-      "{\"query\":{\"bool\":{\"must\":[{\"range\":{\"startTime\":{\"gte\":\"now-5m\",\"lte\":\"now\"}}},{\"query_string\":{\"query\":\"order\"}},{\"term\":{\"traceGroup\":{\"from\":\"100\",\"to\":\"∞\"}}}],\"filter\":[],\"should\":[],\"must_not\":[]}},\"custom\":{\"timeFilter\":[{\"range\":{\"startTime\":{\"gte\":\"now-5m\",\"lte\":\"now\"}}}],\"serviceNames\":[],\"serviceNamesExclude\":[],\"traceGroup\":[],\"traceGroupExclude\":[],\"percentiles\":{\"query\":{\"bool\":{\"should\":[]}}}}}"
+      "{\"query\":{\"bool\":{\"must\":[{\"range\":{\"startTime\":{\"gte\":\"now-5m\",\"lte\":\"now\"}}},{\"query_string\":{\"query\":\"order\"}},{\"term\":{\"traceGroup.name\":{\"from\":\"100\",\"to\":\"∞\"}}}],\"filter\":[],\"should\":[],\"must_not\":[]}},\"custom\":{\"timeFilter\":[{\"range\":{\"startTime\":{\"gte\":\"now-5m\",\"lte\":\"now\"}}}],\"serviceNames\":[],\"serviceNamesExclude\":[],\"traceGroup\":[],\"traceGroupExclude\":[],\"percentiles\":{\"query\":{\"bool\":{\"should\":[]}}}}}"
     );
     const isBetweenDSL = filtersToDsl(...getTestFilters('durationInNanos', 'is between'));
     expect(JSON.stringify(isBetweenDSL)).toEqual(

diff --git a/public/components/common/filters/__tests__/__snapshots__/filter_edit_popover.test.tsx.snap b/public/components/common/filters/__tests__/__snapshots__/filter_edit_popover.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`Filter popover component renders filter popover 1`] = `
   filterFieldOptions={
     Array [
       Object {
-        "label": "traceGroup",
+        "label": "traceGroup.name",
       },
       Object {
         "label": "serviceName",
@@ -100,7 +100,7 @@ exports[`Filter popover component renders filter popover 1`] = `
                     options={
                       Array [
                         Object {
-                          "label": "traceGroup",
+                          "label": "traceGroup.name",
                         },
                         Object {
                           "label": "serviceName",

diff --git a/public/components/common/filters/__tests__/filter_edit_popover.test.tsx b/public/components/common/filters/__tests__/filter_edit_popover.test.tsx
@@ -40,7 +40,7 @@ describe('Filter popover component', () => {
     wrapper
       .find('input')
       .at(0)
-      .simulate('change', [{ label: 'traceGroup' }]);
+      .simulate('change', [{ label: 'traceGroup.name' }]);
     wrapper
       .find('input')
       .at(1)

diff --git a/public/components/common/filters/__tests__/filter_helpers.test.tsx b/public/components/common/filters/__tests__/filter_helpers.test.tsx
@@ -29,7 +29,7 @@ describe('Filter helper functions', () => {
   it('returns fields by page', () => {
     const fields = getFilterFields('dashboard');
     expect(fields).toEqual([
-      'traceGroup',
+      'traceGroup.name',
       'serviceName',
       'error',
       'status.message',
@@ -41,15 +41,15 @@ describe('Filter helper functions', () => {
     const dashboardFields = getValidFilterFields('dashboard');
     const servicesFields = getValidFilterFields('services');
     expect(dashboardFields).toEqual([
-      'traceGroup',
+      'traceGroup.name',
       'serviceName',
       'error',
       'status.message',
       'latency',
       'Latency percentile within trace group',
     ]);
     expect(servicesFields).toEqual([
-      'traceGroup',
+      'traceGroup.name',
       'serviceName',
       'error',
       'status.message',

diff --git a/public/components/common/filters/filter_helpers.tsx b/public/components/common/filters/filter_helpers.tsx
@@ -25,9 +25,9 @@ import React from 'react';
 
 const getFields = (page: 'dashboard' | 'traces' | 'services') =>
   ({
-    dashboard: ['traceGroup', 'serviceName', 'error', 'status.message', 'latency'],
-    traces: ['traceId', 'traceGroup', 'serviceName', 'error', 'status.message', 'latency'],
-    services: ['traceGroup', 'serviceName', 'error', 'status.message', 'latency'],
+    dashboard: ['traceGroup.name', 'serviceName', 'error', 'status.message', 'latency'],
+    traces: ['traceId', 'traceGroup.name', 'serviceName', 'error', 'status.message', 'latency'],
+    services: ['traceGroup.name', 'serviceName', 'error', 'status.message', 'latency'],
   }[page]);
 // filters will take effect and can be manually added
 export const getFilterFields = (page: 'dashboard' | 'traces' | 'services') => getFields(page);

diff --git a/public/components/common/helper_functions.tsx b/public/components/common/helper_functions.tsx
@@ -257,14 +257,14 @@ export const getPercentileFilter = (
         must: [
           {
             term: {
-              'traceGroup': {
+              'traceGroup.name': {
                 value: map.traceGroupName,
               },
             },
           },
           {
             range: {
-              'traceGroupFields.durationInNanos': map.durationFilter,
+              'traceGroup.durationInNanos': map.durationFilter,
             },
           },
         ],
@@ -344,8 +344,8 @@ export const filtersToDsl = (
 
       let filterQuery = {};
       let field = filter.field;
-      if (field === 'latency') field = 'traceGroupFields.durationInNanos';
-      else if (field === 'error') field = 'traceGroupFields.statusCode';
+      if (field === 'latency') field = 'traceGroup.durationInNanos';
+      else if (field === 'error') field = 'traceGroup.statusCode';
       let value;
 
       switch (filter.operator) {
@@ -362,9 +362,9 @@ export const filtersToDsl = (
         case 'is not':
           value = filter.value;
           // latency and error are not actual fields, need to convert first
-          if (field === 'traceGroupFields.durationInNanos') {
+          if (field === 'traceGroup.durationInNanos') {
             value = milliToNanoSec(value);
-          } else if (field === 'traceGroupFields.statusCode') {
+          } else if (field === 'traceGroup.statusCode') {
             value = value[0].label === 'true' ? '2' : '0';
           }
 
@@ -380,7 +380,7 @@ export const filtersToDsl = (
           const range: { gte?: string; lte?: string } = {};
           if (!filter.value.from.includes('\u221E')) range.gte = filter.value.from;
           if (!filter.value.to.includes('\u221E')) range.lte = filter.value.to;
-          if (field === 'traceGroupFields.durationInNanos') {
+          if (field === 'traceGroup.durationInNanos') {
             if (range.lte) range.lte = milliToNanoSec(parseInt(range.lte || '')).toString();
             if (range.gte) range.gte = milliToNanoSec(parseInt(range.gte || '')).toString();
           }

diff --git a/public/components/dashboard/__tests__/__snapshots__/dashboard_table.test.tsx.snap b/public/components/dashboard/__tests__/__snapshots__/dashboard_table.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
     Array [
       Object {
         "disabled": false,
-        "field": "traceGroup",
+        "field": "traceGroup.name",
         "inverted": false,
         "operator": "exists",
         "value": "exists",

diff --git a/public/components/dashboard/__tests__/dashboard_table.test.tsx b/public/components/dashboard/__tests__/dashboard_table.test.tsx
@@ -58,7 +58,7 @@ describe('Dashboard table component', () => {
         items={tableItems}
         filters={[
           {
-            field: 'traceGroup',
+            field: 'traceGroup.name',
             operator: 'exists',
             value: 'exists',
             inverted: false,

diff --git a/public/components/dashboard/dashboard.tsx b/public/components/dashboard/dashboard.tsx
@@ -125,11 +125,11 @@ export function Dashboard(props: DashboardProps) {
         const newFilter = JSON.parse(JSON.stringify(props.filters[i]));
         newFilter.custom.query.bool.should.forEach((should) =>
           should.bool.must.forEach((must) => {
-            const range = must?.range?.['traceGroupFields.durationInNanos'];
+            const range = must?.range?.['traceGroup.durationInNanos'];
             if (range) {
               const duration = range.lt || range.lte || range.gt || range.gte;
               if (duration || duration === 0) {
-                must.range['traceGroupFields.durationInNanos'] = {
+                must.range['traceGroup.durationInNanos'] = {
                   [condition]: duration,
                 };
               }

diff --git a/public/components/dashboard/dashboard_table.tsx b/public/components/dashboard/dashboard_table.tsx
@@ -111,7 +111,7 @@ export function DashboardTable(props: {
               data-test-subj="dashboard-table-trace-group-name-button"
               onClick={() =>
                 props.addFilter({
-                  field: 'traceGroup',
+                  field: 'traceGroup.name',
                   operator: 'is',
                   value: item,
                   inverted: false,
@@ -179,7 +179,7 @@ export function DashboardTable(props: {
                 currPercentileFilter,
                 addFilter: (condition?: 'lte' | 'gte') => {
                   const traceGroupFilter = {
-                    field: 'traceGroup',
+                    field: 'traceGroup.name',
                     operator: 'is',
                     value: row.dashboard_trace_group_name,
                     inverted: false,
@@ -331,7 +331,7 @@ export function DashboardTable(props: {
             onClick={() => {
               props.setRedirect(true);
               props.addFilter({
-                field: 'traceGroup',
+                field: 'traceGroup.name',
                 operator: 'is',
                 value: row.dashboard_trace_group_name,
                 inverted: false,

diff --git a/public/requests/queries/dashboard_queries.ts b/public/requests/queries/dashboard_queries.ts
@@ -27,7 +27,7 @@ export const getDashboardQuery = () => {
     aggs: {
       trace_group_name: {
         terms: {
-          field: 'traceGroup',
+          field: 'traceGroup.name',
           size: 10000,
         },
         aggs: {
@@ -48,12 +48,12 @@ export const getDashboardQuery = () => {
                 aggs: {
                   duration: {
                     max: {
-                      field: 'traceGroupFields.durationInNanos',
+                      field: 'traceGroup.durationInNanos',
                     },
                   },
                   last_updated: {
                     max: {
-                      field: 'traceGroupFields.endTime',
+                      field: 'traceGroup.endTime',
                     },
                   },
                 },
@@ -85,12 +85,12 @@ export const getDashboardQuery = () => {
             aggs: {
               duration: {
                 max: {
-                  field: 'traceGroupFields.durationInNanos',
+                  field: 'traceGroup.durationInNanos',
                 },
               },
               last_updated: {
                 max: {
-                  field: 'traceGroupFields.endTime',
+                  field: 'traceGroup.endTime',
                 },
               },
             },
@@ -117,7 +117,7 @@ export const getDashboardQuery = () => {
           error_count: {
             filter: {
               term: {
-                'traceGroupFields.statusCode': '2',
+                'traceGroup.statusCode': '2',
               },
             },
             aggs: {
@@ -166,12 +166,12 @@ export const getDashboardTraceGroupPercentiles = () => {
     aggs: {
       trace_group: {
         terms: {
-          field: 'traceGroup',
+          field: 'traceGroup.name',
         },
         aggs: {
           latency_variance_nanos: {
             percentiles: {
-              field: 'traceGroupFields.durationInNanos',
+              field: 'traceGroup.durationInNanos',
               percents: [0, 95, 100],
             },
           },
@@ -202,7 +202,7 @@ export const getErrorRatePltQuery = (fixedInterval) => {
           error_count: {
             filter: {
               term: {
-                'traceGroupFields.statusCode': '2',
+                'traceGroup.statusCode': '2',
               },
             },
             aggs: {

diff --git a/public/requests/queries/services_queries.ts b/public/requests/queries/services_queries.ts
@@ -197,8 +197,8 @@ export const getServiceEdgesQuery = (source: 'destination' | 'target') => {
 export const getServiceMetricsQuery = (DSL, serviceNames: string[], map: ServiceObject) => {
   const traceGroupFilter = new Set(
     DSL?.query?.bool.must
-      .filter((must) => must.term?.['traceGroup'])
-      .map((must) => must.term['traceGroup']) || []
+      .filter((must) => must.term?.['traceGroup.name'])
+      .map((must) => must.term['traceGroup.name']) || []
   );
 
   const targetResource =

diff --git a/public/requests/queries/traces_queries.ts b/public/requests/queries/traces_queries.ts
@@ -82,8 +82,8 @@ export const getTracesQuery = (traceId = null, sort?: PropertySort) => {
             max: {
               script: {
                 source: `
-                if (doc.containsKey('traceGroupFields.durationInNanos') && !doc['traceGroupFields.durationInNanos'].empty) {
-                  return Math.round(doc['traceGroupFields.durationInNanos'].value / 10000) / 100.0
+                if (doc.containsKey('traceGroup.durationInNanos') && !doc['traceGroup.durationInNanos'].empty) {
+                  return Math.round(doc['traceGroup.durationInNanos'].value / 10000) / 100.0
                 }
 
                 return 0
@@ -94,20 +94,20 @@ export const getTracesQuery = (traceId = null, sort?: PropertySort) => {
           },
           trace_group: {
             terms: {
-              field: 'traceGroup',
+              field: 'traceGroup.name',
               size: 1,
             },
           },
           error_count: {
             filter: {
               term: {
-                'traceGroupFields.statusCode': '2',
+                'traceGroup.statusCode': '2',
               },
             },
           },
           last_updated: {
             max: {
-              field: 'traceGroupFields.endTime',
+              field: 'traceGroup.endTime',
             },
           },
         },
@@ -258,7 +258,7 @@ export const getValidTraceIdsQuery = (DSL) => {
     },
   };
   if (DSL.custom?.timeFilter.length > 0) query.query.bool.must.push(...DSL.custom.timeFilter);
-  if (DSL.custom?.traceGroupFields.length > 0) {
+  if (DSL.custom?.traceGroup.length > 0) {
     query.query.bool.filter.push({
       terms: {
         traceGroup: DSL.custom.traceGroup,