[WFLY-19351] Add Micrometer test to verify that applications with shared metrics names are not merged when exported #17898

jasondlee · 2024-05-20T22:13:48Z

https://issues.redhat.com/browse/WFLY-19351

Add test with multiple war deployments
Add test with ear with multiple war subdeployments
Rework how Prometheus metrics are retrieved and handled
Add test to verify that metrics with identical names are exported separately

More information about the wildfly-bot[bot]

bstansberry

@jasondlee I made a bunch of code style comments but the substantive change LGTM.

...ile/src/test/java/org/wildfly/test/integration/observability/container/PrometheusMetric.java

...org/wildfly/test/integration/observability/micrometer/MicrometerOtelIntegrationTestCase.java

...ava/org/wildfly/test/integration/observability/micrometer/multiple/BaseMultipleTestCase.java

...java/org/wildfly/test/integration/observability/micrometer/multiple/MultipleWarTestCase.java

...test/integration/observability/micrometer/multiple/application/DuplicateMetricResource1.java

...test/integration/observability/micrometer/multiple/application/DuplicateMetricResource2.java

.../wildfly/test/integration/observability/micrometer/multiple/application/TestApplication.java

jasondlee · 2024-06-10T20:51:41Z

@jasondlee I made a bunch of code style comments but the substantive change LGTM.

Thanks. I'll get these updated as soon as I can.

jasondlee · 2024-06-11T01:13:12Z

@bstansberry All changes should be address 'cept for the import order. Those have been updated, but I'll wait to resolve those until I can confirm I have the right order. :)

@jasondlee

@jasondlee I'm withdrawing my approval because the tests are failing.

jasondlee · 2024-06-24T19:26:33Z

@jasondlee I'm withdrawing my approval because the tests are failing.

@bstansberry You're so picky. :) I've been reworking the tests so they should be more stable. Will be pushing an update "soon"

bstansberry

@jasondlee There are new missing header issues and import reordering issues.

...profile/src/test/java/org/wildfly/test/integration/observability/TestContainersEnricher.java

bstansberry

@darranl This LGTM but I put the 'hold' label on it with the idea that until we tag 33 Beta you can decide whether to merge or let it wait for the tag.

@jasondlee Until merged, perhaps do a retest every now and then

bstansberry · 2024-07-09T20:12:19Z

...java/org/wildfly/test/integration/observability/micrometer/multiple/MultipleWarTestCase.java

+import org.wildfly.test.integration.observability.micrometer.multiple.application.TestApplication;
+
+public class MultipleWarTestCase extends BaseMultipleTestCase {
+    @Deployment(name = SERVICE_ONE, order = 1)


add 'testable=false' to this to avoid this stuff in the logs:

2024-07-09 19:14:48,680 WARN [org.jboss.modules.define] (Weld Thread Pool -- 2) Failed to define class org.wildfly.test.integration.observability.micrometer.multiple.MultipleWarTestCase in Module "deployment.service-one.war" from Service Module Loader: java.lang.NoClassDefFoundError: Failed to link org/wildfly/test/integration/observability/micrometer/multiple/MultipleWarTestCase (Module "deployment.service-one.war" from Service Module Loader): org/wildfly/test/integration/observability/micrometer/multiple/BaseMultipleTestCase at java.base/java.lang.ClassLoader.defineClass1(Native Method) at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1022) at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1101) at org.jboss.modules.ModuleClassLoader.doDefineOrLoadClass(ModuleClassLoader.java:351) at org.jboss.modules.ModuleClassLoader.defineClass(ModuleClassLoader.java:482) at org.jboss.modules.ModuleClassLoader.loadClassLocal(ModuleClassLoader.java:276) at org.jboss.modules.ModuleClassLoader$1.loadClassLocal(ModuleClassLoader.java:79) at org.jboss.modules.Module.loadModuleClass(Module.java:798) at org.jboss.modules.ModuleClassLoader.findClass(ModuleClassLoader.java:192) at org.jboss.modules.ConcurrentClassLoader.performLoadClassUnchecked(ConcurrentClassLoader.java:408) at org.jboss.modules.ConcurrentClassLoader.performLoadClass(ConcurrentClassLoader.java:396) at org.jboss.modules.ConcurrentClassLoader.loadClass(ConcurrentClassLoader.java:115) at org.jboss.as.weld@33.0.0.Final-SNAPSHOT//org.jboss.as.weld.WeldModuleResourceLoader.classForName(WeldModuleResourceLoader.java:51) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.bootstrap.AnnotatedTypeLoader.loadClass(AnnotatedTypeLoader.java:86) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.bootstrap.AnnotatedTypeLoader.loadAnnotatedType(AnnotatedTypeLoader.java:65) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.bootstrap.FastAnnotatedTypeLoader.loadAnnotatedType(FastAnnotatedTypeLoader.java:112) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.bootstrap.BeanDeployer.addClass(BeanDeployer.java:87) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.bootstrap.ConcurrentBeanDeployer$1.doWork(ConcurrentBeanDeployer.java:55) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.bootstrap.ConcurrentBeanDeployer$1.doWork(ConcurrentBeanDeployer.java:52) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.executor.IterativeWorkerTaskFactory$1.call(IterativeWorkerTaskFactory.java:62) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.executor.IterativeWorkerTaskFactory$1.call(IterativeWorkerTaskFactory.java:55) at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) at java.base/java.lang.Thread.run(Thread.java:829) at org.jboss.threads@2.4.0.Final//org.jboss.threads.JBossThread.run(JBossThread.java:513) Caused by: java.lang.ClassNotFoundException: org.wildfly.test.integration.observability.micrometer.multiple.BaseMultipleTestCase from [Module "deployment.service-one.war" from Service Module Loader] at org.jboss.modules.ModuleClassLoader.findClass(ModuleClassLoader.java:200) at org.jboss.modules.ConcurrentClassLoader.performLoadClassUnchecked(ConcurrentClassLoader.java:408) at org.jboss.modules.ConcurrentClassLoader.performLoadClass(ConcurrentClassLoader.java:396) at org.jboss.modules.ConcurrentClassLoader.loadClass(ConcurrentClassLoader.java:115) ... 26 more

