Merge pull request #162 from North-Two-Five/Issue161-EventsNotSentToSegmentServersUnexpectedStatusCode

Issue161 events not sent to segment servers unexpected status code

Author: pooyaj

Analytics/Exception/BadParameter.cs

@@ -7,12 +7,10 @@ namespace Segment.Exception
     public class APIException : System.Exception
     {
         public string Code { get; set; }
-        public string message { get; set; }
 
-        public APIException(string code, string message) : base(message)
+        public APIException(string code, string message) : base($"Status Code: {code}, Message: {message}")
         {
-            this.Code = code;
-            this.message = message;
+            Code = code;
         }
     }
 }

Analytics/Request/Backo.cs

@@ -17,6 +17,7 @@ public class Backo
 
 
         public bool HasReachedMax => _currentAttemptTime >= _max;
+        public int CurrentAttempt => _attempt;
 
         public Backo(int min = 100, int max = 10000, byte factor = 2, ushort jitter = 10000)
         {

Analytics/Request/BlockingRequestHandler.cs

@@ -227,10 +227,30 @@ public async Task MakeRequest(Batch batch)
                             // Error code 429 indicates rate limited.
                             // Retry uploading in these cases.
                             Thread.Sleep(_backo.AttemptTime());
+                            if (statusCode == 429)
+                            {
+                                Logger.Info($"Too many request at the moment CurrentAttempt:{_backo.CurrentAttempt} Retrying to send request", new Dict
+                                {
+                                    { "batch id", batch.MessageId },
+                                    { "statusCode", statusCode },
+                                    { "duration (ms)", watch.ElapsedMilliseconds }
+                                });
+                            }
+                            else
+                            {
+                                Logger.Info($"Internal Segment Server error CurrentAttempt:{_backo.CurrentAttempt} Retrying to send request", new Dict
+                                {
+                                    { "batch id", batch.MessageId },
+                                    { "statusCode", statusCode },
+                                    { "duration (ms)", watch.ElapsedMilliseconds }
+                                });
+                            }
                             continue;
                         }
-                        else if (statusCode >= 400)
+                        else
                         {
+                            //If status code is greater or equal than 400 but not 429 should indicate is client error.
+                            //All other types of HTTP Status code are not errors (Between 100 and 399)
                             responseStr = String.Format("Status Code {0}. ", statusCode);
                             responseStr += ex.Message;
                             break;
@@ -277,21 +297,39 @@ public async Task MakeRequest(Batch batch)
                             // Error code 429 indicates rate limited.
                             // Retry uploading in these cases.
                             await _backo.AttemptAsync();
+                            if (statusCode == 429)
+                            {
+                                Logger.Info($"Too many request at the moment CurrentAttempt:{_backo.CurrentAttempt} Retrying to send request", new Dict
+                                {
+                                    { "batch id", batch.MessageId },
+                                    { "statusCode", statusCode },
+                                    { "duration (ms)", watch.ElapsedMilliseconds }
+                                });
+                            }
+                            else
+                            {
+                                Logger.Info($"Internal Segment Server error CurrentAttempt:{_backo.CurrentAttempt} Retrying to send request", new Dict
+                                {
+                                    { "batch id", batch.MessageId },
+                                    { "statusCode", statusCode },
+                                    { "duration (ms)", watch.ElapsedMilliseconds }
+                                });
+                            }
                             continue;
                         }
-                        else if (statusCode >= 400)
+                        else
                         {
-                            responseStr = String.Format("Status Code {0}. ", response.StatusCode);
-                            responseStr += await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                             break;
                         }
                     }
 #endif
                 }
 
-                if (_backo.HasReachedMax || statusCode != (int)HttpStatusCode.OK)
+                var hasBackoReachedMax = _backo.HasReachedMax;
+                if (hasBackoReachedMax || statusCode != (int)HttpStatusCode.OK)
                 {
-                    Fail(batch, new APIException("Unexpected Status Code", responseStr), watch.ElapsedMilliseconds);
+                    var message = $"Has Backoff reached max: {hasBackoReachedMax} with number of Attempts:{_backo.CurrentAttempt},\n Status Code: {statusCode}\n, response message: {responseStr}";
+                    Fail(batch, new APIException(statusCode.ToString(), message), watch.ElapsedMilliseconds);
                     if (_backo.HasReachedMax)
                     {
                         _backo.Reset();

Test/ConnectionTests.cs

@@ -47,7 +47,6 @@ public void RetryErrorTest()
             config.SetHost("https://fake.segment-server.com");
             config.SetTimeout(new TimeSpan(0, 0, 1));
             Analytics.Initialize(Constants.WRITE_KEY, config);
-
             // Calculate working time for Identiy message with invalid host address
             watch.Start();
             Actions.Identify(Analytics.Client);
@@ -57,9 +56,9 @@ public void RetryErrorTest()
             Assert.AreEqual(0, Analytics.Client.Statistics.Succeeded);
             Assert.AreEqual(1, Analytics.Client.Statistics.Failed);
 
-            // Handling Identify message will take more than 10s even though the timeout is 1s.
+            // Handling Identify message will take more than 5s even though the timeout is 1s.
             // That's because it retries submit when it's failed.
-            Assert.AreEqual(true, watch.ElapsedMilliseconds > 10000);
+            Assert.AreEqual(true, watch.ElapsedMilliseconds > 5000);
         }
 
         [Test()]