fix many compile bug and proto error

This commit is contained in:
wusheng 2016-11-11 23:01:37 +08:00
parent 52becff8f5
commit bf5eb1398a
6 changed files with 24 additions and 28 deletions

View File

@ -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

View File

@ -5,7 +5,7 @@
<groupId>com.a.eye</groupId>
<artifactId>skywalking</artifactId>
<version>${project.version}</version>
<version>2.0-2016</version>
<modules>
<module>skywalking-alarm</module>

View File

@ -77,7 +77,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.1</version>
<version>2.4.3</version>
<executions>
<execution>
<phase>package</phase>
@ -103,6 +103,18 @@
<shadedPattern>${shade.io.netty.target}</shadedPattern>
</relocation>
</relocations>
<artifactSet>
<includes>
<include>io.grpc:grpc-*:jar:*</include>
<inclued>io.netty:netty-*:jar:*</inclued>
<inclued>com.google.protobuf:*:jar:*</inclued>
<inclued>com.google.code.gson:gson:jar:*</inclued>
<include>com.google.guava:guava:jar:*</include>
</includes>
</artifactSet>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
</configuration>
</execution>
</executions>

View File

@ -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;

View File

@ -29,28 +29,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
<repositories>
<repository>
<id>local-central</id>
<url>http://10.128.7.197:8081/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>apmparty</id>
<url>http://10.128.7.197:8081/nexus/content/repositories/apmparty/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</project>

View File

@ -21,6 +21,11 @@
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.a.eye</groupId>
<artifactId>skywalking-registry</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>