Disable tests with embedded mariaDB and change instr test ubuntu vers…

…ion to 24

.github/workflows/Java-Instrumentation-Tests.yml

@@ -24,7 +24,7 @@ jobs:
     name: Java ${{ matrix.java-version }}
     timeout-minutes: 120
     # needs: install-all-java
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       # we use these in env vars for conditionals (secrets can't be used in conditionals)
       AWS_KEY: ${{ secrets.aws-secret-access-key }}

instrumentation/jdbc-mariadb-1.1.7/src/test/java/org/mariadb/jdbc/MariaDbTest.java

@@ -29,6 +29,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"org.mariadb.jdbc", "java.sql", "javax.sql" })
+@Ignore
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test converage of Java 8.
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariaDbTest {
 
     private static DB mariaDb;

instrumentation/jdbc-mariadb-1.3.0/src/test/java/org/mariadb/jdbc/MariaDbTest.java

@@ -29,6 +29,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"org.mariadb.jdbc"})
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariaDbTest {
 
     private static DB mariaDb;

instrumentation/jdbc-mariadb-3.0.0/src/test/java/org/mariadb/jdbc/MariaDbTest.java

@@ -29,6 +29,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"org.mariadb.jdbc"})
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariaDbTest {
 
     private static DB mariaDb;

instrumentation/r2dbc-mariadb-1.1.2/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation(project(":agent-bridge"))
     implementation(project(":agent-bridge-datastore"))
     implementation("org.mariadb:r2dbc-mariadb:1.1.2")
-    testImplementation("ch.vorburger.mariaDB4j:mariaDB4j:2.5.3")
+    testImplementation("ch.vorburger.mariaDB4j:mariaDB4j:2.2.1")
 }
 
 jar {

instrumentation/r2dbc-mariadb-1.1.2/src/test/java/com/nr/agent/instrumentation/r2dbc/MariadbInstrumentedTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "org.mariadb.r2dbc")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariadbInstrumentedTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mariadb-1.1.2/src/test/java/com/nr/agent/instrumentation/r2dbc/MariadbNoInstrumentationTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "none")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariadbNoInstrumentationTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mariadb-1.2.1/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation(project(":agent-bridge"))
     implementation(project(":agent-bridge-datastore"))
     implementation("org.mariadb:r2dbc-mariadb:1.2.1")
-    testImplementation("ch.vorburger.mariaDB4j:mariaDB4j:2.5.3")
+    testImplementation("ch.vorburger.mariaDB4j:mariaDB4j:2.2.1")
 }
 
 jar {

instrumentation/r2dbc-mariadb-1.2.1/src/test/java/com/nr/agent/instrumentation/r2dbc/MariadbInstrumentedTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "org.mariadb.r2dbc")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariadbInstrumentedTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mariadb-1.2.1/src/test/java/com/nr/agent/instrumentation/r2dbc/MariadbNoInstrumentationTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "none")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariadbNoInstrumentationTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mariadb/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation(project(":agent-bridge"))
     implementation(project(":agent-bridge-datastore"))
     implementation("org.mariadb:r2dbc-mariadb:1.0.2")
-    testImplementation("ch.vorburger.mariaDB4j:mariaDB4j:2.5.3")
+    testImplementation("ch.vorburger.mariaDB4j:mariaDB4j:2.2.1")
 }
 
 jar {

instrumentation/r2dbc-mariadb/src/test/java/com/nr/agent/instrumentation/r2dbc/MariadbInstrumentedTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "org.mariadb.r2dbc")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariadbInstrumentedTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mariadb/src/test/java/com/nr/agent/instrumentation/r2dbc/MariadbNoInstrumentationTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "none")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariadbNoInstrumentationTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mysql-1.1.3/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation(project(":agent-bridge"))
     implementation(project(":agent-bridge-datastore"))
     implementation("io.asyncer:r2dbc-mysql:1.1.3")
-    testImplementation("ch.vorburger.mariaDB4j:mariaDB4j:2.5.3")
+    testImplementation("ch.vorburger.mariaDB4j:mariaDB4j:2.2.1")
 }
 
 jar {

instrumentation/r2dbc-mysql-1.1.3/src/test/java/com/nr/agent/instrumentation/r2dbc/MySQLInstrumentedTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "io.asyncer.r2dbc.mysql")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MySQLInstrumentedTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mysql-1.1.3/src/test/java/com/nr/agent/instrumentation/r2dbc/MySQLNoInstrumentationTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "none")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8.
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MySQLNoInstrumentationTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mysql/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     implementation(project(":agent-bridge"))
     implementation(project(":agent-bridge-datastore"))
     implementation("dev.miku:r2dbc-mysql:0.8.2.RELEASE")
-    testImplementation("ch.vorburger.mariaDB4j:mariaDB4j:2.5.3")
+    testImplementation("ch.vorburger.mariaDB4j:mariaDB4j:2.2.1")
 }
 
 jar {

instrumentation/r2dbc-mysql/src/test/java/com/nr/agent/instrumentation/r2dbc/MySQLInstrumentedTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "dev.miku.r2dbc.mysql")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MySQLInstrumentedTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mysql/src/test/java/com/nr/agent/instrumentation/r2dbc/MySQLNoInstrumentationTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "none")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MySQLNoInstrumentationTest {
 
     public static DB mariaDb;