From c2775dbbee11adfd449b7e20a126ae9956c40d0d Mon Sep 17 00:00:00 2001
From: Georgios Andrianakis <geoand@gmail.com>
Date: Fri, 7 Feb 2025 09:28:28 +0200
Subject: [PATCH] Move OpenTelemetry tests to dedicated module

---
 core/deployment/pom.xml                       | 15 ----
 ...ListenersProcessorNoOpentelemetryTest.java |  2 +-
 core/opentelemetry-tests/pom.xml              | 71 +++++++++++++++++++
 ...ssorAbstractSpanChatModelListenerTest.java |  2 +-
 ...rocessorOnlySpanChatModelListenerTest.java |  9 +--
 ...sorSingleChatModelSpanContributorTest.java |  9 +--
 ...essorTwoChatModelSpanContributorsTest.java |  8 +--
 core/pom.xml                                  |  1 +
 8 files changed, 80 insertions(+), 37 deletions(-)
 rename core/deployment/src/test/java/io/quarkiverse/langchain4j/test/{listeners => }/ListenersProcessorNoOpentelemetryTest.java (95%)
 create mode 100644 core/opentelemetry-tests/pom.xml
 rename core/{deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners => opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test}/ListenersProcessorAbstractSpanChatModelListenerTest.java (98%)
 rename core/{deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners => opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test}/ListenersProcessorOnlySpanChatModelListenerTest.java (70%)
 rename core/{deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners => opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test}/ListenersProcessorSingleChatModelSpanContributorTest.java (91%)
 rename core/{deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners => opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test}/ListenersProcessorTwoChatModelSpanContributorsTest.java (95%)

diff --git a/core/deployment/pom.xml b/core/deployment/pom.xml
index 995235a18..a42bdd846 100644
--- a/core/deployment/pom.xml
+++ b/core/deployment/pom.xml
@@ -112,21 +112,6 @@
             <artifactId>quarkus-test-vertx</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.opentelemetry.instrumentation</groupId>
-            <artifactId>opentelemetry-instrumentation-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>io.opentelemetry</groupId>
-          <artifactId>opentelemetry-sdk-testing</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito</artifactId>
-            <scope>test</scope>
-        </dependency>        
     </dependencies>
     <build>
         <plugins>
diff --git a/core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorNoOpentelemetryTest.java b/core/deployment/src/test/java/io/quarkiverse/langchain4j/test/ListenersProcessorNoOpentelemetryTest.java
similarity index 95%
rename from core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorNoOpentelemetryTest.java
rename to core/deployment/src/test/java/io/quarkiverse/langchain4j/test/ListenersProcessorNoOpentelemetryTest.java
index af2d014ca..ec7180caf 100644
--- a/core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorNoOpentelemetryTest.java
+++ b/core/deployment/src/test/java/io/quarkiverse/langchain4j/test/ListenersProcessorNoOpentelemetryTest.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.langchain4j.test.listeners;
+package io.quarkiverse.langchain4j.test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/core/opentelemetry-tests/pom.xml b/core/opentelemetry-tests/pom.xml
new file mode 100644
index 000000000..51e83bde4
--- /dev/null
+++ b/core/opentelemetry-tests/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkiverse.langchain4j</groupId>
+        <artifactId>quarkus-langchain4j-core-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-langchain4j-core-opentelemetry-tests</artifactId>
+    <version>999-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkiverse.langchain4j</groupId>
+            <artifactId>quarkus-langchain4j-core-deployment</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-instrumentation-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-sdk-testing</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-opentelemetry</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-mockito</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    
+</project>
diff --git a/core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorAbstractSpanChatModelListenerTest.java b/core/opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test/ListenersProcessorAbstractSpanChatModelListenerTest.java
similarity index 98%
rename from core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorAbstractSpanChatModelListenerTest.java
rename to core/opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test/ListenersProcessorAbstractSpanChatModelListenerTest.java
index 7829150e2..89466c1f7 100644
--- a/core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorAbstractSpanChatModelListenerTest.java
+++ b/core/opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test/ListenersProcessorAbstractSpanChatModelListenerTest.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.langchain4j.test.listeners;
+package io.quarkiverse.langchain4j.opentelemetry.test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
diff --git a/core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorOnlySpanChatModelListenerTest.java b/core/opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test/ListenersProcessorOnlySpanChatModelListenerTest.java
similarity index 70%
rename from core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorOnlySpanChatModelListenerTest.java
rename to core/opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test/ListenersProcessorOnlySpanChatModelListenerTest.java
index bc2929759..77b5fedb4 100644
--- a/core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorOnlySpanChatModelListenerTest.java
+++ b/core/opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test/ListenersProcessorOnlySpanChatModelListenerTest.java
@@ -1,13 +1,10 @@
-package io.quarkiverse.langchain4j.test.listeners;
+package io.quarkiverse.langchain4j.opentelemetry.test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import io.quarkus.maven.dependency.Dependency;
 import io.quarkus.test.QuarkusUnitTest;
 
 class ListenersProcessorOnlySpanChatModelListenerTest
