client_java 1.3.0 integration (#957)

Signed-off-by: dhoard <[email protected]>

Author: dhoard

MAINTAINER_NOTES.md

@@ -88,7 +88,7 @@ Checkout the `main` branch and increment the version
 
 ```shell
 git checkout main
-./tools/change-version.sh 1.0.0-SNAPSHOT
+./tools/change-version.sh 1.0.0
 git add -u
 git commit -m "prepare for next development iteration"
 ```

README.md

@@ -17,6 +17,8 @@ process metrics (e.g., memory and CPU usage).
 
 **Documentation is specific to a release.**
 
+[1.0.0](https://github.com/prometheus/jmx_exporter/tree/release-1.0.0)
+
 [0.20.0](https://github.com/prometheus/jmx_exporter/tree/release-0.20.0)
 
 [0.19.0](https://github.com/prometheus/jmx_exporter/tree/release-0.19.0)

collector/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.prometheus.jmx</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>collector</artifactId>
@@ -55,15 +55,17 @@
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>prometheus-metrics-core</artifactId>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>prometheus-metrics-model</artifactId>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>prometheus-metrics-exposition-formats</artifactId>
-            <version>1.2.0</version>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>

collector/src/test/java/io/prometheus/jmx/DuplicateLabels.java

@@ -16,22 +16,29 @@
 
 package io.prometheus.jmx;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
+import io.prometheus.metrics.model.snapshots.DuplicateLabelsException;
+import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
 import io.prometheus.metrics.model.snapshots.UnknownSnapshot;
 import java.util.HashMap;
 import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
 
 public class DuplicateLabels {
 
     Map<String, UnknownSnapshot.Builder> unknownMap;
 
-    // @Before
+    @Before
     public void setUp() {
         unknownMap = new HashMap<>();
     }
 
-    // @Test
+    @Test
     public void testDuplicateLabels() {
-        /*
         UnknownSnapshot.Builder unknownBuilder =
                 unknownMap.computeIfAbsent(
                         "test",
@@ -77,6 +84,5 @@ public void testDuplicateLabels() {
         assertEquals(
                 "Duplicate labels for metric \"test_metric\": {label1=\"value1\"}",
                 exception.getMessage());
-        */
     }
 }

docs/README.md

@@ -5,7 +5,6 @@
 JMX Exporter
 =====
 
-
 JMX to Prometheus exporter: a collector that can configurable scrape and
 expose mBeans of a JMX target.
 
@@ -15,16 +14,25 @@ HTTP server and scrape remote JMX targets, but this has various
 disadvantages, such as being harder to configure and being unable to expose
 process metrics (e.g., memory and CPU usage).
 
-**Running the exporter as a Java agent is strongly encouraged.**
+### **NOTE**
+
+**Some JVM metric names have changed to conform with the [OpenMetrics](https://openmetrics.io/) specification.**
+
+**Dashboards will need to be changed if referencing the changed JVM metrics.**
+
+https://prometheus.github.io/client_java/migration/simpleclient/#jvm-metrics
+
 
 ## Running the Java Agent
 
-- [jmx_prometheus_javaagent-0.20.0.jar](https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.20.0/jmx_prometheus_javaagent-0.20.0.jar)
+**Running the exporter as a Java agent is strongly encouraged.**
+
+- [jmx_prometheus_javaagent-1.0.0.jar](https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/1.0.0/jmx_prometheus_javaagent-1.0.0.jar)
 
 To run as a Java agent, download one of the JARs and run:
 
 ```
-java -javaagent:./jmx_prometheus_javaagent-0.20.0.jar=12345:config.yaml -jar yourJar.jar
+java -javaagent:./jmx_prometheus_javaagent-1.0.0.jar=12345:config.yaml -jar yourJar.jar
 ```
 
 Metrics will now be accessible at [http://localhost:12345/metrics](http://localhost:12345/metrics).
@@ -41,12 +49,12 @@ Example configurations can be found in the `example_configs/` directory.
 
 ## Running the Standalone HTTP Server
 
-- [jmx_prometheus_httpserver-0.20.0.jar](https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_httpserver/0.20.0/jmx_prometheus_httpserver-0.20.0.jar)
+- [jmx_prometheus_httpserver-1.0.0.jar](https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_httpserver/1.0.0/jmx_prometheus_httpserver-1.0.0.jar)
 
 To run the standalone HTTP server, download one of the JARs and run:
 
 ```
-java -jar jmx_prometheus_httpserver-0.20.0.jar 12345 config.yaml
+java -jar jmx_prometheus_httpserver-1.0.0.jar 12345 config.yaml
 ```
 
 Metrics will now be accessible at [http://localhost:12345/metrics](http://localhost:12345/metrics).

integration_test_suite/integration_tests/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.prometheus.jmx</groupId>
         <artifactId>integration_test_suite</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>integration_tests</artifactId>
@@ -105,10 +105,15 @@
             <artifactId>test-engine-api</artifactId>
             <version>${antublue.test.engine.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.prometheus</groupId>
+            <artifactId>prometheus-metrics-model</artifactId>
+            <version>1.3.0</version>
+        </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>prometheus-metrics-exposition-formats</artifactId>
-            <version>1.2.0</version>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

integration_test_suite/integration_tests/src/main/java/io/prometheus/jmx/test/support/TestContext.java

@@ -20,7 +20,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 
-/** Class to a TestState */
+/** Class to a TestContext */
 public class TestContext {
 
     private Network network;

integration_test_suite/jmx_example_application/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.prometheus.jmx</groupId>
         <artifactId>integration_test_suite</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>jmx_example_application</artifactId>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>prometheus-metrics-core</artifactId>
-            <version>1.2.0</version>
+            <version>1.3.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>prometheus-metrics-exposition-formats</artifactId>
-            <version>1.2.0</version>
+            <version>1.3.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

integration_test_suite/pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>io.prometheus.jmx</groupId>
     <artifactId>integration_test_suite</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <name>Prometheus JMX Exporter - Integration Test Suite</name>
     <description>
         See https://github.com/prometheus/jmx_exporter/blob/master/README.md

jmx_prometheus_common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.prometheus.jmx</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
 
     <groupId>io.prometheus.jmx</groupId>