Merge pull request #8 from pagopa/fix-problems

feat: Fix problems Hikari + logs

Author: aomegax

.identity/.terraform.lock.hcl

@@ -1,21 +1,21 @@
 #
 # Build
 #
-FROM maven:3.9.5-amazoncorretto-17-al2023@sha256:eeaa7ab572d931f7273fc5cf31429923f172091ae388969e11f42ec6dd817d74 as buildtime
+FROM maven:3.9.6-amazoncorretto-17-al2023@sha256:4c8bd9ec72b372f587f7b9d92564a307e4f5180b7ec08455fb346617bae1757e as buildtime
 WORKDIR /build
 COPY . .
 RUN mvn clean package -DskipTests
 
 
-FROM amazoncorretto:17.0.9-alpine3.18@sha256:df48bf2e183230040890460ddb4359a10aa6c7aad24bd88899482c52053c7e17 as builder
+FROM amazoncorretto:17.0.10-alpine3.19@sha256:180e9c91bdbaad3599fedd2f492bf0d0335a9382835aa64669b2c2a8de7c9a22 as builder
 WORKDIR /app
 COPY --from=buildtime /build/target/*.jar /app/application.jar
 RUN java -Djarmode=layertools -jar application.jar extract
 
 
-FROM ghcr.io/pagopa/docker-base-springboot-openjdk17:v1.1.0@sha256:6fa320d452fa22066441f1ef292d15eb06f944bc8bca293e1a91ea460d30a613
+FROM ghcr.io/pagopa/docker-base-springboot-openjdk17:v1.1.3@sha256:a4e970ef05ecf2081424a64707e7c20856bbc40ddb3e99b32a24cd74591817c4
 WORKDIR /app
-ADD --chown=spring:spring https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.25.1/opentelemetry-javaagent.jar .
+#ADD --chown=spring:spring https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.25.1/opentelemetry-javaagent.jar .
 
 COPY --chown=spring:spring  --from=builder /app/dependencies/ ./
 COPY --chown=spring:spring  --from=builder /app/snapshot-dependencies/ ./
@@ -25,4 +25,5 @@ COPY --chown=spring:spring  --from=builder /app/application/ ./
 
 EXPOSE 8080
 
-ENTRYPOINT ["java","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"]
+#ENTRYPOINT ["java","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "--enable-preview","org.springframework.boot.loader.JarLauncher"]

.identity/02_application_action.tf

@@ -1,9 +1,9 @@
 apiVersion: v2
-name: pagopa-afm-calculator
-description: Microservice that handles calculation for pagoPA Advanced Fees Management
+name: pagopa-node-cfg-sync
+description: Microservice that sync api-config-cache and standin configuration
 type: application
-version: 0.41.0
-appVersion: 0.0.2
+version: 0.51.0
+appVersion: 0.0.2-4-fix-problems
 dependencies:
   - name: microservice-chart
     version: 2.8.0

Dockerfile

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-node-cfg-sync
-    tag: "0.0.2"
+    tag: "0.0.2-4-fix-problems"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -65,20 +65,27 @@ microservice-chart:
     WEBSITE_SITE_NAME: 'pagopa-node-cfg-sync'
     ENV: 'azure-dev'
     APP_LOGGING_LEVEL: 'INFO'
+    HIKARI_LOGGING_LEVEL: 'INFO'
     DEFAULT_LOGGING_LEVEL: 'INFO'
     CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
     DB_NEXI_POSTGRES_URL: "jdbc:postgresql://db-postgres-ndp.d.db-nodo-pagamenti.com:5444/ndpspct?prepareThreshold=0&currentSchema=NODO4_CFG"
     DB_NEXI_POSTGRES_USER: "pp_nodo4_cfg"
     DB_NEXI_POSTGRES_ENABLED: "false"
     DB_NEXI_POSTGRES_SERVICE_IDENTIFIER: "NDP004DEV"
+    DB_NEXI_POSTGRES_CONNECTION_TIMEOUT: "15000"
+    DB_NEXI_POSTGRES_MAX_LIFETIME: "30000"
     DB_NEXI_ORACLE_URL: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1522)(HOST=db-nodo-pagamenti.d.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCT_PP_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
     DB_NEXI_ORACLE_USER: "NODO4_CFG"
     DB_NEXI_ORACLE_ENABLED: "true"
     DB_NEXI_ORACLE_SERVICE_IDENTIFIER: "NDP003DEV"
+    DB_NEXI_ORACLE_CONNECTION_TIMEOUT: "15000"
+    DB_NEXI_ORACLE_MAX_LIFETIME: "30000"
     DB_PAGOPA_POSTGRES_URL: "jdbc:postgresql://ndp.d.db-nodo-pagamenti.com:6432/nodo?sslmode=require&prepareThreshold=0&currentSchema=cfg"
     DB_PAGOPA_POSTGRES_USER: "cfg"
     DB_PAGOPA_POSTGRES_ENABLED: "true"
     DB_PAGOPA_POSTGRES_SERVICE_IDENTIFIER: "NDP001DEV"
+    DB_PAGOPA_POSTGRES_CONNECTION_TIMEOUT: "15000"
+    DB_PAGOPA_POSTGRES_MAX_LIFETIME: "30000"
     API_CONFIG_CACHE_URL: "https://api.dev.platform.pagopa.it/api-config-cache/o/v1/stakeholders/node/cache/schemas/v1"
     STAND_IN_MANAGER_URL: "https://api.dev.platform.pagopa.it/stand-in-manager/api/v1"
     OTEL_SERVICE_NAME: "pagopanodecfgsync"

helm/Chart.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-node-cfg-sync
-    tag: "0.0.2"
+    tag: "0.0.2-4-fix-problems"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -65,20 +65,27 @@ microservice-chart:
     WEBSITE_SITE_NAME: 'pagopa-node-cfg-sync' # required to show cloud role name in application insights
     ENV: 'azure-prod'
     APP_LOGGING_LEVEL: 'INFO'
+    HIKARI_LOGGING_LEVEL: 'INFO'
     DEFAULT_LOGGING_LEVEL: 'INFO'
     CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
     DB_NEXI_POSTGRES_URL: "jdbc:postgresql://db-postgres-ndp.p.db-nodo-pagamenti.com:5444/ndpspcp?prepareThreshold=0&currentSchema=NODO4_CFG"
     DB_NEXI_POSTGRES_USER: "pp_nodo4_cfg"
     DB_NEXI_POSTGRES_ENABLED: "false"
     DB_NEXI_POSTGRES_SERVICE_IDENTIFIER: "NDP004DEV"
+    DB_NEXI_POSTGRES_CONNECTION_TIMEOUT: "15000"
+    DB_NEXI_POSTGRES_MAX_LIFETIME: "30000"
     DB_CONFIG_URL: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1521)(HOST=db-nodo-pagamenti.p.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCP_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
     DB_NEXI_ORACLE_USER: "NODO4_CFG"
     DB_NEXI_ORACLE_ENABLED: "true"
     DB_NEXI_ORACLE_SERVICE_IDENTIFIER: "NDP003DEV"
+    DB_NEXI_ORACLE_CONNECTION_TIMEOUT: "15000"
+    DB_NEXI_ORACLE_MAX_LIFETIME: "30000"
     DB_PAGOPA_POSTGRES_URL: "jdbc:postgresql://ndp.p.db-nodo-pagamenti.com:6432/nodo?sslmode=require&prepareThreshold=0&currentSchema=cfg"
     DB_PAGOPA_POSTGRES_USER: "cfg"
     DB_PAGOPA_POSTGRES_ENABLED: "true"
     DB_PAGOPA_POSTGRES_SERVICE_IDENTIFIER: "NDP001DEV"
+    DB_PAGOPA_POSTGRES_CONNECTION_TIMEOUT: "15000"
+    DB_PAGOPA_POSTGRES_MAX_LIFETIME: "30000"
     API_CONFIG_CACHE_URL: "https://api.uat.platform.pagopa.it/api-config-cache/o/v1/stakeholders/node/cache/schemas/v1"
     STAND_IN_MANAGER_URL: "https://api.uat.platform.pagopa.it/stand-in-manager/api/v1"
     OTEL_SERVICE_NAME: "pagopanodecfgsync"

helm/values-dev.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-node-cfg-sync
-    tag: "0.0.2"
+    tag: "0.0.2-4-fix-problems"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -65,20 +65,27 @@ microservice-chart:
     WEBSITE_SITE_NAME: 'pagopa-node-cfg-sync'
     ENV: 'azure-uat'
     APP_LOGGING_LEVEL: 'INFO'
+    HIKARI_LOGGING_LEVEL: 'INFO'
     DEFAULT_LOGGING_LEVEL: 'INFO'
     CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
     DB_NEXI_POSTGRES_URL: "jdbc:postgresql://db-postgres-ndp.u.db-nodo-pagamenti.com:5444/ndpspca?prepareThreshold=0&currentSchema=NODO4_CFG"
     DB_NEXI_POSTGRES_USER: "pp_nodo4_cfg"
     DB_NEXI_POSTGRES_ENABLED: "false"
     DB_NEXI_POSTGRES_SERVICE_IDENTIFIER: "NDP004DEV"
+    DB_NEXI_POSTGRES_CONNECTION_TIMEOUT: "15000"
+    DB_NEXI_POSTGRES_MAX_LIFETIME: "30000"
     DB_CONFIG_URL: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1524)(HOST=db-nodo-pagamenti.u.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCA_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
     DB_NEXI_ORACLE_USER: "NODO4_CFG"
     DB_NEXI_ORACLE_ENABLED: "true"
     DB_NEXI_ORACLE_SERVICE_IDENTIFIER: "NDP003DEV"
+    DB_NEXI_ORACLE_CONNECTION_TIMEOUT: "15000"
+    DB_NEXI_ORACLE_MAX_LIFETIME: "30000"
     DB_PAGOPA_POSTGRES_URL: "jdbc:postgresql://ndp.u.db-nodo-pagamenti.com:6432/nodo?sslmode=require&prepareThreshold=0&currentSchema=cfg"
     DB_PAGOPA_POSTGRES_USER: "cfg"
     DB_PAGOPA_POSTGRES_ENABLED: "true"
     DB_PAGOPA_POSTGRES_SERVICE_IDENTIFIER: "NDP001DEV"
+    DB_PAGOPA_POSTGRES_CONNECTION_TIMEOUT: "15000"
+    DB_PAGOPA_POSTGRES_MAX_LIFETIME: "30000"
     API_CONFIG_CACHE_URL: "https://api.uat.platform.pagopa.it/api-config-cache/o/v1/stakeholders/node/cache/schemas/v1"
     STAND_IN_MANAGER_URL: "https://api.uat.platform.pagopa.it/stand-in-manager/api/v1"
     OTEL_SERVICE_NAME: "pagopanodecfgsync"

helm/values-prod.yaml

@@ -4,7 +4,7 @@
     "title": "cfg-sync",
     "description": "Microservice to update configuration schema of Nodo dei Pagamenti",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "0.0.2"
+    "version": "0.0.2-4-fix-problems"
   },
   "servers": [
     {
@@ -226,28 +226,6 @@
   },
   "components": {
     "schemas": {
-      "ProblemJson": {
-        "type": "object",
-        "properties": {
-          "title": {
-            "type": "string",
-            "description": "A short, summary of the problem type. Written in english and readable for engineers (usually not suited for non technical stakeholders and not localized); example: Service Unavailable"
-          },
-          "status": {
-            "maximum": 600,
-            "minimum": 100,
-            "type": "integer",
-            "description": "The HTTP status code generated by the origin server for this occurrence of the problem.",
-            "format": "int32",
-            "example": 200
-          },
-          "detail": {
-            "type": "string",
-            "description": "A human readable explanation specific to this occurrence of the problem.",
-            "example": "There was an error processing the request"
-          }
-        }
-      },
       "SyncStatusResponse": {
         "required": [
           "serviceIdentifier",
@@ -272,6 +250,28 @@
             ]
           }
         }
+      },
+      "ProblemJson": {
+        "type": "object",
+        "properties": {
+          "title": {
+            "type": "string",
+            "description": "A short, summary of the problem type. Written in english and readable for engineers (usually not suited for non technical stakeholders and not localized); example: Service Unavailable"
+          },
+          "status": {
+            "maximum": 600,
+            "minimum": 100,
+            "type": "integer",
+            "description": "The HTTP status code generated by the origin server for this occurrence of the problem.",
+            "format": "int32",
+            "example": 200
+          },
+          "detail": {
+            "type": "string",
+            "description": "A human readable explanation specific to this occurrence of the problem.",
+            "example": "There was an error processing the request"
+          }
+        }
       }
     },
     "securitySchemes": {

helm/values-uat.yaml

@@ -12,7 +12,7 @@
 
   <groupId>it.gov.pagopa.node</groupId>
   <artifactId>cfg-sync</artifactId>
-  <version>0.0.2</version>
+  <version>0.0.2-4-fix-problems</version>
   <description>Microservice to update configuration schema of Nodo dei Pagamenti</description>
 
   <properties>