Skip to content

make graphql indy-ready #14862

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 1 commit into from
Oct 2, 2025
Merged

make graphql indy-ready #14862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions ...java/io/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.asm.Advice.AssignReturned;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;

Expand All @@ -34,9 +35,10 @@ public void transform(TypeTransformer transformer) {

@SuppressWarnings("unused")
public static class AddInstrumentationAdvice {
@AssignReturned.ToReturned
@Advice.OnMethodExit(suppress = Throwable.class)
public static void onExit(@Advice.Return(readOnly = false) Instrumentation instrumentation) {
instrumentation = addInstrumentation(instrumentation);
public static Instrumentation onExit(@Advice.Return Instrumentation instrumentation) {
return addInstrumentation(instrumentation);
}
}
}
9 changes: 8 additions & 1 deletion ...o/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@
import com.google.auto.service.AutoService;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
import java.util.Collections;
import java.util.List;
import net.bytebuddy.matcher.ElementMatcher;

@SuppressWarnings("unused")
@AutoService(InstrumentationModule.class)
public class GraphqlInstrumentationModule extends InstrumentationModule {
public class GraphqlInstrumentationModule extends InstrumentationModule
implements ExperimentalInstrumentationModule {

public GraphqlInstrumentationModule() {
super("graphql-java", "graphql-java-12.0");
Expand All @@ -34,4 +36,9 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
public List<TypeInstrumentation> typeInstrumentations() {
return Collections.singletonList(new GraphqlInstrumentation());
}

@Override
public boolean isIndyReady() {
return true;
}
}
6 changes: 4 additions & 2 deletions ...java/io/opentelemetry/javaagent/instrumentation/graphql/v20_0/GraphqlInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.asm.Advice.AssignReturned;
import net.bytebuddy.asm.AsmVisitorWrapper;
import net.bytebuddy.description.field.FieldDescription;
import net.bytebuddy.description.field.FieldList;
Expand Down Expand Up @@ -106,10 +107,11 @@ public void visitFieldInsn(

@SuppressWarnings("unused")
public static class AddInstrumentationAdvice {
@AssignReturned.ToReturned
@Advice.OnMethodExit(suppress = Throwable.class)
public static void onExit(@Advice.Return(readOnly = false) Instrumentation instrumentation) {
public static Instrumentation onExit(@Advice.Return Instrumentation instrumentation) {
// this advice is here only to get GraphqlSingletons injected and checked by muzzle
instrumentation = addInstrumentation(instrumentation);
return addInstrumentation(instrumentation);
}
}
}
5 changes: 5 additions & 0 deletions ...o/opentelemetry/javaagent/instrumentation/graphql/v20_0/GraphqlInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,9 @@ public void injectClasses(ClassInjector injector) {
.proxyBuilder("io.opentelemetry.javaagent.instrumentation.graphql.v20_0.GraphqlSingletons")
.inject(InjectionMode.CLASS_ONLY);
}

@Override
public boolean isIndyReady() {
return true;
}
}