add wildfly.yaml to JMX scraper

jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/WildflyIntegrationTest.java

@@ -54,7 +54,7 @@ void endToEnd() {
                 metric,
                 "wildfly.request.count",
                 "The number of requests received.",
-                "{requests}",
+                "{request}",
                 attrs ->
                     attrs.containsOnly(
                         entry("server", "default-server"), entry("listener", "default"))),
@@ -72,7 +72,7 @@ void endToEnd() {
                 metric,
                 "wildfly.request.server_error",
                 "The number of requests that have resulted in a 5xx response.",
-                "{requests}",
+                "{request}",
                 attrs ->
                     attrs.containsOnly(
                         entry("server", "default-server"), entry("listener", "default"))),
@@ -92,12 +92,14 @@ void endToEnd() {
                         entry("server", "default-server"),
                         entry("listener", "default"),
                         entry("state", "out"))),
+
+        // TODO from here:
         metric ->
             assertSumWithAttributes(
                 metric,
                 "wildfly.jdbc.connection.open",
                 "The number of open jdbc connections.",
-                "{connections}",
+                "{connection}",
                 attrs ->
                     attrs.containsOnly(entry("data_source", "ExampleDS"), entry("state", "active")),
                 attrs ->
@@ -107,20 +109,20 @@ void endToEnd() {
                 metric,
                 "wildfly.jdbc.request.wait",
                 "The number of jdbc connections that had to wait before opening.",
-                "{requests}",
+                "{request}",
                 attrs -> attrs.containsOnly(entry("data_source", "ExampleDS"))),
         metric ->
             assertSum(
                 metric,
                 "wildfly.jdbc.transaction.count",
                 "The number of transactions created.",
-                "{transactions}"),
+                "{transaction}"),
         metric ->
             assertSumWithAttributes(
                 metric,
                 "wildfly.jdbc.rollback.count",
                 "The number of transactions rolled back.",
-                "{transactions}",
+                "{transaction}",
                 attrs -> attrs.containsOnly(entry("cause", "system")),
                 attrs -> attrs.containsOnly(entry("cause", "resource")),
                 attrs -> attrs.containsOnly(entry("cause", "application"))));

jmx-metrics/src/main/resources/target-systems/wildfly.groovy

@@ -15,27 +15,31 @@
  */
 
 def beanWildflyDeployment = otel.mbeans("jboss.as:deployment=*,subsystem=undertow")
