Merge branch 'RED-7714' into 'main'

RED-7715 - Add log4j config to enable switching between json/line logs

See merge request fforesight/layout-parser!87

layoutparser-service/layoutparser-service-server/build.gradle.kts

@@ -21,7 +21,6 @@ dependencies {
 
     implementation("com.iqser.red.commons:storage-commons:2.45.0")
     implementation("com.knecon.fforesight:tenant-commons:0.14.0")
-    implementation("com.knecon.fforesight:tracing:0.5.0")
     implementation("org.springframework.boot:spring-boot-starter-actuator:3.1.3")
     implementation("com.amazonaws:aws-java-sdk-s3:1.12.536")
     implementation("org.springframework.boot:spring-boot-starter-amqp:3.1.3")

layoutparser-service/layoutparser-service-server/src/main/resources/application.yml

@@ -5,8 +5,6 @@ tenant-user-management-service.url: "http://tenant-user-management-service:8080/
 
 fforesight.tenants.remote: true
 
-logging.pattern.level: "%5p [${spring.application.name},namespace=${management.namespace},traceID=%X{traceId:-NONE},spanID=%X{spanId:-NONE}]"
-
 server:
   port: 8080
 
@@ -34,14 +32,6 @@ management:
     prometheus.enabled: ${monitoring.enabled:false}
     health.enabled: true
   endpoints.web.exposure.include: prometheus, health
-  namespace: ${NAMESPACE:default}
-  tracing:
-    enabled: ${TRACING_ENABLED:false}
-    sampling:
-      probability: ${TRACING_PROBABILITY:1.0}
-  otlp:
-    tracing:
-      endpoint: ${OTLP_ENDPOINT:http://otel-collector-opentelemetry-collector.otel-collector:4318/v1/traces}
 
 
 storage:

layoutparser-service/layoutparser-service-server/src/main/resources/log4j2.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="INFO">
+    <Properties>
+        <property name="logType">${env:LOGGING_TYPE}</property>
+    </Properties>
+    <Appenders>
+        <Console name="json" target="SYSTEM_OUT">
+            <JSONLayout compact="true" eventEol="true" properties="true" stacktraceAsString="true"
+                        includeTimeMillis="true">
+
+                <KeyValuePair key="version" value="${project.version}"/>
+            </JSONLayout>
+        </Console>
+        <Console name="console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n " />
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <AppenderRef ref="${logType}"/>
+        </Root>
+    </Loggers>
+</Configuration>