plugin management

Signed-off-by: Gregor Zeitlinger <[email protected]>

Author: zeitlinger

.github/workflows/build.yml

@@ -25,7 +25,6 @@ jobs:
           PROTO_GENERATION: true
           REQUIRE_PROTO_UP_TO_DATE: true
         run: |
-          echo "Java version: $(java -version) in $(which java), Maven version: $(mvn -v)"
-          echo "JAVA_HOME: $JAVA_HOME"
+          mvn -v
           ./mvnw clean install
           ./mvnw javadoc:javadoc -P javadoc # just to check if javadoc is generated

.github/workflows/native-tests.yml

@@ -0,0 +1,21 @@
+name: GraalVM Native Tests
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  native-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: graalvm
+          cache: 'maven'
+      - name: Run the Maven verify phase
+        run: ./scripts/run-native-tests.sh

integration-tests/it-common/pom.xml

@@ -16,6 +16,14 @@
         Common utilities for integration tests
     </description>
 
+    <dependencies>
+        <dependency>
+            <groupId>io.prometheus</groupId>
+            <artifactId>prometheus-metrics-exposition-formats</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
     <build>
         <testResources>
             <testResource>

integration-tests/it-common/src/test/java/io/prometheus/client/it/common/ExporterTest.java

@@ -4,11 +4,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_28_3.Metrics;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -55,21 +58,27 @@ public void tearDown() throws IOException {
     sampleAppVolume.remove();
   }
 
-  protected void assertContentType(String expected, String actual) {
+  public static void assertContentType(String expected, String actual) {
     if (!expected.replace(" ", "").equals(actual)) {
       assertThat(actual).isEqualTo(expected);
     }
   }
 
   protected Response scrape(String method, String queryString, String... requestHeaders)
       throws IOException {
-    long timeoutMillis = TimeUnit.SECONDS.toMillis(5);
-    URL url =
+    return scrape(
+        method,
         new URL(
             "http://localhost:"
                 + sampleAppContainer.getMappedPort(9400)
                 + "/metrics?"
-                + queryString);
+                + queryString),
+        requestHeaders);
+  }
+
+  public static Response scrape(String method, URL url, String... requestHeaders)
+      throws IOException {
+    long timeoutMillis = TimeUnit.SECONDS.toMillis(5);
     HttpURLConnection con = (HttpURLConnection) url.openConnection();
     con.setRequestMethod(method);
     for (int i = 0; i < requestHeaders.length; i += 2) {
@@ -106,7 +115,7 @@ protected Response scrape(String method, String queryString, String... requestHe
     return null; // will not happen
   }
 
-  protected static class Response {
+  public static class Response {
     public final int status;
     private final Map<String, String> headers;
     public final byte[] body;
@@ -136,5 +145,14 @@ public String gzipBody() throws IOException {
       return new String(
           IOUtils.toByteArray(new GZIPInputStream(new ByteArrayInputStream(body))), UTF_8);
     }
+
+    public List<Metrics.MetricFamily> protoBody() throws IOException {
+      List<Metrics.MetricFamily> metrics = new ArrayList<>();
+      InputStream in = new ByteArrayInputStream(body);
+      while (in.available() > 0) {
+        metrics.add(Metrics.MetricFamily.parseDelimitedFrom(in));
+      }
+      return metrics;
+    }
   }
 }

integration-tests/it-exporter/it-exporter-no-protobuf/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.prometheus</groupId>
         <artifactId>it-exporter</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
     </parent>
 
     <artifactId>it-exporter-no-protobuf</artifactId>

integration-tests/it-exporter/it-exporter-test/pom.xml

@@ -17,11 +17,6 @@
     </description>
 
     <dependencies>
-        <dependency>
-            <groupId>io.prometheus</groupId>
-            <artifactId>prometheus-metrics-exposition-formats</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>it-common</artifactId>

integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java

@@ -6,12 +6,9 @@
 import com.google.common.io.Resources;
 import io.prometheus.client.it.common.ExporterTest;
 import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_28_3.Metrics;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;
-import java.util.ArrayList;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -82,11 +79,7 @@ public void testPrometheusProtobufFormat() throws IOException {
     assertThat(response.getHeader("Transfer-Encoding")).isNull();
     assertThat(response.getHeader("Content-Length"))
         .isEqualTo(Integer.toString(response.body.length));
-    List<Metrics.MetricFamily> metrics = new ArrayList<>();
-    InputStream in = new ByteArrayInputStream(response.body);
-    while (in.available() > 0) {
-      metrics.add(Metrics.MetricFamily.parseDelimitedFrom(in));
-    }
+    List<Metrics.MetricFamily> metrics = response.protoBody();
     assertThat(metrics).hasSize(3);
     // metrics are sorted by name
     assertThat(metrics.get(0).getName()).isEqualTo("integration_test_info");

…tests/it-exporter/it-no-protobuf/pom.xml …/it-exporter/it-no-protobuf-test/pom.xmlintegration-tests/it-exporter/it-no-protobuf/pom.xml renamed to integration-tests/it-exporter/it-no-protobuf-test/pom.xml integration-tests/it-exporter/it-no-protobuf/pom.xml renamed to integration-tests/it-exporter/it-no-protobuf-test/pom.xml

@@ -5,10 +5,10 @@
     <parent>
         <groupId>io.prometheus</groupId>
         <artifactId>it-exporter</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
     </parent>
 
-    <artifactId>it-no-protobuf</artifactId>
+    <artifactId>it-no-protobuf-test</artifactId>
 
     <name>Integration Test - No Protobuf</name>
     <description>

…/metrics/it/noprotobuf/NoProtobufIT.java …/metrics/it/noprotobuf/NoProtobufIT.javaintegration-tests/it-exporter/it-no-protobuf/src/test/java/io/prometheus/metrics/it/noprotobuf/NoProtobufIT.java renamed to integration-tests/it-exporter/it-no-protobuf-test/src/test/java/io/prometheus/metrics/it/noprotobuf/NoProtobufIT.java integration-tests/it-exporter/it-no-protobuf/src/test/java/io/prometheus/metrics/it/noprotobuf/NoProtobufIT.java renamed to integration-tests/it-exporter/it-no-protobuf-test/src/test/java/io/prometheus/metrics/it/noprotobuf/NoProtobufIT.java

@@ -22,6 +22,6 @@
         <module>it-exporter-httpserver-sample</module>
         <module>it-exporter-no-protobuf</module>
         <module>it-exporter-test</module>
-        <module>it-no-protobuf</module>
+        <module>it-no-protobuf-test</module>
     </modules>
 </project>