Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
月轩居士
SkyWalking
提交
f90923e8
S
SkyWalking
项目概览
月轩居士
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
4
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f90923e8
编写于
3月 21, 2017
作者:
A
ascrutae
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix package issue and fix ref segments when call inject one times issue
上级
dac6aad0
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
57 addition
and
59 deletion
+57
-59
skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java
...main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java
+5
-11
skywalking-sniffer/skywalking-agent/pom.xml
skywalking-sniffer/skywalking-agent/pom.xml
+9
-19
skywalking-sniffer/skywalking-api/pom.xml
skywalking-sniffer/skywalking-api/pom.xml
+43
-0
skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml
...alking-sniffer/skywalking-sdk-plugin/dubbo-plugin/pom.xml
+0
-5
skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml
...iffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml
+0
-7
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml
+0
-5
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/pom.xml
...ivation/skywalking-toolkit-opentracing-activation/pom.xml
+0
-5
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
...ation/skywalking-toolkit-trace-context-activation/pom.xml
+0
-7
未找到文件。
skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java
浏览文件 @
f90923e8
...
...
@@ -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
浏览文件 @
f90923e8
...
...
@@ -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
浏览文件 @
f90923e8
...
...
@@ -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
浏览文件 @
f90923e8
...
...
@@ -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
浏览文件 @
f90923e8
...
...
@@ -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>
...
...
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/pom.xml
浏览文件 @
f90923e8
...
...
@@ -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>
...
...
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/pom.xml
浏览文件 @
f90923e8
...
...
@@ -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>
...
...
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/pom.xml
浏览文件 @
f90923e8
...
...
@@ -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>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录