Adding basic request diagnostics for V3

Microsoft.Azure.Cosmos/src/Query/CosmosQueryExecutionContextFactory.cs

@@ -181,11 +181,7 @@ private async Task<ResponseMessage> ExecuteNextHelperAsync(CancellationToken can
 
             if (response?.queryMetrics != null && response?.queryMetrics.Count > 0)
             {
-                QueryOperationStatistics queryOperationStatistics = new QueryOperationStatistics(response.queryMetrics);
-                response.cosmosDiagnostics = new CosmosDiagnostics
-                {
-                    queryOperationStatistics = queryOperationStatistics
-                };
+                response.cosmosDiagnostics = new QueryOperationStatistics(response.queryMetrics);
             }
 
             return response;
@@ -296,7 +292,7 @@ private async Task<CosmosQueryExecutionContext> CreateItemQueryExecutionContextA
                 rewrittenComosQueryContext = this.cosmosQueryContext;
             }
 
-            return await CreateSpecializedDocumentQueryExecutionContextAsync(
+            return await this.CreateSpecializedDocumentQueryExecutionContextAsync(
                 rewrittenComosQueryContext,
                 partitionedQueryExecutionInfo,
                 targetRanges,

Microsoft.Azure.Cosmos/src/Resource/Settings/CosmosDiagnostics.cs

@@ -7,27 +7,9 @@ namespace Microsoft.Azure.Cosmos
     /// <summary>
     ///  Contains the cosmos diagnostic information for the current request to Azure Cosmos DB service.
     /// </summary>
-    public class CosmosDiagnostics
+    public abstract class CosmosDiagnostics
     {
-        internal PointOperationStatistics pointOperationStatistics { get; set; }
-        internal QueryOperationStatistics queryOperationStatistics { get; set; }
-
-        /// <summary>
-        /// Gets the string field <see cref="Microsoft.Azure.Cosmos.CosmosDiagnostics"/> instance in the Azure DocumentDB database service.
-        /// </summary>
-        /// <returns>The string field <see cref="Microsoft.Azure.Cosmos.CosmosDiagnostics"/> instance in the Azure DocumentDB database service.</returns>
-        public override string ToString()
-        {
-            if (this.pointOperationStatistics != null)
-            {
-                return this.pointOperationStatistics.ToString();
-            }
-            else if (this.queryOperationStatistics != null)
-            {
-                return this.queryOperationStatistics.ToString();
-            }
-
-            return string.Empty;
-        }
+        // For now only ToString() will be used, having child concrete PointOperationStatistics
+        // and QueryOperationStatistics
     }
 }

Microsoft.Azure.Cosmos/src/Resource/Settings/PointOperationStatistics.cs

@@ -6,7 +6,7 @@ namespace Microsoft.Azure.Cosmos
 {
     using Microsoft.Azure.Documents;
 
-    internal class PointOperationStatistics
+    internal sealed class PointOperationStatistics : CosmosDiagnostics
     {
         private ClientSideRequestStatistics clientSideRequestStatistics;
 

Microsoft.Azure.Cosmos/src/Resource/Settings/QueryOperationStatistics.cs

@@ -7,7 +7,7 @@ namespace Microsoft.Azure.Cosmos
     using System.Collections.Generic;
     using Newtonsoft.Json;
 
-    internal class QueryOperationStatistics
+    internal sealed class QueryOperationStatistics : CosmosDiagnostics
     {
         public QueryOperationStatistics(IReadOnlyDictionary<string, QueryMetrics> queryMetrics = null)
         {

Microsoft.Azure.Cosmos/src/Util/Extensions.cs

@@ -40,10 +40,7 @@ internal static ResponseMessage ToCosmosResponseMessage(this DocumentServiceResp
 
             if (response.RequestStats != null)
             {
-                cosmosResponse.cosmosDiagnostics = new CosmosDiagnostics()
-                {
-                    pointOperationStatistics = new PointOperationStatistics(response.RequestStats)
-                };
+                cosmosResponse.cosmosDiagnostics = new PointOperationStatistics(response.RequestStats);
             }
 
             return cosmosResponse;

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/CosmosDiagnosticsTests.cs

@@ -43,41 +43,41 @@ public async Task PointOperationDiagnostic()
             //Checking point operation diagnostics on typed operations
             ToDoActivity testItem = ToDoActivity.CreateRandomToDoActivity();
             ItemResponse<ToDoActivity> createResponse = await this.Container.CreateItemAsync<ToDoActivity>(item: testItem);
-            Assert.IsNotNull(createResponse.cosmosDiagnostics.pointOperationStatistics);
+            Assert.IsNotNull(createResponse.cosmosDiagnostics);
 
             ItemResponse<ToDoActivity> readResponse = await this.Container.ReadItemAsync<ToDoActivity>(id: testItem.id, partitionKey: new PartitionKey(testItem.status));
-            Assert.IsNotNull(readResponse.cosmosDiagnostics.pointOperationStatistics);
+            Assert.IsNotNull(readResponse.cosmosDiagnostics);
 
             testItem.description = "NewDescription";
             ItemResponse<ToDoActivity> replaceResponse = await this.Container.ReplaceItemAsync<ToDoActivity>(item: testItem, id: testItem.id, partitionKey: new PartitionKey(testItem.status));
             Assert.AreEqual(replaceResponse.Resource.description, "NewDescription");
-            Assert.IsNotNull(replaceResponse.cosmosDiagnostics.pointOperationStatistics);
+            Assert.IsNotNull(replaceResponse.cosmosDiagnostics);
 
             ItemResponse<ToDoActivity> deleteResponse = await this.Container.DeleteItemAsync<ToDoActivity>(partitionKey: new Cosmos.PartitionKey(testItem.status), id: testItem.id);
             Assert.IsNotNull(deleteResponse);
-            Assert.IsNotNull(deleteResponse.cosmosDiagnostics.pointOperationStatistics);
+            Assert.IsNotNull(deleteResponse.cosmosDiagnostics);
 
             //Checking point operation diagnostics on stream operations
             ResponseMessage createStreamResponse =  await this.Container.CreateItemStreamAsync(
                 partitionKey: new PartitionKey(testItem.status),
                 streamPayload: TestCommon.Serializer.ToStream<ToDoActivity>(testItem));
-            Assert.IsNotNull(createStreamResponse.cosmosDiagnostics.pointOperationStatistics);
+            Assert.IsNotNull(createStreamResponse.cosmosDiagnostics);
 
             ResponseMessage readStreamResponse = await this.Container.ReadItemStreamAsync(
                 id: testItem.id,
                 partitionKey: new PartitionKey(testItem.status));
-            Assert.IsNotNull(readStreamResponse.cosmosDiagnostics.pointOperationStatistics);
+            Assert.IsNotNull(readStreamResponse.cosmosDiagnostics);
 
             ResponseMessage replaceStreamResponse = await this.Container.ReplaceItemStreamAsync(
                streamPayload: TestCommon.Serializer.ToStream<ToDoActivity>(testItem),
                id: testItem.id,
                partitionKey: new PartitionKey(testItem.status));
-            Assert.IsNotNull(replaceStreamResponse.cosmosDiagnostics.pointOperationStatistics);
+            Assert.IsNotNull(replaceStreamResponse.cosmosDiagnostics);
 
             ResponseMessage deleteStreamResponse = await this.Container.DeleteItemStreamAsync(
                id: testItem.id,
                partitionKey: new PartitionKey(testItem.status));
-            Assert.IsNotNull(deleteStreamResponse.cosmosDiagnostics.pointOperationStatistics);
+            Assert.IsNotNull(deleteStreamResponse.cosmosDiagnostics);
         }
 
         [TestMethod]
@@ -102,7 +102,7 @@ public async Task QueryOperationDiagnostic()
             if (feedIterator.HasMoreResults)
             {
                 FeedResponse<ToDoActivity> iter = await feedIterator.ReadNextAsync();
-                Assert.IsTrue(iter.cosmosDiagnostics.queryOperationStatistics.queryMetrics.Values.First().OutputDocumentCount > 0);
+                Assert.IsTrue(((QueryOperationStatistics)iter.cosmosDiagnostics).queryMetrics.Values.First().OutputDocumentCount > 0);
             }
 
             sql = new QueryDefinition("select * from ToDoActivity t ORDER BY t.cost");
@@ -112,7 +112,7 @@ public async Task QueryOperationDiagnostic()
             if (feedIterator.HasMoreResults)
             {
                 FeedResponse<ToDoActivity> iter = await feedIterator.ReadNextAsync();
-                Assert.IsTrue(iter.cosmosDiagnostics.queryOperationStatistics.queryMetrics.Values.First().OutputDocumentCount > 0);
+                Assert.IsTrue(((QueryOperationStatistics)iter.cosmosDiagnostics).queryMetrics.Values.First().OutputDocumentCount > 0);
             }
 
             sql = new QueryDefinition("select DISTINCT t.cost from ToDoActivity t");
@@ -122,8 +122,8 @@ public async Task QueryOperationDiagnostic()
             if (feedIterator.HasMoreResults)
             {
                 FeedResponse<ToDoActivity> iter = await feedIterator.ReadNextAsync();
-                Assert.IsNotNull(iter.cosmosDiagnostics.queryOperationStatistics);
-                Assert.AreEqual(1, iter.cosmosDiagnostics.queryOperationStatistics.queryMetrics.Values.First().OutputDocumentCount);
+                Assert.IsNotNull((QueryOperationStatistics)iter.cosmosDiagnostics);
+                Assert.AreEqual(1, ((QueryOperationStatistics)iter.cosmosDiagnostics).queryMetrics.Values.First().OutputDocumentCount);
             }
 
             //No query metrics return from server if user explicitly set PopulateQueryMetrics = false
@@ -135,8 +135,8 @@ public async Task QueryOperationDiagnostic()
             if (feedIterator.HasMoreResults)
             {
                 FeedResponse<ToDoActivity> iter = await feedIterator.ReadNextAsync();
-                Assert.IsNotNull(iter.cosmosDiagnostics.queryOperationStatistics);
-                Assert.AreEqual(0, iter.cosmosDiagnostics.queryOperationStatistics.queryMetrics.Values.First().OutputDocumentCount);
+                Assert.IsNotNull((QueryOperationStatistics)iter.cosmosDiagnostics);
+                Assert.AreEqual(0, ((QueryOperationStatistics)iter.cosmosDiagnostics).queryMetrics.Values.First().OutputDocumentCount);
                 requestOptions.PopulateQueryMetrics = true;
             }
 
@@ -147,7 +147,7 @@ public async Task QueryOperationDiagnostic()
             if (feedIterator.HasMoreResults)
             {
                 FeedResponse<ToDoActivity> iter = await feedIterator.ReadNextAsync();
-                Assert.IsTrue(iter.cosmosDiagnostics.queryOperationStatistics.queryMetrics.Values.First().OutputDocumentCount > 0);
+                Assert.IsTrue(((QueryOperationStatistics)iter.cosmosDiagnostics).queryMetrics.Values.First().OutputDocumentCount > 0);
             }
 
             //Checking query metrics on stream query
@@ -159,7 +159,7 @@ public async Task QueryOperationDiagnostic()
             if (iterator.HasMoreResults)
             {
                 ResponseMessage responseMessage = await iterator.ReadNextAsync();
-                Assert.IsTrue(responseMessage.cosmosDiagnostics.queryOperationStatistics.queryMetrics.Values.First().OutputDocumentCount > 0);
+                Assert.IsTrue(((QueryOperationStatistics)responseMessage.cosmosDiagnostics).queryMetrics.Values.First().OutputDocumentCount > 0);
             }
         }
     }

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/DotNetSDKAPI.json

@@ -1481,18 +1481,7 @@
     },
     "CosmosDiagnostics": {
       "Subclasses": {},
-      "Members": {
-        "System.String ToString()": {
-          "Type": "Method",
-          "Attributes": [],
-          "MethodInfo": "System.String ToString()"
-        },
-        "Void .ctor()": {
-          "Type": "Constructor",
-          "Attributes": [],
-          "MethodInfo": "Void .ctor()"
-        }
-      },
+      "Members": {},
       "NestedTypes": {}
     },
     "CosmosException": {