Skip to content

Commit 0335c98

Browse files
committed
Re-enable Agroal datasource metrics
- Introduce a new test to validate Agroal metrics functionality when metrics are enabled. - Remove default `false` value for `enabled` configuration in `DataSourceJdbcMetrics` to allow explicit control.
1 parent c04eed2 commit 0335c98

File tree

2 files changed

+38
-1
lines changed

2 files changed

+38
-1
lines changed
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package io.quarkus.agroal.test;
2+
3+
import jakarta.inject.Inject;
4+
5+
import org.eclipse.microprofile.metrics.*;
6+
import org.eclipse.microprofile.metrics.annotation.RegistryType;
7+
import org.junit.jupiter.api.Assertions;
8+
import org.junit.jupiter.api.Test;
9+
import org.junit.jupiter.api.extension.RegisterExtension;
10+
11+
import io.quarkus.test.QuarkusUnitTest;
12+
13+
/**
14+
* Test to verify that Agroal metrics are exposed when only quarkus.datasource.metrics.enabled=true is set
15+
*/
16+
public class AgroalMetricsOnlyTestCase {
17+
18+
@RegisterExtension
19+
static final QuarkusUnitTest config = new QuarkusUnitTest()
20+
.withConfigurationResource("base.properties")
21+
.overrideConfigKey("quarkus.datasource.metrics.enabled", "true");
22+
23+
@Inject
24+
@RegistryType(type = MetricRegistry.Type.VENDOR)
25+
MetricRegistry registry;
26+
27+
@Test
28+
public void testMetricsAreExposed() {
29+
Counter acquireCount = registry.getCounters()
30+
.get(new MetricID("agroal.acquire.count", new Tag("datasource", "default")));
31+
Gauge<?> maxUsed = registry.getGauges()
32+
.get(new MetricID("agroal.max.used.count", new Tag("datasource", "default")));
33+
34+
Assertions.assertNotNull(acquireCount, "Agroal metrics should be registered eagerly");
35+
Assertions.assertNotNull(maxUsed, "Agroal metrics should be registered eagerly");
36+
}
37+
38+
}

extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ interface DataSourceJdbcMetrics {
4545
/**
4646
* Enable metrics collection for this datasource.
4747
*/
48-
@WithDefault("false")
4948
Optional<Boolean> enabled();
5049

5150
}

0 commit comments

Comments
 (0)