Signed-off-by: Emmanuel Jannetti <emmanuel.jannetti@oracle.com>

warm up pools add reset stats endpoint

java/jdbc/statement-interceptor/demo-app/src/main/java/com/oracle/jdbc/samples/statementinterceptordemo/StatementInterceptorDemoApplication.java

@@ -27,17 +27,27 @@
 import com.oracle.jdbc.samples.statementinterceptordemo.services.EmployeeService;
 import com.oracle.jdbc.samples.statementinterceptordemo.utils.WebViolationHandler;
 import lombok.extern.java.Log;
+import oracle.ucp.jdbc.PoolDataSourceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.jdbc.core.JdbcTemplate;
 
+import javax.sql.DataSource;
 import java.util.logging.Logger;
 
 @SpringBootApplication
 @Log
 public class StatementInterceptorDemoApplication {
 
+ @Autowired @Qualifier("interceptedDataSource") DataSource DataSource1;
+ @Autowired DataSource DataSource2;
+
  public static void main(String[] args) {
  SpringApplication.run(StatementInterceptorDemoApplication.class, args);
  }
@@ -49,6 +59,13 @@ public CommandLineRunner commandLineRunner(final EmployeeService service) {
  service.initialize();
  log.info("Employees data Initialized");
 
+ log.info("starting connection pools ...");
+ // That's ususally not needed but for the sake of the demo
+ // we forcefully start the pool
+ ((PoolDataSourceImpl)DataSource1).startPool();
+ ((PoolDataSourceImpl)DataSource2).startPool();
+ log.info("Pools started...");
+
  // add our handler to violation logger
  Logger.getLogger(SQLStatementInterceptor.ACTION_LOGGER_NAME)
  .addHandler(new WebViolationHandler());

java/jdbc/statement-interceptor/demo-app/src/main/java/com/oracle/jdbc/samples/statementinterceptordemo/TracedDataSourceConfig.java

@@ -25,8 +25,10 @@
 
 import lombok.AllArgsConstructor;
 import lombok.extern.java.Log;
+import oracle.ucp.UniversalConnectionPool;
 import oracle.ucp.jdbc.PoolDataSource;
 import oracle.ucp.jdbc.PoolDataSourceFactory;
+import oracle.ucp.jdbc.PoolDataSourceImpl;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -139,8 +141,6 @@ public DataSource getInterceptedDataSource() throws SQLException {
  dataSource.setConnectionProperty("oracle.jdbc.provider.traceEventListener",
  "com.oracle.jdbc.samples.interceptor.SQLStatementInterceptorProvider");
 
-
-
  String rules;
  try {
  rules = getStatementRulesAsJSONString();
@@ -168,10 +168,7 @@ public DataSource getInterceptedDataSource() throws SQLException {
  public JdbcTemplate getInterceptedJdbcTemplate() throws SQLException {
  long start = System.currentTimeMillis();
  InstrumentedJdbcTemplate t = new InstrumentedJdbcTemplate(getInterceptedDataSource(), "traced");
- // be sure the pool is warm
- t.execute("SELECT 1 FROM DUAL");
  log.log(Level.INFO,"traced template init time " + (System.currentTimeMillis() - start) + "ms");
- t.getStatistic().clear();
  return t;
  }
 
@@ -186,10 +183,7 @@ public JdbcTemplate getInterceptedJdbcTemplate() throws SQLException {
  public JdbcTemplate getJdbcTemplate() throws SQLException {
  long start = System.currentTimeMillis();
  InstrumentedJdbcTemplate t = new InstrumentedJdbcTemplate(getDataSource(), "untraced");
- // be sure the pool is warm
- t.execute("SELECT 1 FROM DUAL");
  log.log(Level.INFO,"untraced template init time " + (System.currentTimeMillis() - start) + "ms");
- t.getStatistic().clear();
  return t;
 
  }

java/jdbc/statement-interceptor/demo-app/src/main/java/com/oracle/jdbc/samples/statementinterceptordemo/models/Statistic.java

@@ -44,11 +44,11 @@ public class Statistic {
  /**
  * minimum operation time in milliseconds
  */
- private double minTime;
+ private double minTime = -1.0;
  /**
  * maximum operation time in milliseconds
  */
- private double maxTime;
+ private double maxTime = -1.0;;
  /**
  * total operation time in milliseconds
  */
@@ -61,10 +61,11 @@ public class Statistic {
  */
  public void accumulate(long l) {
  if (l < minTime || minTime == -1.0) {
+ minTime = l;
  }
- minTime = l;
- if (l > maxTime)
+ if (l > maxTime) {
  maxTime = l;
+ }
  count++;
  totalTime += l;
  }

java/jdbc/statement-interceptor/demo-app/src/main/java/com/oracle/jdbc/samples/statementinterceptordemo/services/StatisticService.java

@@ -37,4 +37,10 @@ public interface StatisticService {
  * @return the statistic or null if no such statistic for this tag is found
  */
  Statistic getRequestStatistics(String tag);
+
+ /**
+ * Resets all registered statistics.
+ * All counters will be set ot zero
+ */
+ void resetAllStatistics();
 }

java/jdbc/statement-interceptor/demo-app/src/main/java/com/oracle/jdbc/samples/statementinterceptordemo/services/impl/StatisticServiceImpl.java

@@ -55,4 +55,10 @@ public Statistic getRequestStatistics(String tag) {
  .findFirst()
  .orElse(null);
  }
+
+ @Override
+ public void resetAllStatistics() {
+ allStats.stream().forEach(s->{s.clear();});
+ }
+
 }

java/jdbc/statement-interceptor/demo-app/src/main/java/com/oracle/jdbc/samples/statementinterceptordemo/webcontent/DynamicContentController.java

@@ -28,11 +28,13 @@
 import com.oracle.jdbc.samples.statementinterceptordemo.utils.WebViolationHandler;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.java.Log;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.ArrayList;
@@ -108,6 +110,12 @@ public ModelAndView getStats() {
  return modelAndView;
  }
 
+ @DeleteMapping("interceptor/stats")
+ public @ResponseBody ResponseEntity<String> delete() {
+ statService.resetAllStatistics();
+ return new ResponseEntity<String>("DELETE Response", HttpStatus.OK);
+ }
+
  @GetMapping("interceptor/logs")
  public ModelAndView getLogs(HttpServletRequest request,
  @RequestParam(name = "uuid", required = true) String uuid) {

java/jdbc/statement-interceptor/demo-app/src/main/resources/oracle-pooled-ds.properties

@@ -27,9 +27,9 @@ connection-factory-class-name=oracle.jdbc.pool.OracleDataSource
 username=${DATABASE_USER}
 password=${DATABASE_PASSWORD}
 url=${DATABASE_URL}
-sql-for-validate-connection=select * from dual 
+sql-for-validate-connection=select 1 from dual 
 connection-pool-name=DemoUcpPool
-initial-pool-size=1
-min-pool-size=1
-max-pool-size=5
+initial-pool-size=5
+min-pool-size=2
+max-pool-size=10