Merge pull request #307 from scouter-project/master

gunlee01 · web-flow · commit 46af7ac21896 · 2017-03-30T21:47:36.000+09:00
Release merge v0.5.1
diff --git a/scouter.agent.java/src/scouter/agent/Configure.java b/scouter.agent.java/src/scouter/agent/Configure.java
@@ -371,7 +371,7 @@ public final static synchronized Configure getInstance() {
     public String hook_async_callrunnable_scan_package_prefixes = "";
 
     @ConfigDesc("enable lambda expressioned class hook for detecting asyncronous processing. Only classes under the package configured by 'hook_async_callrunnable_scan_package_prefixes' is hooked.")
-    public boolean hook_lambda_instrumentation_strategy_enabled = true;
+    public boolean hook_lambda_instrumentation_strategy_enabled = false;
 
     @ConfigDesc("")
     public String hook_add_fields = "";
@@ -662,7 +662,7 @@ private void apply() {
         this.hook_async_callrunnable_enable = getBoolean("hook_async_callrunnable_enable", true);
         this.hook_async_callrunnable_scan_package_prefixes = getValue("hook_async_callrunnable_scan_package_prefixes", "");
 
-        this.hook_lambda_instrumentation_strategy_enabled = getBoolean("hook_lambda_instrumentation_strategy_enabled", true);
+        this.hook_lambda_instrumentation_strategy_enabled = getBoolean("hook_lambda_instrumentation_strategy_enabled", false);
 
         this.hook_add_fields = getValue("hook_add_fields", "");
         this.hook_context_classes = getValue("hook_context_classes", "javax/naming/InitialContext");
diff --git a/scouter.agent.java/src/scouter/bytebuddy/ByteBuddy.java b/scouter.agent.java/src/scouter/bytebuddy/ByteBuddy.java
@@ -84,6 +84,8 @@
  * @see AgentBuilder
  */
 public class ByteBuddy {
+    private static final String BYTE_BUDDY_VERSION = "1.6.9";
+
     /**
      * The default prefix for the default {@link NamingStrategy}.
      */
@@ -254,8 +256,8 @@ public <T> DynamicType.Builder<T> subclass(Class<T> superType, ConstructorStrate
      * </p>
      *
      * @param superType The super class or interface type to extend. The type must be a raw type or parameterized type. All type
-     * variables that are referenced by the generic type must be declared by the generated subclass before creating
-     * the type.
+     *                  variables that are referenced by the generic type must be declared by the generated subclass before creating
+     *                  the type.
      * @return A type builder for creating a new class extending the provided class or interface.
      */
     public DynamicType.Builder<?> subclass(Type superType) {
@@ -277,8 +279,8 @@ public DynamicType.Builder<?> subclass(Type superType) {
      * </p>
      *
      * @param superType           The super class or interface type to extend. The type must be a raw type or parameterized
-     * type. All type variables that are referenced by the generic type must be declared by the
-     * generated subclass before creating the type.
+     *                            type. All type variables that are referenced by the generic type must be declared by the
+     *                            generated subclass before creating the type.
      * @param constructorStrategy A constructor strategy that determines the
      * @return A type builder for creating a new class extending the provided class or interface.
      */
@@ -306,8 +308,8 @@ public DynamicType.Builder<?> subclass(Type superType, ConstructorStrategy const
      * </p>
      *
      * @param superType The super class or interface type to extend. The type must be a raw type or parameterized type. All type
-     * variables that are referenced by the generic type must be declared by the generated subclass before creating
-     * the type.
+     *                  variables that are referenced by the generic type must be declared by the generated subclass before creating
+     *                  the type.
      * @return A type builder for creating a new class extending the provided class or interface.
      */
     public DynamicType.Builder<?> subclass(TypeDefinition superType) {
@@ -329,8 +331,8 @@ public DynamicType.Builder<?> subclass(TypeDefinition superType) {
      * </p>
      *
      * @param superType           The super class or interface type to extend. The type must be a raw type or parameterized
-     * type. All type variables that are referenced by the generic type must be declared by the
-     * generated subclass before creating the type.
+     *                            type. All type variables that are referenced by the generic type must be declared by the
+     *                            generated subclass before creating the type.
      * @param constructorStrategy A constructor strategy that determines the
      * @return A type builder for creating a new class extending the provided class or interface.
      */
@@ -399,8 +401,8 @@ public <T> DynamicType.Builder<T> makeInterface(Class<T> interfaceType) {
      * </p>
      *
      * @param interfaceType The interface types to implement. The types must be raw or parameterized types. All type
-     * variables that are referenced by a parameterized type must be declared by the generated
-     * subclass before creating the type.
+     *                      variables that are referenced by a parameterized type must be declared by the generated
+     *                      subclass before creating the type.
      * @return A type builder that creates a new interface type.
      */
     public DynamicType.Builder<?> makeInterface(Type... interfaceType) {
@@ -421,8 +423,8 @@ public DynamicType.Builder<?> makeInterface(Type... interfaceType) {
      * </p>
      *
      * @param interfaceTypes The interface types to implement. The types must be raw or parameterized types. All
-     * type variables that are referenced by a parameterized type must be declared by the
-     * generated subclass before creating the type.
+     *                       type variables that are referenced by a parameterized type must be declared by the
+     *                       generated subclass before creating the type.
      * @return A type builder that creates a new interface type.
      */
     public DynamicType.Builder<?> makeInterface(List<? extends Type> interfaceTypes) {
@@ -443,8 +445,8 @@ public DynamicType.Builder<?> makeInterface(List<? extends Type> interfaceTypes)
      * </p>
      *
      * @param interfaceType The interface types to implement. The types must be raw or parameterized types. All
-     * type variables that are referenced by a parameterized type must be declared by the
-     * generated subclass before creating the type.
+     *                      type variables that are referenced by a parameterized type must be declared by the
+     *                      generated subclass before creating the type.
      * @return A type builder that creates a new interface type.
      */
     public DynamicType.Builder<?> makeInterface(TypeDefinition... interfaceType) {
@@ -465,8 +467,8 @@ public DynamicType.Builder<?> makeInterface(TypeDefinition... interfaceType) {
      * </p>
      *
      * @param interfaceTypes The interface types to implement. The types must be raw or parameterized types. All
-     * type variables that are referenced by a parameterized type must be declared by the
-     * generated subclass before creating the type.
+     *                       type variables that are referenced by a parameterized type must be declared by the
+     *                       generated subclass before creating the type.
      * @return A type builder that creates a new interface type.
      */
     public DynamicType.Builder<?> makeInterface(Collection<? extends TypeDefinition> interfaceTypes) {
@@ -968,7 +970,8 @@ public boolean equals(final java.lang.Object o) {
                 if (!other.canEqual((java.lang.Object) this)) return false;
                 final java.lang.Object this$instrumentedType = this.instrumentedType;
                 final java.lang.Object other$instrumentedType = other.instrumentedType;
-                if (this$instrumentedType == null ? other$instrumentedType != null : !this$instrumentedType.equals(other$instrumentedType)) return false;
+                if (this$instrumentedType == null ? other$instrumentedType != null : !this$instrumentedType.equals(other$instrumentedType))
+                    return false;
                 return true;
             }
 
@@ -1102,34 +1105,44 @@ public boolean equals(final java.lang.Object o) {
         if (!other.canEqual((java.lang.Object) this)) return false;
         final java.lang.Object this$classFileVersion = this.classFileVersion;
         final java.lang.Object other$classFileVersion = other.classFileVersion;
-        if (this$classFileVersion == null ? other$classFileVersion != null : !this$classFileVersion.equals(other$classFileVersion)) return false;
+        if (this$classFileVersion == null ? other$classFileVersion != null : !this$classFileVersion.equals(other$classFileVersion))
+            return false;
         final java.lang.Object this$namingStrategy = this.namingStrategy;
         final java.lang.Object other$namingStrategy = other.namingStrategy;
-        if (this$namingStrategy == null ? other$namingStrategy != null : !this$namingStrategy.equals(other$namingStrategy)) return false;
+        if (this$namingStrategy == null ? other$namingStrategy != null : !this$namingStrategy.equals(other$namingStrategy))
+            return false;
         final java.lang.Object this$auxiliaryTypeNamingStrategy = this.auxiliaryTypeNamingStrategy;
         final java.lang.Object other$auxiliaryTypeNamingStrategy = other.auxiliaryTypeNamingStrategy;
-        if (this$auxiliaryTypeNamingStrategy == null ? other$auxiliaryTypeNamingStrategy != null : !this$auxiliaryTypeNamingStrategy.equals(other$auxiliaryTypeNamingStrategy)) return false;
+        if (this$auxiliaryTypeNamingStrategy == null ? other$auxiliaryTypeNamingStrategy != null : !this$auxiliaryTypeNamingStrategy.equals(other$auxiliaryTypeNamingStrategy))
+            return false;
         final java.lang.Object this$annotationValueFilterFactory = this.annotationValueFilterFactory;
         final java.lang.Object other$annotationValueFilterFactory = other.annotationValueFilterFactory;
-        if (this$annotationValueFilterFactory == null ? other$annotationValueFilterFactory != null : !this$annotationValueFilterFactory.equals(other$annotationValueFilterFactory)) return false;
+        if (this$annotationValueFilterFactory == null ? other$annotationValueFilterFactory != null : !this$annotationValueFilterFactory.equals(other$annotationValueFilterFactory))
+            return false;
         final java.lang.Object this$annotationRetention = this.annotationRetention;
         final java.lang.Object other$annotationRetention = other.annotationRetention;
-        if (this$annotationRetention == null ? other$annotationRetention != null : !this$annotationRetention.equals(other$annotationRetention)) return false;
+        if (this$annotationRetention == null ? other$annotationRetention != null : !this$annotationRetention.equals(other$annotationRetention))
+            return false;
         final java.lang.Object this$implementationContextFactory = this.implementationContextFactory;
         final java.lang.Object other$implementationContextFactory = other.implementationContextFactory;
-        if (this$implementationContextFactory == null ? other$implementationContextFactory != null : !this$implementationContextFactory.equals(other$implementationContextFactory)) return false;
+        if (this$implementationContextFactory == null ? other$implementationContextFactory != null : !this$implementationContextFactory.equals(other$implementationContextFactory))
+            return false;
         final java.lang.Object this$methodGraphCompiler = this.methodGraphCompiler;
         final java.lang.Object other$methodGraphCompiler = other.methodGraphCompiler;
-        if (this$methodGraphCompiler == null ? other$methodGraphCompiler != null : !this$methodGraphCompiler.equals(other$methodGraphCompiler)) return false;
+        if (this$methodGraphCompiler == null ? other$methodGraphCompiler != null : !this$methodGraphCompiler.equals(other$methodGraphCompiler))
+            return false;
         final java.lang.Object this$instrumentedTypeFactory = this.instrumentedTypeFactory;
         final java.lang.Object other$instrumentedTypeFactory = other.instrumentedTypeFactory;
-        if (this$instrumentedTypeFactory == null ? other$instrumentedTypeFactory != null : !this$instrumentedTypeFactory.equals(other$instrumentedTypeFactory)) return false;
+        if (this$instrumentedTypeFactory == null ? other$instrumentedTypeFactory != null : !this$instrumentedTypeFactory.equals(other$instrumentedTypeFactory))
+            return false;
         final java.lang.Object this$ignoredMethods = this.ignoredMethods;
         final java.lang.Object other$ignoredMethods = other.ignoredMethods;
-        if (this$ignoredMethods == null ? other$ignoredMethods != null : !this$ignoredMethods.equals(other$ignoredMethods)) return false;
+        if (this$ignoredMethods == null ? other$ignoredMethods != null : !this$ignoredMethods.equals(other$ignoredMethods))
+            return false;
         final java.lang.Object this$typeValidation = this.typeValidation;
         final java.lang.Object other$typeValidation = other.typeValidation;
-        if (this$typeValidation == null ? other$typeValidation != null : !this$typeValidation.equals(other$typeValidation)) return false;
+        if (this$typeValidation == null ? other$typeValidation != null : !this$typeValidation.equals(other$typeValidation))
+            return false;
         return true;
     }
 
diff --git a/scouter.client/src/scouter/client/util/ConsoleProxy.java b/scouter.client/src/scouter/client/util/ConsoleProxy.java
@@ -22,11 +22,9 @@
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleConstants;
-import org.eclipse.ui.console.MessageConsole;
-import org.eclipse.ui.console.MessageConsoleStream;
+import org.eclipse.ui.console.*;
+
+import java.io.PrintStream;
 
 
 public class ConsoleProxy {
@@ -148,6 +146,10 @@ private MessageConsoleStream getNewMessageConsoleStream(int msgKind) {
 		}
 
 		MessageConsoleStream msgConsoleStream = getMessageConsole().newMessageStream();
+		PrintStream myS = new PrintStream(msgConsoleStream);
+		System.setOut(myS);
+		System.setErr(myS);
+
 		try {
 			Color c = ColorUtil.getInstance().getColor(swtColorId);
 			msgConsoleStream.setColor(c);
diff --git a/scouter.client/src/scouter/client/xlog/ProfileText.java b/scouter.client/src/scouter/client/xlog/ProfileText.java
@@ -930,6 +930,8 @@ public static String simplifyMethod(String method) {
             String methodName = parts[parts.length - 1];
             int bracePos = methodName.indexOf('(');
 
+            if(bracePos <= 0) return method;
+
             return parts[parts.length - 2] + "#" + methodName.substring(0, bracePos) + "()";
         } else {
             return method;
diff --git a/scouter.deploy/build.xml b/scouter.deploy/build.xml
@@ -4,7 +4,7 @@
 	<property name="deploy-dir" value="./out/package"/>
 	<property name="outpack-dir" value="./out"/>
 	
-	<property name="VERSION" value="0.5.0"/>
+	<property name="VERSION" value="0.5.1"/>
 		
 	
     <target name="packing">
