github-forks
/
HikariCP
mirror of https://github.com/brettwooldridge/HikariCP.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Alpha-level support for micrometer metrics

Browse Source
pull/970/head
Brett Wooldridge 8 years ago
parent 48a2a99191
commit 1528a10fc8
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File

29
src/main/java/com/zaxxer/hikari/HikariConfig.java
Unescape Escape View File

@ -16,10 +16,15 @@
package com.zaxxer.hikari; package com.zaxxer.hikari;
import static com.zaxxer.hikari.util.UtilityElf.getNullIfEmpty; import com.codahale.metrics.health.HealthCheckRegistry;
import static java.util.concurrent.TimeUnit.MINUTES; import com.zaxxer.hikari.metrics.MetricsTrackerFactory;
import static java.util.concurrent.TimeUnit.SECONDS; import com.zaxxer.hikari.util.PropertyElf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
@ -33,18 +38,9 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
import javax.naming.InitialContext; import static com.zaxxer.hikari.util.UtilityElf.getNullIfEmpty;
import javax.naming.NamingException; import static java.util.concurrent.TimeUnit.MINUTES;
import javax.sql.DataSource; import static java.util.concurrent.TimeUnit.SECONDS;
import io.micrometer.core.instrument.MeterRegistry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.health.HealthCheckRegistry;
import com.zaxxer.hikari.metrics.MetricsTrackerFactory;
import com.zaxxer.hikari.util.PropertyElf;
@SuppressWarnings({"SameParameterValue", "unused"}) @SuppressWarnings({"SameParameterValue", "unused"})
public class HikariConfig implements HikariConfigMXBean public class HikariConfig implements HikariConfigMXBean
@ -551,7 +547,8 @@ public class HikariConfig implements HikariConfigMXBean
if (metricRegistry != null) { if (metricRegistry != null) {
metricRegistry = getObjectOrPerformJndiLookup(metricRegistry); metricRegistry = getObjectOrPerformJndiLookup(metricRegistry);
if (!(metricRegistry instanceof MetricRegistry) && !(metricRegistry instanceof MeterRegistry)) { if (!(metricRegistry.getClass().getName().contains("MetricRegistry"))
&& !(metricRegistry.getClass().getName().contains("MeterRegistry"))) {
throw new IllegalArgumentException("Class must be instance of com.codahale.metrics.MetricRegistry or io.micrometer.core.instrument.MeterRegistry"); throw new IllegalArgumentException("Class must be instance of com.codahale.metrics.MetricRegistry or io.micrometer.core.instrument.MeterRegistry");
} }
} }

Write Preview
Loading…
Cancel
Save