Commit f2434067 authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Merge pull request #109 from ascrutae/feature/3.0 

fix issue
parents b8051d3e f90923e8

skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java

+5 −11
Original line number Diff line number Diff line
@@ -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;

    }

}

skywalking-sniffer/skywalking-agent/pom.xml

+9 −19
Original line number Diff line number Diff line
@@ -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>

skywalking-sniffer/skywalking-api/pom.xml

+43 −0
Original line number Diff line number Diff line
@@ -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>

skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml

+0 −5
Original line number Diff line number Diff line
@@ -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>

skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml

+0 −7
Original line number Diff line number Diff line
@@ -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>