tmp

pagopa · Jan 5, 2024 · a9e6054 · a9e6054
1 parent d1c4340
commit a9e6054
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -2,7 +2,7 @@ standinmanager:
   namespace: "nodo"
   image:
     repository: ghcr.io/pagopa/pagopa-stand-in-manager
-    tag: "0.0.1-21-fix_pom"
+    tag: "0.0.1-22-fix_pom"
     pullPolicy: Always
   livenessProbe:
     httpGet:

diff --git a/pom.xml b/pom.xml
@@ -148,6 +148,12 @@
         </exclusion>
       </exclusions>
     </dependency>
+
+    <dependency>
+      <groupId>co.elastic.logging</groupId>
+      <artifactId>logback-ecs-encoder</artifactId>
+      <version>1.5.0</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <springProfile name="local">
+    <springProfile name="!default">
         <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" />
@@ -18,33 +18,18 @@
         </root>
     </springProfile>
 
-    <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" />
-
+    <springProfile name="default">
         <springProperty name="ECS_SERVICE_VERSION" source="info.application.version"/>
-        <springProperty name="ECS_SERVICE_NAME" source="info.application.name"/>
-
         <appender name="ECS_JSON_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="co.elastic.logging.logback.EcsEncoder">
-                <serviceName>${ECS_SERVICE_NAME}</serviceName>
+                <serviceName>${OTEL_SERVICE_NAME}</serviceName>
                 <serviceVersion>${ECS_SERVICE_VERSION}</serviceVersion>
                 <serviceEnvironment>${ENV}</serviceEnvironment>
             </encoder>
         </appender>
 
-        <appender name="CONSOLE_STD_OUT" 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} %clr(%mdc){magenta} %m%n%wEx
-                </Pattern>
-            </layout>
-        </appender>
-
         <root level="INFO">
-            <!--            <appender-ref ref="ECS_JSON_CONSOLE"/>-->
-            <appender-ref ref="CONSOLE_STD_OUT" />
+            <appender-ref ref="ECS_JSON_CONSOLE"/>
         </root>
     </springProfile>