Merge pull request Azure#11 from FabianMeiswinkel/users/fabianm/Seria…

…lizationFix

Fxiing Json serialization issue.

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/ClientSideRequestStatistics.java

@@ -163,8 +163,7 @@ String recordAddressResolutionStart(URI targetEndpoint) {
 
         AddressResolutionStatistics resolutionStatistics = new AddressResolutionStatistics();
         resolutionStatistics.startTimeUTC = Instant.now();
-        //  Very far in the future
-        resolutionStatistics.endTimeUTC = Instant.MAX;
+        resolutionStatistics.endTimeUTC = null;
         resolutionStatistics.targetEndpoint = targetEndpoint == null ? "<NULL>" : targetEndpoint.toString();
 
         synchronized (this) {
@@ -192,6 +191,8 @@ void recordAddressResolutionEnd(String identifier) {
 
             AddressResolutionStatistics resolutionStatistics = this.addressResolutionStatistics.get(identifier);
             resolutionStatistics.endTimeUTC = responseTime;
+            resolutionStatistics.errorMessage = null;
+            resolutionStatistics.inflightRequest = false;
         }
     }
 
@@ -329,6 +330,14 @@ private static class AddressResolutionStatistics {
         Instant endTimeUTC;
         @JsonSerialize
         String targetEndpoint;
+        @JsonSerialize
+        String errorMessage;
+
+        // If one replica return error we start address call in parallel,
+        // on other replica  valid response, we end the current user request,
+        // indicating background addressResolution is still inflight
+        @JsonSerialize
+        boolean inflightRequest = true;
     }
 
     private static class GatewayStatistics {
@@ -363,4 +372,4 @@ public RequestTimeline getRequestTimeline() {
             return requestTimeline;
         }
     }
-}
+}