Merge pull request #52 from Ecwid/prometheus-1.2

Prometheus 1.3

Author: turchenkoalex

core/pom.xml

@@ -16,7 +16,7 @@
 
 
 	<artifactId>rest4j-core</artifactId>
-	<version>1.2-ecwid-27</version>
+	<version>1.2-ecwid-28</version>
 	<url>https://code.google.com/p/rest4j/</url>
 	<scm>
 		<connection>
@@ -59,7 +59,7 @@
 	<parent>
 		<artifactId>rest4j</artifactId>
 		<groupId>com.rest4j</groupId>
-		<version>1.2-ecwid-27</version>
+		<version>1.2-ecwid-28</version>
 	</parent>
 	<build>
 		<plugins>
@@ -181,8 +181,8 @@
 		</dependency>
 		<dependency>
 			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient</artifactId>
-			<version>0.16.0</version>
+			<artifactId>prometheus-metrics-core</artifactId>
+			<version>1.3.1</version>
 		</dependency>
 
 		<!-- optional dependencies for Spring users -->

core/src/main/java/com/rest4j/impl/APIImpl.java

@@ -27,7 +27,10 @@
 import com.rest4j.type.ApiType;
 import com.rest4j.type.ArrayApiType;
 import com.rest4j.type.SimpleApiType;
-import io.prometheus.client.Summary;
+import io.prometheus.metrics.core.datapoints.DistributionDataPoint;
+import io.prometheus.metrics.core.datapoints.Timer;
+import io.prometheus.metrics.core.metrics.Summary;
+import io.prometheus.metrics.model.snapshots.Unit;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -45,11 +48,10 @@
  * @author Joseph Kapizza <joseph@rest4j.com>
  */
 public class APIImpl implements API {
-	static final Summary requestDuration = Summary.build()
-			.namespace("rest4j")
-			.subsystem("http")
-			.name("request_duration_seconds")
+	static final Summary requestDuration = Summary.builder()
+			.name("rest4j_http_request_duration_seconds")
 			.help("Requests duration in seconds.")
+			.unit(Unit.SECONDS)
 			.labelNames("http_method", "service_name", "method_name")
 			.quantile(0.5, 0.01)
 			.quantile(0.95, 0.01)
@@ -236,20 +238,17 @@ interface ArgHandler {
 	}
 
 	class InstrumentedEndpointMapping extends EndpointMapping {
-		private final Summary.Child duration;
+		private final DistributionDataPoint duration;
 
 		InstrumentedEndpointMapping(Endpoint ep, ServiceProvider serviceProvider, PermissionChecker permissionChecker) throws ConfigurationException {
 			super(ep, serviceProvider, permissionChecker);
-			this.duration = requestDuration.labels(httpMethod, endpoint.getService().getName(), method.getName());
+			this.duration = requestDuration.labelValues(httpMethod, endpoint.getService().getName(), method.getName());
 		}
 
 		@Override
 		Object invokeRaw(ApiRequest request, Object getResult) throws IOException, ApiException {
-			Summary.Timer requestTimer = duration.startTimer();
-			try {
+			try(Timer timer = duration.startTimer()) {
 				return super.invokeRaw(request, getResult);
-			} finally {
-				requestTimer.observeDuration();
 			}
 		}
 	}

generator/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>rest4j</artifactId>
 		<groupId>com.rest4j</groupId>
-		<version>1.2-ecwid-27</version>
+		<version>1.2-ecwid-28</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.rest4j</groupId>
     <artifactId>rest4j</artifactId>
 	<packaging>pom</packaging>
-	<version>1.2-ecwid-27</version>
+	<version>1.2-ecwid-28</version>
 	<url>https://code.google.com/p/rest4j/</url>
 	<scm>
 		<connection>