Merge pull request #2 from wu-sheng/feature/3.0

merge Feature/3.0
apache · Feb 26, 2017 · 04a232d · 04a232d
2 parents 438359d + cbe370b
commit 04a232d
Show file tree

Hide file tree

Showing 17 changed files with 5,623 additions and 32 deletions.
diff --git a/skywalking-commons/skywalking-trace/pom.xml b/skywalking-commons/skywalking-trace/pom.xml
@@ -52,33 +52,45 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>src/java/generated-source/protobuf/java</source>
+                                <source>${basedir}/target/generated-sources/protobuf/java</source>
                             </sources>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.xolstice.maven.plugins</groupId>
-                <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.5.0</version>
-                <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.1.0:exe:${os.detected.classifier}
-                    </protocArtifact>
-                    <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.1.2:exe:${os.detected.classifier}
-                    </pluginArtifact>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                            <goal>compile-custom</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+            <!-- This plugin can run, only when you have installed `protoc`.-->
+            <!--<plugin>-->
+                <!--<artifactId>maven-antrun-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<id>compile-protoc</id>-->
+                        <!--<phase>generate-sources</phase>-->
+                        <!--<configuration>-->
+                            <!--<tasks>-->
+                                <!--<path id="proto.path">-->
+                                    <!--<fileset dir="src/main/proto">-->
+                                        <!--<include name="*.proto"/>-->
+                                    <!--</fileset>-->
+                                <!--</path>-->
+                                <!--<pathconvert pathsep=" " property="proto.files"-->
+                                             <!--refid="proto.path"/>-->
+
+                                <!--<exec executable="protoc">-->
+                                    <!--<arg value="&#45;&#45;java_out=src/main/java"/>-->
+                                    <!--<arg value="-I${project.basedir}/src/main/proto"/>-->
+                                    <!--<arg line="${proto.files}"/>-->
+                                <!--</exec>-->
+                            <!--</tasks>-->
+                            <!--<sourceRoot>src/main/gen-java</sourceRoot>-->
+                        <!--</configuration>-->
+                        <!--<goals>-->
+                            <!--<goal>run</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
+
         </plugins>
     </build>
 </project>
diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java
@@ -2,8 +2,8 @@
 
 import com.a.eye.skywalking.api.util.StringUtil;
 import com.a.eye.skywalking.messages.ISerializable;
-import com.a.eye.skywalking.trace.messages.proto.KeyValue;
-import com.a.eye.skywalking.trace.messages.proto.LogDataMessage;
+import com.a.eye.skywalking.trace.proto.KeyValue;
+import com.a.eye.skywalking.trace.proto.LogDataMessage;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -14,7 +14,7 @@
  *
  * Created by wusheng on 2017/2/17.
  */
-public class LogData implements ISerializable<LogDataMessage>{
+public class LogData implements ISerializable<LogDataMessage> {
     private long time;
     private Map<String, ?> fields;
 

diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java
@@ -2,9 +2,9 @@
 
 import com.a.eye.skywalking.api.util.StringUtil;
 import com.a.eye.skywalking.messages.ISerializable;
-import com.a.eye.skywalking.trace.messages.proto.KeyValue;
-import com.a.eye.skywalking.trace.messages.proto.LogDataMessage;
-import com.a.eye.skywalking.trace.messages.proto.SpanMessage;
+import com.a.eye.skywalking.trace.proto.KeyValue;
+import com.a.eye.skywalking.trace.proto.LogDataMessage;
+import com.a.eye.skywalking.trace.proto.SpanMessage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...lking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegment.java b/...lking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegment.java
@@ -1,9 +1,9 @@
 package com.a.eye.skywalking.trace;
 
 import com.a.eye.skywalking.messages.ISerializable;
-import com.a.eye.skywalking.trace.messages.proto.SegmentMessage;
-import com.a.eye.skywalking.trace.messages.proto.SegmentRefMessage;
-import com.a.eye.skywalking.trace.messages.proto.SpanMessage;
+import com.a.eye.skywalking.trace.proto.SegmentMessage;
+import com.a.eye.skywalking.trace.proto.SegmentRefMessage;
+import com.a.eye.skywalking.trace.proto.SpanMessage;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;

diff --git a/...ng-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java b/...ng-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java
@@ -1,7 +1,7 @@
 package com.a.eye.skywalking.trace;
 
 import com.a.eye.skywalking.messages.ISerializable;
-import com.a.eye.skywalking.trace.messages.proto.SegmentRefMessage;
+import com.a.eye.skywalking.trace.proto.SegmentRefMessage;
 import com.a.eye.skywalking.trace.tag.Tags;
 
 /**