clean up

Author: sourabh1007

Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetry.cs

@@ -44,8 +44,8 @@ internal class ClientTelemetry : IDisposable
 
         private Task telemetryTask;
 
-        private ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge, int droppedRequestCount)> operationInfoMap 
-            = new ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge, int droppedRequestCount)>();
+        private ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge)> operationInfoMap 
+            = new ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge)>();
 
         private ConcurrentDictionary<CacheRefreshInfo, LongConcurrentHistogram> cacheRefreshInfoMap 
             = new ConcurrentDictionary<CacheRefreshInfo, LongConcurrentHistogram>();
@@ -175,8 +175,8 @@ private async Task EnrichAndSendAsync()
                         this.clientTelemetryInfo.IsDirectConnectionMode);
 
                     // Take the copy for further processing i.e. serializing and dividing into chunks
-                    ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge, int droppedRequestCount)> operationInfoSnapshot
-                        = Interlocked.Exchange(ref this.operationInfoMap, new ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge, int droppedRequestCount)>());
+                    ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge)> operationInfoSnapshot
+                        = Interlocked.Exchange(ref this.operationInfoMap, new ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge)>());
 
                     ConcurrentDictionary<CacheRefreshInfo, LongConcurrentHistogram> cacheRefreshInfoSnapshot
                         = Interlocked.Exchange(ref this.cacheRefreshInfoMap, new ConcurrentDictionary<CacheRefreshInfo, LongConcurrentHistogram>());
@@ -309,14 +309,13 @@ internal void CollectOperationInfo(CosmosDiagnostics cosmosDiagnostics,
                                             statusCode: (int)statusCode,
                                             subStatusCode: (int)subStatusCode);
 
-            (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge, int requestDropCount) = this.operationInfoMap
+            (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge) = this.operationInfoMap
                     .GetOrAdd(payloadKey, x => (latency: new LongConcurrentHistogram(ClientTelemetryOptions.RequestLatencyMin,
                                                         ClientTelemetryOptions.RequestLatencyMax,
                                                         ClientTelemetryOptions.RequestLatencyPrecision),
                             requestcharge: new LongConcurrentHistogram(ClientTelemetryOptions.RequestChargeMin,
                                                         ClientTelemetryOptions.RequestChargeMax,
-                                                        ClientTelemetryOptions.RequestChargePrecision),
-                            droppedRequestCount: 0));
+                                                        ClientTelemetryOptions.RequestChargePrecision)));
             try
             {
                 latency.RecordValue(cosmosDiagnostics.GetClientElapsedTime().Ticks);

Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetryPayloadWriter.cs

@@ -19,7 +19,7 @@ internal static class ClientTelemetryPayloadWriter
     {
         public static async Task SerializedPayloadChunksAsync(
             ClientTelemetryProperties properties,
-            ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge, int droppedRequestCount)> operationInfoSnapshot,
+            ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge)> operationInfoSnapshot,
             ConcurrentDictionary<CacheRefreshInfo, LongConcurrentHistogram> cacheRefreshInfoSnapshot,
             List<RequestInfo> sampledRequestInfo,
             Func<string, Task> callback)
