You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ad...@apache.org on 2025/01/10 15:39:15 UTC
(fineract) branch develop updated: FINERACT-2081: Make MeterRegistry optional
This is an automated email from the ASF dual-hosted git repository.
adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 62635a347 FINERACT-2081: Make MeterRegistry optional
62635a347 is described below
commit 62635a34735177af5cdbca62174546ba62c14563
Author: Adam Saghy <ad...@gmail.com>
AuthorDate: Fri Jan 10 16:16:18 2025 +0100
FINERACT-2081: Make MeterRegistry optional
---
.../core/service/database/DataSourcePerTenantServiceFactory.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/database/DataSourcePerTenantServiceFactory.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/database/DataSourcePerTenantServiceFactory.java
index f62807168..82c1ac967 100644
--- a/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/database/DataSourcePerTenantServiceFactory.java
+++ b/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/database/DataSourcePerTenantServiceFactory.java
@@ -24,6 +24,7 @@ import static org.apache.fineract.infrastructure.core.domain.FineractPlatformTen
import com.zaxxer.hikari.HikariConfig;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.micrometer.core.instrument.MeterRegistry;
+import java.util.Optional;
import javax.sql.DataSource;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -53,7 +54,7 @@ public class DataSourcePerTenantServiceFactory {
private final HikariDataSourceFactory hikariDataSourceFactory;
private final DatabasePasswordEncryptor databasePasswordEncryptor;
- private final MeterRegistry meterRegistry;
+ private final Optional<MeterRegistry> meterRegistry;
@SuppressFBWarnings(value = "SLF4J_SIGN_ONLY_FORMAT")
public DataSource createNewDataSourceFor(FineractPlatformTenant tenant, FineractPlatformTenantConnection tenantConnection) {
@@ -97,7 +98,9 @@ public class DataSourcePerTenantServiceFactory {
// https://github.com/brettwooldridge/HikariCP/wiki/MBean-(JMX)-Monitoring-and-Management
config.setRegisterMbeans(true);
- config.setMetricsTrackerFactory(new TenantConnectionPoolMetricsTrackerFactory(tenant.getTenantIdentifier(), meterRegistry));
+ meterRegistry.ifPresent(registry -> {
+ config.setMetricsTrackerFactory(new TenantConnectionPoolMetricsTrackerFactory(tenant.getTenantIdentifier(), registry));
+ });
// https://github.com/brettwooldridge/HikariCP/wiki/MySQL-Configuration
// These are the properties for each Tenant DB; the same configuration