revert non-working OkHttp detection, and finish addressing Seer

Author: lcian

sentry-ktor-client/src/main/java/io/sentry/ktorClient/SentryKtorClientPlugin.kt

@@ -1,7 +1,6 @@
 package io.sentry.ktorClient
 
 import io.ktor.client.HttpClient
-import io.ktor.client.engine.okhttp.OkHttpConfig
 import io.ktor.client.plugins.api.*
 import io.ktor.client.plugins.api.ClientPlugin
 import io.ktor.client.request.*
@@ -79,17 +78,6 @@ internal const val TRACE_ORIGIN = "auto.http.ktor-client"
  */
 public val SentryKtorClientPlugin: ClientPlugin<SentryKtorClientPluginConfig> =
   createClientPlugin(SENTRY_KTOR_CLIENT_PLUGIN_KEY, ::SentryKtorClientPluginConfig) {
-    // If the engine is OkHttp and the OkHttp client is configured to use the SentryOkHttpInterceptor, any functionality of this plugin is disabled
-    // Without this check, all HTTP requests would be doubly instrumented
-    if (client.engine.config is OkHttpConfig) {
-      val config = client.engine.config as OkHttpConfig
-      var interceptors = config.preconfigured?.interceptors ?: emptyList()
-      config.config { interceptors += this@config.interceptors() }
-      if (interceptors.any { it.toString().contains("SentryOkHttpInterceptor") }) {
-        return@createClientPlugin
-      }
-    }
-
     // Init
     SentryIntegrationPackageStorage.getInstance()
       .addPackage("maven:io.sentry:sentry-ktor-client", BuildConfig.VERSION_NAME)
@@ -112,7 +100,7 @@ public val SentryKtorClientPlugin: ClientPlugin<SentryKtorClientPluginConfig> =
     onRequest { request, _ ->
       request.attributes.put(
         requestStartTimestampKey,
-        Sentry.getCurrentScopes().options.dateProvider.now(),
+        (if (forceScopes) scopes else Sentry.getCurrentScopes()).options.dateProvider.now(),
       )
 
       val parentSpan: ISpan? =
@@ -168,7 +156,8 @@ public val SentryKtorClientPlugin: ClientPlugin<SentryKtorClientPluginConfig> =
     onResponse { response ->
       val request = response.request
       val startTimestamp = response.call.attributes.getOrNull(requestStartTimestampKey)
-      val endTimestamp = Sentry.getCurrentScopes().options.dateProvider.now()
+      val endTimestamp =
+        (if (forceScopes) scopes else Sentry.getCurrentScopes()).options.dateProvider.now()
 
       if (
         captureFailedRequests &&

sentry-ktor-client/src/test/java/io/sentry/ktorClient/SentryKtorClientPluginTest.kt

@@ -1,13 +1,8 @@
 package io.sentry.ktorClient
 
 import io.ktor.client.HttpClient
-import io.ktor.client.HttpClientConfig
 import io.ktor.client.engine.HttpClientEngine
 import io.ktor.client.engine.java.Java
-import io.ktor.client.engine.okhttp.OkHttp
-import io.ktor.client.engine.okhttp.OkHttpConfig
-import io.ktor.client.engine.okhttp.OkHttpEngine
-import io.ktor.client.plugins.plugin
 import io.ktor.client.request.get
 import io.ktor.client.request.post
 import io.ktor.client.request.setBody
@@ -31,10 +26,8 @@ import io.sentry.SpanStatus
 import io.sentry.TransactionContext
 import io.sentry.exception.SentryHttpClientException
 import io.sentry.mockServerRequestTimeoutMillis
-import io.sentry.okhttp.SentryOkHttpInterceptor
 import java.util.concurrent.TimeUnit
 import kotlin.test.Test
-import okhttp3.OkHttpClient
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
@@ -378,7 +371,7 @@ class SentryKtorClientPluginTest {
         isSpanActive = false,
         optionsConfiguration = { options ->
           options.setIgnoredSpanOrigins(listOf("auto.http.ktor-client"))
-        }
+        },
       )
     sut.get(fixture.server.url("/hello").toString())
 
@@ -432,23 +425,4 @@ class SentryKtorClientPluginTest {
     assertTrue(baggageHeaderValues[0].contains("sentry-transaction=name"))
     assertTrue(baggageHeaderValues[0].contains("sentry-trace_id"))
   }
-
-  @Test
-  fun `is disabled when using OkHttp client with Sentry interceptor added to builder`() {
-    val okHttpClient = OkHttpClient.Builder()
-      .addInterceptor(SentryOkHttpInterceptor())
-      .build()
-    val engine = OkHttpEngine(OkHttpConfig().apply { 
-      preconfigured = okHttpClient
-    })
-    
-    val client = fixture.getSut(httpClientEngine = engine)
-    val plugin = client.plugin(SentryKtorClientPlugin)
-  }
-
-  @Test
-  fun `is disabled when using preconfigured OkHttp client with Sentry interceptor`() {
-    val engine = OkHttpEngine(OkHttpConfig())
-    val client = fixture.getSut(httpClientEngine = engine)
-  }
 }