-otel.instrument(beanWildflyDeployment, "wildfly.session.count", "The number of sessions created.", "{sessions}",
+// no test covers sessions
+otel.instrument(beanWildflyDeployment, "wildfly.session.count", "The number of sessions created.", "{session}",
   ["deployment": { mbean -> mbean.name().getKeyProperty("deployment")}],
   "sessionsCreated", otel.&longCounterCallback)
-otel.instrument(beanWildflyDeployment, "wildfly.session.active", "The number of currently active sessions.", "{sessions}",
+
+otel.instrument(beanWildflyDeployment, "wildfly.session.active", "The number of currently active sessions.", "{session}",
   ["deployment": { mbean -> mbean.name().getKeyProperty("deployment")}],
   "activeSessions", otel.&longUpDownCounterCallback)
-otel.instrument(beanWildflyDeployment, "wildfly.session.expired", "The number of sessions that have expired.", "{sessions}",
+otel.instrument(beanWildflyDeployment, "wildfly.session.expired", "The number of sessions that have expired.", "{session}",
   ["deployment": { mbean -> mbean.name().getKeyProperty("deployment")}],
   "expiredSessions", otel.&longCounterCallback)
-otel.instrument(beanWildflyDeployment, "wildfly.session.rejected", "The number of sessions that have been rejected.", "{sessions}",
+otel.instrument(beanWildflyDeployment, "wildfly.session.rejected", "The number of sessions that have been rejected.", "{session}",
   ["deployment": { mbean -> mbean.name().getKeyProperty("deployment")}],
   "rejectedSessions", otel.&longCounterCallback)
 
+
+
 def beanWildflyHttpListener = otel.mbeans("jboss.as:subsystem=undertow,server=*,http-listener=*")
-otel.instrument(beanWildflyHttpListener, "wildfly.request.count", "The number of requests received.", "{requests}",
+otel.instrument(beanWildflyHttpListener, "wildfly.request.count", "The number of requests received.", "{request}",
   ["server": { mbean -> mbean.name().getKeyProperty("server")}, "listener": { mbean -> mbean.name().getKeyProperty("http-listener")}],
   "requestCount", otel.&longCounterCallback)
 otel.instrument(beanWildflyHttpListener, "wildfly.request.time", "The total amount of time spent on requests.", "ns",
   ["server": { mbean -> mbean.name().getKeyProperty("server")}, "listener": { mbean -> mbean.name().getKeyProperty("http-listener")}],
   "processingTime", otel.&longCounterCallback)
-otel.instrument(beanWildflyHttpListener, "wildfly.request.server_error", "The number of requests that have resulted in a 5xx response.", "{requests}",
+otel.instrument(beanWildflyHttpListener, "wildfly.request.server_error", "The number of requests that have resulted in a 5xx response.", "{request}",
   ["server": { mbean -> mbean.name().getKeyProperty("server")}, "listener": { mbean -> mbean.name().getKeyProperty("http-listener")}],
   "errorCount", otel.&longCounterCallback)
 otel.instrument(beanWildflyHttpListener, "wildfly.network.io", "The number of bytes transmitted.", "by",
@@ -44,17 +48,17 @@ otel.instrument(beanWildflyHttpListener, "wildfly.network.io", "The number of by
   otel.&longCounterCallback)
 
 def beanWildflyDataSource = otel.mbeans("jboss.as:subsystem=datasources,data-source=*,statistics=pool")
-otel.instrument(beanWildflyDataSource, "wildfly.jdbc.connection.open", "The number of open jdbc connections.", "{connections}",
+otel.instrument(beanWildflyDataSource, "wildfly.jdbc.connection.open", "The number of open jdbc connections.", "{connection}",
   ["data_source": { mbean -> mbean.name().getKeyProperty("data-source")}],
   ["ActiveCount":["state":{"active"}], "IdleCount":["state":{"idle"}]],
   otel.&longUpDownCounterCallback)
-otel.instrument(beanWildflyDataSource, "wildfly.jdbc.request.wait", "The number of jdbc connections that had to wait before opening.", "{requests}",
+otel.instrument(beanWildflyDataSource, "wildfly.jdbc.request.wait", "The number of jdbc connections that had to wait before opening.", "{request}",
   ["data_source": { mbean -> mbean.name().getKeyProperty("data-source")}],
   "WaitCount", otel.&longCounterCallback)
 
 def beanWildflyTransaction = otel.mbean("jboss.as:subsystem=transactions")
-otel.instrument(beanWildflyTransaction, "wildfly.jdbc.transaction.count", "The number of transactions created.", "{transactions}",
+otel.instrument(beanWildflyTransaction, "wildfly.jdbc.transaction.count", "The number of transactions created.", "{transaction}",
   "numberOfTransactions", otel.&longCounterCallback)
-otel.instrument(beanWildflyTransaction, "wildfly.jdbc.rollback.count", "The number of transactions rolled back.", "{transactions}",
+otel.instrument(beanWildflyTransaction, "wildfly.jdbc.rollback.count", "The number of transactions rolled back.", "{transaction}",
   ["numberOfSystemRollbacks":["cause":{"system"}], "numberOfResourceRollbacks":["cause":{"resource"}], "numberOfApplicationRollbacks":["cause":{"application"}]],
   otel.&longCounterCallback)

jmx-scraper/build.gradle.kts

@@ -60,9 +60,16 @@ tasks {
 
   withType<Test>().configureEach {
     dependsOn(shadowJar)
-    dependsOn(named("appJar"))
     systemProperty("shadow.jar.path", shadowJar.get().archiveFile.get().asFile.absolutePath)
-    systemProperty("app.jar.path", named<Jar>("appJar").get().archiveFile.get().asFile.absolutePath)
+
+    val testAppTask = project("test-app").tasks.named<Jar>("jar")
+    dependsOn(testAppTask)
+    systemProperty("app.jar.path", testAppTask.get().archiveFile.get().asFile.absolutePath)
+
+    val testWarTask = project("test-webapp").tasks.named<Jar>("war")
+    dependsOn(testWarTask)
+    systemProperty("app.war.path", testWarTask.get().archiveFile.get().asFile.absolutePath)
+
     systemProperty("gradle.project.version", "${project.version}")
   }
 
@@ -74,14 +81,6 @@ tasks {
   }
 }
 
-tasks.register<Jar>("appJar") {
-  from(sourceSets.get("integrationTest").output)
-  archiveClassifier.set("app")
-  manifest {
-    attributes["Main-Class"] = "io.opentelemetry.contrib.jmxscraper.TestApp"
-  }
-}
-
 // Don't publish non-shadowed jar (shadowJar is in shadowRuntimeElements)
 with(components["java"] as AdhocComponentWithVariants) {
   configurations.forEach {

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

@@ -50,7 +50,8 @@ void loginPwdAuth() {
       testConnector(
           () ->
               JmxConnectorBuilder.createNew(app.getHost(), app.getMappedPort(port))
-                  .userCredentials(login, pwd)
+                  .withUser(login)
+                  .withPassword(pwd)
                   .build());
     }
   }
@@ -75,7 +76,7 @@ private static void testConnector(ConnectorSupplier connectorSupplier) {
           .satisfies(
               connection -> {
                 try {
-                  ObjectName name = new ObjectName(TestApp.OBJECT_NAME);
+                  ObjectName name = new ObjectName("io.opentelemetry.test:name=TestApp");
                   Object value = connection.getAttribute(name, "IntValue");
                   assertThat(value).isEqualTo(42);
                 } catch (Exception e) {

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

@@ -26,9 +26,12 @@ public class JmxScraperContainer extends GenericContainer<JmxScraperContainer> {
   private String serviceUrl;
   private int intervalMillis;
   private final Set<String> customYamlFiles;
+  private String user;
+  private String password;
+  private final List<String> extraJars;
 
-  public JmxScraperContainer(String otlpEndpoint) {
-    super("openjdk:8u342-jre-slim");
+  public JmxScraperContainer(String otlpEndpoint, String baseImage) {
+    super(baseImage);
 
     String scraperJarPath = System.getProperty("shadow.jar.path");
     assertThat(scraperJarPath).isNotNull();
@@ -42,6 +45,7 @@ public JmxScraperContainer(String otlpEndpoint) {
     this.targetSystems = new HashSet<>();
     this.customYamlFiles = new HashSet<>();
     this.intervalMillis = 1000;
+    this.extraJars = new ArrayList<>();
   }
 
   @CanIgnoreReturnValue
@@ -57,11 +61,52 @@ public JmxScraperContainer withIntervalMillis(int intervalMillis) {
   }
 
   @CanIgnoreReturnValue
-  public JmxScraperContainer withService(String host, int port) {
+  public JmxScraperContainer withRmiServiceUrl(String host, int port) {
     // TODO: adding a way to provide 'host:port' syntax would make this easier for end users
-    this.serviceUrl =
+    return withServiceUrl(
         String.format(
-            Locale.getDefault(), "service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi", host, port);
+            Locale.getDefault(), "service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi", host, port));
+  }
+
+  @CanIgnoreReturnValue
+  public JmxScraperContainer withServiceUrl(String serviceUrl) {
+    this.serviceUrl = serviceUrl;
+    return this;
+  }
+
+  /**
+   * Sets JMX user login
+   *
+   * @param user user login
+   * @return this
+   */
+  @CanIgnoreReturnValue
+  public JmxScraperContainer withUser(String user) {
+    this.user = user;
+    return this;
+  }
+
+  /**
+   * Sets JMX password
+   *
+   * @param password user password
+   * @return this
+   */
+  @CanIgnoreReturnValue
+  public JmxScraperContainer withPassword(String password) {
+    this.password = password;
+    return this;
+  }
+
+  /**
+   * Adds path to an extra jar for classpath
+   *
+   * @param jarPath path to an extra jar that should be added to jmx scraper classpath
+   * @return this
+   */
+  @CanIgnoreReturnValue
+  public JmxScraperContainer withExtraJar(String jarPath) {
+    this.extraJars.add(jarPath);
     return this;
   }
 
@@ -89,15 +134,30 @@ public void start() {
     arguments.add("-Dotel.jmx.service.url=" + serviceUrl);
     arguments.add("-Dotel.jmx.interval.milliseconds=" + intervalMillis);
 
+    if (user != null) {
+      arguments.add("-Dotel.jmx.username=" + user);
+    }
+    if (password != null) {
+      arguments.add("-Dotel.jmx.password=" + password);
+    }
+
     if (!customYamlFiles.isEmpty()) {
       for (String yaml : customYamlFiles) {
         this.withCopyFileToContainer(MountableFile.forClasspathResource(yaml), yaml);
       }
       arguments.add("-Dotel.jmx.config=" + String.join(",", customYamlFiles));
     }
 
-    arguments.add("-jar");
-    arguments.add("/scraper.jar");
+    if (extraJars.isEmpty()) {
+      // using "java -jar" to start
+      arguments.add("-jar");
+      arguments.add("/scraper.jar");
+    } else {
+      // using "java -cp" to start
+      arguments.add("-cp");
+      arguments.add("/scraper.jar:" + String.join(":", extraJars));
+      arguments.add("io.opentelemetry.contrib.jmxscraper.JmxScraper");
+    }
 
     this.withCommand(arguments.toArray(new String[0]));
 

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

@@ -21,7 +21,7 @@
 import org.testcontainers.shaded.com.google.errorprone.annotations.CanIgnoreReturnValue;
 import org.testcontainers.utility.MountableFile;
 
-/** Test container that allows to execute {@link TestApp} in an isolated container */
+/** Test container that allows to execute TestApp in an isolated container */
 public class TestAppContainer extends GenericContainer<TestAppContainer> {
 
   private final Map<String, String> properties;
@@ -38,8 +38,7 @@ public TestAppContainer() {
 
     this.withCopyFileToContainer(MountableFile.forHostPath(appJar), "/app.jar")
         .waitingFor(
-            Wait.forLogMessage(TestApp.APP_STARTED_MSG + "\\n", 1)
-                .withStartupTimeout(Duration.ofSeconds(5)))
+            Wait.forLogMessage("app started\\n", 1).withStartupTimeout(Duration.ofSeconds(5)))
         .withCommand("java", "-jar", "/app.jar");
   }
 

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

@@ -25,11 +25,12 @@ protected GenericContainer<?> createTargetContainer(int jmxPort) {
                     builder -> builder.from("apache/activemq-classic:5.18.6").build()))
         .withEnv("JAVA_TOOL_OPTIONS", genericJmxJvmArguments(jmxPort))
         .withStartupTimeout(Duration.ofMinutes(2))
-        .waitingFor(Wait.forListeningPort());
+        .waitingFor(Wait.forLogMessage(".*Apache ActiveMQ.*started.*", 1));
   }
 
   @Override
-  protected JmxScraperContainer customizeScraperContainer(JmxScraperContainer scraper) {
+  protected JmxScraperContainer customizeScraperContainer(
+      JmxScraperContainer scraper, GenericContainer<?> target) {
     return scraper.withTargetSystem("activemq");
   }
 

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

@@ -34,7 +34,8 @@ protected GenericContainer<?> createTargetContainer(int jmxPort) {
   }
 
   @Override
-  protected JmxScraperContainer customizeScraperContainer(JmxScraperContainer scraper) {
+  protected JmxScraperContainer customizeScraperContainer(
+      JmxScraperContainer scraper, GenericContainer<?> target) {
     return scraper.withTargetSystem("cassandra");
   }
 

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

@@ -45,7 +45,8 @@ protected GenericContainer<?> createTargetContainer(int jmxPort) {
   }
 
   @Override
-  protected JmxScraperContainer customizeScraperContainer(JmxScraperContainer scraper) {
+  protected JmxScraperContainer customizeScraperContainer(
+      JmxScraperContainer scraper, GenericContainer<?> target) {
     return scraper.withTargetSystem("jetty");
   }
 

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

@@ -24,7 +24,8 @@ protected GenericContainer<?> createTargetContainer(int jmxPort) {
   }
 
   @Override
-  protected JmxScraperContainer customizeScraperContainer(JmxScraperContainer scraper) {
+  protected JmxScraperContainer customizeScraperContainer(
+      JmxScraperContainer scraper, GenericContainer<?> target) {
     return scraper.withTargetSystem("jvm");
   }
 

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

@@ -87,7 +87,7 @@ static void assertSumWithAttributes(
     assertThat(metric.getName()).isEqualTo(name);
     assertThat(metric.getDescription()).isEqualTo(description);
     assertThat(metric.getUnit()).isEqualTo(unit);
-    assertThat(metric.hasSum()).isTrue();
+    assertThat(metric.hasSum()).describedAs("sum expected").isTrue();
     assertThat(metric.getSum().getIsMonotonic()).isEqualTo(isMonotonic);
     assertAttributedPoints(metric.getSum().getDataPointsList(), attributeGroupAssertions);
   }

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

@@ -97,6 +97,10 @@ void afterEach() {
     }
   }
 
+  protected String scraperBaseImage() {
+    return "openjdk:8u342-jre-slim";
+  }
+
   @Test
   void endToEndTest() {
 
@@ -108,12 +112,12 @@ void endToEndTest() {
     target.start();
 
     scraper =
-        new JmxScraperContainer(otlpEndpoint)
+        new JmxScraperContainer(otlpEndpoint, scraperBaseImage())
             .withLogConsumer(new Slf4jLogConsumer(jmxScraperLogger))
             .withNetwork(network)
-            .withService(TARGET_SYSTEM_NETWORK_ALIAS, JMX_PORT);
+            .withRmiServiceUrl(TARGET_SYSTEM_NETWORK_ALIAS, JMX_PORT);
 
-    scraper = customizeScraperContainer(scraper);
+    scraper = customizeScraperContainer(scraper, target);
     scraper.start();
 
     verifyMetrics();
@@ -156,7 +160,8 @@ protected final void waitAndAssertMetrics(Consumer<Metric>... assertions) {
 
   protected abstract void verifyMetrics();
 
-  protected JmxScraperContainer customizeScraperContainer(JmxScraperContainer scraper) {
+  protected JmxScraperContainer customizeScraperContainer(
+      JmxScraperContainer scraper, GenericContainer<?> target) {
     return scraper;
   }