Fix Fault Tolerance multiple metrics provider test

Split OTel relatedconfiguration APIs to OpenTelemetryServerCOnfiguration
jboss-eap-qe · Dec 6, 2024 · 1c12a81 · 1c12a81
1 parent 622d336
commit 1c12a81
Show file tree

Hide file tree

Showing 6 changed files with 254 additions and 208 deletions.
diff --git a/microprofile-fault-tolerance/pom.xml b/microprofile-fault-tolerance/pom.xml
@@ -146,6 +146,7 @@
                                     <layers>
                                         <layer>cloud-server</layer>
                                         <layer>microprofile-fault-tolerance</layer>
+                                        <layer>micrometer</layer>
                                     </layers>
                                 </configuration>
                             </execution>

diff --git a/...rance/src/test/java/org/jboss/eap/qe/microprofile/fault/tolerance/UndeployDeployTest.java b/...rance/src/test/java/org/jboss/eap/qe/microprofile/fault/tolerance/UndeployDeployTest.java
@@ -17,6 +17,7 @@
 import org.jboss.eap.qe.microprofile.common.setuptasks.MicroProfileFaultToleranceServerConfiguration;
 import org.jboss.eap.qe.microprofile.common.setuptasks.MicroProfileTelemetryServerConfiguration;
 import org.jboss.eap.qe.microprofile.common.setuptasks.MicrometerServerConfiguration;
+import org.jboss.eap.qe.microprofile.common.setuptasks.OpenTelemetryServerConfiguration;
 import org.jboss.eap.qe.microprofile.fault.tolerance.deployments.v10.HelloService;
 import org.jboss.eap.qe.microprofile.tooling.server.configuration.creaper.ManagementClientProvider;
 import org.jboss.eap.qe.microprofile.tooling.server.configuration.deployment.ConfigurationUtil;
@@ -142,8 +143,8 @@ public void testFaultToleranceMetricsAreTracedWithSameDeployments(
             otelCollector.start();
             try {
                 // Enable MP Telemetry based metrics, which rely on OpenTelemetry subsystem
-                MicroProfileTelemetryServerConfiguration.enableOpenTelemetry();
-                MicroProfileTelemetryServerConfiguration
+                OpenTelemetryServerConfiguration.enableOpenTelemetry();
+                OpenTelemetryServerConfiguration
                         .addOpenTelemetryCollectorConfiguration(otelCollector.getOtlpGrpcEndpoint());
                 MicroProfileTelemetryServerConfiguration.enableMicroProfileTelemetry();
                 try {
@@ -213,7 +214,7 @@ public void testFaultToleranceMetricsAreTracedWithSameDeployments(
                 } finally {
                     // disable MP Telemetry based metrics
                     MicroProfileTelemetryServerConfiguration.disableMicroProfileTelemetry();
-                    MicroProfileTelemetryServerConfiguration.disableOpenTelemetry();
+                    OpenTelemetryServerConfiguration.disableOpenTelemetry();
                 }
             } finally {
                 // stop the OTel collector container