Merge pull request #7 from pagopa/PRDP-133-change-log-service-name

[PRDP-133] fix: Change log service name
pagopa · Sep 13, 2023 · f38c895 · f38c895
2 parents 9796c42 + cdeb9b4
commit f38c895
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 8 deletions.
diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -94,7 +94,6 @@ microservice-chart:
     CONSOLE_LOG_THRESHOLD: "DEBUG"
     CONSOLE_LOG_PATTERN: "%d{HH:mm:ss.SSS}[%thread]%-5level%logger{36}-%msg%n"
     CONSOLE_LOG_CHARSET: "UTF-8"
-    ECS_SERVICE_NAME: "pagopareceiptpdfgeneratorotl"
     OTEL_RESOURCE_ATTRIBUTES: "service.name=pagopareceiptpdfgeneratorotl,deployment.environment=dev"
     OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
     OTEL_LOGS_EXPORTER: none

diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -93,7 +93,6 @@ microservice-chart:
     CONSOLE_LOG_THRESHOLD: "DEBUG"
     CONSOLE_LOG_PATTERN: "%d{HH:mm:ss.SSS}[%thread]%-5level%logger{36}-%msg%n"
     CONSOLE_LOG_CHARSET: "UTF-8"
-    ECS_SERVICE_NAME: "pagopareceiptpdfgeneratorotl"
     OTEL_RESOURCE_ATTRIBUTES: "service.name=pagopareceiptpdfgeneratorotl,deployment.environment=prod"
     OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
     OTEL_LOGS_EXPORTER: none

diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -94,7 +94,6 @@ microservice-chart:
     CONSOLE_LOG_THRESHOLD: "DEBUG"
     CONSOLE_LOG_PATTERN: "%d{HH:mm:ss.SSS}[%thread]%-5level%logger{36}-%msg%n"
     CONSOLE_LOG_CHARSET: "UTF-8"
-    ECS_SERVICE_NAME: "pagopareceiptpdfgeneratorotl"
     OTEL_RESOURCE_ATTRIBUTES: "service.name=pagopareceiptpdfgeneratorotl,deployment.environment=uat"
     OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
     OTEL_LOGS_EXPORTER: none

diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/generator/Info.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/Info.java
@@ -49,7 +49,7 @@ public synchronized AppInfo getInfo() {
             if (inputStream != null) {
                 properties.load(inputStream);
                 version = properties.getProperty("version", null);
-                name = properties.getProperty("artifactId", null);
+                name = properties.getProperty("name", null);
             }
         } catch (Exception e) {
             logger.error("Impossible to retrieve information from pom.properties file.", e);

diff --git a/src/main/resources-filtered/application.properties b/src/main/resources-filtered/application.properties
@@ -1,2 +1,2 @@
 version=${project.version}
-artifactId=${project.artifactId}
+name=${project.name}
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -16,7 +16,7 @@
     <if condition='"TRUE".equalsIgnoreCase("${ENABLE_ECS_CONSOLE}")'>
         <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="co.elastic.logging.logback.EcsEncoder">
-                <serviceName>${ECS_SERVICE_NAME}</serviceName>
+                <serviceName>${name}</serviceName>
                 <serviceVersion>${version}</serviceVersion>
                 <serviceEnvironment>${ENV}</serviceEnvironment>
             </encoder>

diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/generator/InfoTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/generator/InfoTest.java
@@ -51,7 +51,7 @@ void runOK() {
         assertNotNull(responseBody.getName());
         assertNotNull(responseBody.getVersion());
         assertNotNull(responseBody.getEnvironment());
-        assertEquals("receipt-pdf-generator", responseBody.getName());
+        assertEquals("pagopa-receipt-pdf-generator", responseBody.getName());
         assertEquals("azure-fn", responseBody.getEnvironment());
     }
 }
diff --git a/...s/META-INF/maven/it.gov.pagopa.receipt.pdf.datastore/receipt-pdf-datastore/pom.properties b/...s/META-INF/maven/it.gov.pagopa.receipt.pdf.datastore/receipt-pdf-datastore/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
 #Mon Jul 31 17:21:09 CEST 2023
 groupId=it.gov.pagopa.receipt
-artifactId=receipt-pdf-generator
+name=pagopa-receipt-pdf-generator
 version=x.y.z