@@ -35,7 +35,7 @@ public static async Task SerializedPayloadChunksAsync(
 
             if (operationInfoSnapshot?.Any() == true)
             {
-                foreach (KeyValuePair<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge, int droppedRequestCount)> entry in operationInfoSnapshot)
+                foreach (KeyValuePair<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge)> entry in operationInfoSnapshot)
                 {
                     long lengthNow = stringBuilder.Length;
 
@@ -46,19 +46,11 @@ public static async Task SerializedPayloadChunksAsync(
                     OperationInfo payloadForRequestCharge = payloadForLatency.Copy();
                     payloadForRequestCharge.MetricInfo = new MetricInfo(ClientTelemetryOptions.RequestChargeName, ClientTelemetryOptions.RequestChargeUnit);
                     payloadForRequestCharge.SetAggregators(entry.Value.requestcharge, ClientTelemetryOptions.HistogramPrecisionFactor);
-
-                    OperationInfo payloadForDroppedRntbdRequests = payloadForLatency.Copy();
-                    payloadForRequestCharge.MetricInfo 
-                        = new MetricInfo(
-                                metricsName: ClientTelemetryOptions.DroppedRntbdRequestsName, 
-                                unitName: ClientTelemetryOptions.DroppedRntbdRequestsUnit, 
-                                count: entry.Value.droppedRequestCount);
 
                     string latencyMetrics = JsonConvert.SerializeObject(payloadForLatency);
                     string requestChargeMetrics = JsonConvert.SerializeObject(payloadForRequestCharge);
-                    string droppedRntbdRequestsMetrics = JsonConvert.SerializeObject(payloadForDroppedRntbdRequests);
 
-                    int thisSectionLength = latencyMetrics.Length + requestChargeMetrics.Length + droppedRntbdRequestsMetrics.Length;
+                    int thisSectionLength = latencyMetrics.Length + requestChargeMetrics.Length;
                     if (lengthNow + thisSectionLength > ClientTelemetryOptions.PayloadSizeThreshold)
                     {
                         writer.WriteEndArray();
@@ -71,7 +63,6 @@ public static async Task SerializedPayloadChunksAsync(
 
                     writer.WriteRawValue(latencyMetrics);
                     writer.WriteRawValue(requestChargeMetrics);
-                    writer.WriteRawValue(droppedRntbdRequestsMetrics);
                 }
 
             }

Microsoft.Azure.Cosmos/src/Telemetry/ClientTelemetryProcessor.cs

@@ -36,7 +36,7 @@ internal ClientTelemetryProcessor(CosmosHttpClient httpClient, AuthorizationToke
         /// <returns>Task</returns>
         internal async Task ProcessAndSendAsync(
             ClientTelemetryProperties clientTelemetryInfo, 
-            ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge, int droppedRequestCount)> operationInfoSnapshot,
+            ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharget)> operationInfoSnapshot,
             ConcurrentDictionary<CacheRefreshInfo, LongConcurrentHistogram> cacheRefreshInfoSnapshot,
             List<RequestInfo> requestInfoSnapshot,
             CancellationToken cancellationToken)

Microsoft.Azure.Cosmos/src/Telemetry/Models/RequestInfo.cs

@@ -26,7 +26,7 @@ internal sealed class RequestInfo
         [JsonProperty("resource")]
         public string Resource { get; set; }
 
-        [JsonProperty("statusCode")] 
+        [JsonProperty("statusCode")]
         public int? StatusCode { get; set; }
 
         [JsonProperty("subStatusCode")]

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Telemetry/ClientTelemetryTests.cs

@@ -161,8 +161,8 @@ public async Task CheckIfPayloadIsDividedCorrectlyAsync(int expectedOperationInf
                 MockCosmosUtil.CreateCosmosHttpClient(() => new HttpClient(new HttpHandlerHelper(mockHttpHandler.Object))),
                 Mock.Of<AuthorizationTokenProvider>());
 
-            ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge, int droppedrequestCount)> operationInfoSnapshot 
-                = new ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge, int droppedrequestCount)> ();
+            ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge)> operationInfoSnapshot 
+                = new ConcurrentDictionary<OperationInfo, (LongConcurrentHistogram latency, LongConcurrentHistogram requestcharge)> ();
 
             int numberOfMetricsInOperatiionSection = 3;
             for (int i = 0; i < (expectedOperationInfoSize/ numberOfMetricsInOperatiionSection); i++)
@@ -187,7 +187,7 @@ public async Task CheckIfPayloadIsDividedCorrectlyAsync(int expectedOperationInf
                                                             ClientTelemetryOptions.RequestChargePrecision);
                 requestcharge.RecordValue(11);
 
-                operationInfoSnapshot.TryAdd(opeInfo, (latency, requestcharge, 100));
+                operationInfoSnapshot.TryAdd(opeInfo, (latency, requestcharge));
             }
 
             ConcurrentDictionary<CacheRefreshInfo, LongConcurrentHistogram> cacheRefreshInfoSnapshot 

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Telemetry/DataSamplerTests.cs

@@ -14,19 +14,6 @@ namespace Microsoft.Azure.Cosmos.Tests.Telemetry
     [TestClass]
     public class DataSamplerTests
     {
-      /*  [TestMethod]
-        [DataRow(200, 0, 1, false)]
-        [DataRow(404, 0, 1, false)]
-        [DataRow(404, 1002, 1, true)]
-        [DataRow(409, 0, 1, false)]
-        [DataRow(409, 1002, 1, true)]
-        [DataRow(503, 2001, 1, true)]
-        [DataRow(200, 0, 6, true)]
-        public void CheckEligibleStatistics(int statusCode, int subStatusCode, int latencyInMs, bool expectedFlag)
-        {
-            Assert.AreEqual(expectedFlag, NetworkRequestSampler.IsEligible(statusCode, subStatusCode, TimeSpan.FromMilliseconds(latencyInMs)));
-        }*/
-
         [TestMethod]
         [DataRow(10)]
         public void TestNetworkRequestSamplerForThreshold(int threshold)

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Telemetry/NetworkDataRecorderTest.cs

@@ -0,0 +1,25 @@
+//------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//------------------------------------------------------------
+
+namespace Microsoft.Azure.Cosmos.Tests.Telemetry
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+    using System.Threading.Tasks;
+    using Microsoft.Azure.Cosmos.Telemetry;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+    [TestClass]
+    public class NetworkDataRecorderTest
+    {
+        [TestMethod]
+        public void TestRecordWithErroredAndHighLatencyRequests()
+        {
+            NetworkDataRecorder recorder = new NetworkDataRecorder();
+            
+        }
+    }
+}