pagopa · jacopocarlini · Jun 20, 2023 · Jun 20, 2023 · Jul 3, 2023 · Jul 3, 2023
diff --git a/.github/workflows/deploy_with_github_runner.yml b/.github/workflows/deploy_with_github_runner.yml
@@ -42,7 +42,6 @@ jobs:
           container_app_environment_name: ${{ vars.CONTAINER_APP_ENVIRONMENT_NAME }}
           resource_group_name: ${{ vars.CONTAINER_APP_ENVIRONMENT_RESOURCE_GROUP_NAME }} # RG of the runner
           pat_token: ${{ secrets.BOT_TOKEN_GITHUB }}
-          self_hosted_runner_image_tag: "v1.4.1"
 
   deploy:
     needs: [ create_runner ]

diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +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://search.maven.org/remotecontent?filepath=co/elastic/apm/elastic-apm-agent/1.36.0/elastic-apm-agent-1.36.0.jar ./apm-elk-agent.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 dependencies/ ./
 COPY --chown=spring:spring  --from=builder snapshot-dependencies/ ./
@@ -24,4 +24,4 @@ COPY --chown=spring:spring  --from=builder application/ ./
 
 EXPOSE 8080
 
-ENTRYPOINT ["java","-javaagent:apm-elk-agent.jar","-javaagent:applicationinsights-agent.jar","org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"]
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopa-afm-calculator
 description: Microservice that handles calculation for pagoPA Advanced Fees Management
 type: application
-version: 2.24.0
-appVersion: 2.6.6
+version: 2.24.5
+appVersion: 2.6.6-5-kibana
 dependencies:
   - name: microservice-chart
     version: 1.21.0

diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -70,16 +70,17 @@ microservice-chart:
     ISSUER_RANGE_TABLE: 'pagopadweuafmsaissuerrangetable'
     AMOUNT_THRESHOLD: '0'
     ID_PSP_POSTE: 'POSTE1'
-    ELASTIC_APM_SERVICE_NAME: pagopa-afm-calculator
-    ELASTIC_APM_APPLICATION_PACKAGES: it.gov.pagopa.afm.calculator
-    ELASTIC_APM_SERVER_URL: http://quickstart-apm-http.elastic-system.svc:8200
-    ELASTIC_APM_LOG_SENDING: 'true'
+    OTEL_SERVICE_NAME: "pagopa-afm-calculator"
+    OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=azure-dev"
+    OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
+    OTEL_LOGS_EXPORTER: none
+    OTEL_TRACES_SAMPLER: "always_on"
   envSecret:
     # required
     APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-d-connection-string'
     COSMOS_KEY: afm-marketplace-d-cosmos-pkey
     AFM_SA_CONNECTION_STRING: afm-d-sa-connection-string
-    ELASTIC_APM_SECRET_TOKEN: elastic-apm-secret-token
+    OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token
   keyvault:
     name: "pagopa-d-afm-kv"
     tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
@@ -109,7 +110,7 @@ microservice-chart:
       create: true
       image:
         repository: ghcr.io/pagopa/pagopa-afm-calculator
-        tag: "2.6.6"
+        tag: "2.6.6-5-kibana"
         pullPolicy: Always
-      envConfig:
-      envSecret:
+      envConfig: {OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=azure-dev-beta"}
+      envSecret: {}
diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -108,7 +108,7 @@ microservice-chart:
       create: true
       image:
         repository: ghcr.io/pagopa/pagopa-afm-calculator
-        tag: "2.6.6"
+        tag: "2.6.6-5-kibana"
         pullPolicy: Always
       envConfig:
       envSecret:
diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -108,7 +108,7 @@ microservice-chart:
       create: true
       image:
         repository: ghcr.io/pagopa/pagopa-afm-calculator
-        tag: "2.6.6"
+        tag: "2.6.6-5-kibana"
         pullPolicy: Always
       envConfig:
       envSecret:
diff --git a/openapi/openapi-node.json b/openapi/openapi-node.json
@@ -4,7 +4,7 @@
     "title": "PagoPA API Calculator Logic for Node",
     "description": "Calculator Logic microservice for pagoPA AFM",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "2.6.6"
+    "version": "2.6.6-5-kibana"
   },
   "servers": [
     {

diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -4,7 +4,7 @@
     "title": "PagoPA API Calculator Logic",
     "description": "Calculator Logic microservice for pagoPA AFM",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "2.6.6"
+    "version": "2.6.6-5-kibana"
   },
   "servers": [
     {

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>it.gov.pagopa</groupId>
     <artifactId>calculator</artifactId>
-    <version>2.6.6</version>
+    <version>2.6.6-5-kibana</version>
     <name>afm-calculator</name>
     <description>Calculator Logic microservice for pagoPA AFM</description>
 
@@ -156,6 +156,12 @@
             <artifactId>javaniotcpproxy</artifactId>
             <version>1.6</version>
         </dependency>
+
+        <dependency>
+            <groupId>co.elastic.logging</groupId>
+            <artifactId>logback-ecs-encoder</artifactId>
+            <version>1.5.0</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

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>