fix bug about log info is too large

JThink · Sep 8, 2017 · f9e1b1e · f9e1b1e
1 parent c8a0ce2
commit f9e1b1e
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 31 deletions.
diff --git a/skyeye-alarm/build.gradle b/skyeye-alarm/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'application'
 
 group = 'skyeye'
 applicationName = 'skyeye-alarm'
-version = '1.1.0'
+version = '1.1.1'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -21,8 +21,8 @@ repositories {
 }
 
 ext {
-  baseVersion = '1.1.0'
-  dataVersion = '1.1.0'
+  baseVersion = '1.1.1'
+  dataVersion = '1.1.1'
 }
 
 dependencies {

diff --git a/skyeye-base/build.gradle b/skyeye-base/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'maven'
 apply plugin: 'eclipse'
 
 group = 'skyeye'
-version = '1.1.0'
+version = '1.1.1'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

diff --git a/skyeye-benchmark/dubbo-service/build.gradle b/skyeye-benchmark/dubbo-service/build.gradle
@@ -3,7 +3,7 @@ allprojects {
   apply plugin: 'eclipse'
 
   group = 'skyeye'
-  version = '1.1.0'
+  version = '1.1.1'
   sourceCompatibility = 1.8
   targetCompatibility = 1.8
   compileJava.options.encoding = 'UTF-8'
@@ -37,8 +37,8 @@ subprojects {
   ext {
     slf4jVersion = '1.7.21'
     dubboVersion = '2.8.4-skyeye-trace-1.1.0'
-    dataVersion = '1.1.0'
-    clientVersion = '1.1.0'
+    dataVersion = '1.1.1'
+    clientVersion = '1.1.1'
     zookeeperVerison = '3.4.6'
     zkClientVersion = '0.10'
   }

diff --git a/skyeye-benchmark/hi-log/build.gradle b/skyeye-benchmark/hi-log/build.gradle
@@ -3,7 +3,7 @@ allprojects {
   apply plugin: 'eclipse'
 
   group = 'skyeye'
-  version = '1.1.0'
+  version = '1.1.1'
   sourceCompatibility = 1.8
   targetCompatibility = 1.8
   compileJava.options.encoding = 'UTF-8'
@@ -35,7 +35,7 @@ subprojects {
   apply plugin: 'eclipse'
 
   ext {
-    clientVersion = '1.1.0'
+    clientVersion = '1.1.1'
   }
 
   [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

diff --git a/skyeye-benchmark/log-generater/build.gradle b/skyeye-benchmark/log-generater/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'application'
 
 group = 'skyeye'
 applicationName = 'log-generater'
-version = '1.1.0'
+version = '1.1.1'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -21,7 +21,7 @@ repositories {
 }
 
 ext {
-  clientVersion = '1.1.0'
+  clientVersion = '1.1.1'
 }
 
 dependencies {

diff --git a/skyeye-client/build.gradle b/skyeye-client/build.gradle
@@ -4,7 +4,7 @@ allprojects {
   apply plugin: 'eclipse'
 
   group = 'skyeye'
-  version = '1.1.0'
+  version = '1.1.1'
 
   sourceCompatibility = 1.8
   targetCompatibility = 1.8
@@ -57,8 +57,8 @@ subprojects {
     kafkaVersion = '0.10.0.1'
     zookeeperVersion = '3.4.6'
     zkclientVersion = '0.10'
-    baseVersion = '1.1.0'
-    traceVersion = '1.1.0'
+    baseVersion = '1.1.1'
+    traceVersion = '1.1.1'
   }
 
   [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

diff --git a/...eye-client-log4j/src/main/java/com/jthink/skyeye/client/log4j/appender/KafkaAppender.java b/...eye-client-log4j/src/main/java/com/jthink/skyeye/client/log4j/appender/KafkaAppender.java
@@ -129,6 +129,10 @@ protected void append(LoggingEvent event) {
      * @param value
      */
     private void send(String value) {
+        // 对value的大小进行判定，当大于某个值认为该日志太大直接丢弃（防止影响到kafka）
+        if (value.length() > 10000) {
+            return;
+        }
         final byte[] key = ByteBuffer.allocate(4).putInt(new StringBuilder(app).append(host).toString().hashCode()).array();
 
         final ProducerRecord<byte[], String> record = new ProducerRecord<>(this.topic, key, value);

diff --git a/...e-client-log4j2/src/main/java/com/jthink/skyeye/client/log4j2/appender/KafkaAppender.java b/...e-client-log4j2/src/main/java/com/jthink/skyeye/client/log4j2/appender/KafkaAppender.java
@@ -91,6 +91,10 @@ public void append(LogEvent event) {
                 }
                 // 发送数据到kafka
                 String value = System.nanoTime() + Constants.SEMICOLON + new String(data);
+                // 对value的大小进行判定，当大于某个值认为该日志太大直接丢弃（防止影响到kafka）
+                if (value.length() > 10000) {
+                    return;
+                }
                 final ProducerRecord<byte[], String> record = new ProducerRecord<>(this.manager.getTopic(), this.manager.getKey(), value);
                 LazySingletonProducer.getInstance(this.manager.getConfig()).send(record, new Callback() {
                     @Override

diff --git a/...client-logback/src/main/java/com/jthink/skyeye/client/logback/appender/KafkaAppender.java b/...client-logback/src/main/java/com/jthink/skyeye/client/logback/appender/KafkaAppender.java
@@ -125,6 +125,10 @@ protected void append(E e) {
             return;
         }
         final String value = System.nanoTime() + Constants.SEMICOLON + this.encoder.doEncode(e);
+        // 对value的大小进行判定，当大于某个值认为该日志太大直接丢弃（防止影响到kafka）
+        if (value.length() > 10000) {
+            return;
+        }
         final byte[] key = this.keyBuilder.build(e);
         final ProducerRecord<byte[], String> record = new ProducerRecord<byte[], String>(this.topic, key, value);
         LazySingletonProducer.getInstance(this.config).send(record, new Callback() {

diff --git a/skyeye-collector/build.gradle b/skyeye-collector/build.gradle
@@ -3,7 +3,7 @@ allprojects {
   apply plugin: 'eclipse'
 
   group = 'skyeye'
-  version = '1.1.0'
+  version = '1.1.1'
   sourceCompatibility = 1.8
   targetCompatibility = 1.8
   compileJava.options.encoding = 'UTF-8'
@@ -37,7 +37,7 @@ subprojects {
   apply plugin: 'eclipse'
 
   ext {
-    baseVersion = '1.1.0'
+    baseVersion = '1.1.1'
     kafkaVersion = '0.10.0.1'
     springBootVersion = '1.5.6.RELEASE'
     esVersion = '2.3.3'

diff --git a/skyeye-collector/skyeye-collector-metrics/build.gradle b/skyeye-collector/skyeye-collector-metrics/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'application'
 
 ext {
-  dataVersion = '1.1.0'
+  dataVersion = '1.1.1'
   zkclientVersion = '0.10'
 }
 

diff --git a/skyeye-collector/skyeye-collector-trace/build.gradle b/skyeye-collector/skyeye-collector-trace/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'application'
 
 ext {
-  dataVersion = '1.1.0'
+  dataVersion = '1.1.1'
   fastJsonVersion = '1.2.35'
 }
 

diff --git a/skyeye-data/build.gradle b/skyeye-data/build.gradle
@@ -4,7 +4,7 @@ allprojects {
   apply plugin: 'eclipse'
 
   group = 'skyeye'
-  version = '1.1.0'
+  version = '1.1.1'
 
   sourceCompatibility = 1.8
   targetCompatibility = 1.8
@@ -55,7 +55,7 @@ subprojects {
 
   ext {
     slf4jVersion = '1.7.25'
-    baseVersion = '1.1.0'
+    baseVersion = '1.1.1'
   }
 
   [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

diff --git a/skyeye-monitor/build.gradle b/skyeye-monitor/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'application'
 
 group = 'skyeye'
 applicationName = 'skyeye-monitor'
-version = '1.1.0'
+version = '1.1.1'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -23,8 +23,8 @@ repositories {
 ext {
   zookeeperVersion = '3.4.6'
   curatorVersion = '2.11.0'
-  baseVersion = '1.1.0'
-  dataVersion = '1.1.0'
+  baseVersion = '1.1.1'
+  dataVersion = '1.1.1'
   jacksonVersion = '1.9.13'
   zkclientVersion = '0.10'
 }

diff --git a/skyeye-statistics/build.gradle b/skyeye-statistics/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'application'
 
 group = 'skyeye'
 applicationName = 'skyeye-statistics'
-version = '1.1.0'
+version = '1.1.1'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -27,7 +27,7 @@ ext {
   scalaVersion = '2.10.4'
   scalaBinaryVersion = '2.10'
   sparkVersion = '1.3.0-cdh5.4.0'
-  baseVersion = '1.1.0'
+  baseVersion = '1.1.1'
   fastjsonVersion = '1.2.35'
   zkClientVersion = '0.10'
 }

diff --git a/skyeye-trace/build.gradle b/skyeye-trace/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'maven'
 apply plugin: 'eclipse'
 
 group = 'skyeye'
-version = '1.1.0'
+version = '1.1.1'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -14,8 +14,8 @@ ext {
   mavenPublicUrl = 'http://192.168.88.8:8081/nexus/content/repositories/public'
   mavenReleaseUrl = 'http://192.168.88.8:8081/nexus/content/repositories/releases'
   mavenSnapshotUrl = "http://192.168.88.8:8081/nexus/content/repositories/snapshots"
-  baseVersion = '1.1.0'
-  dataVersion = '1.1.0'
+  baseVersion = '1.1.1'
+  dataVersion = '1.1.1'
   slf4jVersion = '1.7.21'
   fastJsonVersion = '1.2.35'
   zookeeperVersion = '3.4.6'

diff --git a/skyeye-web/build.gradle b/skyeye-web/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'application'
 
 group = 'skyeye'
 applicationName = 'skyeye-web'
-version = '1.1.0'
+version = '1.1.1'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -24,8 +24,8 @@ repositories {
 }
 
 ext {
-  baseVersion = '1.1.0'
-  dataVersion = '1.1.0'
+  baseVersion = '1.1.1'
+  dataVersion = '1.1.1'
   jacksonVersion = '1.9.13'
   httpclientVersion = '4.5.2'
   fastjsonVersion = '1.2.35'