Skip to content

Commit 26ddaed

Browse files
committed
use kotlin internal
1 parent b38566d commit 26ddaed

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import io.opentelemetry.api.common.AttributesBuilder
1313
import io.opentelemetry.context.Context
1414
import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder
1515
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor
16-
import io.opentelemetry.instrumentation.ktor.v2_0.common.client.internal.Experimental
1716
import io.opentelemetry.instrumentation.ktor.v2_0.common.internal.KtorBuilderUtil
1817

1918
abstract class AbstractKtorClientTelemetryBuilder(
@@ -22,12 +21,11 @@ abstract class AbstractKtorClientTelemetryBuilder(
2221
companion object {
2322
init {
2423
KtorBuilderUtil.clientBuilderExtractor = { it.builder }
25-
Experimental.setSetEmitExperimentalTelemetry { builder, emit -> builder.builder.setEmitExperimentalHttpClientMetrics(emit) }
2624
}
2725
}
2826

2927
internal lateinit var openTelemetry: OpenTelemetry
30-
protected lateinit var builder: DefaultHttpClientInstrumenterBuilder<HttpRequestData, HttpResponse>
28+
internal lateinit var builder: DefaultHttpClientInstrumenterBuilder<HttpRequestData, HttpResponse>
3129

3230
fun setOpenTelemetry(openTelemetry: OpenTelemetry) {
3331
this.openTelemetry = openTelemetry
@@ -67,7 +65,7 @@ abstract class AbstractKtorClientTelemetryBuilder(
6765

6866
fun attributesExtractor(extractorBuilder: ExtractorBuilder.() -> Unit = {}) {
6967
val builder = ExtractorBuilder().apply(extractorBuilder).build()
70-
this.builder.addAttributeExtractor(
68+
this.builder.addAttributesExtractor(
7169
object : AttributesExtractor<HttpRequestData, HttpResponse> {
7270
override fun onStart(attributes: AttributesBuilder, parentContext: Context, request: HttpRequestData) {
7371
builder.onStart(OnStartData(attributes, parentContext, request))

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,12 @@
66
package io.opentelemetry.instrumentation.ktor.v2_0.common.client.internal
77

88
import io.opentelemetry.instrumentation.ktor.v2_0.common.client.AbstractKtorClientTelemetryBuilder
9-
import java.util.function.BiConsumer
109

1110
class Experimental private constructor() {
1211

1312
companion object {
14-
@Volatile
15-
private var setEmitExperimentalTelemetry: BiConsumer<AbstractKtorClientTelemetryBuilder, Boolean>? = null
16-
1713
fun emitExperimentalTelemetry(builder: AbstractKtorClientTelemetryBuilder) {
18-
if (setEmitExperimentalTelemetry != null) {
19-
setEmitExperimentalTelemetry!!.accept(builder, true)
20-
}
21-
}
22-
23-
fun setSetEmitExperimentalTelemetry(setEmitExperimentalTelemetry: BiConsumer<AbstractKtorClientTelemetryBuilder, Boolean>?) {
24-
Companion.setEmitExperimentalTelemetry = setEmitExperimentalTelemetry
14+
builder.builder.setEmitExperimentalHttpClientMetrics(true)
2515
}
2616
}
2717
}

0 commit comments

Comments
 (0)