add stdout appender, refactor

README.md

@@ -1,23 +1,22 @@
-Данный репозиторий содержит файлы, которые повторяются от проекта к проекту и могут быть шаблонизированы.
+Данный репозиторий содержит шаблоны (используемых в сервисах домена) ресурсов
 
-Для этого в pom нужно добавить:
+#Переопределяемые настройки `logback`
 
+`application.yml`
+```yaml
+logback:
+  appender: JSON_K8S_CONSOLE # возможные значения: DEFAULT_CONSOLE || COLOR_CONSOLE || JSON_K8S_CONSOLE
 ```
-<properties>
-    <server.port>8022</server.port>
-    <dockerfile.base.service.tag>f26fcc19d1941ab74f1c72dd8a408be17a769333</dockerfile.base.service.tag>
-    <damsel.version>1.151-4018c41</damsel.version>
-    <shared.resources.version>1.0.0</shared.resources.version>
-...
 
+#`pom.xml`
+```xml
 <dependency>
     <groupId>dev.vality</groupId>
     <artifactId>shared-resources</artifactId>
     <version>${shared.resources.version}</version>
 </dependency>
-
-...    
-
+```
+```xml
 <resources>
     <resource>
         <directory>${project.build.directory}/maven-shared-archive-resources</directory>
@@ -39,7 +38,8 @@
         <filtering>true</filtering>
     </resource>
 </resources>
-
+```
+```xml
 <plugin>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-remote-resources-plugin</artifactId>
@@ -67,8 +67,3 @@
     </executions>
 </plugin>
 ```
-
-после этого можно удалить локальные файлы: 
-1. Dockerfile
-1. git.properties
-1. logback-spring.xml

pom.xml

@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>shared-resources</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <packaging>jar</packaging>
 
     <name>Java shared resources</name>

src/main/resources/Dockerfile

@@ -1,4 +1,3 @@
-# @dockerfile.Template@
 FROM openjdk:15-jdk-slim
 
 RUN useradd -s /bin/false -U -u 20000 vality
@@ -7,7 +6,7 @@ COPY --chown=vality:vality @artifactId@-@[email protected] /opt/@artifactId@/@artifac
 
 USER vality:vality
 
-CMD ["java", "-Xmx256m", "-jar","/opt/@artifactId@/@[email protected]"]
+CMD ["java", "-jar","/opt/@artifactId@/@[email protected]"]
 
 EXPOSE @exposed.ports@
 

src/main/resources/logback-spring.xml

@@ -1,25 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <property name="LOG_APPENDERS" value="${logbackAppenders:-CONSOLE}"/>
     <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-    <include resource="dev/vality/sharedresources/logback/console-appender.xml"/>
-    <include resource="dev/vality/sharedresources/logback/properties-appender.xml"/>
+    <springProperty scope="context" name="logbackAppender" source="logback.appender" defaultValue="COLOR_CONSOLE"/>
+    <springProperty scope="context" name="loggingLevelRoot" source="logging.level.root" defaultValue="INFO"/>
+
+    <appender name="DEFAULT_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>${CONSOLE_LOG_CHARSET}</charset>
+        </encoder>
+    </appender>
+
+    <appender name="COLOR_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>
+                %black(%d{ISO8601}) [%blue(%t)] %magenta(${PID:- }) %highlight(%-5level) %cyan(%logger{36}).%yellow(%M):%white(%L) — %m%n%wEx
+            </Pattern>
+        </layout>
+    </appender>
+
+    <appender name="JSON_K8S_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+            <providers>
+                <mdc/>
+                <pattern>
+                    <pattern>
+                        {
+                            "@timestamp": "%date{yyy-MM-dd'T'HH:mm:ss.SSSXXX, UTC}",
+                            "@severity": "%level",
+                            "thread_name": "%thread",
+                            "logger_name": "%logger",
+                            "message": "%message"
+                        }
+                    </pattern>
+                </pattern>
+                <stackTrace>
+                    <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
+                        <maxDepthPerThrowable>30</maxDepthPerThrowable>
+                        <maxLength>2048</maxLength>
+                        <shortenedClassNameLength>20</shortenedClassNameLength>
+                        <exclude>^sun\.reflect\..*\.invoke</exclude>
+                        <exclude>^net\.sf\.cglib\.proxy\.MethodProxy\.invoke</exclude>
+                        <rootCauseFirst>true</rootCauseFirst>
+                    </throwableConverter>
+                </stackTrace>
+            </providers>
+        </encoder>
+    </appender>
 
     <root level="${loggingLevelRoot}">
-        <if condition='property("LOG_APPENDERS").contains("CONSOLE")'>
+        <if condition='"${logbackAppender}".equals("COLOR_CONSOLE")'>
             <then>
-                <appender-ref ref="CONSOLE"/>
-            </then>
-        </if>
-        <if condition='property("LOG_APPENDERS").contains("FILE")'>
-            <then>
-                <appender-ref ref="FILE"/>
+                <appender-ref ref="COLOR_CONSOLE"/>
             </then>
+            <else>
+                <if condition='"${logbackAppender}".equals("JSON_K8S_CONSOLE")'>
+                    <then>
+                        <appender-ref ref="JSON_K8S_CONSOLE"/>
+                    </then>
+                    <else>
+                        <appender-ref ref="DEFAULT_CONSOLE"/>
+                    </else>
+                </if>
+            </else>
         </if>
     </root>
 
-    <logger name="dev.vality" level="ALL"/>
-    <logger name="dev.vality.woody" level="ALL"/>
-
     <jmxConfigurator/>
 </configuration>