Fixed index metrics serialization and tests (Azure#37437)

Author: kushagraThapar

sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/CosmosDiagnosticsTest.java

@@ -11,7 +11,6 @@
 import com.azure.cosmos.implementation.FeedResponseDiagnostics;
 import com.azure.cosmos.implementation.GlobalEndpointManager;
 import com.azure.cosmos.implementation.HttpConstants;
-import com.azure.cosmos.implementation.IndexUtilizationInfo;
 import com.azure.cosmos.implementation.InternalObjectNode;
 import com.azure.cosmos.implementation.LifeCycleUtils;
 import com.azure.cosmos.implementation.OperationCancelledException;
@@ -535,11 +534,11 @@ public void queryMetricsWithIndexMetrics() {
             while (iterator.hasNext()) {
                 FeedResponse<InternalObjectNode> feedResponse = iterator.next();
                 queryDiagnostics = feedResponse.getCosmosDiagnostics().toString();
-                logger.info("This is query diagnostics {}", queryDiagnostics);
-                if (feedResponse.getResponseHeaders().containsKey(HttpConstants.HttpHeaders.INDEX_UTILIZATION)) {
-                    assertThat(feedResponse.getResponseHeaders().get(HttpConstants.HttpHeaders.INDEX_UTILIZATION)).isNotNull();
-                    assertThat(createFromJSONString(Utils.decodeBase64String(feedResponse.getResponseHeaders().get(HttpConstants.HttpHeaders.INDEX_UTILIZATION))).getUtilizedSingleIndexes()).isNotNull();
-                }
+                assertThat(queryDiagnostics).contains("\"indexUtilizationInfo\"");
+                assertThat(queryDiagnostics).contains("\"UtilizedSingleIndexes\"");
+                assertThat(queryDiagnostics).contains("\"PotentialSingleIndexes\"");
+                assertThat(queryDiagnostics).contains("\"UtilizedCompositeIndexes\"");
+                assertThat(queryDiagnostics).contains("\"PotentialCompositeIndexes\"");
             }
         }
     }
@@ -1556,17 +1555,6 @@ private HttpClient httpClient(boolean fakeProxy) {
         return HttpClient.createFixed(httpClientConfig);
     }
 
-    private IndexUtilizationInfo createFromJSONString(String jsonString) {
-        ObjectMapper indexUtilizationInfoObjectMapper = new ObjectMapper();
-        IndexUtilizationInfo indexUtilizationInfo = null;
-        try {
-            indexUtilizationInfo = indexUtilizationInfoObjectMapper.readValue(jsonString, IndexUtilizationInfo.class);
-        } catch (JsonProcessingException e) {
-            logger.error("Json not correctly formed ", e);
-        }
-        return indexUtilizationInfo;
-    }
-
     private void validateRegionContacted(CosmosDiagnostics cosmosDiagnostics, CosmosAsyncClient cosmosAsyncClient) throws Exception {
         RxDocumentClientImpl rxDocumentClient =
             (RxDocumentClientImpl) ReflectionUtils.getAsyncDocumentClient(cosmosAsyncClient);

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/CompositeIndexUtilizationEntity.java

@@ -9,11 +9,11 @@
 
 public class CompositeIndexUtilizationEntity {
 
-    @JsonProperty(value = "IndexSpecs", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "IndexSpecs", access = JsonProperty.Access.READ_WRITE)
     private List<String> indexDocumentExpressions;
-    @JsonProperty(value = "IndexPreciseSet", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "IndexPreciseSet", access = JsonProperty.Access.READ_WRITE)
     private boolean indexPlanFullFidelity;
-    @JsonProperty(value = "IndexImpactScore", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "IndexImpactScore", access = JsonProperty.Access.READ_WRITE)
     private String indexImpactScore;
 
     CompositeIndexUtilizationEntity() {}

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/SingleIndexUtilizationEntity.java

@@ -7,15 +7,15 @@
 
 public class SingleIndexUtilizationEntity {
 
-    @JsonProperty(value = "FilterExpression", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "FilterExpression", access = JsonProperty.Access.READ_WRITE)
     private String filterExpression;
-    @JsonProperty(value = "IndexSpec", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "IndexSpec", access = JsonProperty.Access.READ_WRITE)
     private String indexDocumentExpression;
-    @JsonProperty(value = "FilterPreciseSet", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "FilterPreciseSet", access = JsonProperty.Access.READ_WRITE)
     private boolean filterExpressionPrecision;
-    @JsonProperty(value = "IndexPreciseSet", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "IndexPreciseSet", access = JsonProperty.Access.READ_WRITE)
     private boolean indexPlanFullFidelity;
-    @JsonProperty(value = "IndexImpactScore", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "IndexImpactScore", access = JsonProperty.Access.READ_WRITE)
     private String indexImpactScore;
 
     SingleIndexUtilizationEntity() {}