[1.7.x] Refactor CustomJsonLayout, and test it locally

api/pom.xml

@@ -68,6 +68,14 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
+      <dependency>
+        <groupId>ch.qos.logback.contrib</groupId>
+        <artifactId>logback-jackson</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback.contrib</groupId>
+        <artifactId>logback-json-classic</artifactId>
+      </dependency>
   </dependencies>
 
 </project>

subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/CustomJsonLayout.java → api/src/main/java/org/commonjava/indy/CustomJsonLayout.java

@@ -13,49 +13,63 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.commonjava.indy.bind.jaxrs;
+package org.commonjava.indy;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.contrib.json.classic.JsonLayout;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import org.commonjava.indy.conf.EnvironmentConfig;
-import org.commonjava.indy.model.core.io.IndyObjectMapper;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.enterprise.inject.spi.CDI;
+import java.util.HashMap;
 import java.util.Map;
-
-import static org.commonjava.indy.bind.jaxrs.RequestContextConstants.ENVIRONMENT;
+import java.util.stream.Stream;
 
 /**
  * Created by yma on 2019/3/26.
  */
 public class CustomJsonLayout
         extends JsonLayout
 {
+    public static final String ENVIRONMENT = "environment";
+
     private final Logger logger = LoggerFactory.getLogger( getClass() );
 
+    private String environmentMappings;
+
+    private Map<String, String> envars;
+
+    public String getEnvironmentMappings()
+    {
+        return environmentMappings;
+    }
+
+    public void setEnvironmentMappings( final String environmentMappings )
+    {
+        this.environmentMappings = environmentMappings;
+
+        String[] mappings = environmentMappings == null ? new String[0] : environmentMappings.split( "\\s*,\\s*" );
+        envars = new HashMap<>();
+        Stream.of(mappings).forEach( kv ->{
+            String[] keyAlias = kv.split( "\\s*=\\s*" );
+            if ( keyAlias.length > 1 )
+            {
+                String value = System.getenv( keyAlias[0].trim() );
+                if ( StringUtils.isEmpty( value ) )
+                {
+                    value = "Unknown";
+                }
+
+                envars.put( keyAlias[1].trim(), value );
+            }
+        } );
+    }
+
     @Override
     protected void addCustomDataToJsonMap( Map<String, Object> map, ILoggingEvent iLoggingEvent )
     {
-        IndyObjectMapper objectMapper = new IndyObjectMapper( true );
         super.addCustomDataToJsonMap( map, iLoggingEvent );
 
-        if ( !iLoggingEvent.getMDCPropertyMap().isEmpty() )
-        {
-            Map<String, String> mdcs = (Map<String, String>) map.get( MDC_ATTR_NAME );
-            try
-            {
-                Map<String, String> envars = CDI.current().select( EnvironmentConfig.class ).get().getEnvars();
-                mdcs.put( ENVIRONMENT, objectMapper.writeValueAsString( envars ) );
-            }
-            catch ( JsonProcessingException e )
-            {
-                mdcs.put( ENVIRONMENT, "{error: \"Envars could not be processed by Jackson.\"}" );
-                logger.error( String.format( "Failed to create environment mdc. Reason: %s", e.getMessage() ), e );
-            }
-            map.put( MDC_ATTR_NAME, mdcs );
-        }
+        map.put( ENVIRONMENT, envars );
     }
 }

deployments/launcher/src/main/etc/indy/logging/logback.xml

@@ -82,43 +82,6 @@
     </encoder>
   </appender>
 
-  <!-- This appender is used for reporting to elasticsearch. -->
-  <!-- appender name="ELASTIC" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
-    <url>${elasticsearch.server.url}</url>
-    <index>${elasticsearch.index}</index>
-    <type>${elasticsearch.type}</type>
-    <loggerName>${elasticsearch.loggerName}</loggerName>
-    <properties>
-      <property>
-        <name>host</name>
-        <value>${HOSTNAME}</value>
-        <allowEmpty>false</allowEmpty>
-      </property>
-      <property>
-        <name>severity</name>
-        <value>%level</value>
-      </property>
-      <property>
-        <name>thread</name>
-        <value>%thread</value>
-      </property>
-      <property>
-        <name>stacktrace</name>
-        <value>%ex</value>
-      </property>
-      <property>
-        <name>logger</name>
-        <value>%logger</value>
-      </property>
-    </properties>
-    <headers>
-      <header>
-        <name>Content-Type</name>
-        <value>text/plain</value>
-      </header>
-    </headers>
-  </appender -->
-
   <!-- This example configuration is probably most unreliable under
     failure conditions but wont block your application at all -->
   <!-- The encoder part is using JsonLayout format encoder to generate structured logs using json format -->
@@ -134,9 +97,16 @@
   <!--
   <appender name="KAFKA" class="com.github.danielwegener.logback.kafka.KafkaAppender">
     <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-      <layout class="ch.qos.logback.contrib.json.classic.JsonLayout">
+      <layout class="org.commonjava.indy.CustomJsonLayout">
         <jsonFormatter class="ch.qos.logback.contrib.jackson.JacksonJsonFormatter"/>
         <appendLineSeparator>true</appendLineSeparator>
+
+        <environmentMappings><![CDATA[
+          OPENSHIFT_BUILD_NAMESPACE=NAMESPACE,
+          OPENSHIFT_BUILD_NAME=BUILD_NAME,
+          OPENSHIFT_BUILD_COMMIT=BUILD_COMMIT,
+          HOSTNAME=HOSTNAME
+        ]]></environmentMappings>
       </layout>
     </encoder>
 
@@ -145,6 +115,13 @@
     <deliveryStrategy class="com.github.danielwegener.logback.kafka.delivery.AsynchronousDeliveryStrategy" />
 
     <producerConfig>bootstrap.servers=localhost:9092</producerConfig>
+
+    <producerConfig>security.protocol=SSL</producerConfig>
+    <producerConfig>ssl.keystore.location=/path/to/secret/keystore.jks</producerConfig>
+    <producerConfig>ssl.keystore.password=changeit</producerConfig>
+    <producerConfig>ssl.truststore.location=/path/to/secret/truststore.jks</producerConfig>
+    <producerConfig>ssl.truststore.password=changeit</producerConfig>
+
     <producerConfig>acks=0</producerConfig>
     <producerConfig>linger.ms=1000</producerConfig>
     <producerConfig>max.block.ms=0</producerConfig>
@@ -171,8 +148,6 @@
   <logger name="org.commonjava.indy.action.IndyLifecycleManager" level="INFO" />
   <logger name="org.commonjava.indy.subsys.infinispan.CacheProducer" level="INFO" />
 
-  <!-- <logger name="org.commonjava.maven.galley.transport" level="DEBUG" /> -->
-
   <logger name="org.commonjava.topic.content.delete" level="INFO">
     <appender-ref ref="CONTENT-DELETE" />
   </logger>
@@ -193,14 +168,6 @@
     <!--
     <appender-ref ref="KAFKA" />
     -->
-
-    <!-- if elasticsearch function is on, include ELASTIC appender-->
-    <!-- if condition='property("elasticsearch.enable").equalsIgnoreCase("true")'>
-      <then>
-        <appender-ref ref="ELASTIC" />
-      </then>
-    </if -->
-
   </root>
 
 </configuration>

subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/RequestContextConstants.java

@@ -60,7 +60,4 @@ public class RequestContextConstants
 
     @Thread @MDC
     public static final String PREFERRED_ID = "preferred-id";
-
-    @Thread @MDC
-    public static final String ENVIRONMENT = "environment";
 }