Merge pull request #46 from LeeKyoungIl/master

merge
LeeKyoungIl · Mar 20, 2018 · 8dd5ca0 · 8dd5ca0
2 parents 2db4c24 + d3437bc
commit 8dd5ca0
Show file tree

Hide file tree

Showing 20 changed files with 121 additions and 120 deletions.
diff --git a/ApiServerSample/pom.xml b/ApiServerSample/pom.xml
@@ -75,21 +75,21 @@
         <dependency>
             <groupId>com.leekyoungil.illuminati</groupId>
             <artifactId>illuminati-client-jscollector</artifactId>
-            <version>0.5.3</version>
+            <version>0.5.5</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>com.leekyoungil.illuminati</groupId>
             <artifactId>illuminati-client-processor</artifactId>
-            <version>0.9.9.2</version>
+            <version>0.9.9.4</version>
             <scope>compile</scope>
         </dependency>
 
         <!--<dependency>-->
             <!--<groupId>com.leekyoungil.illuminati</groupId>-->
             <!--<artifactId>illuminati-client-switch</artifactId>-->
-            <!--<version>1.0.4</version>-->
+            <!--<version>1.0.5</version>-->
             <!--<scope>compile</scope>-->
         <!--</dependency>-->
 

diff --git a/README.md b/README.md
@@ -85,21 +85,21 @@ The illuminati is desinged to make collect all data easily and it can be possibl
    <dependency>
       <groupId>com.leekyoungil.illuminati</groupId>
       <artifactId>illuminati-client-processor</artifactId>
-      <version>0.9.9.2</version>
+      <version>0.9.9.4</version>
    </dependency>
 
    <!-- This is an option. If you add the module, you can turn it on and off without deploying it. -->
    <dependency>
        <groupId>com.leekyoungil.illuminati</groupId>
        <artifactId>illuminati-client-switch</artifactId>
-       <version>1.0.4</version>
+       <version>1.0.5</version>
    </dependency>
 
    <!-- This is an option. If you add the module, you can collect Event data from Browser to server to response by one transaction id. -->
    <dependency>
       <groupId>com.leekyoungil.illuminati</groupId>
       <artifactId>illuminati-client-jscollector</artifactId>
-      <version>0.5.3</version>
+      <version>0.5.5</version>
    </dependency>
 </dependencies>
 ```
@@ -113,11 +113,11 @@ repositories {
 }
 
 compile 'com.leekyoungil.illuminati:illuminati-client-annotation:1.1.1'
-compile 'com.leekyoungil.illuminati:illuminati-client-processor:0.9.9.2'
+compile 'com.leekyoungil.illuminati:illuminati-client-processor:0.9.9.4'
 // This is an option. If you add the module, you can turn it on and off without deploying it.
-compile 'com.leekyoungil.illuminati:illuminati-client-switch:1.0.4'
+compile 'com.leekyoungil.illuminati:illuminati-client-switch:1.0.5'
 <!-- This is an option. If you add the module, you can collect Event data from Browser to server to response by one transaction id. -->
-compile 'com.leekyoungil.illuminati:illuminati-client-jscollectorswitch:0.5.3'
+compile 'com.leekyoungil.illuminati:illuminati-client-jscollectorswitch:0.5.5'
 ```
 
 ## add @Illuminati  to Class
@@ -275,21 +275,21 @@ Application에서 발생하는 모든데이터를 수집하고 그중에 어떤
    <dependency>
      <groupId>com.leekyoungil.illuminati</groupId>
      <artifactId>illuminati-client-processor</artifactId>
-     <version>0.9.9.2</version>
+     <version>0.9.9.4</version>
   </dependency>
 
   <!-- 이것은 옵션 입니다. 해당 모듈을 추가하면 대시 배포 없이 on, off할수 있습니다. -->
   <dependency>
       <groupId>com.leekyoungil.illuminati</groupId>
       <artifactId>illuminati-client-switch</artifactId>
-      <version>1.0.4</version>
+      <version>1.0.5</version>
   </dependency>
 
   <!-- 이것은 옵션 입니다. 해당 모듈을 추가하면 브라우저에서 발생된 Event data까지 수집할수 있습니다. -->
   <dependency>
       <groupId>com.leekyoungil.illuminati</groupId>
       <artifactId>illuminati-client-jscollector</artifactId>
