add more logs into TestDatabase

airbytehq · Feb 24, 2024 · a147092 · a147092
1 parent e2a990e
commit a147092
Showing 1 changed file with 37 additions and 6 deletions.
diff --git a/...dk/java/airbyte-cdk/core/src/testFixtures/java/io/airbyte/cdk/testutils/TestDatabase.java b/...dk/java/airbyte-cdk/core/src/testFixtures/java/io/airbyte/cdk/testutils/TestDatabase.java
@@ -19,11 +19,15 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.sql.SQLException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
 import javax.sql.DataSource;
 import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
@@ -51,12 +55,30 @@ abstract public class TestDatabase<C extends JdbcDatabaseContainer<?>, T extends
   final private ArrayList<String> cleanupSQL = new ArrayList<>();
   final private Map<String, String> connectionProperties = new HashMap<>();
 
-  private DataSource dataSource;
-  private DSLContext dslContext;
+  private volatile DataSource dataSource;
+  private volatile DSLContext dslContext;
 
+  protected final int databaseId;
+  private static final AtomicInteger nextDatabaseId = new AtomicInteger(0);
+
+  protected final int containerId;
+  private static final AtomicInteger nextContainerId = new AtomicInteger(0);
+  private static final Map<String, Integer> containerUidToId = new ConcurrentHashMap<>();
+
+  @SuppressWarnings("this-escape")
   protected TestDatabase(C container) {
     this.container = container;
     this.suffix = Strings.addRandomSuffix("", "_", 10);
+    this.databaseId = nextDatabaseId.getAndIncrement();
+    this.containerId = containerUidToId.computeIfAbsent(container.getContainerId(), k -> nextContainerId.getAndIncrement());
+    LOGGER.info(formatLogLine("creating database " + getDatabaseName()));
+  }
+
+  private final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
+
+  protected String formatLogLine(String logLine) {
+    String retVal = "SGX TestDatabase databaseId=" + databaseId + ", containerId=" + containerId + " - " + logLine;
+    return retVal;
   }
 
   @SuppressWarnings("unchecked")
@@ -170,7 +192,14 @@ public Database getDatabase() {
   protected void execSQL(final List<String> sqls) {
     try {
       for (String sql : sqls) {
-        getDslContext().execute(sql);
+        LOGGER.info(formatLogLine("executing SQL: " + sql));
+        try {
+          getDslContext().execute(sql);
+          LOGGER.info(formatLogLine("completed SQL: " + sql));
+        } catch (Throwable t) {
+          LOGGER.error(formatLogLine("error when executing SQL: " + sql + "e=\n" + t));
+          throw t;
+        }
       }
     } catch (DataAccessException e) {
       throw new RuntimeException(e);
@@ -182,12 +211,13 @@ protected void execInContainer(List<String> cmd) {
       return;
     }
     try {
-      LOGGER.debug("executing {}", Strings.join(cmd, " "));
+      LOGGER.info(formatLogLine(String.format("executing command %s", Strings.join(cmd, " "))));
       final var exec = getContainer().execInContainer(cmd.toArray(new String[0]));
       if (exec.getExitCode() == 0) {
-        LOGGER.debug("execution success\nstdout:\n{}\nstderr:\n{}", exec.getStdout(), exec.getStderr());
+        LOGGER.info(formatLogLine(String.format("execution success\nstdout:\n%s\nstderr:\n%s", exec.getStdout(), exec.getStderr())));
       } else {
-        LOGGER.error("execution failure, code {}\nstdout:\n{}\nstderr:\n{}", exec.getExitCode(), exec.getStdout(), exec.getStderr());
+        LOGGER.error(formatLogLine(
+            String.format("execution failure, code %s\nstdout:\n%s\nstderr:\n%s", exec.getExitCode(), exec.getStdout(), exec.getStderr())));
       }
     } catch (IOException e) {
       throw new UncheckedIOException(e);
@@ -229,6 +259,7 @@ public B integrationTestConfigBuilder() {
   public void close() {
     execSQL(this.cleanupSQL);
     execInContainer(inContainerUndoBootstrapCmd());
+    LOGGER.info("closing database databaseId=" + databaseId);
   }
 
   static public class ConfigBuilder<T extends TestDatabase<?, ?, ?>, B extends ConfigBuilder<T, B>> {