Merge pull request #22 from LeeKyoungIl/feature/separate_illuminati_e…

…xecutor_from_main Improving the performance of illuminati processor.
LeeKyoungIl · Dec 2, 2017 · 7a2553e · 7a2553e
2 parents 62d4a2b + 9c87534
commit 7a2553e
Show file tree

Hide file tree

Showing 32 changed files with 909 additions and 402 deletions.
diff --git a/ApiServerSample/pom.xml b/ApiServerSample/pom.xml
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>com.leekyoungil.illuminati</groupId>
             <artifactId>illuminati-client-processor</artifactId>
-            <version>0.9.6</version>
+            <version>0.9.7</version>
             <scope>compile</scope>
         </dependency>
 
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>com.rabbitmq</groupId>
             <artifactId>amqp-client</artifactId>
-            <version>4.2.2</version>
+            <version>4.3.0</version>
             <scope>compile</scope>
         </dependency>
 

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.6</version>
+  <version>0.9.7</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.6'
+compile 'com.leekyoungil.illuminati:illuminati-client-processor:0.9.7'
 ```
 
 ## 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.6</version>
+  <version>0.9.7</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.6'
+compile 'com.leekyoungil.illuminati:illuminati-client-processor:0.9.7'
 ```
 
 

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.1.4</version>
+    <version>1.2.0</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/...mon/src/main/java/com/leekyoungil/illuminati/common/dto/IlluminatiDataInterfaceModel.java b/...mon/src/main/java/com/leekyoungil/illuminati/common/dto/IlluminatiDataInterfaceModel.java
@@ -0,0 +1,92 @@
+package com.leekyoungil.illuminati.common.dto;
+
+import com.leekyoungil.illuminati.common.constant.IlluminatiConstant;
+import com.leekyoungil.illuminati.common.dto.enums.IlluminatiTransactionIdType;
+import com.leekyoungil.illuminati.common.util.ConvertUtil;
+import com.leekyoungil.illuminati.common.util.SystemUtil;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
+import java.util.Map;
+
+public class IlluminatiDataInterfaceModel {
+
+    private static final Logger ILLUMINATI_DATA_INTERFACE_MODEL_LOGGER = LoggerFactory.getLogger(IlluminatiDataInterfaceModel.class);
+
+    private final static String ILLUMINATI_UNIQUE_USER_ID_KEY_NAME = "illuminatiUniqueUserId";
+
+    private final MethodSignature signature;
+    private final Object[] args;
+    private long elapsedTime = 0L;
+    private final Object output;
+
+    private String illuminatiUniqueUserId;
+    private RequestHeaderModel requestHeaderModel;
+    private Map<String, String> clientInfoMap;
+    private Map<String, Object> staticInfo;
+    private boolean isActiveChaosBomber;
+
+    public IlluminatiDataInterfaceModel (final HttpServletRequest request, final MethodSignature signature, final Object[] args, long elapsedTime, final Object output) {
+        this.signature = signature;
+        this.args = args;
+        this.elapsedTime = elapsedTime;
+        this.output = output;
+
+        this.initDataFromHttpRequest(request);
+    }
+
+    private void initDataFromHttpRequest (final HttpServletRequest request) {
+        this.requestHeaderModel = new RequestHeaderModel(request);
+        this.requestHeaderModel.setSessionTransactionId(SystemUtil.generateTransactionIdByRequest(request, IlluminatiTransactionIdType.ILLUMINATI_S_PROC_ID));
+        this.requestHeaderModel.setGlobalTransactionId(SystemUtil.generateTransactionIdByRequest(request, IlluminatiTransactionIdType.ILLUMINATI_G_PROC_ID));
+        this.requestHeaderModel.setTransactionId(SystemUtil.generateTransactionIdByRequest(request, IlluminatiTransactionIdType.ILLUMINATI_PROC_ID));
+        this.illuminatiUniqueUserId = SystemUtil.getValueFromHeaderByKey(request, ILLUMINATI_UNIQUE_USER_ID_KEY_NAME);
+        this.clientInfoMap = ConvertUtil.getClientInfoFromHttpRequest(request);
+        this.staticInfo = ConvertUtil.getStaticInfoFromHttpRequest(request);
+        this.isActiveChaosBomber = ConvertUtil.getChaosBomberFromHttpRequest(request);
+    }
+
+    public boolean isValid () {
+        if (this.requestHeaderModel == null) {
+            ILLUMINATI_DATA_INTERFACE_MODEL_LOGGER.warn("request is must not null");
+            return  false;
+        }
+        if (signature == null) {
+            ILLUMINATI_DATA_INTERFACE_MODEL_LOGGER.warn("signature is must not null");
+            return  false;
+        }
+
+        return true;
+    }
+
+    public long getElapsedTime () {
+        return this.elapsedTime;
+    }
+    public Object getOutput () {
+        return this.output;
+    }
+    public Object[] getParamValues () {
+        return this.args;
+    }
+    public MethodSignature getSignature () {
+        return this.signature;
+    }
+    public RequestHeaderModel getRequestHeaderModel () {
+        return this.requestHeaderModel;
+    }
+    public String getIlluminatiUniqueUserId() {
+        return this.illuminatiUniqueUserId;
+    }
+    public Map<String, String> getClientInfoMap() {
+        return this.clientInfoMap;
+    }
+    public Map<String, Object> getStaticInfo() {
+        return this.staticInfo;
+    }
+    public boolean isActiveChaosBomber() {
+        return this.isActiveChaosBomber;
+    }
+}
diff --git a/...lluminati/common/dto/IlluminatiModel.java → ...dto/IlluminatiTemplateInterfaceModel.java b/...lluminati/common/dto/IlluminatiModel.java → ...dto/IlluminatiTemplateInterfaceModel.java
@@ -15,7 +15,7 @@
 /**
  * Created by leekyoungil (leekyoungil@gmail.com) on 10/07/2017.
  */
