Remove micrometer metrics on close

brettwooldridge · Nov 25, 2020 · 8b15e1c · 8b15e1c
1 parent 8217f20
commit 8b15e1c
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/main/java/com/zaxxer/hikari/metrics/micrometer/MicrometerMetricsTracker.java b/src/main/java/com/zaxxer/hikari/metrics/micrometer/MicrometerMetricsTracker.java
@@ -67,10 +67,12 @@ public class MicrometerMetricsTracker implements IMetricsTracker
    private final Gauge minConnectionGauge;
    @SuppressWarnings({"FieldCanBeLocal", "unused"})
    private final PoolStats poolStats;
+   private final MeterRegistry meterRegistry;
 
    MicrometerMetricsTracker(final String poolName, final PoolStats poolStats, final MeterRegistry meterRegistry)
    {
       this.poolStats = poolStats;
+      this.meterRegistry = meterRegistry;
 
       this.connectionObtainTimer = Timer.builder(METRIC_NAME_WAIT)
          .description("Connection acquire time")
@@ -149,4 +151,18 @@ public void recordConnectionCreatedMillis(long connectionCreatedMillis)
    {
       connectionCreation.record(connectionCreatedMillis, TimeUnit.MILLISECONDS);
    }
+
+   @Override
+   public void close() {
+      meterRegistry.remove(connectionObtainTimer);
+      meterRegistry.remove(connectionTimeoutCounter);
+      meterRegistry.remove(connectionUsage);
+      meterRegistry.remove(connectionCreation);
+      meterRegistry.remove(totalConnectionGauge);
+      meterRegistry.remove(idleConnectionGauge);
+      meterRegistry.remove(activeConnectionGauge);
+      meterRegistry.remove(pendingConnectionGauge);
+      meterRegistry.remove(maxConnectionGauge);
+      meterRegistry.remove(minConnectionGauge);
+   }
 }