Skip to content

make armeria indy-ready #15013

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 17, 2025
Merged

make armeria indy-ready #15013

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
15 changes: 9 additions & 6 deletions ...aagent/instrumentation/armeria/v1_3/AbstractStreamMessageSubscriptionInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import java.util.concurrent.CompletableFuture;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.asm.Advice.AssignReturned;
import net.bytebuddy.asm.Advice.AssignReturned.ToArguments.ToArgument;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
import org.reactivestreams.Subscriber;
Expand Down Expand Up @@ -52,20 +54,21 @@ public void transform(TypeTransformer transformer) {
@SuppressWarnings("unused")
public static class WrapSubscriberAdvice {

@AssignReturned.ToArguments(@ToArgument(1))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapSubscriber(
@Advice.Argument(value = 1, readOnly = false) Subscriber<?> subscriber) {
subscriber = SubscriberWrapper.wrap(subscriber);
public static Subscriber<?> wrapSubscriber(@Advice.Argument(1) Subscriber<?> subscriber) {
return SubscriberWrapper.wrap(subscriber);
}
}

@SuppressWarnings("unused")
public static class WrapCompletableFutureAdvice {

@AssignReturned.ToArguments(@ToArgument(4))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCompletableFuture(
@Advice.Argument(value = 4, readOnly = false) CompletableFuture<?> future) {
future = CompletableFutureWrapper.wrap(future);
public static CompletableFuture<?> wrapCompletableFuture(
@Advice.Argument(4) CompletableFuture<?> future) {
return CompletableFutureWrapper.wrap(future);
}
}
}
9 changes: 8 additions & 1 deletion ...io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
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.List;
import net.bytebuddy.matcher.ElementMatcher;

@AutoService(InstrumentationModule.class)
public class ArmeriaInstrumentationModule extends InstrumentationModule {
public class ArmeriaInstrumentationModule extends InstrumentationModule
implements ExperimentalInstrumentationModule {
public ArmeriaInstrumentationModule() {
super("armeria", "armeria-1.3");
}
Expand All @@ -33,4 +35,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
new ArmeriaServerBuilderInstrumentation(),
new AbstractStreamMessageSubscriptionInstrumentation());
}

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