Skip to content

make mongo indy-ready #14647

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 6 commits into from
Sep 15, 2025
Merged

make mongo indy-ready #14647

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
07ba5f8
mongo-3.7
SylvainJuge Sep 12, 2025
3e3c4af
mongo-4.0
SylvainJuge Sep 12, 2025
176d09b
mongo-async-3.3
SylvainJuge Sep 12, 2025
e751076
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-i…
SylvainJuge Sep 15, 2025
7ba2f08
implement missing isIndyReady
SylvainJuge Sep 15, 2025
2e7a05c
update api diff
SylvainJuge Sep 15, 2025
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
9 changes: 6 additions & 3 deletions ...ava/io/opentelemetry/javaagent/instrumentation/mongo/v3_7/BaseClusterInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
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.Advice.AssignReturned.ToArguments.ToArgument;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;

Expand All @@ -41,10 +43,11 @@ public void transform(TypeTransformer transformer) {
@SuppressWarnings("unused")
public static class SingleResultCallbackArg1Advice {

@AssignReturned.ToArguments(@ToArgument(1))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 1, readOnly = false) SingleResultCallback<Object> callback) {
callback = new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
public static SingleResultCallback<Object> wrapCallback(
@Advice.Argument(1) SingleResultCallback<Object> callback) {
return new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
}
}
}
16 changes: 10 additions & 6 deletions ...lemetry/javaagent/instrumentation/mongo/v3_7/InternalStreamConnectionInstrumentation.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.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
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;

Expand Down Expand Up @@ -46,20 +48,22 @@ public void transform(TypeTransformer transformer) {
@SuppressWarnings("unused")
public static class SingleResultCallbackArg0Advice {

@AssignReturned.ToArguments(@ToArgument(0))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 0, readOnly = false) SingleResultCallback<Object> callback) {
callback = new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
public static SingleResultCallback<Object> wrapCallback(
@Advice.Argument(0) SingleResultCallback<Object> callback) {
return new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
}
}

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

@AssignReturned.ToArguments(@ToArgument(1))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 1, readOnly = false) SingleResultCallback<Object> callback) {
callback = new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
public static SingleResultCallback<Object> wrapCallback(
@Advice.Argument(1) SingleResultCallback<Object> callback) {
return new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
}
}
}
9 changes: 8 additions & 1 deletion .../opentelemetry/javaagent/instrumentation/mongo/v3_7/MongoClientInstrumentationModule.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 MongoClientInstrumentationModule extends InstrumentationModule {
public class MongoClientInstrumentationModule extends InstrumentationModule
implements ExperimentalInstrumentationModule {

public MongoClientInstrumentationModule() {
super("mongo", "mongo-3.7");
Expand All @@ -34,4 +36,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
new InternalStreamConnectionInstrumentation(),
new BaseClusterInstrumentation());
}

@Override
public boolean isIndyReady() {
return true;
}
}
16 changes: 10 additions & 6 deletions ...ava/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/BaseClusterInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
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.Advice.AssignReturned.ToArguments.ToArgument;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;

Expand Down Expand Up @@ -47,20 +49,22 @@ public void transform(TypeTransformer transformer) {
@SuppressWarnings("unused")
public static class SingleResultCallbackArg1Advice {

@AssignReturned.ToArguments(@ToArgument(1))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 1, readOnly = false) SingleResultCallback<Object> callback) {
callback = new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
public static SingleResultCallback<Object> wrapCallback(
@Advice.Argument(1) SingleResultCallback<Object> callback) {
return new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
}
}

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

@AssignReturned.ToArguments(@ToArgument(2))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 2, readOnly = false) SingleResultCallback<Object> callback) {
callback = new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
public static SingleResultCallback<Object> wrapCallback(
@Advice.Argument(2) SingleResultCallback<Object> callback) {
return new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
}
}
}
9 changes: 6 additions & 3 deletions ...ntelemetry/javaagent/instrumentation/mongo/v4_0/DefaultConnectionPoolInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
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.Advice.AssignReturned.ToArguments.ToArgument;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;

Expand All @@ -34,10 +36,11 @@ public void transform(TypeTransformer transformer) {
@SuppressWarnings("unused")
public static class SingleResultCallbackAdvice {

@AssignReturned.ToArguments(@ToArgument(0))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 0, readOnly = false) SingleResultCallback<Object> callback) {
callback = new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
public static SingleResultCallback<Object> wrapCallback(
@Advice.Argument(0) SingleResultCallback<Object> callback) {
return new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
}
}
}
20 changes: 11 additions & 9 deletions ...emetry/javaagent/instrumentation/mongo/v4_0/DefaultConnectionPoolTaskInstrumentation.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.function.Consumer;
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;

Expand Down Expand Up @@ -43,30 +45,30 @@ public void transform(TypeTransformer transformer) {
@SuppressWarnings("unused")
public static class TaskArg2Advice {

@AssignReturned.ToArguments(@ToArgument(2))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 2, readOnly = false) Consumer<Object> action) {
action = new TaskWrapper(Java8BytecodeBridge.currentContext(), action);
public static Consumer<Object> wrapCallback(@Advice.Argument(2) Consumer<Object> action) {
return new TaskWrapper(Java8BytecodeBridge.currentContext(), action);
}
}

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

