Merge pull request #33 from pagopa/PAGOPA-1135-sviluppo-migrazione-ap…

…i-config-cache [PAGOPA-1135] new GHA
pagopa · Aug 25, 2023 · 63e1a10 · 63e1a10
2 parents 6e83b1c + 4e31f4f
commit 63e1a10
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 77 deletions.
diff --git a/.devops/code-review-pipelines.yml b/.devops/code-review-pipelines.yml
diff --git a/.github/workflows/deploy_with_github_runner.yml b/.github/workflows/deploy_with_github_runner.yml
@@ -61,7 +61,7 @@ jobs:
           cluster_name: ${{ vars.CLUSTER_NAME }}
           resource_group: ${{ vars.CLUSTER_RESOURCE_GROUP }}
           app_name: ${{ env.APP_NAME }}
-          helm_upgrade_options: "--debug --set postgresql.enabled=\"true\" --set oracle.enabled=\"true\" --set oracledev.enabled=\"true\" --set oracleprod.enabled=\"true\""
+          helm_upgrade_options: "--debug --set postgresql.enabled=true --set oracle.enabled=true --set oracledev.enabled=true --set oracleprod.enabled=true"
 
   cleanup_runner:
     name: Cleanup Runner

diff --git a/Dockerfile b/Dockerfile
@@ -13,6 +13,7 @@ RUN java -Djarmode=layertools -jar application.jar extract
 
 
 FROM ghcr.io/pagopa/docker-base-springboot-openjdk11:v1.0.1@sha256:bbbe948e91efa0a3e66d8f308047ec255f64898e7f9250bdb63985efd3a95dbf
+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 dependencies/ ./
 COPY --chown=spring:spring  --from=builder snapshot-dependencies/ ./
@@ -22,3 +23,5 @@ COPY --chown=spring:spring  --from=builder spring-boot-loader/ ./
 COPY --chown=spring:spring  --from=builder application/ ./
 
 EXPOSE 8080
+
+ENTRYPOINT ["java","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"]
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: pagopa-api-cache-chart
 description: Microservice that handles calculation for pagoPA Advanced Fees Management
 type: application
-version: 0.0.1
+version: 0.1.0
 dependencies:
   - name: microservice-chart
     version: 3.0.0
@@ -24,4 +24,4 @@ dependencies:
     repository: "https://pagopa.github.io/aks-microservice-chart-blueprint"
     alias: oracleprod
     condition: oracleprod.enabled
-
+appVersion: 0.6.0-10-PAGOPA-1135-sviluppo-migrazione-api-config-cache
diff --git a/helm/weu-dev/values-dev.yaml → helm/values-dev.yaml b/helm/weu-dev/values-dev.yaml → helm/values-dev.yaml
@@ -136,3 +136,10 @@ oracleprod:
     envSecrets:
       !!merge <<: *envSecret
       DB_CONFIG_PASSWORD: "oracle-db-cfg-prod-password"
+microservice-chart:
+  image:
+    tag: 0.6.0-10-PAGOPA-1135-sviluppo-migrazione-api-config-cache
+  canaryDelivery:
+    deployment:
+      image:
+        tag: 0.6.0-10-PAGOPA-1135-sviluppo-migrazione-api-config-cache
diff --git a/helm/weu-prod/values-prod.yaml → helm/values-prod.yaml b/helm/weu-prod/values-prod.yaml → helm/values-prod.yaml
@@ -116,3 +116,10 @@ oracleprod:
     envSecrets:
       !!merge <<: *envSecret
       DB_CONFIG_PASSWORD: "oracle-db-cfg-password"
+microservice-chart:
+  image:
+    tag: 0.6.0-10-PAGOPA-1135-sviluppo-migrazione-api-config-cache
+  canaryDelivery:
+    deployment:
+      image:
+        tag: 0.6.0-10-PAGOPA-1135-sviluppo-migrazione-api-config-cache
diff --git a/helm/weu-uat/values-uat.yaml → helm/values-uat.yaml b/helm/weu-uat/values-uat.yaml → helm/values-uat.yaml
@@ -92,3 +92,10 @@ oracledev:
   enabled: false
 oracleprod:
   enabled: false
