corrected bug for fluentd logging

Author: dinuta

sandbox/docker-compose.yml

@@ -0,0 +1,44 @@
+version: '2'
+services:
+  eureka:
+    image: dinutac/netflixoss-eureka:latest
+    expose:
+      - "8080"
+    ports:
+      - "8080:8080"
+
+  estuary-discovery:
+    hostname: estuary-discovery
+    image: dinutac/estuary-discovery:latest
+    command: bash -c "sleep 25 && /scripts/main_flask.py"
+    environment:
+      FLUENTD_IP_PORT: fluentd:24224
+      EUREKA_SERVER: http://eureka:8080/eureka/v2
+      APP_IP_PORT: 192.168.0.11:8081
+    expose:
+      - "8080"
+    ports:
+      - "8081:8080"
+
+
+  estuary-agent-java:
+    hostname: estuary-agent-java
+    image: dinutac/estuary-agent-java:latest
+    entrypoint: bash -c "sleep 30 && java -jar /app/agent-exec.jar --eureka.client.enabled=true"
+    environment:
+      spring_profiles_active: test
+      FLUENTD_IP_PORT: fluentd:24224
+      EUREKA_SERVER: http://eureka:8080/eureka/v2
+      APP_IP: 192.168.0.11
+      PORT: 8082 # <--
+      HTTP_AUTH_TOKEN: None
+    ports:
+      - "8082:8082"
+
+  fluentd:
+    build: ./fluentd
+    volumes:
+      - ./fluentd/conf:/fluentd/etc
+    ports:
+      - "24224:24224"
+      - "24224:24224/udp"

sandbox/fluentd/Dockerfile

@@ -0,0 +1,7 @@
+FROM fluentd:v1.9.1-debian-1.0
+USER root
+
+RUN ["fluent-gem", "install", "fluent-plugin-elasticsearch", "--no-document", "--version", "4.1.1"]
+RUN ["fluent-gem", "install", "fluent-plugin-gelf"]
+
+USER fluent 

sandbox/fluentd/conf/fluent.conf

@@ -0,0 +1,9 @@
+<source>
+  @type forward
+  port 24224
+  bind 0.0.0.0
+</source>
+
+<match *.**>
+  @type stdout
+</match>

sandbox/fluentd/conf/fluent_graylog.conf

@@ -0,0 +1,14 @@
+<source>
+  @type forward
+  port 24224
+  bind 0.0.0.0
+</source>
+
+<match *.**>
+  @type gelf
+  host graylog
+  port 12201
+  <buffer>
+    flush_interval 1s
+  </buffer>
+</match>

src/main/java/com/github/dinuta/estuary/agent/configuration/BeanConfig.java

@@ -1,12 +1,17 @@
 package com.github.dinuta.estuary.agent.configuration;
 
+import com.github.dinuta.estuary.agent.component.About;
 import com.github.dinuta.estuary.agent.model.StateHolder;
 import com.github.dinuta.estuary.agent.model.api.CommandParallel;
+import com.github.dinuta.estuary.agent.service.FluentdService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class BeanConfig {
+    @Autowired
+    private About about;
 
     @Bean
     public CommandParallel getCommandParallel() {
@@ -17,4 +22,9 @@ public CommandParallel getCommandParallel() {
     public StateHolder getStateHolder() {
         return new StateHolder();
     }
+
+    @Bean
+    public FluentdService getFluentdService() {
+        return new FluentdService(about);
+    }
 }

src/main/java/com/github/dinuta/estuary/agent/service/FluentdService.java

@@ -27,15 +27,14 @@ public class FluentdService {
     private static final Logger log = LoggerFactory.getLogger(FluentdService.class);
     private final VirtualEnvironment virtualEnvironment = new VirtualEnvironment();
     private FluentLogger fluentLogger;
+    private About about;
     private EnrichedMessage enrichedMsgCopy;
 
     @Autowired
     private Environment environment;
 
-    @Autowired
-    private About about;
-
-    public FluentdService() {
+    public FluentdService(About about) {
+        this.about = about;
         this.setFluentdLogger();
     }