Skip to content

make hikaricp indy-ready #15075

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

make hikaricp indy-ready #15075

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
9 changes: 8 additions & 1 deletion .../opentelemetry/javaagent/instrumentation/hikaricp/v3_0/HikariCpInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
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;

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

public HikariCpInstrumentationModule() {
super("hikaricp", "hikaricp-3.0");
Expand All @@ -23,4 +25,9 @@ public HikariCpInstrumentationModule() {
public List<TypeInstrumentation> typeInstrumentations() {
return singletonList(new HikariPoolInstrumentation());
}

@Override
public boolean isIndyReady() {
return true;
}
}
9 changes: 6 additions & 3 deletions ...a/io/opentelemetry/javaagent/instrumentation/hikaricp/v3_0/HikariPoolInstrumentation.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 @@ -37,9 +39,10 @@ public void transform(TypeTransformer transformer) {
@SuppressWarnings("unused")
public static class SetMetricsTrackerFactoryAdvice {

@AssignReturned.ToArguments(@ToArgument(0))
@Advice.OnMethodEnter(suppress = Throwable.class)
public static void onEnter(
@Advice.Argument(value = 0, readOnly = false) MetricsTrackerFactory userMetricsTracker,
public static MetricsTrackerFactory onEnter(
@Advice.Argument(0) MetricsTrackerFactory userMetricsTracker,
@Advice.FieldValue("metricsTracker") AutoCloseable existingMetricsTracker)
throws Exception {

Expand All @@ -49,7 +52,7 @@ public static void onEnter(
// about duplicate metrics
existingMetricsTracker.close();
}
userMetricsTracker = HikariSingletons.createMetricsTrackerFactory(userMetricsTracker);
return HikariSingletons.createMetricsTrackerFactory(userMetricsTracker);
}
}
}
Loading