Merge pull request #4 from praves77/praveen

Use the request/response time not current Date.

Author: dgilling

README.md

@@ -24,15 +24,15 @@ For Maven users, add dependency to your `pom.xml`:
 <dependency>
 	<groupId>com.moesif</groupId>
 	<artifactId>moesif-okhttp-interceptor</artifactId>
-	<version>1.0.3</version>
+	<version>1.0.4</version>
 </dependency> 
 ```  
 For Gradle users, add to your project's build.gradle file:  
 
 ```gradle  
 repositories {  
   dependencies {     
-    implementation 'com.moesif:moesif-okhttp-interceptor:1.0.3'
+    implementation 'com.moesif:moesif-okhttp-interceptor:1.0.4'
 }
 ```  
 

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.moesif</groupId>
   <artifactId>moesif-okhttp-interceptor</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4</version>
   <packaging>jar</packaging>
   <name>moesif-okhttp-interceptor</name>
   <url>https://www.moesif.com</url>
@@ -120,7 +120,7 @@
         <version>3.0.0-M5</version>
         <configuration>
           <argLine>
-              --illegal-access=permit
+            --illegal-access=permit
           </argLine>
         </configuration>
       </plugin>
@@ -130,7 +130,7 @@
         <version>3.0.0-M5</version>
         <configuration>
           <argLine>
-              --illegal-access=permit
+            --illegal-access=permit
           </argLine>
         </configuration>
       </plugin>

src/main/java/com/moesif/sdk/okhttp3client/MoesifOkHttp3Interceptor.java

@@ -21,8 +21,11 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
+import java.util.Date;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import java.time.Instant;
+
 /**
  * MoesifOkHttp3Interceptor
  * This intrceptor can be used both as Application and Network interceptor
@@ -125,20 +128,40 @@ public Response intercept(Chain chain) throws IOException {
         if (connConfig.getEventFilterConfig().skip(request, response))
             return response;
 
+        // Initialize the request/response time from the response.
+        Date requestDate = null;
+        Date responseDate = null;
+        try {
+            Instant utcInstance = Instant.ofEpochMilli(response.sentRequestAtMillis()); // UTC
+            requestDate = java.util.Date.from(utcInstance);
+        } catch (Exception e) {
+            requestDate = new Date();
+        }
+        try {
+            Instant utcInstance = Instant.ofEpochMilli(response.receivedResponseAtMillis()); // UTC
+            responseDate = java.util.Date.from(utcInstance);
+        } catch (Exception e) {
+            responseDate = new Date();
+        }
+
         IInterceptEventFilter filter = connConfig.getEventFilterConfig();
         final EventRequestModel loggedRequest =
                 OkHttp3RequestMapper.createOkHttp3Request(
                         request,
+                        requestDate,
                         filter.getApiVersion(request, response).orElse(null),
                         connConfig.getBaseUri(),
-                        connConfig.getMaxAllowedBodyBytesRequest());
+                        connConfig.getMaxAllowedBodyBytesRequest()
+                );
 
         final Connection connection = chain.connection();
         ResponseWrap respw = new ResponseWrap(response);
         final EventResponseModel loggedResponse =
                 OkHttp3ResponseMapper.createOkHttp3Response(
                         response,
-                        connection);
+                        responseDate,
+                        connection
+                );
         if (!respw.hasNullBody()) {
             try {
                 final ByteArrayOutputStream outputStream = genBAOutputStream(respw);

src/main/java/com/moesif/sdk/okhttp3client/models/OkHttp3RequestMapper.java

@@ -42,6 +42,7 @@ public static EventRequestModel createOkHttp3Request(
      * Map okHttp3 Request  to  Moesif EventRequestModel
      *
      * @param request    okHttp3 Request
+     * @param requestDate request's Date.
      * @param apiVersion allow client to set outbound apiVersion eg:"uber-v1"
      * @param ipAddress  IP addr where event occurred, If null, use local IPV4
      * @param maxAllowedBodyBytesRequest The maximum allowed number of bytes in request body
@@ -50,14 +51,15 @@ public static EventRequestModel createOkHttp3Request(
      */
     public static EventRequestModel createOkHttp3Request(
             Request request,
+            Date requestDate,
             String apiVersion,
             String ipAddress,
-            Long maxAllowedBodyBytesRequest)
-            throws IOException {
+            Long maxAllowedBodyBytesRequest
+    ) throws IOException {
         if (StringUtils.isBlank(ipAddress))
             ipAddress = NetUtils.getIPAddress(true);
         EventRequestBuilder erb = new EventRequestBuilder()
-                .time(new Date())
+                .time(requestDate)
                 .uri(request.url().toString())
                 .verb(request.method())
                 .apiVersion(apiVersion)

src/main/java/com/moesif/sdk/okhttp3client/models/OkHttp3ResponseMapper.java

@@ -13,16 +13,20 @@ public class OkHttp3ResponseMapper extends EventResponseModel {
 
     public static EventResponseModel createOkHttp3Response(
             Response response,
-            Connection connection) {
+            Date responseDate,
+            Connection connection
+    ) {
         String ipAddress = getIpAddr(connection);
-        return createOkHttp3Response(response, ipAddress);
+        return createOkHttp3Response(response, responseDate, ipAddress);
     }
 
     public static EventResponseModel createOkHttp3Response(
                 Response response,
-                String ipAddress) {
+                Date responseDate,
+                String ipAddress
+    ) {
         return new EventResponseBuilder()
-                .time(new Date())
+                .time(responseDate)
                 .status(response.code())
                 .headers(CollectionUtils.flattenMultiMap(
                         response.headers().toMultimap())