Skip to content

Commit 5f51e77

Browse files
committed
fixup! fixup! fixup! Add Ktor 3.0 support
1 parent d50e2b4 commit 5f51e77

File tree

8 files changed

+240
-214
lines changed

8 files changed

+240
-214
lines changed

instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/ServerInstrumentation.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
import io.ktor.server.application.ApplicationPluginKt;
1313
import io.opentelemetry.api.GlobalOpenTelemetry;
1414
import io.opentelemetry.instrumentation.ktor.v2_0.internal.KtorBuilderUtil;
15-
import io.opentelemetry.instrumentation.ktor.v2_0.server.KtorServerTracing;
15+
import io.opentelemetry.instrumentation.ktor.v2_0.server.KtorServerTracingBuilder;
16+
import io.opentelemetry.instrumentation.ktor.v2_0.server.KtorServerTracingKt;
1617
import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
1718
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1819
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
@@ -42,15 +43,15 @@ public static class ConstructorAdvice {
4243

4344
@Advice.OnMethodExit
4445
public static void onExit(@Advice.FieldValue("_applicationInstance") Application application) {
45-
ApplicationPluginKt.install(application, KtorServerTracing.Feature, new SetupFunction());
46+
ApplicationPluginKt.install(application, KtorServerTracingKt.getKtorServerTracing(), new SetupFunction());
4647
}
4748
}
4849

4950
public static class SetupFunction
50-
implements Function1<KtorServerTracing.Configuration, kotlin.Unit> {
51+
implements Function1<KtorServerTracingBuilder, kotlin.Unit> {
5152

5253
@Override
53-
public Unit invoke(KtorServerTracing.Configuration configuration) {
54+
public Unit invoke(KtorServerTracingBuilder configuration) {
5455
configuration.setOpenTelemetry(GlobalOpenTelemetry.get());
5556
KtorBuilderUtil.serverBuilderExtractor
5657
.invoke(configuration)

instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/internal/KtorBuilderUtil.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import io.ktor.server.response.*
1212
import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder
1313
import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpServerInstrumenterBuilder
1414
import io.opentelemetry.instrumentation.ktor.v2_0.client.KtorClientTracingBuilder
15-
import io.opentelemetry.instrumentation.ktor.v2_0.server.KtorServerTracing
15+
import io.opentelemetry.instrumentation.ktor.v2_0.server.KtorServerTracingBuilder
1616

1717
/**
1818
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
1919
* any time.
2020
*/
2121
object KtorBuilderUtil {
2222
lateinit var clientBuilderExtractor: (KtorClientTracingBuilder) -> DefaultHttpClientInstrumenterBuilder<HttpRequestData, HttpResponse>
23-
lateinit var serverBuilderExtractor: (KtorServerTracing.Configuration) -> DefaultHttpServerInstrumenterBuilder<ApplicationRequest, ApplicationResponse>
23+
lateinit var serverBuilderExtractor: (KtorServerTracingBuilder) -> DefaultHttpServerInstrumenterBuilder<ApplicationRequest, ApplicationResponse>
2424
}

0 commit comments

Comments
 (0)