diff --git a/skywalking-commons/pom.xml b/skywalking-commons/pom.xml index 238f583e0..6a5ef732e 100644 --- a/skywalking-commons/pom.xml +++ b/skywalking-commons/pom.xml @@ -12,7 +12,6 @@ skywalking-trace - skywalking-logging skywalking-util diff --git a/skywalking-commons/skywalking-logging/pom.xml b/skywalking-commons/skywalking-logging/pom.xml deleted file mode 100644 index 0e836a450..000000000 --- a/skywalking-commons/skywalking-logging/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - skywalking-commons - com.a.eye - 3.0-2017 - - 4.0.0 - - skywalking-logging - pom - - skywalking-logging - http://maven.apache.org - - skywalking-logging-api - skywalking-logging-impl-log4j2 - - - diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/pom.xml b/skywalking-commons/skywalking-logging/skywalking-logging-api/pom.xml deleted file mode 100644 index dbe97fc69..000000000 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - skywalking-logging - com.a.eye - 3.0-2017 - - 4.0.0 - jar - skywalking-logging-api - - diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml deleted file mode 100644 index 8f699e170..000000000 --- a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - skywalking-logging - com.a.eye - 3.0-2017 - - 4.0.0 - jar - skywalking-logging-impl-log4j2 - - - - com.a.eye - skywalking-logging-api - ${project.version} - - - - org.apache.logging.log4j - log4j-api - 2.6.2 - - - org.apache.logging.log4j - log4j-core - 2.6.2 - - - diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Logger.java b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Logger.java deleted file mode 100644 index b3ebe43d2..000000000 --- a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Logger.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.a.eye.skywalking.api.logging.impl.log4j2; - -import com.a.eye.skywalking.api.logging.api.ILog; -import org.apache.logging.log4j.Logger; - -/** - * Created by wusheng on 2016/11/11. - */ -public class Log4j2Logger implements ILog { - private Logger logger; - - public Log4j2Logger(Logger logger) { - this.logger = logger; - } - - @Override - public void info(String message) { - logger.info(message); - } - - @Override - public void info(String message, Object... arguments) { - logger.info(message, arguments); - } - - @Override - public void warn(String format, Object... arguments) { - logger.warn(format, arguments); - } - - @Override - public void error(String message, Throwable e) { - logger.error(message, e); - } - - @Override - public boolean isDebugEnable() { - return logger.isDebugEnabled(); - } - - @Override - public boolean isInfoEnable() { - return logger.isInfoEnabled(); - } - - @Override - public boolean isWarnEnable() { - return logger.isWarnEnabled(); - } - - @Override - public boolean isErrorEnable() { - return logger.isErrorEnabled(); - } - - @Override - public void debug(String format) { - logger.debug(format); - } - - @Override - public void debug(String format, Object... arguments) { - logger.debug(format, arguments); - } - - @Override - public void error(String format) { - logger.error(format); - } -} diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Resolver.java b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Resolver.java deleted file mode 100644 index a2fb23d78..000000000 --- a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2Resolver.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.a.eye.skywalking.api.logging.impl.log4j2; - -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogResolver; -import org.apache.logging.log4j.LogManager; - -/** - * Created by wusheng on 2016/11/11. - */ -public class Log4j2Resolver implements LogResolver { - @Override - public ILog getLogger(Class clazz) { - return new Log4j2Logger(LogManager.getLogger(clazz)); - } -} diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/test/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2LoggerTest.java b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/test/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2LoggerTest.java deleted file mode 100644 index 792151ac0..000000000 --- a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/test/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2LoggerTest.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.a.eye.skywalking.api.logging.impl.log4j2; - -import org.apache.logging.log4j.Logger; -import org.junit.Test; - -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - -/** - * Created by wusheng on 2017/2/28. - */ -public class Log4j2LoggerTest { - @Test - public void testLogProxy(){ - Logger mockLogger = spy(Logger.class); - Log4j2Logger logger = new Log4j2Logger(mockLogger); - - logger.isDebugEnable(); - verify(mockLogger, times(1)).isDebugEnabled(); - logger.isInfoEnable(); - verify(mockLogger, times(1)).isInfoEnabled(); - logger.isWarnEnable(); - verify(mockLogger, times(1)).isWarnEnabled(); - logger.isErrorEnable(); - verify(mockLogger, times(1)).isErrorEnabled(); - - logger.debug("string"); - verify(mockLogger, times(1)).debug("string"); - logger.debug("string", "arg1", "args"); - verify(mockLogger, times(1)).debug("string", new Object[]{"arg1", "args"}); - - logger.info("string"); - verify(mockLogger, times(1)).info("string"); - logger.info("string", "arg1", "args"); - verify(mockLogger, times(1)).info("string", new Object[]{"arg1", "args"}); - - logger.warn("string", "arg1", "args"); - verify(mockLogger, times(1)).warn("string", new Object[]{"arg1", "args"}); - - logger.error("string"); - verify(mockLogger, times(1)).error("string"); - NullPointerException exception = new NullPointerException(); - logger.error("string", exception); - verify(mockLogger, times(1)).error("string", exception); - } -} diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/test/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2ResolverTest.java b/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/test/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2ResolverTest.java deleted file mode 100644 index ec54f32dc..000000000 --- a/skywalking-commons/skywalking-logging/skywalking-logging-impl-log4j2/src/test/java/com/a/eye/skywalking/api/logging/impl/log4j2/Log4j2ResolverTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.a.eye.skywalking.api.logging.impl.log4j2; - -import com.a.eye.skywalking.api.logging.api.ILog; -import org.junit.Assert; -import org.junit.Test; - -/** - * Created by wusheng on 2017/2/28. - */ -public class Log4j2ResolverTest { - @Test - public void testGetLogger() { - Log4j2Resolver resolver = new Log4j2Resolver(); - ILog logger = resolver.getLogger(Log4j2ResolverTest.class); - - Assert.assertTrue(logger instanceof Log4j2Logger); - } -} diff --git a/skywalking-commons/skywalking-trace/pom.xml b/skywalking-commons/skywalking-trace/pom.xml index b0a8b6e6e..553f1e934 100644 --- a/skywalking-commons/skywalking-trace/pom.xml +++ b/skywalking-commons/skywalking-trace/pom.xml @@ -12,11 +12,6 @@ skywalking-trace - - com.a.eye - skywalking-logging-api - ${project.version} - com.a.eye skywalking-util diff --git a/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java b/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java index 21226d285..6a8df9340 100644 --- a/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java +++ b/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java @@ -4,8 +4,8 @@ import com.a.eye.skywalking.agent.junction.SkyWalkingEnhanceMatcher; import com.a.eye.skywalking.api.conf.Config; import com.a.eye.skywalking.api.conf.SnifferConfigInitializer; import com.a.eye.skywalking.api.logging.EasyLogResolver; -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.ILog; +import com.a.eye.skywalking.api.logging.LogManager; import com.a.eye.skywalking.api.plugin.AbstractClassEnhancePluginDefine; import com.a.eye.skywalking.api.plugin.PluginBootstrap; import com.a.eye.skywalking.api.plugin.PluginFinder; diff --git a/skywalking-sniffer/skywalking-api/pom.xml b/skywalking-sniffer/skywalking-api/pom.xml index 615db5f4f..943a1f8a5 100644 --- a/skywalking-sniffer/skywalking-api/pom.xml +++ b/skywalking-sniffer/skywalking-api/pom.xml @@ -20,7 +20,6 @@ - net.bytebuddy byte-buddy @@ -36,11 +35,6 @@ disruptor 3.3.6 - - com.a.eye - skywalking-logging-api - ${project.version} - diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java index 4faa1b64e..1a267fa78 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.api.conf; -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.ILog; +import com.a.eye.skywalking.api.logging.LogManager; import com.a.eye.skywalking.api.util.ConfigInitializer; import com.a.eye.skywalking.api.util.StringUtil; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogResolver.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogResolver.java index 3f9103b72..31f33e38d 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogResolver.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogResolver.java @@ -1,8 +1,5 @@ package com.a.eye.skywalking.api.logging; -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogResolver; - /** * Created by wusheng on 2016/11/26. */ diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java index 286366f4c..e449fbf0a 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java @@ -1,8 +1,6 @@ package com.a.eye.skywalking.api.logging; -import com.a.eye.skywalking.api.logging.api.ILog; - import com.a.eye.skywalking.api.util.LoggingUtil; import java.net.URLEncoder; import java.text.SimpleDateFormat; @@ -76,18 +74,13 @@ public class EasyLogger implements ILog { logger(WARN, replaceParam(format, arguments), null); } - @Override - public void warn(String format, Object arguments, Throwable e) { - logger(WARN, replaceParam(format, arguments), e); - } - @Override public void error(String format, Throwable e) { logger(ERROR, format, e); } @Override - public void error(String format, Object arguments, Throwable e) { + public void error(Throwable e, String format, Object... arguments) { logger(ERROR, replaceParam(format, arguments), e); } diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/ILog.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/ILog.java similarity index 85% rename from skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/ILog.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/ILog.java index 84445dfdb..a7de245d5 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/ILog.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/ILog.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.api.logging.api; +package com.a.eye.skywalking.api.logging; /** * The Log interface. @@ -16,6 +16,8 @@ public interface ILog { void error(String format, Throwable e); + void error(Throwable e, String format, Object... arguments); + boolean isDebugEnable(); boolean isInfoEnable(); diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogManager.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogManager.java similarity index 95% rename from skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogManager.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogManager.java index ade1abca8..e290ac040 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogManager.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogManager.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.api.logging.api; +package com.a.eye.skywalking.api.logging; /** * LogManager is the {@link LogResolver} implementation manager. diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogResolver.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogResolver.java similarity index 87% rename from skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogResolver.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogResolver.java index c311e3354..3c751c6ef 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/LogResolver.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogResolver.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.api.logging.api; +package com.a.eye.skywalking.api.logging; /** * {@link LogResolver} just do only one thing: return the {@link ILog} implementation. diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/NoopLogger.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/NoopLogger.java similarity index 86% rename from skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/NoopLogger.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/NoopLogger.java index 5dbb887af..be261815e 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/api/logging/api/NoopLogger.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/NoopLogger.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.api.logging.api; +package com.a.eye.skywalking.api.logging; /** @@ -8,7 +8,9 @@ package com.a.eye.skywalking.api.logging.api; * Created by xin on 2016/11/10. */ public enum NoopLogger implements ILog { - INSTANCE; + INSTANCE { + + }; @Override public void info(String message) { @@ -64,4 +66,9 @@ public enum NoopLogger implements ILog { public void error(String format) { } + + @Override + public void error(Throwable e, String format, Object... arguments) { + + } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefine.java index 611544a1e..dda08f385 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefine.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.ILog; +import com.a.eye.skywalking.api.logging.LogManager; import com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassEnhancePluginDefine; import com.a.eye.skywalking.api.util.StringUtil; import net.bytebuddy.dynamic.DynamicType; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginBootstrap.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginBootstrap.java index 168c2409d..67ed10029 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginBootstrap.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginBootstrap.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.ILog; +import com.a.eye.skywalking.api.logging.LogManager; import net.bytebuddy.pool.TypePool; import java.net.URL; @@ -37,7 +37,7 @@ public class PluginBootstrap { try { PluginCfg.INSTANCE.load(pluginUrl.openStream()); } catch (Throwable t) { - logger.error("plugin [{}] init failure.", new Object[] {pluginUrl}, t); + logger.error(t, "plugin [{}] init failure.", pluginUrl); } } @@ -52,7 +52,7 @@ public class PluginBootstrap { plugin.setClassTypePool(classTypePool); plugins.add(plugin); } catch (Throwable t) { - logger.error("loade plugin [{}] failure.", new Object[] {pluginClassName}, t); + logger.error(t, "loade plugin [{}] failure.", pluginClassName); } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolver.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolver.java index 415014db2..d5e871436 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolver.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolver.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.ILog; +import com.a.eye.skywalking.api.logging.LogManager; import java.io.IOException; import java.net.URL; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/TracingBootstrap.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/TracingBootstrap.java index 0aebaa931..d886ec395 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/TracingBootstrap.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/TracingBootstrap.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.api.plugin; -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.ILog; +import com.a.eye.skywalking.api.logging.LogManager; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.ClassFileLocator; import net.bytebuddy.dynamic.DynamicType; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java index 0c4473851..c5dd3e8ec 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.ILog; +import com.a.eye.skywalking.api.logging.LogManager; import com.a.eye.skywalking.api.plugin.interceptor.loader.InterceptorInstanceLoader; import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import net.bytebuddy.implementation.bind.annotation.AllArguments; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java index 4dfd7709e..79336c34f 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.ILog; +import com.a.eye.skywalking.api.logging.LogManager; import com.a.eye.skywalking.api.plugin.AbstractClassEnhancePluginDefine; import com.a.eye.skywalking.api.plugin.PluginException; import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java index 0def0d564..e0e17414c 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.ILog; +import com.a.eye.skywalking.api.logging.LogManager; import com.a.eye.skywalking.api.plugin.interceptor.loader.InterceptorInstanceLoader; import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import net.bytebuddy.implementation.bind.annotation.*; @@ -55,7 +55,7 @@ public class ClassInstanceMethodsInterceptor { try { interceptor.beforeMethod(instanceContext, interceptorContext, result); } catch (Throwable t) { - logger.error("class[{}] before method[{}] intercept failue:{}", new Object[] {obj.getClass(), method.getName(), t.getMessage()}, t); + logger.error(t,"class[{}] before method[{}] intercept failure", obj.getClass(), method.getName()); } Object ret = null; @@ -69,14 +69,14 @@ public class ClassInstanceMethodsInterceptor { try { interceptor.handleMethodException(t, instanceContext, interceptorContext); } catch (Throwable t2) { - logger.error("class[{}] handle method[{}] exception failue:{}", new Object[] {obj.getClass(), method.getName(), t2.getMessage()}, t2); + logger.error(t2, "class[{}] handle method[{}] exception failure", obj.getClass(), method.getName()); } throw t; } finally { try { ret = interceptor.afterMethod(instanceContext, interceptorContext, ret); } catch (Throwable t) { - logger.error("class[{}] after method[{}] intercept failue:{}", new Object[] {obj.getClass(), method.getName(), t.getMessage()}, t); + logger.error(t, "class[{}] after method[{}] intercept failure", obj.getClass(), method.getName()); } } return ret; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java index 86b472308..0c2d01f17 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.ILog; +import com.a.eye.skywalking.api.logging.LogManager; import com.a.eye.skywalking.api.plugin.interceptor.loader.InterceptorInstanceLoader; import net.bytebuddy.implementation.bind.annotation.AllArguments; import net.bytebuddy.implementation.bind.annotation.Origin; @@ -55,7 +55,7 @@ public class ClassStaticMethodsInterceptor { try { interceptor.beforeMethod(interceptorContext, result); } catch (Throwable t) { - logger.error("class[{}] before static method[{}] intercept failue:{}", new Object[] {clazz, method.getName(), t.getMessage()}, t); + logger.error(t, "class[{}] before static method[{}] intercept failure", clazz, method.getName()); } @@ -70,14 +70,14 @@ public class ClassStaticMethodsInterceptor { try { interceptor.handleMethodException(t, interceptorContext); } catch (Throwable t2) { - logger.error("class[{}] handle static method[{}] exception failue:{}", new Object[] {clazz, method.getName(), t2.getMessage()}, t2); + logger.error(t2, "class[{}] handle static method[{}] exception failure", clazz, method.getName(), t2.getMessage()); } throw t; } finally { try { ret = interceptor.afterMethod(interceptorContext, ret); } catch (Throwable t) { - logger.error("class[{}] after static method[{}] intercept failue:{}", new Object[] {clazz, method.getName(), t.getMessage()}, t); + logger.error(t,"class[{}] after static method[{}] intercept failure:{}", clazz, method.getName(), t.getMessage()); } } return ret; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java index 5de84f0d2..9f240a98f 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.ILog; +import com.a.eye.skywalking.api.logging.LogManager; import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import net.bytebuddy.implementation.bind.annotation.AllArguments; import net.bytebuddy.implementation.bind.annotation.FieldProxy; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/loader/InterceptorInstanceLoader.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/loader/InterceptorInstanceLoader.java index 26bedd0b2..9cfc7d050 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/loader/InterceptorInstanceLoader.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/loader/InterceptorInstanceLoader.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.api.plugin.interceptor.loader; -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.ILog; +import com.a.eye.skywalking.api.logging.LogManager; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/test/java/com/a/eye/skywalking/api/logging/api/LogManagerTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/LogManagerTest.java similarity index 92% rename from skywalking-commons/skywalking-logging/skywalking-logging-api/src/test/java/com/a/eye/skywalking/api/logging/api/LogManagerTest.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/LogManagerTest.java index 812b5660b..7a44a3215 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/test/java/com/a/eye/skywalking/api/logging/api/LogManagerTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/LogManagerTest.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.api.logging.api; +package com.a.eye.skywalking.api.logging; import org.junit.After; import org.junit.Assert; @@ -54,6 +54,10 @@ public class LogManagerTest { } + @Override public void error(Throwable e, String format, Object... arguments) { + + } + @Override public boolean isDebugEnable() { return false; } @@ -83,3 +87,4 @@ public class LogManagerTest { } } } + diff --git a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/test/java/com/a/eye/skywalking/api/logging/api/NoopLoggerTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/NoopLoggerTest.java similarity index 87% rename from skywalking-commons/skywalking-logging/skywalking-logging-api/src/test/java/com/a/eye/skywalking/api/logging/api/NoopLoggerTest.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/NoopLoggerTest.java index 346e9034d..7aafebb55 100644 --- a/skywalking-commons/skywalking-logging/skywalking-logging-api/src/test/java/com/a/eye/skywalking/api/logging/api/NoopLoggerTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/NoopLoggerTest.java @@ -1,9 +1,9 @@ -package com.a.eye.skywalking.api.logging.api; +package com.a.eye.skywalking.api.logging; import org.junit.Assert; import org.junit.Test; -import static com.a.eye.skywalking.api.logging.api.NoopLogger.INSTANCE; +import static com.a.eye.skywalking.api.logging.NoopLogger.INSTANCE; /** * Created by wusheng on 2017/2/27. diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java index 4ab6b4ecf..d7f8a57c6 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java @@ -2,8 +2,8 @@ package com.a.eye.skywalking.toolkit.activation.trace; import com.a.eye.skywalking.api.context.ContextCarrier; import com.a.eye.skywalking.api.context.ContextManager; -import com.a.eye.skywalking.api.logging.api.ILog; -import com.a.eye.skywalking.api.logging.api.LogManager; +import com.a.eye.skywalking.api.logging.ILog; +import com.a.eye.skywalking.api.logging.LogManager; import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInvokeContext; import com.a.eye.skywalking.api.plugin.interceptor.enhance.StaticMethodInvokeContext;