(camel-quarkus) 27/33: Fixed micrometer in native because of CAMEL-20525

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit b0c09af0875def48fe5e8f49202c605bc25de90f
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Fri Mar 15 15:29:17 2024 +0100

    Fixed micrometer in native because of CAMEL-20525
---
 .../quarkus/component/micrometer/it/MicrometerResource.java |  2 --
 .../quarkus/component/micrometer/it/MicrometerTest.java     | 13 +++++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
index 4ea2d11460..a4dcff44e5 100644
--- a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
+++ b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
@@ -42,11 +42,9 @@ import org.apache.camel.component.micrometer.MicrometerComponent;
 import org.apache.camel.component.micrometer.MicrometerConstants;
 import org.apache.camel.component.micrometer.eventnotifier.MicrometerEventNotifierService;
 import org.apache.camel.component.micrometer.messagehistory.MicrometerMessageHistoryService;
-import org.jboss.logging.Logger;
 
 @Path("/micrometer")
 public class MicrometerResource {
-    private static final Logger LOG = Logger.getLogger(MicrometerResource.class);
 
     @Inject
     ProducerTemplate producerTemplate;
diff --git a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
index e5f978d2c7..ec18e5aa14 100644
--- a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
+++ b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
@@ -34,7 +34,6 @@ import io.restassured.RestAssured;
 import io.restassured.path.json.JsonPath;
 import org.awaitility.Awaitility;
 import org.hamcrest.Matchers;
-import org.jboss.logging.Logger;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -45,7 +44,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @QuarkusTest
 class MicrometerTest extends AbstractMicrometerTest {
-    private static final Logger LOG = Logger.getLogger(MicrometerTest.class);
 
     @Test
     public void testMicrometerMetricsCounter() throws Exception {
@@ -200,16 +198,15 @@ class MicrometerTest extends AbstractMicrometerTest {
             //convert to simpler map
             Map<String, Integer> filteredResult = result.entrySet().stream()
                     .collect(Collectors.toMap(e -> e.getKey().toString(), e2 -> e2.getValue()));
-            //remove prometheus tags
-            filteredResult.keySet().removeIf(k -> k.contains("customTag=prometheus"));
-            //keep only dumpAsJson routeId
-            filteredResult.keySet().removeIf(k -> !k.contains("routeId=dumpAsJson"));
-            //keep only `ExchangeCompletedEvent`
-            filteredResult.keySet().removeIf(k -> !k.contains("eventType=ExchangeCompletedEvent"));
+            //remove non-prometheus tags, keep only dumpAsJson routeId for status ExchangeCompletedEvent
+            filteredResult.keySet().removeIf(k -> !k.contains("customTag=prometheus")
+                    || !k.contains("routeId=dumpAsJson")
+                    || k.contains("eventType=ExchangeCompletedEvent"));
 
             //assert results
             return filteredResult.values().stream().map(String::valueOf).collect(Collectors.joining());
         },
+                //1 exchange with completed status should be caught
                 Matchers.is("1"));
     }