@@ -15,9 +12,7 @@ class ListenersProcessorOnlySpanChatModelListenerTest
     @RegisterExtension
     static final QuarkusUnitTest unitTest = new QuarkusUnitTest()
             .setArchiveProducer(
-                    ListenersProcessorAbstractSpanChatModelListenerTest::appWithInMemorySpanExporter)
-            .setForcedDependencies(
-                    List.of(Dependency.of("io.quarkus", "quarkus-opentelemetry", "3.15.2")));
+                    ListenersProcessorAbstractSpanChatModelListenerTest::appWithInMemorySpanExporter);
 
     @Test
     void shouldHaveSpanChatModelListenerWithoutContributors() {
diff --git a/core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorSingleChatModelSpanContributorTest.java b/core/opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test/ListenersProcessorSingleChatModelSpanContributorTest.java
similarity index 91%
rename from core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorSingleChatModelSpanContributorTest.java
rename to core/opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test/ListenersProcessorSingleChatModelSpanContributorTest.java
index 875a00f69..6ae60ae5e 100644
--- a/core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorSingleChatModelSpanContributorTest.java
+++ b/core/opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test/ListenersProcessorSingleChatModelSpanContributorTest.java
@@ -1,9 +1,7 @@
-package io.quarkiverse.langchain4j.test.listeners;
+package io.quarkiverse.langchain4j.opentelemetry.test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-
 import jakarta.enterprise.context.ApplicationScoped;
 
 import org.junit.jupiter.api.Test;
@@ -16,7 +14,6 @@
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.quarkiverse.langchain4j.runtime.listeners.ChatModelSpanContributor;
-import io.quarkus.maven.dependency.Dependency;
 import io.quarkus.test.QuarkusUnitTest;
 
 class ListenersProcessorSingleChatModelSpanContributorTest
@@ -24,9 +21,7 @@ class ListenersProcessorSingleChatModelSpanContributorTest
     @RegisterExtension
     static final QuarkusUnitTest unitTest = new QuarkusUnitTest()
             .setArchiveProducer(
-                    () -> appWithInMemorySpanExporter().addClasses(TestChatModelSpanContributor.class))
-            .setForcedDependencies(
-                    List.of(Dependency.of("io.quarkus", "quarkus-opentelemetry", "3.15.2")));
+                    () -> appWithInMemorySpanExporter().addClasses(TestChatModelSpanContributor.class));
 
     @Test
     void shouldHaveSpanChatModelListenerWitContributor() {
diff --git a/core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorTwoChatModelSpanContributorsTest.java b/core/opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test/ListenersProcessorTwoChatModelSpanContributorsTest.java
similarity index 95%
rename from core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorTwoChatModelSpanContributorsTest.java
rename to core/opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test/ListenersProcessorTwoChatModelSpanContributorsTest.java
index e8f15d2f8..b265419d4 100644
--- a/core/deployment/src/test/java/io/quarkiverse/langchain4j/test/listeners/ListenersProcessorTwoChatModelSpanContributorsTest.java
+++ b/core/opentelemetry-tests/src/test/java/io/quarkiverse/langchain4j/opentelemetry/test/ListenersProcessorTwoChatModelSpanContributorsTest.java
@@ -1,4 +1,4 @@
-package io.quarkiverse.langchain4j.test.listeners;
+package io.quarkiverse.langchain4j.opentelemetry.test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
@@ -9,7 +9,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 
-import java.util.List;
 import java.util.function.BiConsumer;
 
 import jakarta.enterprise.context.ApplicationScoped;
@@ -25,7 +24,6 @@
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.internal.data.ExceptionEventData;
 import io.quarkiverse.langchain4j.runtime.listeners.ChatModelSpanContributor;
-import io.quarkus.maven.dependency.Dependency;
 import io.quarkus.test.QuarkusUnitTest;
 
 class ListenersProcessorTwoChatModelSpanContributorsTest
@@ -36,9 +34,7 @@ class ListenersProcessorTwoChatModelSpanContributorsTest
                     () -> appWithInMemorySpanExporter()
                             .addClasses(
                                     FirstChatModelSpanContributor.class,
-                                    SecondChatModelSpanContributor.class))
-            .setForcedDependencies(
-                    List.of(Dependency.of("io.quarkus", "quarkus-opentelemetry", "3.15.2")));
+                                    SecondChatModelSpanContributor.class));
 
     static BiConsumer<ChatModelRequestContext, Span> onRequest;
     static BiConsumer<ChatModelResponseContext, Span> onResponse;
diff --git a/core/pom.xml b/core/pom.xml
index 9201a2bbf..fead625b9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -14,6 +14,7 @@
         <module>deployment</module>
         <module>runtime</module>
         <module>runtime-spi</module>
+        <module>opentelemetry-tests</module>
     </modules>
     
 </project>