Use new sdk time direcctly and indirectly for timetamps sent in SDK

embrace-io · Oct 18, 2023 · 5f7c4a1 · 5f7c4a1
1 parent a5fae6f
commit 5f7c4a1
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 15 deletions.
diff --git a/...main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3ApplicationInterceptor.java b/...main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3ApplicationInterceptor.java
@@ -51,7 +51,7 @@ public EmbraceOkHttp3ApplicationInterceptor() {
 
     @Override
     public Response intercept(Chain chain) throws IOException {
-        long startTime = System.currentTimeMillis();
+        long startTime = embrace.getSdkApi().getSdkCurrentTime();
         Request request = chain.request();
         try {
             // we are not interested in response, just proceed
@@ -65,7 +65,7 @@ public Response intercept(Chain chain) throws IOException {
                         urlString,
                         HttpMethod.fromString(request.method()),
                         startTime,
-                        System.currentTimeMillis(),
+                        embrace.getSdkApi().getSdkCurrentTime(),
                         causeName(e, UNKNOWN_EXCEPTION),
                         causeMessage(e, UNKNOWN_MESSAGE),
                         request.header(embrace.getTraceIdHeader()),
@@ -87,7 +87,7 @@ public Response intercept(Chain chain) throws IOException {
                         urlString,
                         HttpMethod.fromString(request.method()),
                         startTime,
-                        System.currentTimeMillis(),
+                        embrace.getSdkApi().getSdkCurrentTime(),
                         errorType != null ? errorType : UNKNOWN_EXCEPTION,
                         errorMessage != null ? errorMessage : UNKNOWN_MESSAGE,
                         request.header(embrace.getTraceIdHeader()),

diff --git a/...src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3NetworkInterceptor.java b/...src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3NetworkInterceptor.java
@@ -77,6 +77,7 @@ public Response intercept(Chain chain) throws IOException {
             return chain.proceed(originalRequest);
         }
 
+        long preRequestClockOffset = sdkClockOffset();
         boolean networkSpanForwardingEnabled = sdkFacade.isNetworkSpanForwardingEnabled();
 
         String traceparent = null;
@@ -88,6 +89,7 @@ public Response intercept(Chain chain) throws IOException {
             originalRequest : originalRequest.newBuilder().header(TRACEPARENT_HEADER_NAME, traceparent).build();
 
         Response networkResponse = chain.proceed(request);
+        long postResponseClockOffset = sdkClockOffset();
         Response.Builder responseBuilder = networkResponse.newBuilder().request(request);
 
         Long contentLength = null;
@@ -153,12 +155,14 @@ public Response intercept(Chain chain) throws IOException {
             networkCaptureData = getNetworkCaptureData(request, response);
         }
 
+
+
         embrace.recordNetworkRequest(
             EmbraceNetworkRequest.fromCompletedRequest(
                 EmbraceHttpPathOverride.getURLString(new EmbraceOkHttp3PathOverrideRequest(request)),
                 HttpMethod.fromString(request.method()),
-                response.sentRequestAtMillis(),
-                response.receivedResponseAtMillis(),
+                response.sentRequestAtMillis() + preRequestClockOffset,
+                response.receivedResponseAtMillis() + postResponseClockOffset,
                 request.body() != null ? request.body().contentLength() : 0,
                 contentLength,
                 response.code(),
@@ -250,4 +254,12 @@ private byte[] getRequestBody(final Request request) {
         }
         return null;
     }
+
+    /**
+     * Get the difference between the SDK clock time and the time System.currentTimeMillis() returns, which is used by OkHttp for
+     * determining client-side timestamps.
+     */
+    private long sdkClockOffset() {
+        return embrace.getSdkApi().getSdkCurrentTime() - System.currentTimeMillis();
+    }
 }
diff --git a/...3/src/test/kotlin/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3InterceptorsTest.kt b/...3/src/test/kotlin/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3InterceptorsTest.kt
@@ -110,6 +110,7 @@ internal class EmbraceOkHttp3InterceptorsTest {
         every { mockEmbrace.shouldCaptureNetworkBody(any(), "GET") } answers { false }
         every { mockEmbrace.recordNetworkRequest(capture(capturedEmbraceNetworkRequest)) } answers { }
         every { mockEmbrace.generateW3cTraceparent() } answers { GENERATED_TRACEPARENT }
+        every { mockEmbrace.sdkApi.getSdkCurrentTime() } answers { System.currentTimeMillis() }
         every { mockSdkFacade.isNetworkSpanForwardingEnabled } answers { isNetworkSpanForwardingEnabled }
     }
 

diff --git a/...rc/main/java/io/embrace/android/embracesdk/network/http/EmbraceUrlConnectionOverride.java b/...rc/main/java/io/embrace/android/embracesdk/network/http/EmbraceUrlConnectionOverride.java
@@ -154,9 +154,9 @@ public EmbraceUrlConnectionOverride(@NonNull T connection, boolean enableWrapIoS
     EmbraceUrlConnectionOverride(@NonNull T connection, boolean enableWrapIoStreams,
                                  @NonNull Embrace embrace) {
         this.connection = connection;
-        this.createdTime = System.currentTimeMillis();
         this.enableWrapIoStreams = enableWrapIoStreams;
         this.embrace = embrace;
+        this.createdTime = embrace.getSdkApi().getSdkCurrentTime();
     }
 
     @Override
@@ -354,7 +354,7 @@ public long getHeaderFieldLong(@NonNull String name, long defaultValue) {
     @Override
     @Nullable
     public Map<String, List<String>> getHeaderFields() {
-        final long startTime = System.currentTimeMillis();
+        final long startTime = embrace.getSdkApi().getSdkCurrentTime();
         cacheResponseData();
         internalLogNetworkCall(startTime);
         return headerFields.get();
@@ -367,7 +367,7 @@ private <R> R retrieveHeaderField(@Nullable String name,
         if (name == null) {
             return null;
         }
-        long startTime = System.currentTimeMillis();
+        long startTime = embrace.getSdkApi().getSdkCurrentTime();
         if (shouldInterceptHeaderRetrieval(name)) {
             // Strip the content encoding and length headers, as we transparently ungzip the content
             return defaultValue;
@@ -467,9 +467,9 @@ public String getRequestProperty(@NonNull String key) {
     }
 
     @Override
-    public int getResponseCode() throws IOException {
+    public int getResponseCode() {
         identifyTraceId();
-        long startTime = System.currentTimeMillis();
+        long startTime = embrace.getSdkApi().getSdkCurrentTime();
         cacheResponseData();
         internalLogNetworkCall(startTime);
         return responseCode.get();
@@ -479,7 +479,7 @@ public int getResponseCode() throws IOException {
     @Nullable
     public String getResponseMessage() throws IOException {
         identifyTraceId();
-        long startTime = System.currentTimeMillis();
+        long startTime = embrace.getSdkApi().getSdkCurrentTime();
         String responseMsg = this.connection.getResponseMessage();
         cacheResponseData();
         internalLogNetworkCall(startTime);
@@ -544,7 +544,7 @@ public boolean usingProxy() {
      * ignored.
      */
     synchronized void internalLogNetworkCall(long startTime) {
-        internalLogNetworkCall(startTime, System.currentTimeMillis(), false, null);
+        internalLogNetworkCall(startTime, embrace.getSdkApi().getSdkCurrentTime(), false, null);
     }
 
     /**
@@ -787,7 +787,7 @@ public Principal getPeerPrincipal() throws SSLPeerUnverifiedException {
     @Nullable
     private InputStream getWrappedInputStream(InputStream connectionInputStream) {
         identifyTraceId();
-        long startTime = System.currentTimeMillis();
+        long startTime = embrace.getSdkApi().getSdkCurrentTime();
 
         InputStream in = null;
         if (shouldUncompressGzip()) {

diff --git a/...ce-android-sdk/src/main/java/io/embrace/android/embracesdk/samples/EmbraceCrashSamples.kt b/...ce-android-sdk/src/main/java/io/embrace/android/embracesdk/samples/EmbraceCrashSamples.kt
@@ -76,9 +76,10 @@ internal object EmbraceCrashSamples {
     fun triggerLongAnr() {
         isSdkStarted()
         checkAnrDetectionEnabled()
-        val start = System.currentTimeMillis()
+        val embrace = Embrace.getInstance()
+        val start = embrace.sdkApi.getSdkCurrentTime()
         while (true) {
-            if (System.currentTimeMillis() - start >= LONG_ANR_LENGTH) {
+            if (embrace.sdkApi.getSdkCurrentTime() - start >= LONG_ANR_LENGTH) {
                 break
             }
         }