diff --git a/.travis.yml b/.travis.yml index cbb023a72..95a763519 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ install: - cd .. script: - - cd skywalking-protocol + - cd skywalking-network - mvn clean install -Dmaven.test.skip=true - cd .. - mvn clean install -Dmaven.test.skip=true diff --git a/pom.xml b/pom.xml index f6625747f..5a5353667 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.a.eye skywalking - ${project.version} + 2.0-2016 skywalking-alarm diff --git a/skywalking-logging/pom.xml b/skywalking-logging/pom.xml index 1032a3936..97579c9fb 100644 --- a/skywalking-logging/pom.xml +++ b/skywalking-logging/pom.xml @@ -8,21 +8,13 @@ 4.0.0 skywalking-logging - jar + pom skywalking-logging http://maven.apache.org + + skywalking-logging-api + skywalking-logging-log4j-impl + - - UTF-8 - - - - - junit - junit - 3.8.1 - test - - diff --git a/skywalking-logging/skywalking-logging-api/pom.xml b/skywalking-logging/skywalking-logging-api/pom.xml new file mode 100644 index 000000000..792273a89 --- /dev/null +++ b/skywalking-logging/skywalking-logging-api/pom.xml @@ -0,0 +1,14 @@ + + + + skywalking-logging + com.a.eye + 2.0-2016 + + 4.0.0 + + skywalking-logging-api + + diff --git a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/ILog.java b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/ILog.java similarity index 85% rename from skywalking-logging/src/main/java/com/a/eye/skywalking/logging/ILog.java rename to skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/ILog.java index 9a27cdf3b..656d36305 100644 --- a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/ILog.java +++ b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/ILog.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.logging.api; /** * Created by xin on 2016/11/10. diff --git a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/LogManager.java b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogManager.java similarity index 90% rename from skywalking-logging/src/main/java/com/a/eye/skywalking/logging/LogManager.java rename to skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogManager.java index 19faba471..6683ef226 100644 --- a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/LogManager.java +++ b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogManager.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.logging.api; /** * Created by xin on 2016/11/10. diff --git a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/LogResolver.java b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogResolver.java similarity index 72% rename from skywalking-logging/src/main/java/com/a/eye/skywalking/logging/LogResolver.java rename to skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogResolver.java index 7e4853dc9..627792ea3 100644 --- a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/LogResolver.java +++ b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogResolver.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.logging.api; /** * Created by xin on 2016/11/10. diff --git a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/NoopLogger.java b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/NoopLogger.java similarity index 91% rename from skywalking-logging/src/main/java/com/a/eye/skywalking/logging/NoopLogger.java rename to skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/NoopLogger.java index 236df43bb..f1491875e 100644 --- a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/NoopLogger.java +++ b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/NoopLogger.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.logging.api; /** diff --git a/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml b/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml new file mode 100644 index 000000000..26751f770 --- /dev/null +++ b/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml @@ -0,0 +1,27 @@ + + + + skywalking-logging + com.a.eye + 2.0-2016 + + 4.0.0 + + skywalking-logging-impl-log4j2 + + + + com.a.eye + skywalking-logging-api + ${project.version} + + + + org.apache.logging.log4j + log4j-core + 2.4.1 + + + diff --git a/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Logger.java b/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Logger.java new file mode 100644 index 000000000..50bb95e22 --- /dev/null +++ b/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Logger.java @@ -0,0 +1,35 @@ +package com.a.eye.skywalking.logging.impl.log4j2; + +import com.a.eye.skywalking.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 error(String message, Throwable e) { + logger.error(message, e); + } + + @Override + public void error(String message, Object argument, Throwable e) { + logger.error(message, argument, e); + } +} diff --git a/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Resolver.java b/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Resolver.java new file mode 100644 index 000000000..de0d9ca20 --- /dev/null +++ b/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Resolver.java @@ -0,0 +1,15 @@ +package com.a.eye.skywalking.logging.impl.log4j2; + +import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.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-network/pom.xml b/skywalking-network/pom.xml index 762bf18c2..566f29bf2 100644 --- a/skywalking-network/pom.xml +++ b/skywalking-network/pom.xml @@ -77,7 +77,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.1 + 2.4.3 package @@ -103,6 +103,18 @@ ${shade.io.netty.target} + + + io.grpc:grpc-*:jar:* + io.netty:netty-*:jar:* + com.google.protobuf:*:jar:* + com.google.code.gson:gson:jar:* + com.google.guava:guava:jar:* + + + + + diff --git a/skywalking-network/src/main/proto/TraceSearchService.proto b/skywalking-network/src/main/proto/TraceSearchService.proto index 34b147c26..544e2c612 100644 --- a/skywalking-network/src/main/proto/TraceSearchService.proto +++ b/skywalking-network/src/main/proto/TraceSearchService.proto @@ -6,9 +6,12 @@ option java_package = "com.a.eye.skywalking.network.grpc"; import "Spans.proto"; service TraceSearchService{ - rpc search(string) returns (SearchResult){}; + rpc search(TraceSearchCondition) returns (SearchResult){}; } +message TraceSearchCondition{ + string traceid = 1; +} message SearchResult{ repeated Span spans= 1; diff --git a/skywalking-registry/pom.xml b/skywalking-registry/pom.xml index 253a9b3ea..a8375e5ea 100644 --- a/skywalking-registry/pom.xml +++ b/skywalking-registry/pom.xml @@ -25,32 +25,8 @@ com.a.eye - skywalking-logging + skywalking-logging-api ${project.version} - - - - local-central - http://10.128.7.197:8081/nexus/content/groups/public/ - - true - - - true - - - - apmparty - http://10.128.7.197:8081/nexus/content/repositories/apmparty/ - - true - - - true - - - - diff --git a/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperConfig.java b/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperConfig.java index f44d4a396..93d83b8cc 100644 --- a/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperConfig.java +++ b/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperConfig.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.registry.impl.zookeeper; -import com.a.eye.skywalking.logging.ILog; -import com.a.eye.skywalking.logging.LogManager; +import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.logging.api.LogManager; import java.util.Properties; diff --git a/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperRegistryCenter.java b/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperRegistryCenter.java index ee5ed9e98..791b0e727 100644 --- a/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperRegistryCenter.java +++ b/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperRegistryCenter.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.registry.impl.zookeeper; -import com.a.eye.skywalking.logging.ILog; -import com.a.eye.skywalking.logging.LogManager; +import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.logging.api.LogManager; import com.a.eye.skywalking.registry.api.*; import org.apache.zookeeper.*; diff --git a/skywalking-storage-center/skywalking-storage/pom.xml b/skywalking-storage-center/skywalking-storage/pom.xml index dbd3052dc..25a515326 100644 --- a/skywalking-storage-center/skywalking-storage/pom.xml +++ b/skywalking-storage-center/skywalking-storage/pom.xml @@ -16,15 +16,19 @@ - junit - junit - 4.12 - test + com.a.eye + skywalking-network + ${project.version} - org.apache.logging.log4j - log4j-core - 2.4.1 + com.a.eye + skywalking-registry + ${project.version} + + + com.a.eye + skywalking-logging-impl-log4j2 + ${project.version} org.hsqldb @@ -36,6 +40,13 @@ data-carrier 1.0 + + + junit + junit + 4.12 + test + diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/BlockIndexUpdator.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/BlockIndexUpdator.java index 2e44a0c0c..dcde0e2f7 100644 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/BlockIndexUpdator.java +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/BlockIndexUpdator.java @@ -1,8 +1,8 @@ package com.a.eye.skywalking.storage.block.index; +import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.logging.api.LogManager; import com.a.eye.skywalking.storage.block.index.exception.BlockIndexPersistenceFailedException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import java.io.*; import java.util.ArrayList; @@ -14,7 +14,7 @@ import static com.a.eye.skywalking.storage.config.Config.BlockIndex.STORAGE_BASE public class BlockIndexUpdator { - private static Logger logger = LogManager.getLogger(BlockIndexUpdator.class); + private static ILog logger = LogManager.getLogger(BlockIndexUpdator.class); private L1Cache l1Cache; private L2Cache l2Cache; @@ -64,8 +64,7 @@ public class BlockIndexUpdator { List indexData = new ArrayList<>(); BufferedReader indexFileReader = null; try { - indexFileReader = - new BufferedReader(new FileReader(new File(STORAGE_BASE_PATH, DATA_FILE_INDEX_FILE_NAME))); + indexFileReader = new BufferedReader(new FileReader(new File(STORAGE_BASE_PATH, DATA_FILE_INDEX_FILE_NAME))); String indexDataStr = null; while ((indexDataStr = indexFileReader.readLine()) != null) { indexData.add(Long.parseLong(indexDataStr)); diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/L1Cache.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/L1Cache.java index f8f9a3e65..4f2281e73 100644 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/L1Cache.java +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/L1Cache.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.storage.block.index; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.logging.api.LogManager; import java.util.List; import java.util.TreeSet; @@ -11,13 +11,13 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; /** * 块索引的一级缓存 - * + *

