Skip to content
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

Jump to bottom

Hikaricp: Avoid registering duplicate metrics #6325

Merged
merged 4 commits into from
Jul 15, 2022
Merged

Hikaricp: Avoid registering duplicate metrics #6325

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ee9905
Hikaricp: Avoid registering duplicate metrics
laurit Jul 14, 2022
b74ce8b
Update instrumentation/hikaricp-3.0/javaagent/src/main/java/io/opente…
laurit Jul 14, 2022
547b239
spotless
laurit Jul 14, 2022
ddc9a2c
Trigger build
laurit Jul 15, 2022
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: 10 additions & 2 deletions ...n/java/io/opentelemetry/javaagent/instrumentation/hikaricp/HikariPoolInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,16 @@ public static class SetMetricsTrackerFactoryAdvice {

@Advice.OnMethodEnter(suppress = Throwable.class)
public static void onEnter(
@Advice.Argument(value = 0, readOnly = false) MetricsTrackerFactory userMetricsTracker) {

@Advice.Argument(value = 0, readOnly = false) MetricsTrackerFactory userMetricsTracker,
@Advice.FieldValue(value = "metricsTracker") AutoCloseable existingMetricsTracker)
throws Exception {

if (existingMetricsTracker != null) {
// we call close on the existing metrics tracker in case it's our wrapper, so that our
// wrapper will unregister itself and won't keep recording metrics which leads to warnings
// about duplicate metrics
existingMetricsTracker.close();
}
userMetricsTracker = HikariSingletons.createMetricsTrackerFactory(userMetricsTracker);
}
}
Expand Down