added support on jmx attributes of type java.util.Date #449

tianhai · 2019-11-12T09:44:43Z

Dear maintainers,

We recently had an requirement to expose certain JMX attributes of java Date type to prometheus, specifically, a number of timestamps in the built-in JMX of Apache Camel library.

We thought that it might be useful for other users of the exporter, would you review our changes and let us know any feedbacks and critics please?

Thank you
Jacky

brian-brazil · 2019-11-12T10:20:05Z

collector/src/main/java/io/prometheus/jmx/JmxScraper.java

@@ -190,7 +190,12 @@ private void processBeanValue(
            Object value) {
        if (value == null) {
            logScrape(domain + beanProperties + attrName, "null");
-        } else if (value instanceof Number || value instanceof String || value instanceof Boolean) {
+        } else if (value instanceof Number || value instanceof String || value instanceof Boolean || value instanceof java.util.Date) {
+            //output Date as Long (the number of milliseconds since January 1, 1970, 00:00:00 GMT)


Seconds are usual for Prometheus.

updated to output the number of seconds instead of milliseconds.

brian-brazil · 2019-11-12T10:20:17Z

collector/src/main/java/io/prometheus/jmx/JmxScraper.java

-        } else if (value instanceof Number || value instanceof String || value instanceof Boolean) {
+        } else if (value instanceof Number || value instanceof String || value instanceof Boolean || value instanceof java.util.Date) {
+            //output Date as Long (the number of milliseconds since January 1, 1970, 00:00:00 GMT)
+            if( value instanceof java.util.Date){


Watch your spaces

removed the unintended spaces.

brian-brazil · 2019-11-12T10:20:46Z

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

+    }
+
+    @Override
+    public long getLastExchangeFailureTimestamp() {


This isn't a Date

fixed the test :)
thank you very much for the feedbacks and could you review the latest commit please, thank you!

brian-brazil · 2019-11-13T08:14:14Z

collector/src/main/java/io/prometheus/jmx/JmxScraper.java

-        } else if (value instanceof Number || value instanceof String || value instanceof Boolean) {
+        } else if (value instanceof Number || value instanceof String || value instanceof Boolean || value instanceof java.util.Date) {
+            //output Date as Long (the number of seconds since January 1, 1970, 00:00:00 GMT)
+            if(value instanceof java.util.Date){


formatting is still off here.

fixed formatting

There should be a space after the if and before the {

updated to desired style

brian-brazil · 2019-11-13T08:14:40Z

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

+
+    @Override
+    public Date getLastExchangeFailureTimestamp() {
+        int theMillisecondAtTheMoment = Calendar.getInstance().get(Calendar.MILLISECOND);


We should preserve milliseconds if we can.

changed data type from long to double to preserve milliseconds in decimal places, thank you.

Signed-off-by: jacky <jacky.chen@nzqa.govt.nz> Signed-off-by: jacky <jac.chen@gmail.com>

…heus conventions Signed-off-by: jacky <jac.chen@gmail.com>

…ents milliseconds Signed-off-by: jacky <jac.chen@gmail.com>

Signed-off-by: jacky <jac.chen@gmail.com>

brian-brazil · 2019-11-14T09:24:54Z

collector/src/main/java/io/prometheus/jmx/JmxScraper.java

-        } else if (value instanceof Number || value instanceof String || value instanceof Boolean) {
+        } else if (value instanceof Number || value instanceof String || value instanceof Boolean || value instanceof java.util.Date) {
+            //output Date as Long (the number of seconds since January 1, 1970, 00:00:00 GMT)
+            if(value instanceof java.util.Date){


There should be a space after the if and before the {

brian-brazil · 2019-11-14T09:25:08Z

collector/src/main/java/io/prometheus/jmx/JmxScraper.java

+        } else if (value instanceof Number || value instanceof String || value instanceof Boolean || value instanceof java.util.Date) {
+            if(value instanceof java.util.Date){
+                attrType = "java.lang.Double";
+                value = (double) ((java.util.Date) value).getTime() / 1000;


Usually I do this as value / 1000.0

updated to desired style

brian-brazil · 2019-11-14T09:25:30Z

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

+                      "    route: \"$2\"\n" +
+                      "    type: routes";
+      JmxCollector jc = new JmxCollector(rulePattern).register(registry);
+      assertEquals(Double.valueOf((double)Camel.EXPECTED_DATE_IN_MILLISECONDS / 1000), registry.getSampleValue("org_apache_camel_LastExchangeFailureTimestamp", new String[]{"context", "route", "type"}, new String[]{"my-camel-context", "my-route-name", "routes"}));


Check for the actual literal float value.

updated test to do that, cheers

Signed-off-by: jacky <jac.chen@gmail.com>

brian-brazil · 2019-11-14T11:19:16Z

Thanks!

* added support on jmx attributes of type java.util.Date Signed-off-by: jacky <jacky.chen@nzqa.govt.nz> Signed-off-by: jacky <jac.chen@gmail.com>

brian-brazil reviewed Nov 12, 2019

View reviewed changes

brian-brazil reviewed Nov 13, 2019

View reviewed changes

jacky and others added 5 commits November 14, 2019 09:15

added support on jmx attributes of type java.util.Date

68c58d6

Signed-off-by: jacky <jacky.chen@nzqa.govt.nz> Signed-off-by: jacky <jac.chen@gmail.com>

output number of seconds instead of milliseconds to align with promet…

8379d4b

…heus conventions Signed-off-by: jacky <jac.chen@gmail.com>

output as Double on java.util.Date attributes, decimal portion repres…

7a78aca

…ents milliseconds Signed-off-by: jacky <jac.chen@gmail.com>

fixed formatting

ecb43f7

Signed-off-by: jacky <jac.chen@gmail.com>

fixed white spaces

3cc8b0f

Signed-off-by: jacky <jac.chen@gmail.com>

brian-brazil reviewed Nov 14, 2019

View reviewed changes

update formatting and test

be117b7

Signed-off-by: jacky <jac.chen@gmail.com>

brian-brazil merged commit 20e8954 into prometheus:master Nov 14, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

added support on jmx attributes of type java.util.Date #449

added support on jmx attributes of type java.util.Date #449

tianhai commented Nov 12, 2019

brian-brazil Nov 12, 2019

tianhai Nov 12, 2019

brian-brazil Nov 12, 2019

tianhai Nov 12, 2019

brian-brazil Nov 12, 2019

tianhai Nov 12, 2019

brian-brazil Nov 13, 2019

tianhai Nov 13, 2019

brian-brazil Nov 14, 2019

tianhai Nov 14, 2019

brian-brazil Nov 13, 2019

tianhai Nov 13, 2019

brian-brazil Nov 14, 2019

brian-brazil Nov 14, 2019

tianhai Nov 14, 2019

brian-brazil Nov 14, 2019

tianhai Nov 14, 2019

brian-brazil commented Nov 14, 2019

added support on jmx attributes of type java.util.Date #449

added support on jmx attributes of type java.util.Date #449

Conversation

tianhai commented Nov 12, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brian-brazil commented Nov 14, 2019