HBase test stabilization

Author: robsunday

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

@@ -16,15 +16,16 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 
 public class HBaseIntegrationTest extends TargetSystemIntegrationTest {
-  private static final int DEFAULT_MASTER_SERVICE_PORT = 16000;
-
   @Override
   protected GenericContainer<?> createTargetContainer(int jmxPort) {
     return new GenericContainer<>("dajobe/hbase")
         .withEnv("HBASE_MASTER_OPTS", genericJmxJvmArguments(jmxPort))
         .withStartupTimeout(Duration.ofMinutes(2))
-        .withExposedPorts(jmxPort, DEFAULT_MASTER_SERVICE_PORT)
-        .waitingFor(Wait.forListeningPorts(jmxPort, DEFAULT_MASTER_SERVICE_PORT));
+        .withExposedPorts(jmxPort)
+        // HBase initialization process is finished a long time after all the ports are opened.
+        // Because of this it is necessary to wait for log message confirming that startup process
+        // is complete.
+        .waitingFor(Wait.forLogMessage(".+Master has completed initialization.+", 1));
   }
 
   @Override

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

@@ -114,7 +114,11 @@ private void verifyAllExpectedMetricsWereReceived(List<Metric> metrics) {
 
     assertionNames.removeAll(receivedMetricNames);
     if (!assertionNames.isEmpty()) {
-      fail("Metrics expected but not received: " + assertionNames);
+      fail(
+          "Metrics expected but not received: "
+              + assertionNames
+              + "\nReceived only: "
+              + receivedMetricNames);
     }
   }
 }

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

@@ -185,7 +185,7 @@ protected void verifyMetrics() {
                       .collect(Collectors.toList());
 
               assertThat(metrics)
-                  .describedAs("metrics reported but none from JMX scraper")
+                  .describedAs("Metrics received but not suitable for JMX scraper")
                   .isNotEmpty();
 
               metricsVerifier.verify(metrics);