-public class IlluminatiModel implements Serializable {
+public class IlluminatiTemplateInterfaceModel implements Serializable {
 
     private static final long serialVersionUID = 7526472295622776147L;
 
@@ -40,25 +40,31 @@ public class IlluminatiModel implements Serializable {
     private Date localTime;
     private Object[] paramValues;
 
-    public IlluminatiModel () {}
+    public IlluminatiTemplateInterfaceModel() {}
 
-    public IlluminatiModel (final Date localTime, final long elapsedTime, final MethodSignature signature, final Object output, final Object[] paramValues) {
-        this.localTime = localTime;
+    public IlluminatiTemplateInterfaceModel(final IlluminatiDataInterfaceModel illuminatiDataInterfaceModel) {
+        this.localTime = new Date();
         this.generateAggregateId();
 
-        this.elapsedTime = elapsedTime;
-        this.output = output;
+        this.elapsedTime = illuminatiDataInterfaceModel.getElapsedTime();
+        this.output = illuminatiDataInterfaceModel.getOutput();
 
         this.timestamp = localTime.getTime();
         this.logTime = DATE_FORMAT_EVENT.format(localTime);
-        this.paramValues = paramValues;
+        this.paramValues = illuminatiDataInterfaceModel.getParamValues();
 
-        this.setMethod(signature.getMethod(), signature.getParameterNames());
+        this.setMethod(illuminatiDataInterfaceModel.getSignature());
+        this.initReqHeaderInfo(illuminatiDataInterfaceModel.getRequestHeaderModel());
+        this.checkAndSetTransactionIdFromPostBody(this.header.getPostContentBody());
+        this.initUniqueUserId(illuminatiDataInterfaceModel.getIlluminatiUniqueUserId());
+        this.loadClientInfo(illuminatiDataInterfaceModel.getClientInfoMap());
+        this.staticInfo(illuminatiDataInterfaceModel.getStaticInfo());
+        this.isActiveChaosBomber(illuminatiDataInterfaceModel.isActiveChaosBomber());
     }
 
-    public void initReqHeaderInfo (final RequestHeaderModel requestHeaderModel) {
-        this.header = requestHeaderModel;
-    }
+    // ################################################################################################################
+    // ### public methods                                                                                           ###
+    // ################################################################################################################
 
     public void initBasicJvmInfo (final Map<String, Object> jvmInfo) {
         this.jvmInfo = jvmInfo;
@@ -79,28 +85,6 @@ public void addBasicJvmMemoryInfo (final Map<String, Object> jvmMemoryInfo) {
         }
     }
 
-    public void loadClientInfo (final Map<String, String> clientInfoMap) {
-        if (clientInfoMap == null) {
-            return;
-        }
-
-        if (this.general == null) {
-            this.general = new RequestGeneralModel();
-        }
-
-        this.general.initClientInfo(clientInfoMap);
-    }
-
-    public void staticInfo (final Map<String, Object> staticInfo) {
-        if (this.serverInfo != null && !this.serverInfo.isAreadySetServerDomainAndPort()) {
-            this.serverInfo.setStaticInfoFromRequest(staticInfo);
-        }
-    }
-
-    public void isActiveChaosBomber (boolean isActiveChaosBomber) {
-        this.isActiveChaosBomber = isActiveChaosBomber;
-    }
-
     public String getJsonString () {
         return IlluminatiConstant.ILLUMINATI_GSON_OBJ.toJson(this);
     }
@@ -124,11 +108,53 @@ public void setJavascriptUserAction () {
         }
     }
 
-    public void initUniqueUserId (String illuminatiUniqueUserId) {
+    // ################################################################################################################
+    // ### protected methods                                                                                        ###
+    // ################################################################################################################
+
+    protected String getId () {
+        return this.id;
+    }
+
+    protected String getParentModuleName () {
+        return this.parentModuleName;
+    }
+
+    // ################################################################################################################
+    // ### private methods                                                                                          ###
+    // ################################################################################################################
+
+    private void initReqHeaderInfo (final RequestHeaderModel requestHeaderModel) {
+        this.header = requestHeaderModel;
+    }
+
+    private void loadClientInfo (final Map<String, String> clientInfoMap) {
+        if (clientInfoMap == null) {
+            return;
+        }
+
+        if (this.general == null) {
+            this.general = new RequestGeneralModel();
+        }
+
+        this.general.initClientInfo(clientInfoMap);
+    }
+
+    private void staticInfo (final Map<String, Object> staticInfo) {
+        if (this.serverInfo != null && !this.serverInfo.isAreadySetServerDomainAndPort()) {
+            this.serverInfo.setStaticInfoFromRequest(staticInfo);
+        }
+    }
+
+    private void isActiveChaosBomber (boolean isActiveChaosBomber) {
+        this.isActiveChaosBomber = isActiveChaosBomber;
+    }
+
+    private void initUniqueUserId (String illuminatiUniqueUserId) {
         this.illuminatiUniqueUserId = illuminatiUniqueUserId;
     }
 
-    public void checkAndSetTransactionIdFromPostBody (String postBody) {
+    private void checkAndSetTransactionIdFromPostBody (String postBody) {
         if (StringObjectUtils.isValid(postBody) == false) {
             return;
         }
@@ -164,18 +190,10 @@ private void generateAggregateId () {
         this.id = StringObjectUtils.generateId(this.localTime.getTime(), null);
     }
 
-    protected String getId () {
-        return this.id;
-    }
-
-    protected String getParentModuleName () {
-        return this.parentModuleName;
-    }
-
-    private void setMethod (final Method method, final String[] paramNames) {
+    private void setMethod (final MethodSignature methodSignature) {
         if (this.general == null) {
             this.general = new RequestGeneralModel();
         }
-        this.general.setMethod(method, paramNames, this.paramValues);
+        this.general.setMethod(methodSignature.getMethod(), methodSignature.getParameterNames(), this.paramValues);
     }
 }
diff --git a/...client-common/src/main/java/com/leekyoungil/illuminati/common/dto/RequestHeaderModel.java b/...client-common/src/main/java/com/leekyoungil/illuminati/common/dto/RequestHeaderModel.java
@@ -367,8 +367,7 @@ public RequestHeaderModel (final HttpServletRequest request) {
         if (request != null) {
             this.init(request);
             //this.getIlluminatiProcId(request);
-
-            if ("post".equals(request.getMethod().toLowerCase())) {
+            if ("post".equalsIgnoreCase(request.getMethod())) {
                 try {
                     this.postContentBody = StringObjectUtils.getPostBodyString(request);
                 } catch (IOException ex) {
@@ -418,18 +417,21 @@ private void init (HttpServletRequest request) {
                 field.setAccessible(true);
                 field.set(this, value);
             } catch (Exception ex) {
-                if (this.anotherHeader == null) {
-                    this.anotherHeader = new HashMap<String, String>();
-                }
+                try {
+                    if (this.anotherHeader == null) {
+                        this.anotherHeader = new HashMap<String, String>();
+                    }
 
-                final String key = (String) headerNames.nextElement();
-                final String value = request.getHeader(key);
-                this.anotherHeader.put(key, value);
+                    final String key = (String) headerNames.nextElement();
+                    final String value = request.getHeader(key);
+                    this.anotherHeader.put(key, value);
+                } catch (Exception ex1) {
+                    // ignore
+                }
 
                 REQUEST_HEADER_MODEL_LOGGER.debug("Sorry. check your header (There Exception is no problem in operation). ("+ex.toString()+")");
             }
         }
-
     }
 
     @Deprecated

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
@@ -129,15 +129,15 @@ public void run() {
                         }
 
                         try {
-                            Thread.sleep(1000);
+                            Thread.sleep(10000);
                         } catch (InterruptedException e) {
                             // ignore
                         }
                     }
                 }
             };
 
-            SystemUtil.createSystemThread(threadCheckRunnable, "debug");
+            SystemUtil.createSystemThread(threadCheckRunnable, "ILLUMINATI_DEBUG_THREAD");
         }
     }
 }