Skip to content

Commit cb5971d

Browse files
committed
fix
1 parent 26ddaed commit cb5971d

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/client/AbstractKtorClientTelemetryBuilder.kt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@ abstract class AbstractKtorClientTelemetryBuilder(
2525
}
2626

2727
internal lateinit var openTelemetry: OpenTelemetry
28-
internal lateinit var builder: DefaultHttpClientInstrumenterBuilder<HttpRequestData, HttpResponse>
28+
internal lateinit var internalBuilder: DefaultHttpClientInstrumenterBuilder<HttpRequestData, HttpResponse>
29+
protected lateinit var builder: DefaultHttpClientInstrumenterBuilder<HttpRequestData, HttpResponse>
2930

3031
fun setOpenTelemetry(openTelemetry: OpenTelemetry) {
3132
this.openTelemetry = openTelemetry
32-
this.builder = DefaultHttpClientInstrumenterBuilder.create(
33+
this.internalBuilder = DefaultHttpClientInstrumenterBuilder.create(
3334
instrumentationName,
3435
openTelemetry,
3536
KtorHttpClientAttributesGetter
3637
)
38+
this.builder = internalBuilder
3739
}
3840

3941
protected fun getOpenTelemetry(): OpenTelemetry {
@@ -65,17 +67,15 @@ abstract class AbstractKtorClientTelemetryBuilder(
6567

6668
fun attributesExtractor(extractorBuilder: ExtractorBuilder.() -> Unit = {}) {
6769
val builder = ExtractorBuilder().apply(extractorBuilder).build()
68-
this.builder.addAttributesExtractor(
69-
object : AttributesExtractor<HttpRequestData, HttpResponse> {
70-
override fun onStart(attributes: AttributesBuilder, parentContext: Context, request: HttpRequestData) {
71-
builder.onStart(OnStartData(attributes, parentContext, request))
72-
}
73-
74-
override fun onEnd(attributes: AttributesBuilder, context: Context, request: HttpRequestData, response: HttpResponse?, error: Throwable?) {
75-
builder.onEnd(OnEndData(attributes, context, request, response, error))
76-
}
70+
this.builder.addAttributesExtractor(object : AttributesExtractor<HttpRequestData, HttpResponse> {
71+
override fun onStart(attributes: AttributesBuilder, parentContext: Context, request: HttpRequestData) {
72+
builder.onStart(OnStartData(attributes, parentContext, request))
7773
}
78-
)
74+
75+
override fun onEnd(attributes: AttributesBuilder, context: Context, request: HttpRequestData, response: HttpResponse?, error: Throwable?) {
76+
builder.onEnd(OnEndData(attributes, context, request, response, error))
77+
}
78+
})
7979
}
8080

8181
class ExtractorBuilder {

instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/client/internal/Experimental.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Experimental private constructor() {
1111

1212
companion object {
1313
fun emitExperimentalTelemetry(builder: AbstractKtorClientTelemetryBuilder) {
14-
builder.builder.setEmitExperimentalHttpClientMetrics(true)
14+
builder.internalBuilder.setEmitExperimentalHttpClientMetrics(true)
1515
}
1616
}
1717
}

0 commit comments

Comments
 (0)