+microservice-chart:
+  image:
+    tag: 0.6.0-10-PAGOPA-1135-sviluppo-migrazione-api-config-cache
+  canaryDelivery:
+    deployment:
+      image:
+        tag: 0.6.0-10-PAGOPA-1135-sviluppo-migrazione-api-config-cache
diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -4,7 +4,7 @@
     "title": "API-Config Cacher",
     "description": "Generate cache for regarding Nodo dei Pagamenti configuration",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "0.6.0-3-NOD-383-jdbc-connection-error"
+    "version": "0.6.0-10-PAGOPA-1135-sviluppo-migrazione-api-config-cache"
   },
   "servers": [
     {

diff --git a/openapi/openapi_fdrv1.json b/openapi/openapi_fdrv1.json
@@ -4,7 +4,7 @@
     "title": "API-Config Cacher",
     "description": "Generate cache for regarding Nodo dei Pagamenti configuration",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "0.6.0-3-NOD-383-jdbc-connection-error"
+    "version": "0.6.0-10-PAGOPA-1135-sviluppo-migrazione-api-config-cache"
   },
   "servers": [
     {

diff --git a/openapi/openapi_nodev1.json b/openapi/openapi_nodev1.json
@@ -4,7 +4,7 @@
     "title": "API-Config Cacher",
     "description": "Generate cache for regarding Nodo dei Pagamenti configuration",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "0.6.0-3-NOD-383-jdbc-connection-error"
+    "version": "0.6.0-10-PAGOPA-1135-sviluppo-migrazione-api-config-cache"
   },
   "servers": [
     {

diff --git a/openapi/openapi_verifierv1.json b/openapi/openapi_verifierv1.json
@@ -4,7 +4,7 @@
     "title": "API-Config Cacher",
     "description": "Generate cache for regarding Nodo dei Pagamenti configuration",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "0.6.0-3-NOD-383-jdbc-connection-error"
+    "version": "0.6.0-10-PAGOPA-1135-sviluppo-migrazione-api-config-cache"
   },
   "servers": [
     {

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>it.gov.pagopa.api-config</groupId>
   <artifactId>cache</artifactId>
-  <version>0.6.0-3-NOD-383-jdbc-connection-error</version>
+  <version>0.6.0-10-PAGOPA-1135-sviluppo-migrazione-api-config-cache</version>
   <name>API-Config Cacher</name>
   <description>Generate cache for regarding Nodo dei Pagamenti configuration</description>
 
@@ -115,8 +115,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-
-
+    <dependency>
+      <groupId>co.elastic.logging</groupId>
+      <artifactId>logback-ecs-encoder</artifactId>
+      <version>1.5.0</version>
+    </dependency>
   </dependencies>
 
   <profiles>

diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <springProfile name="local">
+        <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+        <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+        <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+
+        <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+            <layout class="ch.qos.logback.classic.PatternLayout">
+                <Pattern>
+                    %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m %clr(%mdc){magenta}%n%wEx
+                </Pattern>
+            </layout>
+        </appender>
+
+        <root level="INFO">
+            <appender-ref ref="stdout"/>
+        </root>
+    </springProfile>
+
+    <springProfile name="!local">
+        <springProperty name="ECS_SERVICE_VERSION" source="info.application.version"/>
+        <appender name="ECS_JSON_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+            <encoder class="co.elastic.logging.logback.EcsEncoder">
+                <serviceName>${OTEL_SERVICE_NAME}</serviceName>
+                <serviceVersion>${ECS_SERVICE_VERSION}</serviceVersion>
+                <serviceEnvironment>${ENV}</serviceEnvironment>
+            </encoder>
+        </appender>
+
+        <root level="INFO">
+            <appender-ref ref="ECS_JSON_CONSOLE"/>
+        </root>
+    </springProfile>
+
+</configuration>