Skip to content

[ISSUE 2637] Fix jvm_memory_direct_bytes_used metrics when using jdk11+ #3252

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

Merged
zymap merged 2 commits into from
Jul 29, 2022
Merged

[ISSUE 2637] Fix jvm_memory_direct_bytes_used metrics when using jdk11+ #3252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d47a21
[ISSUE 3247] Fix jvm_memory_direct_bytes_used metrics when using jdk11+
Apr 29, 2022
b5a8189
remove annotation
May 5, 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
30 changes: 10 additions & 20 deletions ...vider/src/main/java/org/apache/bookkeeper/stats/prometheus/PrometheusMetricsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@
import io.prometheus.client.hotspot.MemoryPoolsExports;
import io.prometheus.client.hotspot.StandardExports;
import io.prometheus.client.hotspot.ThreadExports;

import java.io.IOException;
import java.io.Writer;
import java.lang.reflect.Field;
import java.lang.management.BufferPoolMXBean;
import java.lang.management.ManagementFactory;
import java.net.InetSocketAddress;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;

import org.apache.bookkeeper.stats.StatsLogger;
import org.apache.bookkeeper.stats.StatsProvider;
import org.apache.bookkeeper.stats.ThreadRegistry;
Expand Down Expand Up @@ -130,7 +130,7 @@ public void start(Configuration conf) {
registerMetrics(Gauge.build("jvm_memory_direct_bytes_used", "-").create().setChild(new Child() {
@Override
public double get() {
return directMemoryUsage != null ? directMemoryUsage.longValue() : Double.NaN;
return poolMxBeanOp.isPresent() ? poolMxBeanOp.get().getMemoryUsed() : Double.NaN;
}
}));

Expand Down Expand Up @@ -215,21 +215,11 @@ private void registerMetrics(Collector collector) {

private static final Logger log = LoggerFactory.getLogger(PrometheusMetricsProvider.class);

/*
* Try to get Netty counter of used direct memory. This will be correct, unlike the JVM values.
*/
private static final AtomicLong directMemoryUsage;
static {
AtomicLong tmpDirectMemoryUsage = null;
private static final Optional<BufferPoolMXBean> poolMxBeanOp;

try {
Field field = PlatformDependent.class.getDeclaredField("DIRECT_MEMORY_COUNTER");
field.setAccessible(true);
tmpDirectMemoryUsage = (AtomicLong) field.get(null);
} catch (Throwable t) {
log.warn("Failed to access netty DIRECT_MEMORY_COUNTER field {}", t.getMessage());
}

directMemoryUsage = tmpDirectMemoryUsage;
static {
List<BufferPoolMXBean> platformMXBeans = ManagementFactory.getPlatformMXBeans(BufferPoolMXBean.class);
poolMxBeanOp = platformMXBeans.stream()
.filter(bufferPoolMXBean -> bufferPoolMXBean.getName().equals("direct")).findAny();
}
}
40 changes: 40 additions & 0 deletions ...r/src/test/java/org/apache/bookkeeper/stats/prometheus/TestPrometheusMetricsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,16 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;

import java.io.StringWriter;
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.HashMap;

import lombok.Cleanup;
import org.apache.bookkeeper.stats.Counter;
import org.apache.bookkeeper.stats.StatsLogger;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.junit.Assert;
import org.junit.Test;

/**
Expand Down Expand Up @@ -111,4 +116,39 @@ public void testTwoCounters() throws Exception {
assertEquals(1, provider.counters.size());
}

@Test
public void testJvmDirectMemoryMetrics() throws Exception {
PropertiesConfiguration config = new PropertiesConfiguration();
config.setProperty(PrometheusMetricsProvider.PROMETHEUS_STATS_HTTP_ENABLE, true);
config.setProperty(PrometheusMetricsProvider.PROMETHEUS_STATS_HTTP_PORT, 0);
config.setProperty(PrometheusMetricsProvider.PROMETHEUS_STATS_HTTP_ADDRESS, "127.0.0.1");
ByteBuffer byteBuffer = ByteBuffer.allocateDirect(25);
PrometheusMetricsProvider provider = new PrometheusMetricsProvider();
try {
provider.start(config);
assertNotNull(provider.server);
StringWriter writer = new StringWriter();
provider.writeAllMetrics(writer);
String s = writer.toString();
String[] split = s.split(System.lineSeparator());
HashMap<String, String> map = new HashMap<>();
for (String str : split) {
String[] aux = str.split(" ");
map.put(aux[0], aux[1]);
}
String directBytesMax = map.get("jvm_memory_direct_bytes_max{}");
Assert.assertNotNull(directBytesMax);
Assert.assertNotEquals("Nan", directBytesMax);
Assert.assertNotEquals("-1", directBytesMax);
String directBytesUsed = map.get("jvm_memory_direct_bytes_used{}");
Assert.assertNotNull(directBytesUsed);
Assert.assertNotEquals("Nan", directBytesUsed);
Assert.assertTrue(Double.parseDouble(directBytesUsed) > 25);
// ensure byteBuffer doesn't gc
byteBuffer.clear();
} finally {
provider.stop();
}
}

}