Skip to content

Commit 08cdcec

Browse files
deejgregormcculls
andcommitted
Add dbcp2/hikari aliases for pool waiting instrumentation
This would help if this feature becomes enabled it by default in the future, or if someone using this feature wanted to disable it for a particular pool library. Suggested during code review. Co-authored-by: Stuart McCulloch <[email protected]>
1 parent 8edfbd5 commit 08cdcec

10 files changed

+10
-10
lines changed

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2LinkedBlockingDequeInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public final class Dbcp2LinkedBlockingDequeInstrumentation extends InstrumenterM
1919
implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
2020

2121
public Dbcp2LinkedBlockingDequeInstrumentation() {
22-
super("jdbc");
22+
super("jdbc", "dbcp2");
2323
}
2424

2525
@Override

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2ManagedConnectionInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public final class Dbcp2ManagedConnectionInstrumentation extends InstrumenterMod
1414
implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
1515

1616
public Dbcp2ManagedConnectionInstrumentation() {
17-
super("jdbc");
17+
super("jdbc", "dbcp2");
1818
}
1919

2020
@Override

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PerUserPoolDataSourceInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public final class Dbcp2PerUserPoolDataSourceInstrumentation extends Instrumente
1414
implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
1515

1616
public Dbcp2PerUserPoolDataSourceInstrumentation() {
17-
super("jdbc");
17+
super("jdbc", "dbcp2");
1818
}
1919

2020
@Override

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDataSourceInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public final class Dbcp2PoolingDataSourceInstrumentation extends InstrumenterMod
1414
implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
1515

1616
public Dbcp2PoolingDataSourceInstrumentation() {
17-
super("jdbc");
17+
super("jdbc", "dbcp2");
1818
}
1919

2020
@Override

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2PoolingDriverInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public final class Dbcp2PoolingDriverInstrumentation extends InstrumenterModule.
1414
implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
1515

1616
public Dbcp2PoolingDriverInstrumentation() {
17-
super("jdbc");
17+
super("jdbc", "dbcp2");
1818
}
1919

2020
@Override

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/Dbcp2SharedPoolDataSourceInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public final class Dbcp2SharedPoolDataSourceInstrumentation extends Instrumenter
1414
implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
1515

1616
public Dbcp2SharedPoolDataSourceInstrumentation() {
17-
super("jdbc");
17+
super("jdbc", "dbcp2");
1818
}
1919

2020
@Override

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagHandoffQueueInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public final class HikariConcurrentBagHandoffQueueInstrumentation extends Instru
2525
Instrumenter.WithTypeStructure {
2626

2727
public HikariConcurrentBagHandoffQueueInstrumentation() {
28-
super("jdbc");
28+
super("jdbc", "hikari");
2929
}
3030

3131
@Override

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariConcurrentBagInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public final class HikariConcurrentBagInstrumentation extends InstrumenterModule
3838
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
3939

4040
public HikariConcurrentBagInstrumentation() {
41-
super("jdbc");
41+
super("jdbc", "hikari");
4242
}
4343

4444
@Override

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariPoolInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public final class HikariPoolInstrumentation extends InstrumenterModule.Tracing
2121
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
2222

2323
public HikariPoolInstrumentation() {
24-
super("jdbc");
24+
super("jdbc", "hikari");
2525
}
2626

2727
@Override

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/HikariQueuedSequenceSynchronizerInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public final class HikariQueuedSequenceSynchronizerInstrumentation
1717
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
1818

1919
public HikariQueuedSequenceSynchronizerInstrumentation() {
20-
super("jdbc");
20+
super("jdbc", "hikari");
2121
}
2222

2323
@Override

0 commit comments

Comments
 (0)