Minor fixes

Author: Jonathan Henrique Medeiros

src/main/java/br/com/multidatasources/config/datasource/DataSourceConfiguration.java

@@ -7,15 +7,17 @@
 
 public interface DataSourceConfiguration {
 
- String getPoolName();
+ String poolName();
 
- int getMinimumIdle();
+ int minimumIdle();
 
- int getMaximumPoolSize();
+ int maximumPoolSize();
 
- long getConnectionTimeout();
+ long connectionTimeout();
 
- long getMaxLifetime();
+ long idleTimeout();
+
+ long maxLifetime();
 
  default HikariDataSource definePoolDataSourceConnection(final DataSource dataSource) {
  return new HikariDataSource(hikariConfig(dataSource));
@@ -24,11 +26,12 @@ default HikariDataSource definePoolDataSourceConnection(final DataSource dataSou
  private HikariConfig hikariConfig(final DataSource dataSource) {
  final HikariConfig hikariConfig = new HikariConfig();
 
- hikariConfig.setPoolName(getPoolName());
- hikariConfig.setMaximumPoolSize(getMaximumPoolSize());
- hikariConfig.setMinimumIdle(getMinimumIdle());
- hikariConfig.setConnectionTimeout(getConnectionTimeout());
- hikariConfig.setMaxLifetime(getMaxLifetime());
+ hikariConfig.setPoolName(poolName());
+ hikariConfig.setMaximumPoolSize(maximumPoolSize());
+ hikariConfig.setMinimumIdle(minimumIdle());
+ hikariConfig.setConnectionTimeout(connectionTimeout());
+ hikariConfig.setMaxLifetime(maxLifetime());
+ hikariConfig.setIdleTimeout(idleTimeout());
  hikariConfig.setDataSource(dataSource);
  hikariConfig.setAutoCommit(false);
 

src/main/java/br/com/multidatasources/config/datasource/DataSourceType.java

@@ -4,45 +4,55 @@ public enum DataSourceType {
 
  READ_ONLY("Replica-DB") {
  @Override
- public int getMinimumIdle() {
+ public int minimumIdle() {
  return Runtime.getRuntime().availableProcessors();
  }
 
  @Override
- public int getMaximumPoolSize() {
+ public int maximumPoolSize() {
  return Runtime.getRuntime().availableProcessors() * 4;
  }
 
  @Override
- public long getConnectionTimeout() {
+ public long connectionTimeout() {
  return 250;
  }
 
  @Override
- public long getMaxLifetime() {
+ public long idleTimeout() {
  return 600000;
  }
+
+ @Override
+ public long maxLifetime() {
+ return 800000;
+ }
  },
  READ_WRITE("Master-DB") {
  @Override
- public int getMinimumIdle() {
+ public int minimumIdle() {
  return Runtime.getRuntime().availableProcessors();
  }
 
  @Override
- public int getMaximumPoolSize() {
+ public int maximumPoolSize() {
  return Runtime.getRuntime().availableProcessors() * 2;
  }
 
  @Override
- public long getConnectionTimeout() {
+ public long connectionTimeout() {
  return 250;
  }
 
  @Override
- public long getMaxLifetime() {
+ public long idleTimeout() {
  return 600000;
  }
+
+ @Override
+ public long maxLifetime() {
+ return 800000;
+ }
  };
 
  private final String poolName;
@@ -51,16 +61,18 @@ public long getMaxLifetime() {
  this.poolName = poolName;
  }
 
- public String getPoolName() {
+ public String poolName() {
  return this.poolName;
  }
 
- public abstract int getMinimumIdle();
+ public abstract int minimumIdle();
+
+ public abstract int maximumPoolSize();
 
- public abstract int getMaximumPoolSize();
+ public abstract long connectionTimeout();
 
- public abstract long getConnectionTimeout();
+ public abstract long idleTimeout();
 
- public abstract long getMaxLifetime();
+ public abstract long maxLifetime();
 
 }

src/main/java/br/com/multidatasources/config/datasource/MasterDataSourceConfiguration.java

@@ -8,34 +8,40 @@
 
 import javax.sql.DataSource;
 
+import static br.com.multidatasources.config.datasource.DataSourceType.READ_ONLY;
 import static br.com.multidatasources.config.datasource.DataSourceType.READ_WRITE;
 
 @Configuration
 public class MasterDataSourceConfiguration implements DataSourceConfiguration {
 
  @Override
- public String getPoolName() {
- return READ_WRITE.getPoolName();
+ public String poolName() {
+ return READ_WRITE.poolName();
  }
 
  @Override
- public int getMinimumIdle() {
- return READ_WRITE.getMinimumIdle();
+ public int minimumIdle() {
+ return READ_WRITE.minimumIdle();
  }
 
  @Override
- public int getMaximumPoolSize() {
- return READ_WRITE.getMaximumPoolSize();
+ public int maximumPoolSize() {
+ return READ_WRITE.maximumPoolSize();
  }
 
  @Override
- public long getConnectionTimeout() {
- return READ_WRITE.getConnectionTimeout();
+ public long idleTimeout() {
+ return READ_ONLY.idleTimeout();
  }
 
  @Override
- public long getMaxLifetime() {
- return READ_WRITE.getMaxLifetime();
+ public long connectionTimeout() {
+ return READ_WRITE.connectionTimeout();
+ }
+
+ @Override
+ public long maxLifetime() {
+ return READ_WRITE.maxLifetime();
  }
 
  @Bean

src/main/java/br/com/multidatasources/config/datasource/ReplicaDataSourceConfiguration.java

@@ -14,28 +14,33 @@
 public class ReplicaDataSourceConfiguration implements DataSourceConfiguration {
 
  @Override
- public String getPoolName() {
- return READ_ONLY.getPoolName();
+ public String poolName() {
+ return READ_ONLY.poolName();
  }
 
  @Override
- public int getMinimumIdle() {
- return READ_ONLY.getMinimumIdle();
+ public int minimumIdle() {
+ return READ_ONLY.minimumIdle();
  }
 
  @Override
- public int getMaximumPoolSize() {
- return READ_ONLY.getMaximumPoolSize();
+ public int maximumPoolSize() {
+ return READ_ONLY.maximumPoolSize();
  }
 
  @Override
- public long getConnectionTimeout() {
- return READ_ONLY.getConnectionTimeout();
+ public long connectionTimeout() {
+ return READ_ONLY.connectionTimeout();
  }
 
  @Override
- public long getMaxLifetime() {
- return READ_ONLY.getMaxLifetime();
+ public long idleTimeout() {
+ return READ_ONLY.idleTimeout();
+ }
+
+ @Override
+ public long maxLifetime() {
+ return READ_ONLY.maxLifetime();
  }
 
  @Bean

src/main/java/br/com/multidatasources/config/routing/TransactionRoutingDataSource.java

@@ -1,5 +1,6 @@
 package br.com.multidatasources.config.routing;
 
+import io.opentelemetry.api.trace.Span;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
@@ -15,12 +16,23 @@ public class TransactionRoutingDataSource extends AbstractRoutingDataSource {
  @Override
  protected Object determineCurrentLookupKey() {
  if (TransactionSynchronizationManager.isCurrentTransactionReadOnly()) {
+
  LOGGER.info("Routed to: {}", READ_ONLY);
+ enrichSpan(READ_ONLY.name(), READ_ONLY.poolName());
+
  return READ_ONLY;
  }
 
  LOGGER.info("Routed to: {}", READ_WRITE);
+ enrichSpan(READ_WRITE.name(), READ_WRITE.poolName());
+
  return READ_WRITE;
  }
 
+ private void enrichSpan(final String dbType, final String pollName) {
+ final var currentSpan = Span.current();
+ currentSpan.setAttribute("db.type", dbType);
+ currentSpan.setAttribute("db.poll", pollName);
+ }
+
 }