From 20b6be53d9af815ca0cfc8299883b9d55f7ea2f2 Mon Sep 17 00:00:00 2001 From: senthilkumarchinnasamycognizant Date: Tue, 21 May 2019 16:09:59 -0400 Subject: [PATCH] Bug Fix --- CXOptimizeAPI/build.gradle | 4 +- .../AnalysisEngine/ElasticSearchUtils.groovy | 99 +++++++++++++++---- .../AnalysisEngine/GlobalConstants.groovy | 1 + .../AnalysisEngine/PaceAnalysisEngine.groovy | 30 +++--- .../AnalysisEngine/PaceReportEngine.groovy | 4 +- CXOptimizeUI/build.gradle | 4 +- .../templates/TransactionSamples.html | 4 +- 7 files changed, 105 insertions(+), 41 deletions(-) diff --git a/CXOptimizeAPI/build.gradle b/CXOptimizeAPI/build.gradle index dae4cd9..a81b78f 100644 --- a/CXOptimizeAPI/build.gradle +++ b/CXOptimizeAPI/build.gradle @@ -1,5 +1,5 @@ group 'com.cognizant.pace.CXOptimize.api' -version '2.0.5' +version '2.0.6' buildscript { ext { @@ -36,7 +36,7 @@ apply plugin: 'com.palantir.docker' jar { baseName = 'CXOptimizeAPI' - version = '2.0.5' + version = '2.0.6' } ext { diff --git a/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/ElasticSearchUtils.groovy b/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/ElasticSearchUtils.groovy index 40d9d79..e2feff6 100644 --- a/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/ElasticSearchUtils.groovy +++ b/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/ElasticSearchUtils.groovy @@ -458,12 +458,27 @@ class ElasticSearchUtils if (txnName == null) { //query.append('{"size" : 0,"query": {"filtered": {"filter": {"and": [').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(',{"term": {"RunID": "').append((runID == null ? configReader.RunID.toString() : runID)).append('"}}]}}},"aggs" : {"Transaction" : {"terms" : {"field" : "TransactionName","size" : 10000 },"aggs" : {"percentile" : {"percentiles" : { "field" : "totalPageLoadTime","percents" : [90.0,95.0]}},"average" : {"avg" : {"field" : "totalPageLoadTime"}}}}}}') - query.append('{"size" : 0,"query": {"bool": {"filter": [').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(',{"term": {"RunID": "').append((runID == null ? configReader.RunID.toString() : runID)).append('"}}]}},"aggs" : {"Transaction" : {"terms" : {"field" : "TransactionName","size" : 10000 },"aggs" : {"percentile" : {"percentiles" : { "field" : "totalPageLoadTime","percents" : [90.0,95.0]}},"max":{ "max": {"field" : "totalPageLoadTime"}},"min":{ "min": {"field" : "totalPageLoadTime"}},"average" : {"avg" : {"field" : "totalPageLoadTime"}}}}}}') + //if(configReader?.SLACheck == 'totalload') + //{ + //query.append('{"size" : 0,"query": {"bool": {"filter": [').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(',{"term": {"RunID": "').append((runID == null ? configReader.RunID.toString() : runID)).append('"}}]}},"aggs" : {"Transaction" : {"terms" : {"field" : "TransactionName","size" : 10000 },"aggs" : {"percentile" : {"percentiles" : { "field" : "visuallyComplete","percents" : [90.0,95.0]}},"max":{ "max": {"field" : "visuallyComplete"}},"min":{ "min": {"field" : "visuallyComplete"}},"average" : {"avg" : {"field" : "visuallyComplete"}}}}}}') + //} + //else + //{ + query.append('{"size" : 0,"query": {"bool": {"filter": [').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(',{"term": {"RunID": "').append((runID == null ? configReader.RunID.toString() : runID)).append('"}}]}},"aggs" : {"Transaction" : {"terms" : {"field" : "TransactionName","size" : 10000 },"aggs" : {"percentile" : {"percentiles" : { "field" : "totalPageLoadTime","percents" : [90.0,95.0]}},"max":{ "max": {"field" : "totalPageLoadTime"}},"min":{ "min": {"field" : "totalPageLoadTime"}},"average" : {"avg" : {"field" : "totalPageLoadTime"}}}}}}') + //} + } else { //query.append('{"size" : 0,"query": {"filtered": {"filter": {"and": [').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(',{"term": {"RunID": "').append((runID == null ? configReader.RunID.toString() : runID)).append('"}}').append(',{"term": {"TransactionName": "').append(txnName).append('"}}]}}},"aggs" : {"Transaction" : {"terms" : {"field" : "TransactionName","size" : 10000 },"aggs" : {"percentile" : {"percentiles" : { "field" : "totalPageLoadTime","percents" : [90.0,95.0]}},"average" : {"avg" : {"field" : "totalPageLoadTime"}}}}}}') - query.append('{"size" : 0,"query": {"bool": {"filter": [').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(',{"term": {"RunID": "').append((runID == null ? configReader.RunID.toString() : runID)).append('"}}').append(',{"term": {"TransactionName": "').append(txnName).append('"}}]}},"aggs" : {"Transaction" : {"terms" : {"field" : "TransactionName","size" : 10000 },"aggs" : {"percentile" : {"percentiles" : { "field" : "totalPageLoadTime","percents" : [90.0,95.0]}},"max":{ "max": {"field" : "totalPageLoadTime"}},"min":{ "min": {"field" : "totalPageLoadTime"}},"average" : {"avg" : {"field" : "totalPageLoadTime"}}}}}}') + //if(configReader?.SLACheck == 'totalload') + //{ + //query.append('{"size" : 0,"query": {"bool": {"filter": [').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(',{"term": {"RunID": "').append((runID == null ? configReader.RunID.toString() : runID)).append('"}}').append(',{"term": {"TransactionName": "').append(txnName).append('"}}]}},"aggs" : {"Transaction" : {"terms" : {"field" : "TransactionName","size" : 10000 },"aggs" : {"percentile" : {"percentiles" : { "field" : "visuallyComplete","percents" : [90.0,95.0]}},"max":{ "max": {"field" : "visuallyComplete"}},"min":{ "min": {"field" : "visuallyComplete"}},"average" : {"avg" : {"field" : "visuallyComplete"}}}}}}') + //} + //else + //{ + query.append('{"size" : 0,"query": {"bool": {"filter": [').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(',{"term": {"RunID": "').append((runID == null ? configReader.RunID.toString() : runID)).append('"}}').append(',{"term": {"TransactionName": "').append(txnName).append('"}}]}},"aggs" : {"Transaction" : {"terms" : {"field" : "TransactionName","size" : 10000 },"aggs" : {"percentile" : {"percentiles" : { "field" : "totalPageLoadTime","percents" : [90.0,95.0]}},"max":{ "max": {"field" : "totalPageLoadTime"}},"min":{ "min": {"field" : "totalPageLoadTime"}},"average" : {"avg" : {"field" : "totalPageLoadTime"}}}}}}') + //} } } @@ -516,9 +531,11 @@ class ElasticSearchUtils if(comparisonPerc == 'Average') { selectedSample = ElasticSearchUtils.getSampleValueForResponseTimeAndPayLoad(configReader,it.key,(it.average.value).toString(),(runID == null ? null : runID),type) - txnMetrics.put("Average",Float.parseFloat(selectedSample.totalPageLoadTime.toString()).round()) - txnMetrics.put("HttpCount",selectedSample.resourceCount) - txnMetrics.put("Payload",selectedSample.resourceSize) + //txnMetrics.put("Average",configReader?.SLACheck == 'totalload' ? Float.parseFloat(selectedSample[0].visuallyComplete.toString()).round() : Float.parseFloat(selectedSample[0].totalPageLoadTime.toString()).round()) + txnMetrics.put("Average",Float.parseFloat(selectedSample[0].totalPageLoadTime.toString()).round()) + txnMetrics.put("HttpCount",selectedSample[0].resourceCount) + txnMetrics.put("Payload",selectedSample[0].resourceSize) + txnMetrics.put("sampleID",selectedSample[1]) } else { @@ -527,9 +544,12 @@ class ElasticSearchUtils if(comparisonPerc == 'Pcnt90') { selectedSample = ElasticSearchUtils.getSampleValueForResponseTimeAndPayLoad(configReader,it.key,(it.percentile.values.'90.0').toString(),(runID == null ? null : runID),type) - txnMetrics.put("Pcnt90",Float.parseFloat(selectedSample.totalPageLoadTime.toString()).round()) - txnMetrics.put("HttpCount",selectedSample.resourceCount) - txnMetrics.put("Payload",selectedSample.resourceSize) + + //txnMetrics.put("Pcnt90",configReader?.SLACheck == 'totalload' ? Float.parseFloat(selectedSample[0].visuallyComplete.toString()).round() : Float.parseFloat(selectedSample[0].totalPageLoadTime.toString()).round()) + txnMetrics.put("Pcnt90",Float.parseFloat(selectedSample[0].totalPageLoadTime.toString()).round()) + txnMetrics.put("HttpCount",selectedSample[0].resourceCount) + txnMetrics.put("Payload",selectedSample[0].resourceSize) + txnMetrics.put("sampleID",selectedSample[1]) } else { @@ -539,9 +559,11 @@ class ElasticSearchUtils if(comparisonPerc == 'Pcnt95') { selectedSample = ElasticSearchUtils.getSampleValueForResponseTimeAndPayLoad(configReader,it.key,(it.percentile.values.'95.0').toString(),(runID == null ? null : runID),type) - txnMetrics.put("Pcnt95",Float.parseFloat(selectedSample.totalPageLoadTime.toString()).round()) - txnMetrics.put("HttpCount",selectedSample.resourceCount) - txnMetrics.put("Payload",selectedSample.resourceSize) + //txnMetrics.put("Pcnt95",configReader?.SLACheck == 'totalload' ? Float.parseFloat(selectedSample[0].visuallyComplete.toString()).round() : Float.parseFloat(selectedSample[0].totalPageLoadTime.toString()).round()) + txnMetrics.put("Pcnt95",Float.parseFloat(selectedSample[0].totalPageLoadTime.toString()).round()) + txnMetrics.put("HttpCount",selectedSample[0].resourceCount) + txnMetrics.put("Payload",selectedSample[0].resourceSize) + txnMetrics.put("sampleID",selectedSample[1]) } else { @@ -561,7 +583,14 @@ class ElasticSearchUtils if(configReader.AnalysisType == 'Run' || configReader.AnalysisType == 'Transaction') { //query.append('{"fields": ["totalPageLoadTime"],"query":{"filtered":{"filter":{"and":[{"range":{"totalPageLoadTime":{"gte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}}},"sort":[{"totalPageLoadTime":{"order":"asc"}}]}') - query.append('{"_source": ["totalPageLoadTime","resourceCount","resourceSize"],"query":{"bool":{"filter":[{"range":{"totalPageLoadTime":{"gte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}},"sort":[{"totalPageLoadTime":{"order":"asc"}}]}') + //if(configReader?.SLACheck == 'totalload') + //{ + //query.append('{"_source": ["visuallyComplete","resourceCount","resourceSize"],"query":{"bool":{"filter":[{"range":{"visuallyComplete":{"lte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}},"sort":[{"visuallyComplete":{"order":"desc"}}]}') + //} + //else + //{ + query.append('{"_source": ["totalPageLoadTime","resourceCount","resourceSize"],"query":{"bool":{"filter":[{"range":{"totalPageLoadTime":{"lte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}},"sort":[{"totalPageLoadTime":{"order":"desc"}}]}') + //} } if(configReader.AnalysisType == 'Time') @@ -588,7 +617,14 @@ class ElasticSearchUtils if(configReader.AnalysisType == 'Run' || configReader.AnalysisType == 'Transaction') { //query.append('{"fields": ["totalPageLoadTime"],"query":{"filtered":{"filter":{"and":[{"range":{"totalPageLoadTime":{"lte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}}},"sort":[{"totalPageLoadTime":{"order":"desc"}}]}') - query.append('{"_source": ["totalPageLoadTime","resourceCount","resourceSize"],"query":{"bool":{"filter":[{"range":{"totalPageLoadTime":{"lte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}},"sort":[{"totalPageLoadTime":{"order":"desc"}}]}') + //if(configReader?.SLACheck == 'totalload') + //{ + //query.append('{"_source": ["visuallyComplete","resourceCount","resourceSize"],"query":{"bool":{"filter":[{"range":{"visuallyComplete":{"gte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}},"sort":[{"visuallyComplete":{"order":"asc"}}]}') + //} + //else + //{ + query.append('{"_source": ["totalPageLoadTime","resourceCount","resourceSize"],"query":{"bool":{"filter":[{"range":{"totalPageLoadTime":{"gte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}},"sort":[{"totalPageLoadTime":{"order":"asc"}}]}') + //} } if(configReader.AnalysisType == 'Time') { @@ -606,7 +642,7 @@ class ElasticSearchUtils response_body = ElasticSearchUtils.elasticSearchPOST(configReader.esUrl,GlobalConstants.STATSSEARCH,query) } - return response_body.hits.hits[0]."_source" + return [response_body.hits.hits[0]."_source",response_body.hits.hits[0]."_id"] } static def getSampleValueForResponseTime(def configReader,String transactionName,String sampleValue,String runID = null,String type= null) @@ -616,7 +652,14 @@ class ElasticSearchUtils if(configReader.AnalysisType == 'Run' || configReader.AnalysisType == 'Transaction') { //query.append('{"fields": ["totalPageLoadTime"],"query":{"filtered":{"filter":{"and":[{"range":{"totalPageLoadTime":{"gte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}}},"sort":[{"totalPageLoadTime":{"order":"asc"}}]}') - query.append('{"_source": ["totalPageLoadTime"],"query":{"bool":{"filter":[{"range":{"totalPageLoadTime":{"gte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}},"sort":[{"totalPageLoadTime":{"order":"asc"}}]}') + //if(configReader?.SLACheck == 'totalload') + //{ + //query.append('{"_source": ["visuallyComplete"],"query":{"bool":{"filter":[{"range":{"visuallyComplete":{"lte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}},"sort":[{"visuallyComplete":{"order":"desc"}}]}') + //} + //else + //{ + query.append('{"_source": ["totalPageLoadTime"],"query":{"bool":{"filter":[{"range":{"totalPageLoadTime":{"lte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}},"sort":[{"totalPageLoadTime":{"order":"desc"}}]}') + //} } if(configReader.AnalysisType == 'Time') @@ -643,7 +686,11 @@ class ElasticSearchUtils if(configReader.AnalysisType == 'Run' || configReader.AnalysisType == 'Transaction') { //query.append('{"fields": ["totalPageLoadTime"],"query":{"filtered":{"filter":{"and":[{"range":{"totalPageLoadTime":{"lte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}}},"sort":[{"totalPageLoadTime":{"order":"desc"}}]}') - query.append('{"_source": ["totalPageLoadTime"],"query":{"bool":{"filter":[{"range":{"totalPageLoadTime":{"lte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}},"sort":[{"totalPageLoadTime":{"order":"desc"}}]}') + //if(configReader?.SLACheck == 'totalload') { + //query.append('{"_source": ["visuallyComplete"],"query":{"bool":{"filter":[{"range":{"visuallyComplete":{"gte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}},"sort":[{"visuallyComplete":{"order":"asc"}}]}') + // } else { + query.append('{"_source": ["totalPageLoadTime"],"query":{"bool":{"filter":[{"range":{"totalPageLoadTime":{"gte":').append(sampleValue).append('}}},{"term":{"TransactionName":"').append(transactionName).append('"}},{"term":{"RunID":"').append((runID == null ? configReader.RunID.toString() : runID)).append('"}},').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(']}},"sort":[{"totalPageLoadTime":{"order":"asc"}}]}') + // } } if(configReader.AnalysisType == 'Time') { @@ -661,7 +708,13 @@ class ElasticSearchUtils response_body = ElasticSearchUtils.elasticSearchPOST(configReader.esUrl,GlobalConstants.STATSSEARCH,query) } - return Float.parseFloat(response_body.hits.hits[0]."_source".totalPageLoadTime.toString()).round() + + //if(configReader?.SLACheck == 'totalload') { + // return Float.parseFloat(response_body.hits.hits[0]."_source".visuallyComplete.toString()).round() + //} + // else { + return Float.parseFloat(response_body.hits.hits[0]."_source".totalPageLoadTime.toString()).round() + //} } static def getSampleForDetailedAnalysis(def configReader,String transactionName,String sampleValue,String runID = null,String type = null) @@ -721,6 +774,13 @@ class ElasticSearchUtils return response_body } + static def getSampleForDetailedAnalysisByID(def configReader,def id) + { + + def response_body = null + return ElasticSearchUtils.elasticSearchGET(configReader.esUrl,GlobalConstants.STATSINDEXTABLE + id) + } + static def extractAllSamples(def configReader,String runID = null,String txnName,String type = null) { def response_body = null @@ -729,17 +789,18 @@ class ElasticSearchUtils { runID = configReader.RunID } + def sampleCounter = (configReader?.samplesCount == null ? 10 : configReader?.samplesCount) if(configReader.AnalysisType == 'Run' || configReader.AnalysisType == 'Transaction') { //query.append('{"query":{"filtered":{"filter":{"and":[').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(',{"term": {"TransactionName": "').append(txnName).append('"}},{"term": {"RunID": "').append(runID).append('"}}]}}}}') - query.append('{"query":{"bool":{"filter":[').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(',{"term": {"TransactionName": "').append(txnName).append('"}},{"term": {"RunID": "').append(runID).append('"}}]}}}') + query.append('{"size": ').append(sampleCounter).append(',"query":{"bool":{"filter":[').append(ElasticSearchUtils.baseFilterQuery(configReader)).append(',{"term": {"TransactionName": "').append(txnName).append('"}},{"term": {"RunID": "').append(runID).append('"}}]}},"sort":[{"visuallyComplete":{"order":"desc"}}]}') } if(configReader.AnalysisType == 'Time') { //query.append('{"query":{"filtered":{"filter":{"and":[').append(ElasticSearchUtils.baseFilterQuery(configReader,'Y',type)).append(',{"term": {"TransactionName": "').append(txnName).append('"}}]}}}}') - query.append('{"query":{"bool":{"filter":[').append(ElasticSearchUtils.baseFilterQuery(configReader,'Y',type)).append(',{"term": {"TransactionName": "').append(txnName).append('"}}]}}}') + query.append('{"size": ').append(sampleCounter).append(',"query":{"bool":{"filter":[').append(ElasticSearchUtils.baseFilterQuery(configReader,'Y',type)).append(',{"term": {"TransactionName": "').append(txnName).append('"}}]}},"sort":[{"visuallyComplete":{"order":"desc"}}]}') } log.debug 'extractAllSamples query : ' + query diff --git a/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/GlobalConstants.groovy b/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/GlobalConstants.groovy index f98f425..89f83f8 100644 --- a/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/GlobalConstants.groovy +++ b/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/GlobalConstants.groovy @@ -39,6 +39,7 @@ class GlobalConstants public static final String ANALYSISDELETE = 'analysisindex/_delete_by_query' public static final String STATSSEARCH = 'statsindex/run/_search' public static final String STATSINDEX_INSERT = 'statsindex/run' + public static final String STATSINDEXTABLE = 'statsindex/run/' public static final String STATSINDEX = 'statsindex' public static final String STATSDELETE = 'statsindex/_delete_by_query' public static final String USERSEARCH = 'userdetails/user/_search' diff --git a/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/PaceAnalysisEngine.groovy b/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/PaceAnalysisEngine.groovy index 7063213..d992b92 100644 --- a/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/PaceAnalysisEngine.groovy +++ b/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/PaceAnalysisEngine.groovy @@ -353,9 +353,11 @@ class PaceAnalysisEngine LOGGER.debug 'OUTPUT getComparisonReport :' + comparisonReport txnCalcMetrics.each {key,value -> //detailBreakUp = (ElasticSearchUtils.getSampleForDetailedAnalysis(configReader, key, (value."$comparisonPerc").toString(),configReader.CurrentRun.toString(),'Current')).hits.hits[0].'_source' - detailSample = (ElasticSearchUtils.getSampleForDetailedAnalysis(configReader, key, (value."$comparisonPerc").toString(),configReader.CurrentRun.toString(),'Current')).hits.hits[0] - id = detailSample.'_id' - detailBreakUp = detailSample.'_source' + //detailSample = (ElasticSearchUtils.getSampleForDetailedAnalysis(configReader, key, (value."$comparisonPerc").toString(),configReader.CurrentRun.toString(),'Current')).hits.hits[0] + //id = detailSample.'_id' + id = value.sampleID + //detailSample = (ElasticSearchUtils.getSampleForDetailedAnalysisByID(configReader,id)).hits.hits[0] + detailBreakUp = (ElasticSearchUtils.getSampleForDetailedAnalysisByID(configReader,id)).'_source' LOGGER.debug 'OUTPUT getSampleForDetailedAnalysis :' + detailBreakUp if(configReader?.isNativeApp != null && configReader?.isNativeApp == true) { @@ -436,8 +438,8 @@ class PaceAnalysisEngine row.put('clientProcessing',(detailBreakUp?.clientProcessing == null ? 0 : detailBreakUp.clientProcessing)) row.put('visuallyComplete',(detailBreakUp?.visuallyComplete == null ? 0 : detailBreakUp.visuallyComplete)) row.put('domInteractive',(detailBreakUp?.renderingTime == null ? 0 : detailBreakUp.renderingTime)) - row.put('resourceCount',detailBreakUp.Resources.size) - row.put('resourceSize',detailBreakUp?.resourceSize == null ? 0 : detailBreakUp?.resourceSize) + row.put('resourceCount',value.HttpCount) + row.put('resourceSize',value.Payload) if(configReader?.isMarkAPIEnabled != null && configReader?.isMarkAPIEnabled) { def markSample = ElasticSearchUtils.extractMarkDetailsUsingID(configReader,id) @@ -488,8 +490,8 @@ class PaceAnalysisEngine row.put('url',detailBreakUp.url) //row.put('resourceBlockTime',Double.parseDouble(PaceRuleEngine.calculateBlockingTime(detailBreakUp.Resources).toString()).round()) row.put('visuallyComplete',(detailBreakUp?.visuallyComplete == null ? 0 : detailBreakUp.visuallyComplete)) - row.put('resourceCount',detailBreakUp.Resources.size) - row.put('resourceSize',detailBreakUp?.resourceSize == null ? 0 : detailBreakUp?.resourceSize) + row.put('resourceCount',value.HttpCount) + row.put('resourceSize',value.Payload) row.put('clientProcessing',(value."$comparisonPerc" - (detailBreakUp?.resourceLoadTime == null ? 0 : Double.parseDouble(detailBreakUp.resourceLoadTime.toString()).round()))) if(configReader?.isMarkAPIEnabled != null && configReader?.isMarkAPIEnabled) { @@ -1588,12 +1590,12 @@ class PaceAnalysisEngine def txnData = ElasticSearchUtils.extractAllSamples(configReader,configReader?.CurrentRun.toString(),args.txnName,'Current') def analysisList = [] def row = [:] - def sampleCounter = (configReader?.samplesCount == null ? 10 : configReader?.samplesCount) - def cnt = 0 + //def sampleCounter = (configReader?.samplesCount == null ? 10 : configReader?.samplesCount) + //def cnt = 0 txnData.hits.hits.each {it -> - if(cnt < sampleCounter) - { - cnt++ + //if(cnt < sampleCounter) + //{ + //cnt++ if(configReader?.isNativeApp != null && configReader?.isNativeApp == true) { rulesOutput = PaceRuleEngine.applyNativeAppRules(it._source,configReader) @@ -1644,7 +1646,7 @@ class PaceAnalysisEngine row.put('resourceSize',it._source.resourceSize) row.put('ttfbUser',(it._source?.ttfbUser == null ? 0 : it._source?.ttfbUser)) row.put('ttfbBrowser',(it._source?.ttfbBrowser == null ? 0 : it._source?.ttfbBrowser)) - row.put('ttfpUser',(it._source?.ttfbUser == null ? 0 : it._source?.ttfbUser)) + row.put('ttfpUser',(it._source?.ttfpUser == null ? 0 : it._source?.ttfpUser)) row.put('ttfpBrowser',(it._source?.ttfpBrowser == null ? 0 : it._source?.ttfpBrowser)) row.put('clientProcessing',(it._source?.clientProcessing == null ? 0 : it._source?.clientProcessing)) row.put('visuallyComplete',(it._source?.visuallyComplete == null ? 0 : it._source?.visuallyComplete)) @@ -1681,7 +1683,7 @@ class PaceAnalysisEngine } } - } + //} analysisList.add(row.clone()) } diff --git a/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/PaceReportEngine.groovy b/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/PaceReportEngine.groovy index bd2f423..dece506 100644 --- a/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/PaceReportEngine.groovy +++ b/CXOptimizeAPI/src/main/groovy/com/cognizant/pace/CXOptimize/AnalysisEngine/PaceReportEngine.groovy @@ -606,7 +606,7 @@ class PaceReportEngine } jsonStr.append('"visuallyComplete":').append(arrList[i].visuallyComplete).append(',') - jsonStr.append('"clientProcessing":').append(arrList[i].clientProcessing).append(',') + jsonStr.append('"clientProcessing":').append(arrList[i].clientTime).append(',') jsonStr.append('"resrCount":').append(arrList[i].resourceCount).append(',') jsonStr.append('"resrSize":').append(arrList[i].resourceSize).append(',') jsonStr.append('"score":').append(arrList[i].score).append(',') @@ -769,7 +769,7 @@ class PaceReportEngine } jsonStr.append('"visuallyComplete":').append(CommonUtils.convertMilliToSeconds(arrList[i].visuallyComplete)).append(',') - jsonStr.append('"clientProcessing":').append(CommonUtils.convertMilliToSeconds(arrList[i].clientProcessing)).append(',') + jsonStr.append('"clientProcessing":').append(CommonUtils.convertMilliToSeconds(arrList[i].clientTime)).append(',') jsonStr.append('"resrCount":').append(arrList[i].resourceCount).append(',') jsonStr.append('"resrSize":').append(arrList[i].resourceSize).append(',') jsonStr.append('"score":').append(arrList[i].score).append(',') diff --git a/CXOptimizeUI/build.gradle b/CXOptimizeUI/build.gradle index 2061ecb..6a8431a 100644 --- a/CXOptimizeUI/build.gradle +++ b/CXOptimizeUI/build.gradle @@ -1,5 +1,5 @@ group 'com.cognizant.pace.CXOptimize.UI' -version '2.0.5' +version '2.0.6' buildscript { ext { @@ -30,7 +30,7 @@ apply plugin: 'com.palantir.docker' jar { baseName = 'CXOptimizeUI' - version = '2.0.5' + version = '2.0.6' } repositories { diff --git a/CXOptimizeUI/src/main/resources/templates/TransactionSamples.html b/CXOptimizeUI/src/main/resources/templates/TransactionSamples.html index 3215fbd..aed2c71 100644 --- a/CXOptimizeUI/src/main/resources/templates/TransactionSamples.html +++ b/CXOptimizeUI/src/main/resources/templates/TransactionSamples.html @@ -326,9 +326,9 @@ var tableHeader = ''; if (json.TransactionMetrics[0].userPerceivedTime === undefined) { if (json.TransactionMetrics[0].speedIndex === undefined) { - tableHeader = 'TimePageLoadTimeClientProcessingBackendTimeFullLoadTimeResourceCountTotal Payload(bytes)Score (S)RecommendationsView HAR'; + tableHeader = 'TimePageLoadTimeFrontendTimeBackendTimeFullLoadTimeResourceCountTotal Payload(bytes)Score (S)RecommendationsView HAR'; } else { - tableHeader = 'TimePageLoadTimeSpeedIndexFirstByteFirstPaintServerTimeClientProcessingBackendTimeFullLoadTimeResourceCountTotal Payload(bytes)Score (S)RecommendationsView HAR'; + tableHeader = 'TimePageLoadTimeSpeedIndexFirstByteFirstPaintServerTimeFrontendTimeBackendTimeFullLoadTimeResourceCountTotal Payload(bytes)Score (S)RecommendationsView HAR'; } } else { tableHeader = 'TimeTotalPage TimeUser Perceived TimeBackend TimeResource CountPayloadScore (S)RecommendationsView HAR';