* Created by xin on 2016/11/2. */ public class L1Cache { private static final int MAX_DATA_KEEP_SIZE = 30; - private static Logger logger = LogManager.getLogger(L1Cache.class); + private static ILog logger = LogManager.getLogger(L1Cache.class); private TreeSet cacheData = new TreeSet(); private final ReadWriteLock updateLock = new ReentrantReadWriteLock(); diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/IndexDataCapacityMonitor.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/IndexDataCapacityMonitor.java index 608ee39af..066c09619 100644 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/IndexDataCapacityMonitor.java +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/IndexDataCapacityMonitor.java @@ -1,10 +1,9 @@ package com.a.eye.skywalking.storage.data; +import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.logging.api.LogManager; import com.a.eye.skywalking.storage.block.index.BlockIndexEngine; import com.a.eye.skywalking.storage.data.index.IndexDBConnector; -import org.apache.jute.Index; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import java.sql.SQLException; import java.util.concurrent.atomic.AtomicLong; @@ -16,7 +15,7 @@ import static com.a.eye.skywalking.storage.config.Config.DataIndex.MAX_CAPACITY_ */ public class IndexDataCapacityMonitor extends Thread { - private static Logger logger = LogManager.getLogger(IndexDataCapacityMonitor.class); + private static ILog logger = LogManager.getLogger(IndexDataCapacityMonitor.class); private static Detector detector; public static void addIndexData(long timestamp, int size) { diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/IndexDBConnector.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/IndexDBConnector.java index c06e3093c..8914ea261 100644 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/IndexDBConnector.java +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/IndexDBConnector.java @@ -1,9 +1,9 @@ package com.a.eye.skywalking.storage.data.index; +import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.logging.api.LogManager; import com.a.eye.skywalking.storage.config.Config; import com.a.eye.skywalking.storage.data.exception.ConnectorInitializeFailedException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import java.sql.*; @@ -16,7 +16,7 @@ public class IndexDBConnector { private static final int MAX_BATCH_SIZE = 20; - private static Logger logger = LogManager.getLogger(IndexDBConnector.class); + private static ILog logger = LogManager.getLogger(IndexDBConnector.class); static { try {