Merge pull request #655 from Ladicek/fix-cb-telemetry-test

baseline metrics in CircuitBreakerTelemetryTest

Author: Azquelt

tck/src/main/java/org/eclipse/microprofile/fault/tolerance/tck/metrics/CircuitBreakerMetricTest.java

@@ -44,7 +44,7 @@
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import jakarta.inject.Inject;
@@ -75,7 +75,7 @@ public static WebArchive deploy() {
     @Inject
     private CircuitBreakerMetricBean cbBean;
 
-    @BeforeTest
+    @BeforeMethod
     public void closeTheCircuit() throws Exception {
 
         // Condition is needed because BeforeTest runs on both client and server

tck/src/main/java/org/eclipse/microprofile/fault/tolerance/tck/telemetryMetrics/CircuitBreakerTelemetryTest.java

@@ -53,7 +53,7 @@
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
@@ -90,7 +90,7 @@ public static WebArchive deploy() {
     @Inject
     private CircuitBreakerMetricBean cbBean;
 
-    @BeforeTest
+    @BeforeMethod
     public void closeTheCircuit() throws Exception {
 
         // Condition is needed because BeforeTest runs on both client and server
@@ -120,6 +120,7 @@ public void closeTheCircuit() throws Exception {
     @Test
     public void testCircuitBreakerMetric() throws Exception {
         TelemetryMetricGetter m = new TelemetryMetricGetter(CircuitBreakerMetricBean.class, "doWork");
+        m.baselineMetrics();
 
         // First failure, circuit remains closed
         expectTestException(() -> cbBean.doWork(Result.FAIL));