bstansberry · 2024-07-09T20:12:45Z

...java/org/wildfly/test/integration/observability/micrometer/multiple/MultipleWarTestCase.java

+
+    }
+
+    @Deployment(name = SERVICE_TWO, order = 2)


add 'testable=false' to this to avoid this stuff in the logs:

2024-07-09 19:14:49,030 WARN [org.jboss.modules.define] (Weld Thread Pool -- 2) Failed to define class org.wildfly.test.integration.observability.micrometer.multiple.MultipleWarTestCase in Module "deployment.service-two.war" from Service Module Loader: java.lang.NoClassDefFoundError: Failed to link org/wildfly/test/integration/observability/micrometer/multiple/MultipleWarTestCase (Module "deployment.service-two.war" from Service Module Loader): org/wildfly/test/integration/observability/micrometer/multiple/BaseMultipleTestCase at java.base/java.lang.ClassLoader.defineClass1(Native Method) at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1022) at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1101) at org.jboss.modules.ModuleClassLoader.doDefineOrLoadClass(ModuleClassLoader.java:351) at org.jboss.modules.ModuleClassLoader.defineClass(ModuleClassLoader.java:482) at org.jboss.modules.ModuleClassLoader.loadClassLocal(ModuleClassLoader.java:276) at org.jboss.modules.ModuleClassLoader$1.loadClassLocal(ModuleClassLoader.java:79) at org.jboss.modules.Module.loadModuleClass(Module.java:798) at org.jboss.modules.ModuleClassLoader.findClass(ModuleClassLoader.java:192) at org.jboss.modules.ConcurrentClassLoader.performLoadClassUnchecked(ConcurrentClassLoader.java:408) at org.jboss.modules.ConcurrentClassLoader.performLoadClass(ConcurrentClassLoader.java:396) at org.jboss.modules.ConcurrentClassLoader.loadClass(ConcurrentClassLoader.java:115) at org.jboss.as.weld@33.0.0.Final-SNAPSHOT//org.jboss.as.weld.WeldModuleResourceLoader.classForName(WeldModuleResourceLoader.java:51) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.bootstrap.AnnotatedTypeLoader.loadClass(AnnotatedTypeLoader.java:86) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.bootstrap.AnnotatedTypeLoader.loadAnnotatedType(AnnotatedTypeLoader.java:65) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.bootstrap.FastAnnotatedTypeLoader.loadAnnotatedType(FastAnnotatedTypeLoader.java:112) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.bootstrap.BeanDeployer.addClass(BeanDeployer.java:87) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.bootstrap.ConcurrentBeanDeployer$1.doWork(ConcurrentBeanDeployer.java:55) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.bootstrap.ConcurrentBeanDeployer$1.doWork(ConcurrentBeanDeployer.java:52) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.executor.IterativeWorkerTaskFactory$1.call(IterativeWorkerTaskFactory.java:62) at org.jboss.weld.core@5.1.2.Final//org.jboss.weld.executor.IterativeWorkerTaskFactory$1.call(IterativeWorkerTaskFactory.java:55) at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) at java.base/java.lang.Thread.run(Thread.java:829) at org.jboss.threads@2.4.0.Final//org.jboss.threads.JBossThread.run(JBossThread.java:513) Caused by: java.lang.ClassNotFoundException: org.wildfly.test.integration.observability.micrometer.multiple.BaseMultipleTestCase from [Module "deployment.service-two.war" from Service Module Loader] at org.jboss.modules.ModuleClassLoader.findClass(ModuleClassLoader.java:200) at org.jboss.modules.ConcurrentClassLoader.performLoadClassUnchecked(ConcurrentClassLoader.java:408) at org.jboss.modules.ConcurrentClassLoader.performLoadClass(ConcurrentClassLoader.java:396) at org.jboss.modules.ConcurrentClassLoader.loadClass(ConcurrentClassLoader.java:115) ... 26 more

