From f861f9320fd5782084f970bc5864096a8391a5d5 Mon Sep 17 00:00:00 2001
From: brunobat <brunobat@gmail.com>
Date: Mon, 25 Sep 2023 15:39:11 +0100
Subject: [PATCH 1/2] ignore oracle test

---
 .../OracleOpenTelemetryJdbcInstrumentationTest.java             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleOpenTelemetryJdbcInstrumentationTest.java b/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleOpenTelemetryJdbcInstrumentationTest.java
index 67e784bc1d457..af31663fe69f6 100644
--- a/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleOpenTelemetryJdbcInstrumentationTest.java
+++ b/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleOpenTelemetryJdbcInstrumentationTest.java
@@ -1,5 +1,6 @@
 package io.quarkus.it.opentelemetry;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.common.QuarkusTestResource;
@@ -10,6 +11,7 @@
 public class OracleOpenTelemetryJdbcInstrumentationTest extends OpenTelemetryJdbcInstrumentationTest {
 
     @Test
+    @Disabled("Last oracle image is not working")
     void testOracleQueryTraced() {
         testQueryTraced("oracle", "OracleHit");
     }

From bba567317f334b59b6c104ccd395b8a93e3d1512 Mon Sep 17 00:00:00 2001
From: Bruno Baptista <brunobat@gmail.com>
Date: Mon, 25 Sep 2023 17:18:26 +0100
Subject: [PATCH 2/2] remove oracle tests

---
 .../pom.xml                                   | 81 -------------------
 .../opentelemetry/OracleLifecycleManager.java | 30 -------
 ...cleOpenTelemetryJdbcInstrumentationIT.java |  8 --
 ...eOpenTelemetryJdbcInstrumentationTest.java | 19 -----
 4 files changed, 138 deletions(-)
 delete mode 100644 integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleLifecycleManager.java
 delete mode 100644 integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleOpenTelemetryJdbcInstrumentationIT.java
 delete mode 100644 integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleOpenTelemetryJdbcInstrumentationTest.java

diff --git a/integration-tests/opentelemetry-jdbc-instrumentation/pom.xml b/integration-tests/opentelemetry-jdbc-instrumentation/pom.xml
index 95ba3e9098605..a444e74a9e88c 100644
--- a/integration-tests/opentelemetry-jdbc-instrumentation/pom.xml
+++ b/integration-tests/opentelemetry-jdbc-instrumentation/pom.xml
@@ -326,86 +326,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>test-jdbc-instrumentation-docker-oracle</id>
-            <activation>
-                <property>
-                    <name>start-containers</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>docker-maven-plugin</artifactId>
-                        <configuration>
-                            <images>
-                                <image>
-                                    <name>${oracle.image}</name>
-                                    <run>
-                                        <ports>
-                                            <port>1521:1521</port>
-                                        </ports>
-                                        <env>
-                                            <ORACLE_PASSWORD>quarkus</ORACLE_PASSWORD>
-                                        </env>
-                                        <log>
-                                            <prefix>Oracle Database: </prefix>
-                                            <date>default</date>
-                                            <color>red</color>
-                                        </log>
-                                        <wait>
-                                            <!-- good docs found at: https://dmp.fabric8.io/#build-healthcheck -->
-                                            <!-- Unfortunately booting this is slow, needs to set a generous timeout: -->
-                                            <time>60000</time>
-                                            <!-- leverage the healthcheck in the image we use -->
-                                            <healthy>yes</healthy>
-                                            <!-- In case of any issues with the built-in healthcheck we can revert back to the original log check:-->
-                                            <!--<log>DATABASE IS READY TO USE!</log>-->
-                                        </wait>
-                                    </run>
-                                </image>
-                            </images>
-                            <!--Stops all Oracle DB images currently running, not just those we just started.
-                              Useful to stop processes still running from a previously failed integration test run -->
-                            <allContainers>true</allContainers>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>docker-start</id>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>stop</goal>
-                                    <goal>start</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>docker-stop</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>stop</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>docker-prune</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>${docker-prune.location}</executable>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>
diff --git a/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleLifecycleManager.java b/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleLifecycleManager.java
deleted file mode 100644
index 0bd02392b3c3f..0000000000000
--- a/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleLifecycleManager.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.quarkus.it.opentelemetry;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
-
-public class OracleLifecycleManager implements QuarkusTestResourceLifecycleManager {
-
-    @Override
-    public Map<String, String> start() {
-        Map<String, String> properties = new HashMap<>();
-        properties.put("quarkus.datasource.oracle.jdbc.url", "jdbc:oracle:thin:@localhost:1521/FREEPDB1");
-        properties.put("quarkus.datasource.oracle.password", "quarkus");
-        properties.put("quarkus.datasource.oracle.username", "SYSTEM");
-        properties.put("quarkus.hibernate-orm.oracle.database.generation", "drop-and-create");
-        properties.put("quarkus.hibernate-orm.oracle.active", "true");
-        properties.put("quarkus.hibernate-orm.mariadb.active", "false");
-        properties.put("quarkus.hibernate-orm.postgresql.active", "false");
-        properties.put("quarkus.hibernate-orm.db2.active", "false");
-
-        return properties;
-    }
-
-    @Override
-    public void stop() {
-        // EMPTY
-    }
-
-}
diff --git a/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleOpenTelemetryJdbcInstrumentationIT.java b/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleOpenTelemetryJdbcInstrumentationIT.java
deleted file mode 100644
index e7ccd488acefe..0000000000000
--- a/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleOpenTelemetryJdbcInstrumentationIT.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.quarkus.it.opentelemetry;
-
-import io.quarkus.test.junit.QuarkusIntegrationTest;
-
-@QuarkusIntegrationTest
-public class OracleOpenTelemetryJdbcInstrumentationIT extends OracleOpenTelemetryJdbcInstrumentationTest {
-
-}
diff --git a/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleOpenTelemetryJdbcInstrumentationTest.java b/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleOpenTelemetryJdbcInstrumentationTest.java
deleted file mode 100644
index af31663fe69f6..0000000000000
--- a/integration-tests/opentelemetry-jdbc-instrumentation/src/test/java/io/quarkus/it/opentelemetry/OracleOpenTelemetryJdbcInstrumentationTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.quarkus.it.opentelemetry;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-@QuarkusTestResource(value = OracleLifecycleManager.class, restrictToAnnotatedClass = true)
-public class OracleOpenTelemetryJdbcInstrumentationTest extends OpenTelemetryJdbcInstrumentationTest {
-
-    @Test
-    @Disabled("Last oracle image is not working")
-    void testOracleQueryTraced() {
-        testQueryTraced("oracle", "OracleHit");
-    }
-
-}