@AssignReturned.ToArguments(@ToArgument(3))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 3, readOnly = false) Consumer<Object> action) {
action = new TaskWrapper(Java8BytecodeBridge.currentContext(), action);
public static Consumer<Object> wrapCallback(@Advice.Argument(3) Consumer<Object> action) {
return new TaskWrapper(Java8BytecodeBridge.currentContext(), action);
}
}

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

@AssignReturned.ToArguments(@ToArgument(4))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 4, readOnly = false) Consumer<Object> action) {
action = new TaskWrapper(Java8BytecodeBridge.currentContext(), action);
public static Consumer<Object> wrapCallback(@Advice.Argument(4) Consumer<Object> action) {
return new TaskWrapper(Java8BytecodeBridge.currentContext(), action);
}
}
}
30 changes: 18 additions & 12 deletions ...lemetry/javaagent/instrumentation/mongo/v4_0/InternalStreamConnectionInstrumentation.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.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
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;

Expand Down Expand Up @@ -67,40 +69,44 @@ public void transform(TypeTransformer transformer) {
@SuppressWarnings("unused")
public static class SingleResultCallbackArg0Advice {

@AssignReturned.ToArguments(@ToArgument(0))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 0, readOnly = false) SingleResultCallback<Object> callback) {
callback = new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
public static SingleResultCallback<Object> wrapCallback(
@Advice.Argument(0) SingleResultCallback<Object> callback) {
return new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
}
}

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

@AssignReturned.ToArguments(@ToArgument(1))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 1, readOnly = false) SingleResultCallback<Object> callback) {
callback = new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
public static SingleResultCallback<Object> wrapCallback(
@Advice.Argument(1) SingleResultCallback<Object> callback) {
return new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
}
}

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

@AssignReturned.ToArguments(@ToArgument(2))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 2, readOnly = false) SingleResultCallback<Object> callback) {
callback = new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
public static SingleResultCallback<Object> wrapCallback(
@Advice.Argument(2) SingleResultCallback<Object> callback) {
return new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
}
}

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

@AssignReturned.ToArguments(@ToArgument(3))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 3, readOnly = false) SingleResultCallback<Object> callback) {
callback = new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
public static SingleResultCallback<Object> wrapCallback(
@Advice.Argument(3) SingleResultCallback<Object> callback) {
return new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
}
}
}
9 changes: 6 additions & 3 deletions ...o/opentelemetry/javaagent/instrumentation/mongoasync/v3_3/BaseClusterInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
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.Advice.AssignReturned.ToArguments.ToArgument;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;

Expand All @@ -39,10 +41,11 @@ public void transform(TypeTransformer transformer) {
@SuppressWarnings("unused")
public static class SingleResultCallbackArg1Advice {

@AssignReturned.ToArguments(@ToArgument(1))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 1, readOnly = false) SingleResultCallback<Object> callback) {
callback = new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
public static SingleResultCallback<Object> wrapCallback(
@Advice.Argument(1) SingleResultCallback<Object> callback) {
return new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
}
}
}
23 changes: 14 additions & 9 deletions ...ry/javaagent/instrumentation/mongoasync/v3_3/InternalStreamConnectionInstrumentation.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.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
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;

Expand Down Expand Up @@ -46,30 +48,33 @@ public void transform(TypeTransformer transformer) {
@SuppressWarnings("unused")
public static class SingleResultCallbackArg0Advice {

@AssignReturned.ToArguments(@ToArgument(0))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 0, readOnly = false) SingleResultCallback<Object> callback) {
callback = new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
public static SingleResultCallback<Object> wrapCallback(
@Advice.Argument(0) SingleResultCallback<Object> callback) {
return new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
}
}

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

@AssignReturned.ToArguments(@ToArgument(1))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 1, readOnly = false) SingleResultCallback<Object> callback) {
callback = new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
public static SingleResultCallback<Object> wrapCallback(
@Advice.Argument(1) SingleResultCallback<Object> callback) {
return new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
}
}

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

@AssignReturned.ToArguments(@ToArgument(2))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void wrapCallback(
@Advice.Argument(value = 2, readOnly = false) SingleResultCallback<Object> callback) {
callback = new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
public static SingleResultCallback<Object> wrapCallback(
@Advice.Argument(2) SingleResultCallback<Object> callback) {
return new SingleResultCallbackWrapper(Java8BytecodeBridge.currentContext(), callback);
}
}
}
9 changes: 8 additions & 1 deletion ...etry/javaagent/instrumentation/mongoasync/v3_3/MongoAsyncClientInstrumentationModule.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 MongoAsyncClientInstrumentationModule extends InstrumentationModule {
public class MongoAsyncClientInstrumentationModule extends InstrumentationModule
implements ExperimentalInstrumentationModule {

public MongoAsyncClientInstrumentationModule() {
super("mongo-async", "mongo-async-3.3", "mongo");
Expand All @@ -33,4 +35,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
new InternalStreamConnectionInstrumentation(),
new BaseClusterInstrumentation());
}

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