Skip to content

Indy-ready - r2dbc #15123

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
Oct 26, 2025
+16 −5
Merged

Indy-ready - r2dbc #15123

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
c1e4423
Migrating R2dbcInstrumentation
LikeTheSalad Oct 24, 2025
6681350
Checking if factory is null
LikeTheSalad Oct 24, 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
12 changes: 8 additions & 4 deletions ...main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcInstrumentation.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.TypeTransformer;
import io.r2dbc.spi.ConnectionFactory;
import io.r2dbc.spi.ConnectionFactoryOptions;
import javax.annotation.Nullable;
import net.bytebuddy.asm.Advice;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
Expand All @@ -38,14 +39,17 @@ public void transform(TypeTransformer transformer) {
@SuppressWarnings("unused")
public static class FactoryAdvice {

@Advice.AssignReturned.ToReturned
@Advice.OnMethodExit(suppress = Throwable.class)
public static void methodExit(
@Advice.Return(readOnly = false) ConnectionFactory factory,
public static ConnectionFactory methodExit(
@Advice.Return @Nullable ConnectionFactory factory,
@Advice.Argument(0) ConnectionFactoryOptions factoryOptions) {

if (factory != null) {
factory = R2dbcSingletons.telemetry().wrapConnectionFactory(factory, factoryOptions);
if (factory == null) {
return null;
}

return R2dbcSingletons.telemetry().wrapConnectionFactory(factory, factoryOptions);
}
}
}
9 changes: 8 additions & 1 deletion ...ava/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,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.Collections;
import java.util.List;

@AutoService(InstrumentationModule.class)
public class R2dbcInstrumentationModule extends InstrumentationModule {
public class R2dbcInstrumentationModule extends InstrumentationModule
implements ExperimentalInstrumentationModule {

public R2dbcInstrumentationModule() {
super("r2dbc", "r2dbc-1.0");
Expand All @@ -22,4 +24,9 @@ public R2dbcInstrumentationModule() {
public List<TypeInstrumentation> typeInstrumentations() {
return Collections.singletonList(new R2dbcInstrumentation());
}

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