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-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..64669e99a 100644 --- a/skywalking-registry/pom.xml +++ b/skywalking-registry/pom.xml @@ -29,28 +29,4 @@ ${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-storage-center/skywalking-storage/pom.xml b/skywalking-storage-center/skywalking-storage/pom.xml index dbd3052dc..dced15cdd 100644 --- a/skywalking-storage-center/skywalking-storage/pom.xml +++ b/skywalking-storage-center/skywalking-storage/pom.xml @@ -21,6 +21,11 @@ 4.12 test + + com.a.eye + skywalking-registry + ${project.version} + org.apache.logging.log4j log4j-core