Ktor2 http client uses low level instrumentation (#12530)

open-telemetry · Oct 29, 2024 · 86ee95c · 86ee95c
1 parent 40640a3
commit 86ee95c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...ry/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorClientTracing.kt b/...ry/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorClientTracing.kt
@@ -16,6 +16,7 @@ import io.opentelemetry.context.Context
 import io.opentelemetry.context.propagation.ContextPropagators
 import io.opentelemetry.extension.kotlin.asContextElement
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter
+import io.opentelemetry.instrumentation.api.semconv.http.HttpClientRequestResendCount
 import kotlinx.coroutines.InternalCoroutinesApi
 import kotlinx.coroutines.job
 import kotlinx.coroutines.launch
@@ -63,6 +64,14 @@ class KtorClientTracing internal constructor(
     }
 
     private fun installSpanCreation(plugin: KtorClientTracing, scope: HttpClient) {
+      val initializeRequestPhase = PipelinePhase("OpenTelemetryInitializeRequest")
+      scope.requestPipeline.insertPhaseAfter(HttpRequestPipeline.State, initializeRequestPhase)
+
+      scope.requestPipeline.intercept(initializeRequestPhase) {
+        val openTelemetryContext = HttpClientRequestResendCount.initialize(Context.current())
+        withContext(openTelemetryContext.asContextElement()) { proceed() }
+      }
+
       val createSpanPhase = PipelinePhase("OpenTelemetryCreateSpan")
       scope.sendPipeline.insertPhaseAfter(HttpSendPipeline.State, createSpanPhase)
 

diff --git a/...in/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/AbstractKtorHttpClientTest.kt b/...in/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/AbstractKtorHttpClientTest.kt
@@ -60,9 +60,8 @@ abstract class AbstractKtorHttpClientTest : AbstractHttpClientTest<HttpRequestBu
   override fun configure(optionsBuilder: HttpClientTestOptions.Builder) {
     with(optionsBuilder) {
       disableTestReadTimeout()
-      // this instrumentation creates a span per each physical request
-      // related issue https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/5722
-      disableTestRedirects()
+      markAsLowLevelInstrumentation()
+      setMaxRedirects(20)
       spanEndsAfterBody()
 
       setHttpAttributes { DEFAULT_HTTP_ATTRIBUTES - setOf(NetworkAttributes.NETWORK_PROTOCOL_VERSION) }