-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dropwizard5-metrics' of https://github.com/wholesail/Hi…
…kariCP into wholesail-dropwizard5-metrics
- Loading branch information
Showing
14 changed files
with
819 additions
and
304 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 118 additions & 0 deletions
118
src/main/java/com/zaxxer/hikari/metrics/dropwizard/Dropwizard5MetricsTracker.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| package com.zaxxer.hikari.metrics.dropwizard; | ||
|
|
||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import com.zaxxer.hikari.metrics.IMetricsTracker; | ||
| import com.zaxxer.hikari.metrics.PoolStats; | ||
| import io.dropwizard.metrics5.Gauge; | ||
| import io.dropwizard.metrics5.Histogram; | ||
| import io.dropwizard.metrics5.Meter; | ||
| import io.dropwizard.metrics5.MetricRegistry; | ||
| import io.dropwizard.metrics5.Timer; | ||
|
|
||
| import static com.zaxxer.hikari.metrics.dropwizard.DropwizardCommon.METRIC_CATEGORY; | ||
| import static com.zaxxer.hikari.metrics.dropwizard.DropwizardCommon.METRIC_NAME_ACTIVE_CONNECTIONS; | ||
| import static com.zaxxer.hikari.metrics.dropwizard.DropwizardCommon.METRIC_NAME_CONNECT; | ||
| import static com.zaxxer.hikari.metrics.dropwizard.DropwizardCommon.METRIC_NAME_IDLE_CONNECTIONS; | ||
| import static com.zaxxer.hikari.metrics.dropwizard.DropwizardCommon.METRIC_NAME_MAX_CONNECTIONS; | ||
| import static com.zaxxer.hikari.metrics.dropwizard.DropwizardCommon.METRIC_NAME_MIN_CONNECTIONS; | ||
| import static com.zaxxer.hikari.metrics.dropwizard.DropwizardCommon.METRIC_NAME_PENDING_CONNECTIONS; | ||
| import static com.zaxxer.hikari.metrics.dropwizard.DropwizardCommon.METRIC_NAME_TIMEOUT_RATE; | ||
| import static com.zaxxer.hikari.metrics.dropwizard.DropwizardCommon.METRIC_NAME_TOTAL_CONNECTIONS; | ||
| import static com.zaxxer.hikari.metrics.dropwizard.DropwizardCommon.METRIC_NAME_USAGE; | ||
| import static com.zaxxer.hikari.metrics.dropwizard.DropwizardCommon.METRIC_NAME_WAIT; | ||
|
|
||
| public class Dropwizard5MetricsTracker implements IMetricsTracker | ||
| { | ||
| private final String poolName; | ||
| private final Timer connectionObtainTimer; | ||
| private final Histogram connectionUsage; | ||
| private final Histogram connectionCreation; | ||
| private final Meter connectionTimeoutMeter; | ||
| private final MetricRegistry registry; | ||
|
|
||
| Dropwizard5MetricsTracker(final String poolName, final PoolStats poolStats, final MetricRegistry registry) | ||
| { | ||
| this.poolName = poolName; | ||
| this.registry = registry; | ||
| this.connectionObtainTimer = registry.timer(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_WAIT)); | ||
| this.connectionUsage = registry.histogram(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_USAGE)); | ||
| this.connectionCreation = registry.histogram(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_CONNECT)); | ||
| this.connectionTimeoutMeter = registry.meter(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_TIMEOUT_RATE)); | ||
|
|
||
| registry.register(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_TOTAL_CONNECTIONS), | ||
| (Gauge<Integer>) poolStats::getTotalConnections); | ||
|
|
||
| registry.register(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_IDLE_CONNECTIONS), | ||
| (Gauge<Integer>) poolStats::getIdleConnections); | ||
|
|
||
| registry.register(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_ACTIVE_CONNECTIONS), | ||
| (Gauge<Integer>) poolStats::getActiveConnections); | ||
|
|
||
| registry.register(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_PENDING_CONNECTIONS), | ||
| (Gauge<Integer>) poolStats::getPendingThreads); | ||
|
|
||
| registry.register(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_MAX_CONNECTIONS), | ||
| (Gauge<Integer>) poolStats::getMaxConnections); | ||
|
|
||
| registry.register(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_MIN_CONNECTIONS), | ||
| (Gauge<Integer>) poolStats::getMinConnections); | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override | ||
| public void close() | ||
| { | ||
| registry.remove(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_WAIT)); | ||
| registry.remove(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_USAGE)); | ||
| registry.remove(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_CONNECT)); | ||
| registry.remove(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_TIMEOUT_RATE)); | ||
| registry.remove(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_TOTAL_CONNECTIONS)); | ||
| registry.remove(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_IDLE_CONNECTIONS)); | ||
| registry.remove(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_ACTIVE_CONNECTIONS)); | ||
| registry.remove(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_PENDING_CONNECTIONS)); | ||
| registry.remove(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_MAX_CONNECTIONS)); | ||
| registry.remove(MetricRegistry.name(poolName, METRIC_CATEGORY, METRIC_NAME_MIN_CONNECTIONS)); | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override | ||
| public void recordConnectionAcquiredNanos(final long elapsedAcquiredNanos) | ||
| { | ||
| connectionObtainTimer.update(elapsedAcquiredNanos, TimeUnit.NANOSECONDS); | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override | ||
| public void recordConnectionUsageMillis(final long elapsedBorrowedMillis) | ||
| { | ||
| connectionUsage.update(elapsedBorrowedMillis); | ||
| } | ||
|
|
||
| @Override | ||
| public void recordConnectionTimeout() | ||
| { | ||
| connectionTimeoutMeter.mark(); | ||
| } | ||
|
|
||
| @Override | ||
| public void recordConnectionCreatedMillis(final long connectionCreatedMillis) | ||
| { | ||
| connectionCreation.update(connectionCreatedMillis); | ||
| } | ||
|
|
||
| public Timer getConnectionAcquisitionTimer() | ||
| { | ||
| return connectionObtainTimer; | ||
| } | ||
|
|
||
| public Histogram getConnectionDurationHistogram() | ||
| { | ||
| return connectionUsage; | ||
| } | ||
|
|
||
| public Histogram getConnectionCreationHistogram() | ||
| { | ||
| return connectionCreation; | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
src/main/java/com/zaxxer/hikari/metrics/dropwizard/Dropwizard5MetricsTrackerFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package com.zaxxer.hikari.metrics.dropwizard; | ||
|
|
||
| import com.zaxxer.hikari.metrics.IMetricsTracker; | ||
| import com.zaxxer.hikari.metrics.MetricsTrackerFactory; | ||
| import com.zaxxer.hikari.metrics.PoolStats; | ||
| import io.dropwizard.metrics5.MetricRegistry; | ||
|
|
||
| public class Dropwizard5MetricsTrackerFactory implements MetricsTrackerFactory | ||
| { | ||
| private final MetricRegistry registry; | ||
|
|
||
| public Dropwizard5MetricsTrackerFactory(final MetricRegistry registry) | ||
| { | ||
| this.registry = registry; | ||
| } | ||
|
|
||
| public MetricRegistry getRegistry() | ||
| { | ||
| return registry; | ||
| } | ||
|
|
||
| @Override | ||
| public IMetricsTracker create(final String poolName, final PoolStats poolStats) | ||
| { | ||
| return new Dropwizard5MetricsTracker(poolName, poolStats, registry); | ||
| } | ||
| } |
33 changes: 33 additions & 0 deletions
33
src/main/java/com/zaxxer/hikari/metrics/dropwizard/DropwizardCommon.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.zaxxer.hikari.metrics.dropwizard; | ||
|
|
||
| final class DropwizardCommon { | ||
| private DropwizardCommon() | ||
| { | ||
| } | ||
|
|
||
| static final String METRIC_CATEGORY = "pool"; | ||
| static final String METRIC_NAME_WAIT = "Wait"; | ||
| static final String METRIC_NAME_USAGE = "Usage"; | ||
| static final String METRIC_NAME_CONNECT = "ConnectionCreation"; | ||
| static final String METRIC_NAME_TIMEOUT_RATE = "ConnectionTimeoutRate"; | ||
| static final String METRIC_NAME_TOTAL_CONNECTIONS = "TotalConnections"; | ||
| static final String METRIC_NAME_IDLE_CONNECTIONS = "IdleConnections"; | ||
| static final String METRIC_NAME_ACTIVE_CONNECTIONS = "ActiveConnections"; | ||
| static final String METRIC_NAME_PENDING_CONNECTIONS = "PendingConnections"; | ||
| static final String METRIC_NAME_MAX_CONNECTIONS = "MaxConnections"; | ||
| static final String METRIC_NAME_MIN_CONNECTIONS = "MinConnections"; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
src/test/java/com/zaxxer/hikari/metrics/dropwizard/Dropwizard5MetricsTrackerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package com.zaxxer.hikari.metrics.dropwizard; | ||
|
|
||
| import com.zaxxer.hikari.mocks.StubPoolStats; | ||
| import io.dropwizard.metrics5.MetricRegistry; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.mockito.Mock; | ||
| import org.mockito.junit.MockitoJUnitRunner; | ||
|
|
||
| import static org.mockito.Mockito.verify; | ||
|
|
||
| @RunWith(MockitoJUnitRunner.class) | ||
| public class Dropwizard5MetricsTrackerTest | ||
| { | ||
| @Mock | ||
| public MetricRegistry mockMetricRegistry; | ||
|
|
||
| private Dropwizard5MetricsTracker testee; | ||
|
|
||
| @Before | ||
| public void setup() | ||
| { | ||
| testee = new Dropwizard5MetricsTracker("mypool", new StubPoolStats(0), mockMetricRegistry); | ||
| } | ||
|
|
||
| @Test | ||
| public void close() | ||
| { | ||
| testee.close(); | ||
|
|
||
| verify(mockMetricRegistry).remove(MetricRegistry.name("mypool.pool.Wait")); | ||
| verify(mockMetricRegistry).remove(MetricRegistry.name("mypool.pool.Usage")); | ||
| verify(mockMetricRegistry).remove(MetricRegistry.name("mypool.pool.ConnectionCreation")); | ||
| verify(mockMetricRegistry).remove(MetricRegistry.name("mypool.pool.ConnectionTimeoutRate")); | ||
| verify(mockMetricRegistry).remove(MetricRegistry.name("mypool.pool.TotalConnections")); | ||
| verify(mockMetricRegistry).remove(MetricRegistry.name("mypool.pool.IdleConnections")); | ||
| verify(mockMetricRegistry).remove(MetricRegistry.name("mypool.pool.ActiveConnections")); | ||
| verify(mockMetricRegistry).remove(MetricRegistry.name("mypool.pool.PendingConnections")); | ||
| verify(mockMetricRegistry).remove(MetricRegistry.name("mypool.pool.MaxConnections")); | ||
| verify(mockMetricRegistry).remove(MetricRegistry.name("mypool.pool.MinConnections")); | ||
| } | ||
| } |
Oops, something went wrong.