Skip to content

make oracle-ucp indy-ready #15130

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 24, 2025
+13 −7
Merged

make oracle-ucp indy-ready #15130

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 ...entelemetry/javaagent/instrumentation/oracleucp/v11_2/OracleUcpInstrumentationModule.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 OracleUcpInstrumentationModule extends InstrumentationModule {
public class OracleUcpInstrumentationModule extends InstrumentationModule
implements ExperimentalInstrumentationModule {

public OracleUcpInstrumentationModule() {
super("oracle-ucp", "oracle-ucp-11.2");
Expand All @@ -23,4 +25,9 @@ public OracleUcpInstrumentationModule() {
public List<TypeInstrumentation> typeInstrumentations() {
return singletonList(new UniversalConnectionPoolInstrumentation());
}

@Override
public boolean isIndyReady() {
return true;
}
}
11 changes: 5 additions & 6 deletions ...try/javaagent/instrumentation/oracleucp/v11_2/UniversalConnectionPoolInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,18 @@ public static void onExit(@Advice.This UniversalConnectionPool connectionPool) {
public static class StopAdvice {

@Advice.OnMethodEnter(suppress = Throwable.class)
public static void onEnter(@Advice.Local("otelCallDepth") CallDepth callDepth) {
callDepth = CallDepth.forClass(UniversalConnectionPool.class);
public static CallDepth onEnter() {
CallDepth callDepth = CallDepth.forClass(UniversalConnectionPool.class);
callDepth.getAndIncrement();
return callDepth;
}

@Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
public static void onExit(
@Advice.This UniversalConnectionPool connectionPool,
@Advice.Local("otelCallDepth") CallDepth callDepth) {
if (callDepth == null || callDepth.decrementAndGet() > 0) {
@Advice.This UniversalConnectionPool connectionPool, @Advice.Enter CallDepth callDepth) {
if (callDepth.decrementAndGet() > 0) {
return;
}

telemetry().unregisterMetrics(connectionPool);
}
}
Expand Down
Loading