Merge branch 'main' into remove+get+aggregated+metrics

Author: skjindal93

gateway-service-impl/src/main/java/org/hypertrace/gateway/service/entity/query/visitor/ExecutionVisitor.java

@@ -300,6 +300,7 @@ public EntityResponse visit(SelectionNode selectionNode) {
                 source -> {
                   EntitiesRequest request =
                       EntitiesRequest.newBuilder(executionContext.getEntitiesRequest())
+                          .clearSelection()
                           .clearTimeAggregation()
                           .clearFilter()
                           .clearOrderBy()

gateway-service-impl/src/test/java/org/hypertrace/gateway/service/entity/query/visitor/ExecutionVisitorTest.java

@@ -684,6 +684,7 @@ public void test_visitPaginateOnlyNode() {
     when(executionContext.getTimestampAttributeId()).thenReturn("API.startTime");
     EntitiesRequest entitiesRequestForAttributes = EntitiesRequest.newBuilder(entitiesRequest)
         .clearSelection()
+        .clearTimeAggregation()
         .addSelection(selectionExpression)
         .setLimit(limit + offset)
         .setOffset(0)
@@ -694,11 +695,13 @@ public void test_visitPaginateOnlyNode() {
         .clearOffset()
         .clearOrderBy()
         .clearSelection()
+        .clearTimeAggregation()
         .addSelection(metricExpression)
         .clearFilter()
         .setFilter(generateInFilter(API_ID_ATTR, List.of("entity-id-3", "entity-id-2")))
         .build();
     EntitiesRequest entitiesRequestForTimeAggregation = EntitiesRequest.newBuilder(entitiesRequest)
+        .clearSelection()
         .clearLimit()
         .clearOffset()
         .clearOrderBy()
@@ -753,10 +756,12 @@ public void test_visitSelectionNode_differentSource_callSeparatedCalls() {
         Map.of(EDS_SOURCE, Collections.emptyList()),
         Map.of(QS_SOURCE, Collections.emptyList()));
     when(entityDataServiceEntityFetcher.getEntities(any(), any())).thenReturn(result4);
+    when(queryServiceEntityFetcher.getEntities(any(), any())).thenReturn(result4);
     when(executionVisitor.visit(any(NoOpNode.class)))
         .thenReturn(new EntityResponse(result4, result4.getEntityKeyBuilderMap().keySet()));
     executionVisitor.visit(selectionNode);
-    verify(entityDataServiceEntityFetcher, times(2)).getEntities(any(), any());
+    verify(entityDataServiceEntityFetcher).getEntities(any(), any());
+    verify(queryServiceEntityFetcher).getEntities(any(), any());
   }
 
   @Test