From 137906b6f7871ddf5cf08e489abcb7dc663817e8 Mon Sep 17 00:00:00 2001
From: c feng <c feng>
Date: Fri, 7 Jul 2017 15:14:12 +0800
Subject: [PATCH] Optimize the plug-in load hints

---
 .../apm/agent/core/plugin/PluginBootstrap.java           | 4 ++--
 .../org/skywalking/apm/agent/core/plugin/PluginCfg.java  | 9 +++++----
 .../apm/agent/core/plugin/PluginResourcesResolver.java   | 4 ----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginBootstrap.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginBootstrap.java
index d1b72047d..a355603d7 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginBootstrap.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginBootstrap.java
@@ -27,7 +27,7 @@ public class PluginBootstrap {
         List<URL> resources = resolver.getResources();
 
         if (resources == null || resources.size() == 0) {
-            logger.info("no plugin files (skywalking-plugin.properties) found, continue to start application.");
+            logger.info("no plugin files (skywalking-plugin.def) found, continue to start application.");
             return new ArrayList<AbstractClassEnhancePluginDefine>();
         }
 
@@ -35,7 +35,7 @@ public class PluginBootstrap {
             try {
                 PluginCfg.INSTANCE.load(pluginUrl.openStream());
             } catch (Throwable t) {
-                logger.error(t, "plugin [{}] init failure.", pluginUrl);
+                logger.error(t, "plugin file [{}] init failure.", pluginUrl);
             }
         }
 
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginCfg.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginCfg.java
index 3fae43aa5..5949342ae 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginCfg.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginCfg.java
@@ -1,14 +1,15 @@
 package org.skywalking.apm.agent.core.plugin;
 
+import org.skywalking.apm.agent.core.plugin.exception.IllegalPluginDefineException;
+import org.skywalking.apm.logging.ILog;
+import org.skywalking.apm.logging.LogManager;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
-import org.skywalking.apm.agent.core.plugin.exception.IllegalPluginDefineException;
-import org.skywalking.apm.logging.ILog;
-import org.skywalking.apm.logging.LogManager;
 
 public enum PluginCfg {
     INSTANCE;
@@ -31,7 +32,7 @@ public enum PluginCfg {
                         pluginClassList.add(plugin);
                     }
                 } catch (IllegalPluginDefineException e) {
-                    logger.error("Failed to format plugin define.", e);
+                    logger.error(e,"Failed to format plugin({}) define.", pluginDefine);
                 }
             }
         } finally {
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginResourcesResolver.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginResourcesResolver.java
index b22336437..34e56e93f 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginResourcesResolver.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginResourcesResolver.java
@@ -24,10 +24,6 @@ public class PluginResourcesResolver {
         try {
             urls = getDefaultClassLoader().getResources("skywalking-plugin.def");
 
-            if (!urls.hasMoreElements()) {
-                logger.info("no plugin files (skywalking-plugin.def) found");
-            }
-
             while (urls.hasMoreElements()) {
                 URL pluginUrl = urls.nextElement();
                 cfgUrlPaths.add(pluginUrl);