[PPD-237] Added Actuator (#11)

* [PPD-237] actuator * Actuator
pagopa · Jul 13, 2022 · afe78f5 · afe78f5
1 parent 4ce1f5c
commit afe78f5
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ emulatorcert.crt
 **/package-lock.json
 **/node_modules/
 **/yarn.lock
+**/application-secret.properties
diff --git a/pom.xml b/pom.xml
@@ -45,6 +45,10 @@
 			<groupId>org.springframework.retry</groupId>
 			<artifactId>spring-retry</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>

diff --git a/src/main/java/it/gov/pagopa/spontaneouspayment/config/LoggingAspect.java b/src/main/java/it/gov/pagopa/spontaneouspayment/config/LoggingAspect.java
@@ -26,13 +26,13 @@
 @Slf4j
 public class LoggingAspect {
 
-    @Value("${application.name}")
+    @Value("${info.application.name}")
     private String name;
 
-    @Value("${application.version}")
+    @Value("${info.application.version}")
     private String version;
 
-    @Value("${properties.environment}")
+    @Value("${info.properties.environment}")
     private String environment;
 
     @Pointcut("@within(org.springframework.web.bind.annotation.RestController)")

diff --git a/src/main/java/it/gov/pagopa/spontaneouspayment/config/SwaggerConfig.java b/src/main/java/it/gov/pagopa/spontaneouspayment/config/SwaggerConfig.java
@@ -22,7 +22,7 @@ public class SwaggerConfig {
     public static final String HEADER_REQUEST_ID = "X-Request-Id";
 
     @Bean
-    public OpenAPI customOpenAPI(@Value("${application.description}") String appDescription, @Value("${application.version}") String appVersion) {
+    public OpenAPI customOpenAPI(@Value("${info.application.description}") String appDescription, @Value("${info.application.version}") String appVersion) {
         return new OpenAPI()
                 .components(new Components()
                         .addSecuritySchemes("ApiKey", new SecurityScheme()

diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
@@ -1,6 +1,3 @@
-# info
-properties.environment=dev
-
 # Cosmos account config
 azure.cosmos.uri=https://pagopa-d-weu-gps-cosmos-account.documents.azure.com:443/
 azure.cosmos.key=<PUT_HERE_PRIMARY_KEY>
@@ -12,17 +9,14 @@ azure.cosmos.service-container-name=services
 
 service.gpd.host=http://localhost:8085
 
-# timeout
+# Timeout
 feign.client.config.default.connect-timeout=1000
 feign.client.config.default.read-timeout=1000
 
-# retry configuration
+# Retry configuration
 retry.maxAttempts=1
 retry.maxDelay=200
 
-# logging level settings
+# Logging Level settings
 logging.level.root=INFO
 logging.level.it.gov.pagopa.spontaneouspayment=INFO
-
-
-
diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
@@ -1,6 +1,3 @@
-# info
-properties.environment=local
-
 # Cosmos account config
 azure.cosmos.uri=https://localhost:8081
 azure.cosmos.key=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==
@@ -12,14 +9,14 @@ azure.cosmos.service-container-name=services
 
 service.gpd.host=http://localhost:8085
 
-# timeout
+# Timeout
 feign.client.config.default.connect-timeout=1000
 feign.client.config.default.read-timeout=1000
 
-# retry configuration
+# Retry configuration
 retry.maxAttempts=1
 retry.maxDelay=200
 
-# logging level settings
+# Logging Level settings
 logging.level.root=INFO
-logging.level.it.gov.pagopa.spontaneouspayment=INFO
+logging.level.it.gov.pagopa.spontaneouspayment=INFO
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,12 +1,12 @@
-#cors
-#spring_cors_origin=*
-server.port=9090
-
 # info
-application.name=@project.artifactId@
-application.version=@project.version@
-application.description=@project.description@
-properties.environment=azure
+info.application.name=@project.artifactId@
+info.application.version=@project.version@
+info.application.description=@project.description@
+info.properties.environment=none
+
+# Server
+server.port=9090
+server.servlet.context-path=/pagopa-spontaneous-payments-service
 
 # Cosmos account config
 azure.cosmos.uri=${COSMOS_URI}
@@ -17,24 +17,25 @@ azure.cosmos.populate-query-metrics=${COSMOS_QUERY_METRICS}
 azure.cosmos.ec-container-name=${EC_CONTAINER_NAME}
 azure.cosmos.service-container-name=${SERVICE_CONTAINER_NAME}
 
+# Service
 service.gpd.host=${GPD_HOST}
 
-# timeout
+# Timeout
 feign.client.config.default.connect-timeout=${CONNECTION_TIMEOUT}
 feign.client.config.default.read-timeout=${CONNECTION_TIMEOUT}
 
-# retry configuration
+# Retry configuration
 retry.maxAttempts=${RETRY_MAX_ATTEMPTS}
 retry.maxDelay=${RETRY_MAX_DELAY}
 
-# logging level settings
+# Logging Level settings
 logging.level.root=${LOGGING_LEVEL}
 logging.level.it.gov.pagopa.spontaneouspayment=${LOGGING_LEVEL}
 
-
-#jpa:
-# spring.jpa.hibernate.ddl-auto=validate
-# spring.jpa.show-sql=false
-# spring.jpa.open-in-view=false
-spring.devtools.add-properties=true
-spring.profiles.active=@spring.profiles.active@
+# Actuator
+management.endpoints.web.exposure.include=health,info
+management.endpoints.jmx.exposure.exclude=health,info
+management.info.env.enabled=true
+management.endpoint.health.probes.enabled=true
+management.health.livenessState.enabled=true
+management.health.readinessState.enabled=true
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
@@ -1,8 +1,8 @@
 # info
-application.name=@project.artifactId@
-application.version=@project.version@
-application.description=@project.description@
-properties.environment=JUNIT
+info.application.name=@project.artifactId@
+info.application.version=@project.version@
+info.application.description=@project.description@
+info.properties.environment=JUNIT
 
 # Cosmos account config
 azure.cosmos.uri=https://pagopa-d-gps-cosmos-account.documents.azure.com:443/
@@ -25,4 +25,4 @@ retry.maxDelay=200
 
 # logging level settings
 logging.level.root=INFO
-logging.level.it.gov.pagopa.spontaneouspayment=INFO
+logging.level.it.gov.pagopa.spontaneouspayment=INFO