ES latency

.github/workflows/maven.yml

@@ -26,6 +26,7 @@ on:
       - development
       - master
       - lineageondemand
+      - perfes
 
 jobs:
   build:

.github/workflows/trivy-docker-scan.yml

@@ -7,6 +7,7 @@ on:
       - development
       - master
       - lineageondemand
+      - perfes
 
 
 jobs:

common/src/main/java/org/apache/atlas/utils/AtlasPerfMetrics.java

@@ -34,7 +34,8 @@ public MetricRecorder getMetricRecorder(String name) {
     public void recordMetric(MetricRecorder recorder) {
         if (recorder != null) {
             final String name = recorder.name;
-            final long timeTaken = recorder.getElapsedTime();
+            final long elapsedTime = recorder.getElapsedTime();
+            final long timeTaken = recorder.getTimeTaken();
 
             Metric metric = metrics.get(name);
 
@@ -45,7 +46,11 @@ public void recordMetric(MetricRecorder recorder) {
             }
 
             metric.invocations++;
-            metric.totalTimeMSecs += timeTaken;
+            if(timeTaken == -1){
+                metric.totalTimeMSecs += elapsedTime;
+            } else {
+                metric.totalTimeMSecs += timeTaken;
+            }
         }
     }
 
@@ -91,11 +96,18 @@ public String toString() {
     public class MetricRecorder {
         private final String name;
         private final long startTimeMs = System.currentTimeMillis();
+        private long timeTaken = -1;
 
         MetricRecorder(String name) {
             this.name = name;
         }
 
+        public void setTimeTaken(long timeTaken){
+            this.timeTaken = timeTaken;
+        }
+        long getTimeTaken(){
+            return this.timeTaken;
+        }
         long getElapsedTime() {
             return System.currentTimeMillis() - startTimeMs;
         }

graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/DirectIndexQueryResult.java

@@ -9,6 +9,7 @@ public class DirectIndexQueryResult<V, E> {
     private Iterator<AtlasIndexQuery.Result<V, E>> iterator;
     private Map<String, Aggregation> aggregationMap;
     private Integer approximateCount;
+    private long responseTimeInMS;
 
     public Iterator<AtlasIndexQuery.Result<V, E>> getIterator() {
         return iterator;
@@ -33,4 +34,12 @@ public Integer getApproximateCount() {
     public void setApproximateCount(Integer approximateCount) {
         this.approximateCount = approximateCount;
     }
+
+    public long getResponseTimeInMS() {
+        return this.responseTimeInMS;
+    }
+
+    public void setResponseTimeInMS(long responseTimeInMS) {
+        this.responseTimeInMS = responseTimeInMS;
+    }
 }

graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasElasticsearchQuery.java

@@ -200,6 +200,7 @@ private DirectIndexQueryResult getResultFromResponse(String responseString) {
         Map<String, LinkedHashMap> responseMap = AtlasType.fromJson(responseString, Map.class);
 
         Map<String, LinkedHashMap> hits_0 = AtlasType.fromJson(AtlasType.toJson(responseMap.get("hits")), Map.class);
+        result.setResponseTimeInMS(Long.parseLong(String.valueOf(responseMap.get("took"))));
         this.vertexTotals = (Integer) hits_0.get("total").get("value");
 
         List<LinkedHashMap> hits_1 = AtlasType.fromJson(AtlasType.toJson(hits_0.get("hits")), List.class);

repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java

@@ -999,6 +999,9 @@ public AtlasSearchResult directIndexSearch(SearchParams searchParams) throws Atl
             AtlasPerfMetrics.MetricRecorder elasticSearchQueryMetric = RequestContext.get().startMetricRecord("elasticSearchQuery");
             DirectIndexQueryResult indexQueryResult = indexQuery.vertices(searchParams);
             RequestContext.get().endMetricRecord(elasticSearchQueryMetric);
+            AtlasPerfMetrics.MetricRecorder estimetaken = RequestContext.get().startMetricRecord("estimetaken");
+            estimetaken.setTimeTaken(indexQueryResult.getResponseTimeInMS());
+            RequestContext.get().endMetricRecord(estimetaken);
             prepareSearchResult(ret, indexQueryResult, resultAttributes, true);
 
             ret.setAggregations(indexQueryResult.getAggregationMap());