-      <version>0.5.3</version>
+      <version>0.5.5</version>
   </dependency>
 </dependencies>
 ```
@@ -303,11 +303,11 @@ repositories {
 }
 
 compile 'com.leekyoungil.illuminati:illuminati-client-annotation:1.1.1'
-compile 'com.leekyoungil.illuminati:illuminati-client-processor:0.9.9.2'
+compile 'com.leekyoungil.illuminati:illuminati-client-processor:0.9.9.4'
 //이것은 옵션 입니다. 해당 모듈을 추가하면 대시 배포 없이 on, off할수 있습니다.
-compile 'com.leekyoungil.illuminati:illuminati-client-switch:1.0.4'
+compile 'com.leekyoungil.illuminati:illuminati-client-switch:1.0.5'
 //이것은 옵션 입니다. 해당 모듈을 추가하면 브라우저에서 발생된 Event data까지 수집할수 있습니다.
-compile 'com.leekyoungil.illuminati:illuminati-client-jscollector:0.5.3'
+compile 'com.leekyoungil.illuminati:illuminati-client-jscollector:0.5.5'
 ```
 
 ## Class에 @Illuminati 추가 
@@ -378,5 +378,5 @@ public class ApiSampleController {
 ![image](https://github.com/LeeKyoungIl/illuminati/blob/master/kibana-sample.png)
 
 # License
-illuminati is distributed under the [Apache Software License](https://www.apache.org/licenses/LICENSE-2.0) version 2.0.
+illuminati is distributed under the GNU GPL version 3 or later.
 
diff --git a/illuminati-client/illuminati-client-annotation/README.md b/illuminati-client/illuminati-client-annotation/README.md
@@ -20,7 +20,7 @@
 <dependency>
   <groupId>com.leekyoungil.illuminati</groupId>
   <artifactId>illuminati-client-processor</artifactId>
-  <version>0.9.9.2</version>
+  <version>0.9.9.4</version>
 </dependency>
 ```
 
@@ -29,7 +29,7 @@
 
 ```java
 compile 'com.leekyoungil.illuminati:illuminati-client-annotation:1.1.1'
-compile 'com.leekyoungil.illuminati:illuminati-client-processor:0.9.9.2'
+compile 'com.leekyoungil.illuminati:illuminati-client-processor:0.9.9.4'
 ```
 
 ## add @Illuminati to Class
@@ -121,7 +121,7 @@ public class ApiSampleController {
 <dependency>
   <groupId>com.leekyoungil.illuminati</groupId>
   <artifactId>illuminati-client-processor</artifactId>
-  <version>0.9.9.2</version>
+  <version>0.9.9.4</version>
 </dependency>
 ```
 
@@ -130,7 +130,7 @@ public class ApiSampleController {
 
 ```java
 compile 'com.leekyoungil.illuminati:illuminati-client-annotation:1.1.1'
-compile 'com.leekyoungil.illuminati:illuminati-client-processor:0.9.9.2'
+compile 'com.leekyoungil.illuminati:illuminati-client-processor:0.9.9.4'
 ```
 
 

diff --git a/illuminati-client/illuminati-client-common/pom.xml b/illuminati-client/illuminati-client-common/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.leekyoungil.illuminati</groupId>
     <artifactId>illuminati-client-common</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/...minati-client-common/src/main/java/com/leekyoungil/illuminati/common/util/SystemUtil.java b/...minati-client-common/src/main/java/com/leekyoungil/illuminati/common/util/SystemUtil.java
@@ -11,7 +11,7 @@
 
 public class SystemUtil {
 
-    private static final Logger SYSTEM_UTIL_LOGGER = LoggerFactory.getLogger(SystemUtil.class);
+    public static final Logger SYSTEM_UTIL_LOGGER = LoggerFactory.getLogger(SystemUtil.class);
 
     private final static Runtime RUNTIME = Runtime.getRuntime();
 
@@ -26,7 +26,7 @@ public class SystemUtil {
             "PID"};
 
 
-    private static final int MB = 1024*1024;
+    private static final int MEGA_BYTE = 1024*1024;
 
     public static Map<String, Object> getJvmInfo () {
         final Map<String, Object> jvmInfo = new HashMap<String, Object>();
@@ -44,75 +44,78 @@ public static Map<String, Object> getJvmInfo () {
 
     public static Map<String, Object> getJvmMemoryInfo () {
         final Map<String, Object> jvmInfo = new HashMap<String, Object>();
-        jvmInfo.put("jvmUsedMemory", (RUNTIME.totalMemory() - RUNTIME.freeMemory()) / MB);
-        jvmInfo.put("jvmFreeMemory", RUNTIME.freeMemory() / MB);
-        jvmInfo.put("jvmTotalMemory", RUNTIME.totalMemory() / MB);
-        jvmInfo.put("jvmMaxMemory", RUNTIME.maxMemory() / MB);
+        jvmInfo.put("jvmUsedMemory", (RUNTIME.totalMemory() - RUNTIME.freeMemory()) / MEGA_BYTE);
+        jvmInfo.put("jvmFreeMemory", RUNTIME.freeMemory() / MEGA_BYTE);
+        jvmInfo.put("jvmTotalMemory", RUNTIME.totalMemory() / MEGA_BYTE);
+        jvmInfo.put("jvmMaxMemory", RUNTIME.maxMemory() / MEGA_BYTE);
 
         return jvmInfo;
     }
 
     public static String generateTransactionIdByRequest (final HttpServletRequest request, final IlluminatiTransactionIdType illuminatiTransactionIdType) {
-        String keyName = illuminatiTransactionIdType.getValue();
+        final String keyName = illuminatiTransactionIdType.getValue();
 
-        String id = SystemUtil.getValueFromHeaderByKey(request, keyName);
-        if (StringObjectUtils.isValid(id) == false) {
+        String trxId = SystemUtil.getValueFromHeaderByKey(request, keyName);
+        if (StringObjectUtils.isValid(trxId) == false && request != null) {
             switch (illuminatiTransactionIdType) {
                 case ILLUMINATI_PROC_ID :
                 case ILLUMINATI_G_PROC_ID :
-                    id = StringObjectUtils.generateId(new Date().getTime(), keyName);
-                    request.setAttribute(keyName, id);
+                    trxId = StringObjectUtils.generateId(new Date().getTime(), keyName);
+                    request.setAttribute(keyName, trxId);
+                    break;
+
+                default :
                     break;
             }
         }
 
-        return StringObjectUtils.isValid(id) ? id : null;
+        return (StringObjectUtils.isValid(trxId) == true) ? trxId : null;
     }
 
     public static String getValueFromHeaderByKey (final HttpServletRequest request, final String keyName) {
-        if (request == null || keyName == null) {
-            return null;
-        }
+        Object value = null;
 
-        Object value = request.getHeader(keyName);
+        if (request != null && keyName != null) {
+            value = request.getHeader(keyName);
 
-        if (value == null) {
-            value = request.getAttribute(keyName);
+            if (value == null) {
+                value = request.getAttribute(keyName);
+            }
         }
 
         return (value != null) ? value.toString() : null;
     }
 
     public static void createSystemThread (final Runnable runnable, final String threadName) {
-        if (runnable == null) {
-            SYSTEM_UTIL_LOGGER.warn("Runnable is required.");
-            return;
-        }
+        if (runnable != null && StringUtils.isEmpty(threadName) == false
+                && IlluminatiConstant.SYSTEM_THREAD_MAP.containsKey(threadName) == false) {
+            final Thread newThread = new Thread(runnable);
 
-        if (StringUtils.isEmpty(threadName)) {
-            SYSTEM_UTIL_LOGGER.warn("threadName is required.");
-            return;
-        }
+            if (!"debug".equalsIgnoreCase(threadName)) {
+                newThread.setName(threadName);
+            }
+            newThread.setDaemon(true);
+            newThread.start();
 
-        if (IlluminatiConstant.SYSTEM_THREAD_MAP.containsKey(threadName)) {
-            SYSTEM_UTIL_LOGGER.warn(threadName + " thread is already exists.");
-            return;
-        }
+            IlluminatiConstant.SYSTEM_THREAD_MAP.put(threadName, newThread);
+        } else {
+            if (runnable == null) {
+                SYSTEM_UTIL_LOGGER.warn("Runnable is required.");
+            }
 
-        final Thread newThread = new Thread(runnable);
+            if (StringUtils.isEmpty(threadName)) {
+                SYSTEM_UTIL_LOGGER.warn("threadName is required.");
+            }
 
-        if (!"debug".equalsIgnoreCase(threadName)) {
-            newThread.setName(threadName);
+            if (IlluminatiConstant.SYSTEM_THREAD_MAP.containsKey(threadName) == true) {
+                SYSTEM_UTIL_LOGGER.warn(threadName + " thread is already exists.");
+            }
         }
-        newThread.setDaemon(true);
-        newThread.start();
-
-        IlluminatiConstant.SYSTEM_THREAD_MAP.put(threadName, newThread);
     }
 
     public static void createThreadStatusDebugThread () {
         // debug illuminati buffer queue
-        if (IlluminatiConstant.ILLUMINATI_DEBUG == true) {
+        if (IlluminatiConstant.ILLUMINATI_DEBUG == true && SYSTEM_UTIL_LOGGER.isInfoEnabled() == true) {
             final Runnable threadCheckRunnable = new Runnable() {
                 public void run() {
                     while (true) {

diff --git a/illuminati-client/illuminati-client-elasticsearch/README.md b/illuminati-client/illuminati-client-elasticsearch/README.md
@@ -14,15 +14,15 @@
 <dependency>
   <groupId>com.leekyoungil.illuminati</groupId>
   <artifactId>illuminati-client-elasticsearch</artifactId>
-  <version>0.7.9.1</version>
+  <version>0.7.9.2</version>
 </dependency>
 ```
 
 ## add to Gradle Dependency
     * Gradle
 
 ```java
-compile 'com.leekyoungil.illuminati:illuminati-client-elasticsearch:0.7.9.1'
+compile 'com.leekyoungil.illuminati:illuminati-client-elasticsearch:0.7.9.2'
 ```
 
 ===============================================================================
@@ -42,13 +42,13 @@ compile 'com.leekyoungil.illuminati:illuminati-client-elasticsearch:0.7.9.1'
 <dependency>
   <groupId>com.leekyoungil.illuminati</groupId>
   <artifactId>illuminati-client-elasticsearch</artifactId>
-  <version>0.7.9.1</version>
+  <version>0.7.9.2</version>
 </dependency>
 ```
 
 ## Gradle Dependency 추가 
     * Gradle
 
 ```java
-compile 'com.leekyoungil.illuminati:illuminati-client-elasticsearch:0.7.9.1'
+compile 'com.leekyoungil.illuminati:illuminati-client-elasticsearch:0.7.9.2'
 ```
diff --git a/illuminati-client/illuminati-client-elasticsearch/pom.xml b/illuminati-client/illuminati-client-elasticsearch/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.leekyoungil.illuminati</groupId>
     <artifactId>illuminati-client-elasticsearch</artifactId>
-    <version>0.7.9.1</version>
+    <version>0.7.9.2</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.leekyoungil.illuminati</groupId>
             <artifactId>illuminati-client-common</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.3</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/illuminati-client/illuminati-client-jscollector/README.md b/illuminati-client/illuminati-client-jscollector/README.md
@@ -23,7 +23,7 @@
 <dependency>
     <groupId>com.leekyoungil.illuminati</groupId>
     <artifactId>illuminati-client-jscollector</artifactId>
-    <version>0.5.3</version>
+    <version>0.5.5</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -36,7 +36,7 @@ repositories {
     jcenter()
 }
 
-compile 'com.leekyoungil.illuminati:illuminati-client-jscollector:0.5.3'
+compile 'com.leekyoungil.illuminati:illuminati-client-jscollector:0.5.5'
 ```
 
 ## 2. add to Javascript in HTML & initialization
@@ -113,7 +113,7 @@ compile 'com.leekyoungil.illuminati:illuminati-client-jscollector:0.5.3'
 <dependency>
     <groupId>com.leekyoungil.illuminati</groupId>
     <artifactId>illuminati-client-jscollector</artifactId>
-    <version>0.5.3</version>
+    <version>0.5.5</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -126,7 +126,7 @@ repositories {
     jcenter()
 }
 
-compile 'com.leekyoungil.illuminati:illuminati-client-jscollector:0.5.3'
+compile 'com.leekyoungil.illuminati:illuminati-client-jscollector:0.5.5'
 ```
 
 ## 2. Javascript 추가 & 초기화

diff --git a/illuminati-client/illuminati-client-jscollector/pom.xml b/illuminati-client/illuminati-client-jscollector/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.leekyoungil.illuminati</groupId>
     <artifactId>illuminati-client-jscollector</artifactId>
-    <version>0.5.4</version>
+    <version>0.5.5</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.leekyoungil.illuminati</groupId>
             <artifactId>illuminati-client-common</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.3</version>
             <scope>provided</scope>
         </dependency>