From f90923e88634debc743b3d78628ed6b8f6f312e2 Mon Sep 17 00:00:00 2001
From: ascrutae <nzt48.xin@gmail.com>
Date: Tue, 21 Mar 2017 10:47:24 +0800
Subject: [PATCH] fix package issue and fix ref segments when call inject one
 times issue

---
 .../eye/skywalking/trace/TraceSegmentRef.java | 16 +++----
 skywalking-sniffer/skywalking-agent/pom.xml   | 28 ++++--------
 skywalking-sniffer/skywalking-api/pom.xml     | 43 +++++++++++++++++++
 .../dubbo-plugin/pom.xml                      |  5 ---
 .../httpClient-4.x-plugin/pom.xml             |  7 ---
 .../skywalking-sdk-plugin/jdbc-plugin/pom.xml |  5 ---
 .../pom.xml                                   |  5 ---
 .../pom.xml                                   |  7 ---
 8 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java
index 5375fa0816..0a8a6ab21f 100644
--- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java
+++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java
@@ -88,22 +88,16 @@ public class TraceSegmentRef{
 
     @Override
     public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
 
-        TraceSegmentRef ref = (TraceSegmentRef)o;
+        TraceSegmentRef that = (TraceSegmentRef) o;
 
-        if (spanId != ref.spanId)
-            return false;
-        return traceSegmentId != null ? traceSegmentId.equals(ref.traceSegmentId) : ref.traceSegmentId == null;
+        return traceSegmentId != null ? traceSegmentId.equals(that.traceSegmentId) : that.traceSegmentId == null;
     }
 
     @Override
     public int hashCode() {
-        int result = traceSegmentId != null ? traceSegmentId.hashCode() : 0;
-        result = 31 * result + spanId;
-        return result;
+        return traceSegmentId != null ? traceSegmentId.hashCode() : 0;
     }
 }
diff --git a/skywalking-sniffer/skywalking-agent/pom.xml b/skywalking-sniffer/skywalking-agent/pom.xml
index d807e4a1f0..fcc5b7fe88 100644
--- a/skywalking-sniffer/skywalking-agent/pom.xml
+++ b/skywalking-sniffer/skywalking-agent/pom.xml
@@ -21,13 +21,6 @@
         <shade.package>com.a.eye.skywalking.dependencies</shade.package>
         <shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>
         <shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>
-        <shade.com.lmax.disruptor.source>com.lmax.disruptor</shade.com.lmax.disruptor.source>
-        <shade.com.lmax.disruptor.target>${shade.package}.${shade.com.lmax.disruptor.source}
-        </shade.com.lmax.disruptor.target>
-        <shade.com.google.source>com.google</shade.com.google.source>
-        <shade.com.google.target>${shade.package}.${shade.com.google.source}</shade.com.google.target>
-        <shade.org.apache.source>org.apache</shade.org.apache.source>
-        <shade.org.apache.target>${shade.package}.${shade.org.apache.source}</shade.org.apache.target>
     </properties>
 
     <dependencies>
@@ -123,23 +116,20 @@
                                     </manifestEntries>
                                 </transformer>
                             </transformers>
+                            <artifactSet>
+                                <excludes>
+                                    <exclude>com.lmax:*</exclude>
+                                    <exclude>org.apache.httpcomponents:*</exclude>
+                                    <exclude>commons-logging:*</exclude>
+                                    <exclude>commons-codec:*</exclude>
+                                    <exclude>*:gson</exclude>
+                                </excludes>
+                            </artifactSet>
                             <relocations>
                                 <relocation>
                                     <pattern>${shade.net.bytebuddy.source}</pattern>
                                     <shadedPattern>${shade.net.bytebuddy.target}</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>${shade.com.lmax.disruptor.source}</pattern>
-                                    <shadedPattern>${shade.com.lmax.disruptor.target}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>${shade.com.google.source}</pattern>
-                                    <shadedPattern>${shade.com.google.target}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>${shade.org.apache.source}</pattern>
-                                    <shadedPattern>${shade.org.apache.target}</shadedPattern>
-                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
diff --git a/skywalking-sniffer/skywalking-api/pom.xml b/skywalking-sniffer/skywalking-api/pom.xml
index f578807695..eab817765e 100644
--- a/skywalking-sniffer/skywalking-api/pom.xml
+++ b/skywalking-sniffer/skywalking-api/pom.xml
@@ -17,6 +17,15 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jetty.version>9.4.2.v20170220</jetty.version>
+
+        <shade.package>com.a.eye.skywalking.dependencies</shade.package>
+        <shade.com.lmax.disruptor.source>com.lmax.disruptor</shade.com.lmax.disruptor.source>
+        <shade.com.lmax.disruptor.target>${shade.package}.${shade.com.lmax.disruptor.source}
+        </shade.com.lmax.disruptor.target>
+        <shade.com.google.source>com.google</shade.com.google.source>
+        <shade.com.google.target>${shade.package}.${shade.com.google.source}</shade.com.google.target>
+        <shade.org.apache.source>org.apache</shade.org.apache.source>
+        <shade.org.apache.target>${shade.package}.${shade.org.apache.source}</shade.org.apache.target>
     </properties>
 
     <dependencies>
@@ -74,6 +83,40 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <excludes>
+                                    <exclude>net.bytebuddy:byte-buddy:jar:</exclude>
+                                </excludes>
+                            </artifactSet>
+                            <relocations>
+                                <relocation>
+                                    <pattern>${shade.com.lmax.disruptor.source}</pattern>
+                                    <shadedPattern>${shade.com.lmax.disruptor.target}</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>${shade.com.google.source}</pattern>
+                                    <shadedPattern>${shade.com.google.target}</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>${shade.org.apache.source}</pattern>
+                                    <shadedPattern>${shade.org.apache.target}</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml
index 1fa1a6eaf9..bd8525c123 100644
--- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml
+++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml
@@ -18,11 +18,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.a.eye</groupId>
-            <artifactId>skywalking-api</artifactId>
-            <version>3.0-2017</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml
index 4d13cff6b9..03708288b9 100644
--- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml
+++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml
@@ -20,13 +20,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>com.a.eye</groupId>
-			<artifactId>skywalking-api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		
-
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml
index db239652d3..ebddf6e303 100755
--- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml
+++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml
@@ -18,11 +18,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.a.eye</groupId>
-            <artifactId>skywalking-api</artifactId>
-            <version>3.0-2017</version>
-        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/pom.xml
index d159c4e6b5..cf91ccd65a 100644
--- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/pom.xml
+++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/pom.xml
@@ -12,11 +12,6 @@
     <artifactId>skywalking-toolkit-opentracing-activation</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>com.a.eye</groupId>
-            <artifactId>skywalking-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.a.eye</groupId>
             <artifactId>skywalking-toolkit-opentracing</artifactId>
diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
index c78fd37717..fff2540daf 100644
--- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
+++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
@@ -12,11 +12,4 @@
     <packaging>jar</packaging>
 
     <name>skywalking-toolkit-trace-context-activation</name>
-    <dependencies>
-        <dependency>
-            <groupId>com.a.eye</groupId>
-            <artifactId>skywalking-api</artifactId>
-            <version>3.0-2017</version>
-        </dependency>
-    </dependencies>
 </project>
-- 
GitLab