Merge remote-tracking branch 'origin/HH-85762'

hhru · Dec 4, 2018 · c3029f2 · c3029f2
2 parents 2b019f1 + 974aabb
commit c3029f2
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 16 deletions.
diff --git a/nab-common/src/main/java/ru/hh/nab/common/mdc/MDC.java b/nab-common/src/main/java/ru/hh/nab/common/mdc/MDC.java
@@ -3,7 +3,7 @@
 import java.util.Optional;
 
 public class MDC {
-  public static final String REQUEST_ID_MDC_KEY = "request_id";
+  public static final String REQUEST_ID_MDC_KEY = "rid";
   public static final String CONTROLLER_MDC_KEY = "controller";
 
   public static Optional<String> getRequestId() {

diff --git a/nab-starter/pom.xml b/nab-starter/pom.xml
@@ -125,7 +125,7 @@
         <dependency>
             <groupId>ru.hh</groupId>
             <artifactId>jetty-utils</artifactId>
-            <version>1.7.8</version>
+            <version>1.7.9</version>
         </dependency>
         <!-- update jetty version in jetty-utils first to pass unit tests -->
         <dependency>

diff --git a/nab-starter/src/main/java/ru/hh/nab/starter/server/jetty/JettyServer.java b/nab-starter/src/main/java/ru/hh/nab/starter/server/jetty/JettyServer.java
@@ -1,7 +1,9 @@
 package ru.hh.nab.starter.server.jetty;
 
 import static java.util.Optional.ofNullable;
+
 import javax.servlet.ServletContext;
+
 import org.eclipse.jetty.jmx.MBeanContainer;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.HttpConfiguration;
@@ -13,8 +15,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ru.hh.jetty.HHServerConnector;
-import ru.hh.jetty.RequestLogger;
-import ru.hh.jetty.RequestWithCacheLogger;
+import ru.hh.logging.StructuredRequestLogger;
 import ru.hh.nab.common.properties.FileSettings;
 
 import java.lang.management.ManagementFactory;
@@ -78,10 +79,10 @@ public boolean isRunning() {
 
   private void configureConnector() {
     ServerConnector serverConnector = new HHServerConnector(
-        server,
-        ofNullable(jettySettings.getInteger("acceptors")).orElse(1),
-        ofNullable(jettySettings.getInteger("selectors")).orElse(1),
-        createHttpConnectionFactory());
+      server,
+      ofNullable(jettySettings.getInteger("acceptors")).orElse(1),
+      ofNullable(jettySettings.getInteger("selectors")).orElse(1),
+      createHttpConnectionFactory());
 
     serverConnector.setHost(jettySettings.getString("host"));
     serverConnector.setPort(jettySettings.getInteger(PORT));
@@ -98,8 +99,7 @@ private void configureMBeanContainer() {
   }
 
   private void configureRequestLogger() {
-    boolean httpCacheEnabled = jettySettings.getBoolean("http.cache.sizeInMB") != null;
-    server.setRequestLog(httpCacheEnabled ? new RequestWithCacheLogger() : new RequestLogger());
+    server.setRequestLog(new StructuredRequestLogger());
   }
 
   private void configureStopTimeout() {
@@ -119,7 +119,7 @@ private static HttpConnectionFactory createHttpConnectionFactory() {
 
   private Optional<ServerConnector> getServerConnector() {
     Connector[] connectors = server.getConnectors();
-    for (Connector connector: connectors) {
+    for (Connector connector : connectors) {
       if (connector instanceof ServerConnector) {
         return Optional.of((ServerConnector) connector);
       }

diff --git a/nab-starter/src/main/resources/nab-shared-logback.xml b/nab-starter/src/main/resources/nab-shared-logback.xml
@@ -9,7 +9,18 @@
     <property scope="context" name="log.timings" value="${log.timings:-false}"/>
 
     <!-- service -->
-    <appender name="service" class="ru.hh.logging.HhRollingAppender"/>
+    <appender name="service" class="ru.hh.logging.HhRollingAppender">
+        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+            <layout class="ch.qos.logback.contrib.json.classic.JsonLayout">
+                <jsonFormatter class="ch.qos.logback.contrib.jackson.JacksonJsonFormatter">
+                    <prettyPrint>false</prettyPrint>
+                </jsonFormatter>
+                <timestampFormat>yyyy-MM-dd' 'HH:mm:ss.SSSZ</timestampFormat>
+                <appendLineSeparator>true</appendLineSeparator>
+                <includeContextName>false</includeContextName>
+            </layout>
+        </encoder>
+    </appender>
     <appender name="asyncService" class="ch.qos.logback.classic.AsyncAppender">
         <queueSize>500</queueSize>
         <appender-ref ref="service"/>
@@ -32,21 +43,38 @@
 
     <!-- requests -->
     <appender name="requests" class="ru.hh.logging.HhRollingAppender">
-        <encoder>
-            <pattern>${requests.pattern}</pattern>
+        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+            <layout class="ru.hh.logging.StructuredRequestJsonLayout">
+                <jsonFormatter class="ch.qos.logback.contrib.jackson.JacksonJsonFormatter">
+                    <prettyPrint>false</prettyPrint>
+                </jsonFormatter>
+                <timestampFormat>yyyy-MM-dd' 'HH:mm:ss.SSSZ</timestampFormat>
+                <appendLineSeparator>true</appendLineSeparator>
+            </layout>
         </encoder>
     </appender>
     <appender name="asyncRequests" class="ch.qos.logback.classic.AsyncAppender">
         <appender-ref ref="requests"/>
         <queueSize>512</queueSize>
         <discardingThreshold>0</discardingThreshold>
     </appender>
-    <logger name="ru.hh.jetty.RequestLogger" additivity="false" level="info">
+    <logger name="ru.hh.logging.StructuredRequestLogger" additivity="false" level="info">
         <appender-ref ref="asyncRequests"/>
     </logger>
 
     <!-- libraries -->
-    <appender name="libraries" class="ru.hh.logging.HhRollingAppender"/>
+    <appender name="libraries" class="ru.hh.logging.HhRollingAppender">
+        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+            <layout class="ch.qos.logback.contrib.json.classic.JsonLayout">
+                <jsonFormatter class="ch.qos.logback.contrib.jackson.JacksonJsonFormatter">
+                    <prettyPrint>false</prettyPrint>
+                </jsonFormatter>
+                <timestampFormat>yyyy-MM-dd' 'HH:mm:ss.SSSZ</timestampFormat>
+                <appendLineSeparator>true</appendLineSeparator>
+                <includeContextName>false</includeContextName>
+            </layout>
+        </encoder>
+    </appender>
     <appender name="asyncLibraries" class="ch.qos.logback.classic.AsyncAppender">
         <appender-ref ref="libraries"/>
         <queueSize>512</queueSize>