Commit 860814b6 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #20354 from izeye

* pr/20354:
  Polish "Add descriptions for data source pool metrics"
  Add descriptions for data source pool metrics

Closes gh-20354
parents c71ed407 925756da
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -22,6 +22,7 @@ import java.util.function.Function; ...@@ -22,6 +22,7 @@ import java.util.function.Function;
import javax.sql.DataSource; import javax.sql.DataSource;
import io.micrometer.core.instrument.Gauge;
import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Tag; import io.micrometer.core.instrument.Tag;
import io.micrometer.core.instrument.Tags; import io.micrometer.core.instrument.Tags;
...@@ -65,23 +66,29 @@ public class DataSourcePoolMetrics implements MeterBinder { ...@@ -65,23 +66,29 @@ public class DataSourcePoolMetrics implements MeterBinder {
@Override @Override
public void bindTo(MeterRegistry registry) { public void bindTo(MeterRegistry registry) {
if (this.metadataProvider.getDataSourcePoolMetadata(this.dataSource) != null) { if (this.metadataProvider.getDataSourcePoolMetadata(this.dataSource) != null) {
bindPoolMetadata(registry, "active", DataSourcePoolMetadata::getActive); bindPoolMetadata(registry, "active",
bindPoolMetadata(registry, "idle", DataSourcePoolMetadata::getIdle); "Current number of active connections that have been allocated from the data source.",
bindPoolMetadata(registry, "max", DataSourcePoolMetadata::getMax); DataSourcePoolMetadata::getActive);
bindPoolMetadata(registry, "min", DataSourcePoolMetadata::getMin); bindPoolMetadata(registry, "idle", "Number of established but idle connections.",
DataSourcePoolMetadata::getIdle);
bindPoolMetadata(registry, "max",
"Maximum number of active connections that can be allocated at the same time.",
DataSourcePoolMetadata::getMax);
bindPoolMetadata(registry, "min", "Minimum number of idle connections in the pool.",
DataSourcePoolMetadata::getMin);
} }
} }
private <N extends Number> void bindPoolMetadata(MeterRegistry registry, String metricName, private <N extends Number> void bindPoolMetadata(MeterRegistry registry, String metricName, String description,
Function<DataSourcePoolMetadata, N> function) { Function<DataSourcePoolMetadata, N> function) {
bindDataSource(registry, metricName, this.metadataProvider.getValueFunction(function)); bindDataSource(registry, metricName, description, this.metadataProvider.getValueFunction(function));
} }
private <N extends Number> void bindDataSource(MeterRegistry registry, String metricName, private <N extends Number> void bindDataSource(MeterRegistry registry, String metricName, String description,
Function<DataSource, N> function) { Function<DataSource, N> function) {
if (function.apply(this.dataSource) != null) { if (function.apply(this.dataSource) != null) {
registry.gauge("jdbc.connections." + metricName, this.tags, this.dataSource, Gauge.builder("jdbc.connections." + metricName, this.dataSource, (m) -> function.apply(m).doubleValue())
(m) -> function.apply(m).doubleValue()); .tags(this.tags).description(description).register(registry);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment