Refactored integration tests to get the build info name from a common…

… location (#1094) Signed-off-by: dhoard <doug.hoard@gmail.com>
prometheus · Dec 10, 2024 · 41540dc · 41540dc
1 parent e4a4f45
commit 41540dc
Show file tree

Hide file tree

Showing 27 changed files with 54 additions and 91 deletions.
diff --git a/docs/content/1.1.0/_index.md b/docs/content/1.1.0/_index.md
@@ -1,6 +1,6 @@
 ---
 title: "JMX Exporter 1.1.0"
-weight: 1
+weight: 2
 geekdocCollapseSection: true
 ---
 

diff --git a/docs/content/older-versions/_index.md b/docs/content/older-versions/_index.md
@@ -1,6 +1,6 @@
 ---
 title: "Versions < 1.1.0"
-weight: 2
+weight: 100
 ---
 
 Documentation for previous JMX Exporter versions can be found in associated release branches.

diff --git a/...integration_tests/src/main/java/io/prometheus/jmx/test/support/metrics/MetricsParser.java b/...integration_tests/src/main/java/io/prometheus/jmx/test/support/metrics/MetricsParser.java
@@ -92,8 +92,6 @@ public static Collection<Metric> parseCollection(HttpResponse httpResponse) {
      * @return a Collection of Metrics
      */
     private static Collection<Metric> parseTextMetrics(String body) {
-        // System.out.println("DEBUG parseTextMetrics()");
-
         Collection<Metric> metrics = new ArrayList<>();
 
         try (LineReader lineReader = new LineReader(new StringReader(body))) {
@@ -124,8 +122,6 @@ private static Collection<Metric> parseTextMetrics(String body) {
     }
 
     private static Collection<Metric> parseOpenMetricsTextMetrics(String body) {
-        // System.out.println("DEBUG parseOpenMetricsTextMetrics()");
-
         Collection<Metric> metrics = new ArrayList<>();
 
         String line;
@@ -141,8 +137,6 @@ private static Collection<Metric> parseOpenMetricsTextMetrics(String body) {
                         break;
                     }
 
-                    // System.out.printf("LINE > %s%n", line);
-
                     if (line.startsWith("# EOF")) {
                         break;
                     }
@@ -173,21 +167,11 @@ private static Collection<Metric> parseOpenMetricsTextMetrics(String body) {
                         lineReader.unreadLine(line);
                         break;
                     } else {
-                        // System.out.printf("LINE > %s%n", line);
-                        /*
-                        System.out.println("CREATE METRIC");
-                        System.out.printf("  > %s%n", typeLine);
-                        System.out.printf("  > %s%n", helpLine);
-                        System.out.printf("  > %s%n", line);
-                        */
-
                         if (type.equals("INFO")) {
                             type = "GAUGE";
                         }
 
-                        Metric metric = createMetric(type, help, line);
-                        // System.out.printf("    > %s%n", metric);
-                        metrics.add(metric);
+                        metrics.add(createMetric(type, help, line));
                     }
                 }
             }
@@ -205,8 +189,6 @@ private static Collection<Metric> parseOpenMetricsTextMetrics(String body) {
      * @return a Collection of metrics
      */
     private static Collection<Metric> parseProtobufMetrics(byte[] bytes) {
-        // System.out.println("DEBUG parseProtobufMetrics()");
-
         Collection<Metric> collection = new ArrayList<>();
 
         try (InputStream inputStream = new ByteArrayInputStream(bytes)) {
@@ -265,15 +247,26 @@ private static Collection<Metric> parseProtobufMetrics(byte[] bytes) {
 
                                 break;
                             }
+                        case SUMMARY:
+                            {
+                                // TODO refactor to support Summary metrics
+                                break;
+                            }
                         default:
                             {
-                                // TODO ignore?
+                                throw new MetricsParserException(
+                                        format(
+                                                "Exception parsing Protobuf metrics. MetricsParser"
+                                                        + " doesn't support metric type [%s]",
+                                                metricType));
                             }
                     }
                 }
             }
 
             return collection;
+        } catch (MetricsParserException e) {
+            throw e;
         } catch (Throwable t) {
             throw new MetricsParserException("Exception parsing Protobuf metrics", t);
         }

diff --git a/...ntegration_tests/src/test/java/io/prometheus/jmx/test/core/AutoIncrementingMBeanTest.java b/...ntegration_tests/src/test/java/io/prometheus/jmx/test/core/AutoIncrementingMBeanTest.java
@@ -196,9 +196,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...ion_test_suite/integration_tests/src/test/java/io/prometheus/jmx/test/core/BasicTest.java b/...ion_test_suite/integration_tests/src/test/java/io/prometheus/jmx/test/core/BasicTest.java
@@ -178,9 +178,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...e/integration_tests/src/test/java/io/prometheus/jmx/test/core/OptionalValueMBeanTest.java b/...e/integration_tests/src/test/java/io/prometheus/jmx/test/core/OptionalValueMBeanTest.java
@@ -157,9 +157,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/..._tests/src/test/java/io/prometheus/jmx/test/http/CompleteHttpServerConfigurationTest.java b/..._tests/src/test/java/io/prometheus/jmx/test/http/CompleteHttpServerConfigurationTest.java
@@ -275,9 +275,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...sts/src/test/java/io/prometheus/jmx/test/http/authentication/AuthenticatorPluginTest.java b/...sts/src/test/java/io/prometheus/jmx/test/http/authentication/AuthenticatorPluginTest.java
@@ -268,9 +268,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...io/prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA1Test.java b/...io/prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA1Test.java
@@ -286,9 +286,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/.../prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA256Test.java b/.../prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA256Test.java
@@ -286,9 +286,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/.../prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA512Test.java b/.../prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA512Test.java
@@ -286,9 +286,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...est/java/io/prometheus/jmx/test/http/authentication/BasicAuthenticationPlaintextTest.java b/...est/java/io/prometheus/jmx/test/http/authentication/BasicAuthenticationPlaintextTest.java
@@ -264,9 +264,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...src/test/java/io/prometheus/jmx/test/http/authentication/BasicAuthenticationSHA1Test.java b/...src/test/java/io/prometheus/jmx/test/http/authentication/BasicAuthenticationSHA1Test.java
@@ -264,9 +264,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...c/test/java/io/prometheus/jmx/test/http/authentication/BasicAuthenticationSHA256Test.java b/...c/test/java/io/prometheus/jmx/test/http/authentication/BasicAuthenticationSHA256Test.java
@@ -264,9 +264,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...c/test/java/io/prometheus/jmx/test/http/authentication/BasicAuthenticationSHA512Test.java b/...c/test/java/io/prometheus/jmx/test/http/authentication/BasicAuthenticationSHA512Test.java
@@ -264,9 +264,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...va/io/prometheus/jmx/test/http/ssl/SSLAndBasicAuthenticationPBKDF2WithHmacSHA512Test.java b/...va/io/prometheus/jmx/test/http/ssl/SSLAndBasicAuthenticationPBKDF2WithHmacSHA512Test.java
@@ -295,9 +295,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...test/java/io/prometheus/jmx/test/http/ssl/SSLWithJKSKeyStoreMultipleCertificatesTest.java b/...test/java/io/prometheus/jmx/test/http/ssl/SSLWithJKSKeyStoreMultipleCertificatesTest.java
@@ -189,9 +189,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...tegration_tests/src/test/java/io/prometheus/jmx/test/http/ssl/SSLWithJKSKeyStoreTest.java b/...tegration_tests/src/test/java/io/prometheus/jmx/test/http/ssl/SSLWithJKSKeyStoreTest.java
@@ -189,9 +189,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...egration_tests/src/test/java/io/prometheus/jmx/test/http/ssl/SSLWithJKSKeyStoreTest2.java b/...egration_tests/src/test/java/io/prometheus/jmx/test/http/ssl/SSLWithJKSKeyStoreTest2.java
@@ -189,9 +189,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...t/java/io/prometheus/jmx/test/http/ssl/SSLWithPKCS12KeyStoreMultipleCertificatesTest.java b/...t/java/io/prometheus/jmx/test/http/ssl/SSLWithPKCS12KeyStoreMultipleCertificatesTest.java
@@ -185,9 +185,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...ration_tests/src/test/java/io/prometheus/jmx/test/http/ssl/SSLWithPKCS12KeyStoreTest.java b/...ration_tests/src/test/java/io/prometheus/jmx/test/http/ssl/SSLWithPKCS12KeyStoreTest.java
@@ -185,9 +185,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...ation_tests/src/test/java/io/prometheus/jmx/test/http/ssl/SSLWithPKCS12KeyStoreTest2.java b/...ation_tests/src/test/java/io/prometheus/jmx/test/http/ssl/SSLWithPKCS12KeyStoreTest2.java
@@ -184,9 +184,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...ion_tests/src/test/java/io/prometheus/jmx/test/http/threads/ThreadsConfigurationTest.java b/...ion_tests/src/test/java/io/prometheus/jmx/test/http/threads/ThreadsConfigurationTest.java
@@ -157,9 +157,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...ntegration_tests/src/test/java/io/prometheus/jmx/test/opentelemetry/CombinedModeTest.java b/...ntegration_tests/src/test/java/io/prometheus/jmx/test/opentelemetry/CombinedModeTest.java
@@ -230,9 +230,7 @@ private void assertMetricsResponse(
                 openTelemetryTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(openTelemetryTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...ite/integration_tests/src/test/java/io/prometheus/jmx/test/rmi/ssl/MinimalRMISSLTest.java b/...ite/integration_tests/src/test/java/io/prometheus/jmx/test/rmi/ssl/MinimalRMISSLTest.java
@@ -174,9 +174,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...ration_tests/src/test/java/io/prometheus/jmx/test/rmi/ssl/RMIRegistrySSLDisabledTest.java b/...ration_tests/src/test/java/io/prometheus/jmx/test/rmi/ssl/RMIRegistrySSLDisabledTest.java
@@ -174,9 +174,7 @@ private void assertMetricsResponse(
                 exporterTestEnvironment.getJmxExporterMode() == JmxExporterMode.JavaAgent;
 
         String buildInfoName =
-                isJmxExporterModeJavaAgent
-                        ? "jmx_prometheus_javaagent"
-                        : "jmx_prometheus_standalone";
+                TestSupport.getBuildInfoName(exporterTestEnvironment.getJmxExporterMode());
 
         assertMetric(metrics)
                 .ofType(Metric.Type.GAUGE)

diff --git a/...est_suite/integration_tests/src/test/java/io/prometheus/jmx/test/support/TestSupport.java b/...est_suite/integration_tests/src/test/java/io/prometheus/jmx/test/support/TestSupport.java
@@ -11,6 +11,10 @@ public class TestSupport {
     /** Network configuration constant */
     public static final String NETWORK = "network";
 
+    private static final String BUILD_INFO_JAVAAGENT = "jmx_prometheus_javaagent";
+
+    private static final String BUILD_INFO_STANDALONE = "jmx_prometheus_standalone";
+
     /** Constructor */
     private TestSupport() {
         // INTENTIONALLY BLANK
@@ -124,4 +128,16 @@ public static void destroyNetwork(ClassContext classContext) {
         Optional.ofNullable(classContext.map().removeAs(NETWORK, Network.class))
                 .ifPresent(Network::close);
     }
+
+    /**
+     * Method to get the build info name based on the JMX exporter mode
+     *
+     * @param jmxExporterMode jmxExporterMode
+     * @return the build info name
+     */
+    public static String getBuildInfoName(JmxExporterMode jmxExporterMode) {
+        return jmxExporterMode == JmxExporterMode.JavaAgent
+                ? BUILD_INFO_JAVAAGENT
+                : BUILD_INFO_STANDALONE;
+    }
 }