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

Refine JMX ObjectName #1681

Merged
merged 1 commit into from Jan 9, 2021
Merged

Refine JMX ObjectName #1681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/main/java/com/zaxxer/hikari/pool/PoolBase.java
View file
Open in desktop
Expand Up @@ -279,8 +279,14 @@ void handleMBeans(final HikariPool hikariPool, final boolean register)
try {
final MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();

final ObjectName beanConfigName = new ObjectName("com.zaxxer.hikari:type=PoolConfig (" + poolName + ")");
final ObjectName beanPoolName = new ObjectName("com.zaxxer.hikari:type=Pool (" + poolName + ")");
ObjectName beanConfigName, beanPoolName;
if ("true".equals(System.getProperty("hikaricp.jmx.register2.0"))) {
beanConfigName = new ObjectName("com.zaxxer.hikari:type=PoolConfig,name=" + poolName);
beanPoolName = new ObjectName("com.zaxxer.hikari:type=Pool,name=" + poolName);
} else {
beanConfigName = new ObjectName("com.zaxxer.hikari:type=PoolConfig (" + poolName + ")");
beanPoolName = new ObjectName("com.zaxxer.hikari:type=Pool (" + poolName + ")");
}
if (register) {
if (!mBeanServer.isRegistered(beanConfigName)) {
mBeanServer.registerMBean(config, beanConfigName);
Expand Down
19 changes: 19 additions & 0 deletions src/test/java/com/zaxxer/hikari/pool/TestMBean.java
View file
Open in desktop
Expand Up @@ -96,6 +96,25 @@ public void testMBeanReporting() throws SQLException, InterruptedException, Malf
finally {
System.clearProperty("com.zaxxer.hikari.housekeeping.periodMs");
}

System.setProperty("hikaricp.jmx.register2.0", "true");

try (HikariDataSource ds = new HikariDataSource(config)) {

getUnsealedConfig(ds).setIdleTimeout(3000);

TimeUnit.SECONDS.sleep(1);

MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
ObjectName poolName = new ObjectName("com.zaxxer.hikari:type=Pool,name=testMBeanReporting");
HikariPoolMXBean hikariPoolMXBean = JMX.newMXBeanProxy(mBeanServer, poolName, HikariPoolMXBean.class);

assertEquals(0, hikariPoolMXBean.getActiveConnections());
assertEquals(3, hikariPoolMXBean.getIdleConnections());
}
finally {
System.clearProperty("hikaricp.jmx.register2.0");
}
}

@Test
Expand Down