all but session metrics covered

Author: SylvainJuge

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/WildflyIntegrationTest.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.contrib.jmxscraper.target_systems;
 
+import static io.opentelemetry.contrib.jmxscraper.target_systems.MetricAssertions.assertSum;
 import static io.opentelemetry.contrib.jmxscraper.target_systems.MetricAssertions.assertSumWithAttributes;
 import static org.assertj.core.api.Assertions.entry;
 
@@ -126,6 +127,39 @@ protected void verifyMetrics() {
                     attrs.containsOnly(
                         entry("server", "default-server"),
                         entry("listener", "default"),
-                        entry("state", "out"))));
+                        entry("state", "out"))),
+        metric ->
+            assertSumWithAttributes(
+                metric,
+                "wildfly.jdbc.connection.open",
+                "The number of open jdbc connections.",
+                "{connection}",
+                attrs ->
+                    attrs.containsOnly(entry("data_source", "ExampleDS"), entry("state", "active")),
+                attrs ->
+                    attrs.containsOnly(entry("data_source", "ExampleDS"), entry("state", "idle"))),
+        metric ->
+            assertSumWithAttributes(
+                metric,
+                "wildfly.jdbc.request.wait",
+                "The number of jdbc connections that had to wait before opening.",
+                "{request}",
+                attrs -> attrs.containsOnly(entry("data_source", "ExampleDS"))),
+        metric ->
+            assertSum(
+                metric,
+                "wildfly.jdbc.transaction.count",
+                "The number of transactions created.",
+                "{transaction}"),
+        metric ->
+            assertSumWithAttributes(
+                metric,
+                "wildfly.jdbc.rollback.count",
+                "The number of transactions rolled back.",
+                "{transaction}",
+                attrs -> attrs.containsOnly(entry("cause", "system")),
+                attrs -> attrs.containsOnly(entry("cause", "resource")),
+                attrs -> attrs.containsOnly(entry("cause", "application")))
+    );
   }
 }

jmx-scraper/src/main/resources/wildfly.yaml

@@ -2,16 +2,6 @@
 
 rules:
 
-  # TODO: sessions are not tested in the original groovy implementation
-  - bean: jboss.as:deployment=*,subsystem=undertow
-    metricAttribute:
-      deployment: param(deployment)
-    mapping:
-      sessionsCreated:
-        metric: wildfly.session.count
-        unit: "{session}"
-        desc: The number of sessions created.
-
   - bean: jboss.as:subsystem=undertow,server=*,http-listener=*
     metricAttribute:
       server: param(server)
@@ -43,3 +33,50 @@ rules:
         desc: "The number of bytes transmitted."
         metricAttribute:
           state: const(in)
+
+  - bean: jboss.as:subsystem=datasources,data-source=*,statistics=pool
+    metricAttribute:
+      data_source: param(data-source)
+    type: counter
+    prefix: wildfly.jdbc.
+    mapping:
+      ActiveCount:
+        metric: connection.open
+        unit: "{connection}"
+        desc: The number of open jdbc connections.
+        metricAttribute:
+          state: const(active)
+      IdleCount:
+        metric: connection.open
+        unit: "{connection}"
+        desc: The number of open jdbc connections.
+        metricAttribute:
+          state: const(idle)
+      WaitCount:
+        metric: request.wait
+        unit: "{request}"
+        desc: The number of jdbc connections that had to wait before opening.
+
+  - bean: jboss.as:subsystem=transactions
+    prefix: wildfly.jdbc.
+    unit: "{transaction}"
+    type: counter
+    mapping:
+      numberOfTransactions:
+        metric: transaction.count
+        desc: The number of transactions created.
+      numberOfSystemRollbacks:
+        metric: rollback.count
+        desc: The number of transactions rolled back.
+        metricAttribute:
+          cause: const(system)
+      numberOfResourceRollbacks:
+        metric: rollback.count
+        desc: The number of transactions rolled back.
+        metricAttribute:
+          cause: const(resource)
+      numberOfApplicationRollbacks:
+        metric: rollback.count
+        desc: The number of transactions rolled back.
+        metricAttribute:
+          cause: const(application)