adding actuator for health check

master
Katerina 2 years ago
parent a41d39e974
commit 9fc1f5e5b5

@ -22,7 +22,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
@ -38,16 +41,17 @@
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20210307</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
</dependency>
<!-- Json -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.6.2</version>
</dependency>
</dependencies>

@ -1,12 +1,11 @@
package eu.dnetlib.dnetexploremetrics.service;
import com.fasterxml.jackson.databind.util.JSONPObject;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import eu.dnetlib.dnetexploremetrics.dao.MetricsDAO;
import eu.dnetlib.dnetexploremetrics.dao.MetricsFileDAO;
import eu.dnetlib.dnetexploremetrics.model.Metrics;
import eu.dnetlib.dnetexploremetrics.utils.PrometheusMetricsFormatter;
import org.apache.log4j.Logger;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
@ -53,9 +52,9 @@ public class MetricsService {
ResponseEntity<String> response
= restTemplate.getForEntity(searchUrl + recordsRequest, String.class);
JSONObject jsonObject = new JSONObject(response.getBody());
metrics.records= jsonObject.getJSONObject("meta").get("total").toString();
JsonObject jsonObject = new JsonParser().parse(response.getBody()).getAsJsonObject();
metrics.records= jsonObject.get("meta").getAsJsonObject().get("total").getAsString();
/*
response = restTemplate.
getForEntity(searchUrl + publicationsRequest, String.class);
jsonObject = new JSONObject(response.getBody());
@ -96,7 +95,7 @@ public class MetricsService {
jsonObject = new JSONObject(response.getBody());
metrics.organizations = jsonObject.getJSONObject("meta").get("total").toString();
*/
metricsDAO.save(metrics);
}

@ -1,7 +1,6 @@
package eu.dnetlib.dnetexploremetrics.utils;
import eu.dnetlib.dnetexploremetrics.model.Metrics;
import org.apache.logging.log4j.message.StringFormattedMessage;
public class PrometheusMetricsFormatter {

@ -1,2 +1,5 @@
search.service.api.url = https://services.openaire.eu/search/v2/api/
server.port=8180
#management.endpoint.health.show-details=always
management.endpoints.web.base-path=/-
Loading…
Cancel
Save