Consume sdk time method from EmbraceInternalInterface

embrace-io · Oct 24, 2023 · 5db8dae · 5db8dae
1 parent 92f623f
commit 5db8dae
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/...main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3ApplicationInterceptor.java b/...main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3ApplicationInterceptor.java
@@ -48,7 +48,7 @@ public EmbraceOkHttp3ApplicationInterceptor() {
 
     @Override
     public Response intercept(Chain chain) throws IOException {
-        long startTime = embrace.getSdkApi().getSdkCurrentTime();
+        long startTime = embrace.getInternalInterface().getSdkCurrentTime();
         Request request = chain.request();
         try {
             // we are not interested in response, just proceed
@@ -62,7 +62,7 @@ public Response intercept(Chain chain) throws IOException {
                         urlString,
                         HttpMethod.fromString(request.method()),
                         startTime,
-                        embrace.getSdkApi().getSdkCurrentTime(),
+                        embrace.getInternalInterface().getSdkCurrentTime(),
                         causeName(e, UNKNOWN_EXCEPTION),
                         causeMessage(e, UNKNOWN_MESSAGE),
                         request.header(embrace.getTraceIdHeader()),
@@ -84,7 +84,7 @@ public Response intercept(Chain chain) throws IOException {
                         urlString,
                         HttpMethod.fromString(request.method()),
                         startTime,
-                        embrace.getSdkApi().getSdkCurrentTime(),
+                        embrace.getInternalInterface().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
@@ -78,7 +78,6 @@ public Response intercept(Chain chain) throws IOException {
         long preRequestClockOffset = sdkClockOffset();
         boolean networkSpanForwardingEnabled = embrace.getInternalInterface().isNetworkSpanForwardingEnabled();
 
-
         String traceparent = null;
         if (networkSpanForwardingEnabled && originalRequest.header(TRACEPARENT_HEADER_NAME) == null) {
             traceparent = embrace.generateW3cTraceparent();
@@ -260,6 +259,6 @@ private byte[] getRequestBody(final Request request) {
      * determining client-side timestamps.
      */
     private long sdkClockOffset() {
-        return embrace.getSdkApi().getSdkCurrentTime() - System.currentTimeMillis();
+        return embrace.getInternalInterface().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
@@ -84,6 +84,7 @@ internal class EmbraceOkHttp3InterceptorsTest {
         every { mockInternalInterface.shouldCaptureNetworkBody(any(), "POST") } answers { true }
         every { mockInternalInterface.shouldCaptureNetworkBody(any(), "GET") } answers { false }
         every { mockInternalInterface.isNetworkSpanForwardingEnabled() } answers { isNetworkSpanForwardingEnabled }
+        every { mockInternalInterface.getSdkCurrentTime() } answers { System.currentTimeMillis() }
         applicationInterceptor = EmbraceOkHttp3ApplicationInterceptor(mockEmbrace)
         preNetworkInterceptorTestInterceptor = TestInspectionInterceptor(
             beforeRequestSent = { request -> preNetworkInterceptorBeforeRequestSupplier.invoke(request) },
@@ -112,7 +113,6 @@ internal class EmbraceOkHttp3InterceptorsTest {
         every { mockEmbrace.isStarted } answers { isSDKStarted }
         every { mockEmbrace.recordNetworkRequest(capture(capturedEmbraceNetworkRequest)) } answers { }
         every { mockEmbrace.generateW3cTraceparent() } answers { GENERATED_TRACEPARENT }
-        every { mockEmbrace.sdkApi.getSdkCurrentTime() } answers { System.currentTimeMillis() }
         every { mockEmbrace.internalInterface } answers { mockInternalInterface }
     }
 
@@ -188,7 +188,7 @@ internal class EmbraceOkHttp3InterceptorsTest {
         server.enqueue(createBaseMockResponse())
         runGetRequest()
         verify(exactly = 0) { mockInternalInterface.isNetworkSpanForwardingEnabled() }
-        verify(exactly = 0) { mockEmbrace.internalInterface.shouldCaptureNetworkBody(any(), any()) }
+        verify(exactly = 0) { mockInternalInterface.shouldCaptureNetworkBody(any(), any()) }
     }
 
     @Test

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
@@ -159,7 +159,7 @@ public EmbraceUrlConnectionOverride(@NonNull T connection, boolean enableWrapIoS
         this.connection = connection;
         this.enableWrapIoStreams = enableWrapIoStreams;
         this.embrace = embrace;
-        this.createdTime = embrace.getSdkApi().getSdkCurrentTime();
+        this.createdTime = embrace.getInternalInterface().getSdkCurrentTime();
         this.callId = UUID.randomUUID().toString();
     }
 
@@ -358,7 +358,7 @@ public long getHeaderFieldLong(@NonNull String name, long defaultValue) {
     @Override
     @Nullable
     public Map<String, List<String>> getHeaderFields() {
-        final long startTime = embrace.getSdkApi().getSdkCurrentTime();
+        final long startTime = embrace.getInternalInterface().getSdkCurrentTime();
         cacheResponseData();
         internalLogNetworkCall(startTime);
         return headerFields.get();
@@ -371,7 +371,7 @@ private <R> R retrieveHeaderField(@Nullable String name,
         if (name == null) {
             return null;
         }
-        long startTime = embrace.getSdkApi().getSdkCurrentTime();
+        long startTime = embrace.getInternalInterface().getSdkCurrentTime();
         if (shouldInterceptHeaderRetrieval(name)) {
             // Strip the content encoding and length headers, as we transparently ungzip the content
             return defaultValue;
@@ -473,7 +473,7 @@ public String getRequestProperty(@NonNull String key) {
     @Override
     public int getResponseCode() {
         identifyTraceId();
-        long startTime = embrace.getSdkApi().getSdkCurrentTime();
+        long startTime = embrace.getInternalInterface().getSdkCurrentTime();
         cacheResponseData();
         internalLogNetworkCall(startTime);
         return responseCode.get();
@@ -483,7 +483,7 @@ public int getResponseCode() {
     @Nullable
     public String getResponseMessage() throws IOException {
         identifyTraceId();
-        long startTime = embrace.getSdkApi().getSdkCurrentTime();
+        long startTime = embrace.getInternalInterface().getSdkCurrentTime();
         String responseMsg = this.connection.getResponseMessage();
         cacheResponseData();
         internalLogNetworkCall(startTime);
@@ -548,7 +548,7 @@ public boolean usingProxy() {
      * ignored.
      */
     synchronized void internalLogNetworkCall(long startTime) {
-        internalLogNetworkCall(startTime, embrace.getSdkApi().getSdkCurrentTime(), false, null);
+        internalLogNetworkCall(startTime, embrace.getInternalInterface().getSdkCurrentTime(), false, null);
     }
 
     /**
@@ -792,7 +792,7 @@ public Principal getPeerPrincipal() throws SSLPeerUnverifiedException {
     @Nullable
     private InputStream getWrappedInputStream(InputStream connectionInputStream) {
         identifyTraceId();
-        long startTime = embrace.getSdkApi().getSdkCurrentTime();
+        long startTime = embrace.getInternalInterface().getSdkCurrentTime();
 
         InputStream in = null;
         if (shouldUncompressGzip()) {