upgrading direct to 3.1.6 to leverage IClientSideRequestDiagnostics

Microsoft.Azure.Cosmos/src/ClientRetryPolicy.cs

@@ -33,7 +33,7 @@ internal sealed class ClientRetryPolicy : IDocumentClientRetryPolicy
         private Uri locationEndpoint;
         private RetryContext retryContext;
 
-        private ClientSideRequestStatistics sharedStatistics;
+        private IClientSideRequestStatistics sharedStatistics;
 
         public ClientRetryPolicy(
             GlobalEndpointManager globalEndpointManager,
@@ -50,7 +50,7 @@ public ClientRetryPolicy(
             this.sessionTokenRetryCount = 0;
             this.canUseMultipleWriteLocations = false;
 
-            this.sharedStatistics = new ClientSideRequestStatistics();
+            this.sharedStatistics = new CosmosClientSideRequestStatistics();
         }
 
         /// <summary> 

Microsoft.Azure.Cosmos/src/DocumentFeedResponse.cs

@@ -53,7 +53,7 @@ internal DocumentFeedResponse(
             INameValueCollection responseHeaders,
             bool useETagAsContinuation = false,
             IReadOnlyDictionary<string, QueryMetrics> queryMetrics = null,
-            ClientSideRequestStatistics requestStats = null,
+            IClientSideRequestStatistics requestStats = null,
             string disallowContinuationTokenMessage = null,
             long responseLengthBytes = 0)
             : this(result)
@@ -79,7 +79,7 @@ internal DocumentFeedResponse(
             IEnumerable<T> result,
             int count,
             INameValueCollection responseHeaders,
-            ClientSideRequestStatistics requestStats,
+            IClientSideRequestStatistics requestStats,
             long responseLengthBytes)
             : this(result, count, responseHeaders, false, null, requestStats, responseLengthBytes: responseLengthBytes)
         {
@@ -91,7 +91,7 @@ internal DocumentFeedResponse(
         /// <remarks>
         /// This value is currently used for tracking replica Uris.
         /// </remarks>
-        internal ClientSideRequestStatistics RequestStatistics { get; private set; }
+        internal IClientSideRequestStatistics RequestStatistics { get; private set; }
 
         /// <summary>
         /// Gets the response length in bytes

Microsoft.Azure.Cosmos/src/Microsoft.Azure.Cosmos.csproj

@@ -7,7 +7,7 @@
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <ClientVersion>3.1.1</ClientVersion>
-    <DirectVersion>3.1.5</DirectVersion>
+    <DirectVersion>3.1.6</DirectVersion>
     <HybridRowVersion>1.0.0-preview</HybridRowVersion>
     <DirectPackageName Condition=" '$(SignAssembly)' == 'true' ">Microsoft.Azure.Cosmos.Direct</DirectPackageName>
     <DirectPackageName Condition=" '$(SignAssembly)' != 'true' ">Microsoft.Azure.Cosmos.Direct.MyGet</DirectPackageName>

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

@@ -0,0 +1,184 @@
+//------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//------------------------------------------------------------
+
+namespace Microsoft.Azure.Cosmos
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Text;
+    using Microsoft.Azure.Documents;
+    using Newtonsoft.Json;
+
+    internal sealed class CosmosClientSideRequestStatistics : IClientSideRequestStatistics
+    {
+        internal const int MaxSupplementalRequestsForToString = 10;
+
+        internal DateTime requestStartTime;
+        internal DateTime requestEndTime;
+
+        private object lockObject = new object();
+
+        internal List<StoreResponseStatistics> responseStatisticsList;
+        internal List<StoreResponseStatistics> supplementalResponseStatisticsList;
+        internal Dictionary<string, AddressResolutionStatistics> addressResolutionStatistics;
+
+        [JsonIgnoreAttribute]
+        public List<Uri> ContactedReplicas { get; set; }
+        [JsonIgnoreAttribute]
+        public HashSet<Uri> FailedReplicas { get; private set; }
+        [JsonIgnoreAttribute]
+        public HashSet<Uri> RegionsContacted { get; private set; }
+
+        public CosmosClientSideRequestStatistics()
+        {
+            this.requestStartTime = DateTime.UtcNow;
+            this.requestEndTime = DateTime.UtcNow;
+            this.responseStatisticsList = new List<StoreResponseStatistics>();
+            this.supplementalResponseStatisticsList = new List<StoreResponseStatistics>();
+            this.addressResolutionStatistics = new Dictionary<string, AddressResolutionStatistics>();
+            this.ContactedReplicas = new List<Uri>();
+            this.FailedReplicas = new HashSet<Uri>();
+            this.RegionsContacted = new HashSet<Uri>();
+        }
+
+        public TimeSpan RequestLatency
+        {
+            get
+            {
+                return this.requestEndTime - this.requestStartTime;
+            }
+        }
+
+        public bool IsCpuOverloaded
+        {
+            get
+            {
+                foreach (StoreResponseStatistics responseStatistics in this.responseStatisticsList)
+                {
+                    if (responseStatistics.StoreResult.IsClientCpuOverloaded)
+                    {
+                        return true;
+                    }
+                }
+                foreach (StoreResponseStatistics responseStatistics in this.supplementalResponseStatisticsList)
+                {
+                    if (responseStatistics.StoreResult.IsClientCpuOverloaded)
+                    {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+
+        public void RecordResponse(DocumentServiceRequest request, StoreResult storeResult)
+        {
+            DateTime responseTime = DateTime.UtcNow;
+
+            StoreResponseStatistics responseStatistics;
+            responseStatistics.RequestResponseTime = responseTime;
+            responseStatistics.StoreResult = storeResult;
+            responseStatistics.RequestOperationType = request.OperationType;
+            responseStatistics.RequestResourceType = request.ResourceType;
+
+            Uri locationEndpoint = request.RequestContext.LocationEndpointToRoute;
+
+            lock (this.lockObject)
+            {
+                if (responseTime > this.requestEndTime)
+                {
+                    this.requestEndTime = responseTime;
+                }
+
+                if (locationEndpoint != null)
+                {
+                    this.RegionsContacted.Add(locationEndpoint);
+                }
+
+                if (responseStatistics.RequestOperationType == OperationType.Head || responseStatistics.RequestOperationType == OperationType.HeadFeed)
+                {
+                    this.supplementalResponseStatisticsList.Add(responseStatistics);
+                }
+                else
+                {
+                    this.responseStatisticsList.Add(responseStatistics);
+                }
+            }
+        }
+
+        public string RecordAddressResolutionStart(Uri targetEndpoint)
+        {
+            string identifier = Guid.NewGuid().ToString();
+            AddressResolutionStatistics resolutionStats = new AddressResolutionStatistics
+            {
+                StartTime = DateTime.UtcNow,
+                EndTime = DateTime.MaxValue,
+                TargetEndpoint = targetEndpoint == null ? "<NULL>" : targetEndpoint.ToString()
+            };
+
+            lock (this.lockObject)
+            {
+                this.addressResolutionStatistics.Add(identifier, resolutionStats);
+            }
+
+            return identifier;
+        }
+
+        public void RecordAddressResolutionEnd(string identifier)
+        {
+            if (string.IsNullOrEmpty(identifier))
+            {
+                return;
+            }
+
+            DateTime responseTime = DateTime.UtcNow;
+            lock (this.lockObject)
+            {
+                if (!this.addressResolutionStatistics.ContainsKey(identifier))
+                {
+                    throw new ArgumentException("Identifier {0} does not exist. Please call start before calling end.", identifier);
+                }
+
+                if (responseTime > this.requestEndTime)
+                {
+                    this.requestEndTime = responseTime;
+                }
+
+                this.addressResolutionStatistics[identifier].EndTime = responseTime;
+            }
+        }
+
+        internal struct StoreResponseStatistics
+        {
+            public DateTime RequestResponseTime;
+            public StoreResult StoreResult;
+            public ResourceType RequestResourceType;
+            public OperationType RequestOperationType;
+
+            public override string ToString()
+            {
+                return String.Format(CultureInfo.InvariantCulture, "ResponseTime: {0}, StoreResult: {1}, ResourceType: {2}, OperationType: {3}",
+                    this.RequestResponseTime.ToString("o", System.Globalization.CultureInfo.InvariantCulture),
+                    this.StoreResult != null ? this.StoreResult.ToString() : string.Empty,
+                    this.RequestResourceType, this.RequestOperationType);
+            }
+        }
+
+        internal class AddressResolutionStatistics
+        {
+            public DateTime StartTime { get; set; }
+            public DateTime EndTime { get; set; }
+            public string TargetEndpoint { get; set; }
+
+            public override string ToString()
+            {
+                return string.Format(CultureInfo.InvariantCulture, "AddressResolution - StartTime: {0}, EndTime: {1}, TargetEndpoint: {2}",
+                    this.StartTime.ToString("o", System.Globalization.CultureInfo.InvariantCulture),
+                    this.EndTime.ToString("o", System.Globalization.CultureInfo.InvariantCulture),
+                    this.TargetEndpoint);
+            }
+        }
+    }
+}

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

@@ -4,20 +4,56 @@
 
 namespace Microsoft.Azure.Cosmos
 {
-    using Microsoft.Azure.Documents;
+    using System;
+    using System.Collections.Generic;
+    using Newtonsoft.Json;
+    using static Microsoft.Azure.Cosmos.CosmosClientSideRequestStatistics;
 
-    internal sealed class PointOperationStatistics : CosmosDiagnostics
+    internal class PointOperationStatistics : CosmosDiagnostics
     {
-        private ClientSideRequestStatistics clientSideRequestStatistics;
+        public DateTime requestStartTime { get; private set; }
 
-        public PointOperationStatistics(ClientSideRequestStatistics clientSideRequestStatistics)
+        public DateTime requestEndTime { get; private set; }
+
+        public List<StoreResponseStatistics> responseStatisticsList { get; private set; }
+
+        public List<StoreResponseStatistics> supplementalResponseStatisticsList { get; private set; }
+
+        public Dictionary<string, AddressResolutionStatistics> addressResolutionStatistics { get; private set; }
+
+        internal List<Uri> contactedReplicas { get; set; }
+
+        internal HashSet<Uri> failedReplicas { get; private set; }
+
+        public HashSet<Uri> regionsContacted { get; private set; }
+
+        public TimeSpan requestLatency { get; private set; }
+
+        public PointOperationStatistics(CosmosClientSideRequestStatistics clientSideRequestStatistics)
         {
-            this.clientSideRequestStatistics = clientSideRequestStatistics;
+            this.requestStartTime = clientSideRequestStatistics.requestStartTime;
+            this.requestEndTime = clientSideRequestStatistics.requestEndTime;
+            this.responseStatisticsList = clientSideRequestStatistics.responseStatisticsList;
+            this.supplementalResponseStatisticsList = clientSideRequestStatistics.supplementalResponseStatisticsList;
+            this.addressResolutionStatistics = clientSideRequestStatistics.addressResolutionStatistics;
+            this.contactedReplicas = clientSideRequestStatistics.ContactedReplicas;
+            this.failedReplicas = clientSideRequestStatistics.FailedReplicas;
+            this.regionsContacted = clientSideRequestStatistics.RegionsContacted;
+            this.requestLatency = clientSideRequestStatistics.RequestLatency;
         }
 
         public override string ToString()
         {
-            return this.clientSideRequestStatistics.ToString();
+            if (this.supplementalResponseStatisticsList != null)
+            {
+                int supplementalResponseStatisticsListCount = this.supplementalResponseStatisticsList.Count;
+                int countToRemove = Math.Max(supplementalResponseStatisticsListCount - CosmosClientSideRequestStatistics.MaxSupplementalRequestsForToString, 0);
+                if (countToRemove > 0)
+                {
+                    this.supplementalResponseStatisticsList.RemoveRange(0, countToRemove);
+                }
+            }
+            return JsonConvert.SerializeObject(this);
         }
     }
 }

Microsoft.Azure.Cosmos/src/StoredProcedureResponse.cs

@@ -218,7 +218,7 @@ public TValue Response
         /// Gets the clientside request statics for execution of stored procedure.
         /// </summary>
         /// <value>The clientside request statics for execution of stored procedure.</value>
-        internal ClientSideRequestStatistics RequestStatistics
+        internal IClientSideRequestStatistics RequestStatistics
         {
             get
             {

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

@@ -38,7 +38,11 @@ internal static ResponseMessage ToCosmosResponseMessage(this DocumentServiceResp
 
             if (response.RequestStats != null)
             {
-                cosmosResponse.cosmosDiagnostics = new PointOperationStatistics(response.RequestStats);
+                CosmosClientSideRequestStatistics cosmosClientSideRequestStatistics = response.RequestStats as CosmosClientSideRequestStatistics;
+                if (cosmosClientSideRequestStatistics != null)
+                {
+                    cosmosResponse.cosmosDiagnostics = new PointOperationStatistics(cosmosClientSideRequestStatistics);
+                }
             }
 
             return cosmosResponse;

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Microsoft.Azure.Cosmos.EmulatorTests.csproj

@@ -8,7 +8,7 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>Microsoft.Azure.Cosmos</RootNamespace>
     <AssemblyName>Microsoft.Azure.Cosmos.EmulatorTests</AssemblyName>
-    <DirectVersion>3.1.5</DirectVersion>
+    <DirectVersion>3.1.6</DirectVersion>
     <HybridRowVersion>1.0.0-preview</HybridRowVersion>
     <DirectPackageName Condition=" '$(SignAssembly)' == 'true' ">Microsoft.Azure.Cosmos.Direct</DirectPackageName>
     <DirectPackageName Condition=" '$(SignAssembly)' != 'true' ">Microsoft.Azure.Cosmos.Direct.MyGet</DirectPackageName>

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Performance.Tests/Microsoft.Azure.Cosmos.Performance.Tests.csproj

@@ -6,7 +6,7 @@
     <IsPackable>false</IsPackable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>Microsoft.Azure.Cosmos</RootNamespace>
-    <DirectVersion>3.1.4</DirectVersion>
+    <DirectVersion>3.1.6</DirectVersion>
     <HybridRowVersion>1.0.0-preview</HybridRowVersion>
     <DirectPackageName Condition=" '$(SignAssembly)' == 'true' ">Microsoft.Azure.Cosmos.Direct</DirectPackageName>
     <DirectPackageName Condition=" '$(SignAssembly)' != 'true' ">Microsoft.Azure.Cosmos.Direct.MyGet</DirectPackageName>

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Microsoft.Azure.Cosmos.Tests.csproj

@@ -9,7 +9,7 @@
     <IsPackable>false</IsPackable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>Microsoft.Azure.Cosmos</RootNamespace>
-    <DirectVersion>3.1.5</DirectVersion>
+    <DirectVersion>3.1.6</DirectVersion>
     <HybridRowVersion>1.0.0-preview</HybridRowVersion>
     <DirectPackageName Condition=" '$(SignAssembly)' == 'true' ">Microsoft.Azure.Cosmos.Direct</DirectPackageName>
     <DirectPackageName Condition=" '$(SignAssembly)' != 'true' ">Microsoft.Azure.Cosmos.Direct.MyGet</DirectPackageName>