Skip to content

Fix ktor3 latest dep test #12937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2024
Merged

Fix ktor3 latest dep test #12937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c73e15
Fix ktor3 latest dep test
laurit Dec 20, 2024
8913d3f
fix signature erasure for types in java package that contain $
laurit Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion ...main/java/io/opentelemetry/javaagent/instrumentation/ktor/v3_0/ServerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@

import io.ktor.server.application.Application;
import io.ktor.server.application.ApplicationPluginKt;
import io.ktor.server.engine.EmbeddedServer;
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.ktor.v2_0.common.AbstractKtorServerTelemetryBuilder;
import io.opentelemetry.instrumentation.ktor.v2_0.common.internal.KtorBuilderUtil;
import io.opentelemetry.instrumentation.ktor.v3_0.KtorServerTelemetryBuilderKt;
import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import net.bytebuddy.asm.Advice;
Expand All @@ -39,7 +42,18 @@ public void transform(TypeTransformer transformer) {
public static class ConstructorAdvice {

@Advice.OnMethodExit
public static void onExit(@Advice.FieldValue("_applicationInstance") Application application) {
public static void onExit(
@Advice.This EmbeddedServer<?, ?> server, @Advice.Origin MethodHandles.Lookup lookup)
throws Throwable {
MethodHandle getter;
try {
// since 3.0.3
getter = lookup.findGetter(EmbeddedServer.class, "applicationInstance", Application.class);
} catch (NoSuchFieldException exception) {
// before 3.0.3
getter = lookup.findGetter(EmbeddedServer.class, "_applicationInstance", Application.class);
}
Application application = (Application) getter.invoke(server);
ApplicationPluginKt.install(
application, KtorServerTelemetryBuilderKt.getKtorServerTelemetry(), new SetupFunction());
}
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/AdviceSignatureEraser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private static String eraseTypes(String descriptor) {
String reference = matcher.group();
if (reference.startsWith("Ljava/")) {
// do not erase java.* references
matcher.appendReplacement(result, reference);
matcher.appendReplacement(result, Matcher.quoteReplacement(reference));
} else {
matcher.appendReplacement(result, "Ljava/lang/Object;");
}
Expand Down
Loading