…red metrics names are not merged when exported Add test with multiple war deployments Add test with ear with multiple war subdeployments Rework how Prometheus metrics are retrieved and handled Add test to verify that metrics with identical names are exported separately Add a TestEnricher to manage lifecycle and injection of the Otel container

jasondlee force-pushed the WFLY-19351 branch from b8ce252 to f732f38 Compare May 21, 2024 14:59

jasondlee requested a review from bstansberry June 6, 2024 14:53

bstansberry requested changes Jun 7, 2024

View reviewed changes

jasondlee force-pushed the WFLY-19351 branch from f732f38 to 3ed7fba Compare June 11, 2024 01:11

jasondlee force-pushed the WFLY-19351 branch 2 times, most recently from bbec34b to c939c38 Compare June 12, 2024 13:55

jasondlee requested a review from bstansberry June 12, 2024 15:57

jasondlee force-pushed the WFLY-19351 branch from c939c38 to 5c3ae15 Compare June 13, 2024 15:28

bstansberry previously approved these changes Jun 13, 2024

View reviewed changes

fabiobrz mentioned this pull request Jun 17, 2024

Add micrometer tests jboss-eap-qe/eap-microprofile-test-suite#289

Merged

6 tasks

jasondlee force-pushed the WFLY-19351 branch 4 times, most recently from 496bc27 to 8bd50a0 Compare June 25, 2024 01:36

jasondlee requested a review from bstansberry June 25, 2024 12:26

bstansberry requested changes Jun 25, 2024

View reviewed changes

jasondlee force-pushed the WFLY-19351 branch from 8bd50a0 to 084be58 Compare June 25, 2024 14:24

jasondlee requested a review from bstansberry June 25, 2024 14:33

bstansberry reviewed Jun 25, 2024

View reviewed changes

...profile/src/test/java/org/wildfly/test/integration/observability/TestContainersEnricher.java Outdated Show resolved Hide resolved

bstansberry reviewed Jun 25, 2024

View reviewed changes

...profile/src/test/java/org/wildfly/test/integration/observability/TestContainersEnricher.java Outdated Show resolved Hide resolved

bstansberry reviewed Jun 25, 2024

View reviewed changes

...profile/src/test/java/org/wildfly/test/integration/observability/TestContainersEnricher.java Outdated Show resolved Hide resolved

jasondlee force-pushed the WFLY-19351 branch from 084be58 to a046ebd Compare June 27, 2024 16:39

jasondlee requested a review from bstansberry June 27, 2024 16:41

jasondlee force-pushed the WFLY-19351 branch from a046ebd to daf50c4 Compare June 27, 2024 23:16

bstansberry added the hold PR should not be merged for some reason. label Jun 28, 2024

bstansberry approved these changes Jun 28, 2024

View reviewed changes

jasondlee force-pushed the WFLY-19351 branch 2 times, most recently from 96638c1 to 94b7b78 Compare July 2, 2024 13:50

jasondlee force-pushed the WFLY-19351 branch from 94b7b78 to 4f912a1 Compare July 9, 2024 18:24

bstansberry added 33.x WildFly 33 and removed hold PR should not be merged for some reason. labels Jul 9, 2024

bstansberry reviewed Jul 9, 2024

View reviewed changes

jasondlee force-pushed the WFLY-19351 branch from 4f912a1 to 67e89f5 Compare July 9, 2024 21:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WFLY-19351] Add Micrometer test to verify that applications with shared metrics names are not merged when exported #17898

[WFLY-19351] Add Micrometer test to verify that applications with shared metrics names are not merged when exported #17898

jasondlee commented May 20, 2024 •

edited by wildfly-bot bot

Loading

bstansberry left a comment

jasondlee commented Jun 10, 2024

jasondlee commented Jun 11, 2024

jasondlee commented Jun 24, 2024

bstansberry left a comment

bstansberry left a comment

bstansberry Jul 9, 2024

bstansberry Jul 9, 2024

[WFLY-19351] Add Micrometer test to verify that applications with shared metrics names are not merged when exported #17898

Are you sure you want to change the base?

[WFLY-19351] Add Micrometer test to verify that applications with shared metrics names are not merged when exported #17898

Conversation

jasondlee commented May 20, 2024 • edited by wildfly-bot bot Loading

bstansberry left a comment

Choose a reason for hiding this comment

jasondlee commented Jun 10, 2024

jasondlee commented Jun 11, 2024

jasondlee commented Jun 24, 2024

bstansberry left a comment

Choose a reason for hiding this comment

bstansberry left a comment

Choose a reason for hiding this comment

bstansberry Jul 9, 2024

Choose a reason for hiding this comment

bstansberry Jul 9, 2024

Choose a reason for hiding this comment

jasondlee commented May 20, 2024 •

edited by wildfly-bot bot

Loading