Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
killuaz丶x
SkyWalking
提交
736dc3d3
S
SkyWalking
项目概览
killuaz丶x
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
1
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,发现更多精彩内容 >>
未验证
提交
736dc3d3
编写于
10月 01, 2020
作者:
Z
zhang-wei
提交者:
GitHub
10月 01, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove some unused variables (#5598)
上级
772f1d2e
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
41 addition
and
73 deletion
+41
-73
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrier.java
...pache/skywalking/apm/commons/datacarrier/DataCarrier.java
+3
-5
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitioner.java
...mons/datacarrier/partition/ProducerThreadPartitioner.java
+0
-6
apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrierTest.java
...e/skywalking/apm/commons/datacarrier/DataCarrierTest.java
+23
-30
apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientClusterMethodsInterceptor.java
...rceptor/RestHighLevelClientClusterMethodsInterceptor.java
+1
-2
apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptor.java
...rch/v6/interceptor/RestHighLevelClientConInterceptor.java
+0
-5
apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java
...plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java
+2
-3
apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcConsumerInterceptor.java
...alking/apm/plugin/sofarpc/SofaRpcConsumerInterceptor.java
+9
-12
apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcProviderInterceptor.java
...alking/apm/plugin/sofarpc/SofaRpcProviderInterceptor.java
+3
-5
oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/ClusterModuleStandaloneProvider.java
...er/plugin/standalone/ClusterModuleStandaloneProvider.java
+0
-5
未找到文件。
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrier.java
浏览文件 @
736dc3d3
...
...
@@ -31,8 +31,6 @@ import org.apache.skywalking.apm.commons.datacarrier.partition.SimpleRollingPart
* DataCarrier main class. use this instance to set Producer/Consumer Model.
*/
public
class
DataCarrier
<
T
>
{
private
final
int
bufferSize
;
private
final
int
channelSize
;
private
Channels
<
T
>
channels
;
private
IDriver
driver
;
private
String
name
;
...
...
@@ -47,9 +45,9 @@ public class DataCarrier<T> {
public
DataCarrier
(
String
name
,
String
envPrefix
,
int
channelSize
,
int
bufferSize
)
{
this
.
name
=
name
;
this
.
bufferSize
=
EnvUtil
.
getInt
(
envPrefix
+
"_BUFFER_SIZE"
,
bufferSize
);
this
.
channelSize
=
EnvUtil
.
getInt
(
envPrefix
+
"_CHANNEL_SIZE"
,
channelSize
);
channels
=
new
Channels
<
T
>(
channelSize
,
bufferSize
,
new
SimpleRollingPartitioner
<
T
>(),
BufferStrategy
.
BLOCKING
);
bufferSize
=
EnvUtil
.
getInt
(
envPrefix
+
"_BUFFER_SIZE"
,
bufferSize
);
channelSize
=
EnvUtil
.
getInt
(
envPrefix
+
"_CHANNEL_SIZE"
,
channelSize
);
channels
=
new
Channels
<>(
channelSize
,
bufferSize
,
new
SimpleRollingPartitioner
<
T
>(),
BufferStrategy
.
BLOCKING
);
}
/**
...
...
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitioner.java
浏览文件 @
736dc3d3
...
...
@@ -22,15 +22,9 @@ package org.apache.skywalking.apm.commons.datacarrier.partition;
* use threadid % total to partition
*/
public
class
ProducerThreadPartitioner
<
T
>
implements
IDataPartitioner
<
T
>
{
private
int
retryTime
=
3
;
public
ProducerThreadPartitioner
()
{
}
public
ProducerThreadPartitioner
(
int
retryTime
)
{
this
.
retryTime
=
retryTime
;
}
@Override
public
int
partition
(
int
total
,
T
data
)
{
return
(
int
)
Thread
.
currentThread
().
getId
()
%
total
;
...
...
apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrierTest.java
浏览文件 @
736dc3d3
...
...
@@ -33,11 +33,7 @@ import org.powermock.api.support.membermodification.MemberModifier;
public
class
DataCarrierTest
{
@Test
public
void
testCreateDataCarrier
()
throws
IllegalAccessException
{
DataCarrier
<
SampleData
>
carrier
=
new
DataCarrier
<
SampleData
>(
5
,
100
);
Assert
.
assertEquals
(((
Integer
)
(
MemberModifier
.
field
(
DataCarrier
.
class
,
"bufferSize"
)
.
get
(
carrier
))).
intValue
(),
100
);
Assert
.
assertEquals
(((
Integer
)
(
MemberModifier
.
field
(
DataCarrier
.
class
,
"channelSize"
)
.
get
(
carrier
))).
intValue
(),
5
);
DataCarrier
<
SampleData
>
carrier
=
new
DataCarrier
<>(
5
,
100
);
Channels
<
SampleData
>
channels
=
(
Channels
<
SampleData
>)
(
MemberModifier
.
field
(
DataCarrier
.
class
,
"channels"
)
.
get
(
carrier
));
...
...
@@ -116,39 +112,36 @@ public class DataCarrierTest {
}
long
time1
=
System
.
currentTimeMillis
();
new
Thread
(
new
Runnable
()
{
@Override
public
void
run
()
{
try
{
Thread
.
sleep
(
3000
);
}
catch
(
InterruptedException
e
)
{
e
.
printStackTrace
();
}
IConsumer
<
SampleData
>
consumer
=
new
IConsumer
<
SampleData
>()
{
int
i
=
0
;
new
Thread
(()
->
{
try
{
Thread
.
sleep
(
3000
);
}
catch
(
InterruptedException
e
)
{
e
.
printStackTrace
();
}
IConsumer
<
SampleData
>
consumer
=
new
IConsumer
<
SampleData
>()
{
int
i
=
0
;
@Override
public
void
init
()
{
@Override
public
void
init
()
{
}
}
@Override
public
void
consume
(
List
<
SampleData
>
data
)
{
@Override
public
void
consume
(
List
<
SampleData
>
data
)
{
}
}
@Override
public
void
onError
(
List
<
SampleData
>
data
,
Throwable
t
)
{
@Override
public
void
onError
(
List
<
SampleData
>
data
,
Throwable
t
)
{
}
}
@Override
public
void
onExit
()
{
@Override
public
void
onExit
()
{
}
};
carrier
.
consume
(
consumer
,
1
);
}
}
};
carrier
.
consume
(
consumer
,
1
);
}).
start
();
carrier
.
produce
(
new
SampleData
().
setName
(
"blocking-data"
));
...
...
apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientClusterMethodsInterceptor.java
浏览文件 @
736dc3d3
...
...
@@ -22,7 +22,6 @@ import java.lang.reflect.Method;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult
;
import
org.apache.skywalking.apm.plugin.elasticsearch.v6.RestClientEnhanceInfo
;
public
class
RestHighLevelClientClusterMethodsInterceptor
implements
InstanceMethodsAroundInterceptor
{
...
...
@@ -36,7 +35,7 @@ public class RestHighLevelClientClusterMethodsInterceptor implements InstanceMet
public
Object
afterMethod
(
EnhancedInstance
objInst
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
argumentsTypes
,
Object
ret
)
throws
Throwable
{
if
(
ret
instanceof
EnhancedInstance
)
{
((
EnhancedInstance
)
ret
).
setSkyWalkingDynamicField
(
(
RestClientEnhanceInfo
)
(
objInst
.
getSkyWalkingDynamicField
()
));
((
EnhancedInstance
)
ret
).
setSkyWalkingDynamicField
(
objInst
.
getSkyWalkingDynamicField
(
));
}
return
ret
;
}
...
...
apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptor.java
浏览文件 @
736dc3d3
...
...
@@ -19,8 +19,6 @@
package
org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor
;
import
java.util.List
;
import
org.apache.skywalking.apm.agent.core.logging.api.ILog
;
import
org.apache.skywalking.apm.agent.core.logging.api.LogManager
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor
;
import
org.apache.skywalking.apm.plugin.elasticsearch.v6.RestClientEnhanceInfo
;
...
...
@@ -29,9 +27,6 @@ import org.elasticsearch.client.RestClient;
import
org.elasticsearch.client.RestClientBuilder
;
public
class
RestHighLevelClientConInterceptor
implements
InstanceConstructorInterceptor
{
private
static
final
ILog
LOGGER
=
LogManager
.
getLogger
(
RestHighLevelClientConInterceptor
.
class
);
@Override
public
void
onConstruct
(
EnhancedInstance
objInst
,
Object
[]
allArguments
)
{
RestClientBuilder
restClientBuilder
=
(
RestClientBuilder
)
(
allArguments
[
0
]);
...
...
apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java
浏览文件 @
736dc3d3
...
...
@@ -83,12 +83,11 @@ public class MongoDBCollectionMethodInterceptor implements InstanceMethodsAround
@Override
public
void
onConstruct
(
EnhancedInstance
objInst
,
Object
[]
allArguments
)
{
List
<
ServerAddress
>
servers
=
null
;
DB
db
=
(
DB
)
allArguments
[
0
];
servers
=
db
.
getMongo
().
getAllAddress
();
List
<
ServerAddress
>
servers
=
db
.
getMongo
().
getAllAddress
();
StringBuilder
peers
=
new
StringBuilder
();
for
(
ServerAddress
address
:
servers
)
{
peers
.
append
(
address
.
getHost
()
+
":"
+
address
.
getPort
()
+
";"
);
peers
.
append
(
address
.
getHost
()
).
append
(
":"
).
append
(
address
.
getPort
()).
append
(
";"
);
}
objInst
.
setSkyWalkingDynamicField
(
peers
.
subSequence
(
0
,
peers
.
length
()
-
1
).
toString
());
...
...
apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcConsumerInterceptor.java
浏览文件 @
736dc3d3
...
...
@@ -22,6 +22,7 @@ import com.alipay.sofa.rpc.client.ProviderInfo;
import
com.alipay.sofa.rpc.context.RpcInternalContext
;
import
com.alipay.sofa.rpc.core.request.SofaRequest
;
import
com.alipay.sofa.rpc.core.response.SofaResponse
;
import
java.lang.reflect.Method
;
import
org.apache.skywalking.apm.agent.core.context.CarrierItem
;
import
org.apache.skywalking.apm.agent.core.context.ContextCarrier
;
import
org.apache.skywalking.apm.agent.core.context.ContextManager
;
...
...
@@ -33,27 +34,23 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceM
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult
;
import
org.apache.skywalking.apm.network.trace.component.ComponentsDefine
;
import
java.lang.reflect.Method
;
public
class
SofaRpcConsumerInterceptor
implements
InstanceMethodsAroundInterceptor
{
public
static
final
String
SKYWALKING_PREFIX
=
"skywalking."
;
@Override
public
void
beforeMethod
(
EnhancedInstance
objInst
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
argumentsTypes
,
MethodInterceptResult
result
)
throws
Throwable
{
MethodInterceptResult
result
)
throws
Throwable
{
SofaRequest
sofaRequest
=
(
SofaRequest
)
allArguments
[
0
];
RpcInternalContext
rpcContext
=
RpcInternalContext
.
getContext
();
ProviderInfo
providerInfo
=
rpcContext
.
getProviderInfo
();
AbstractSpan
span
=
null
;
final
String
host
=
providerInfo
.
getHost
();
final
int
port
=
providerInfo
.
getPort
();
final
ContextCarrier
contextCarrier
=
new
ContextCarrier
();
final
String
operationName
=
generateOperationName
(
providerInfo
,
sofaRequest
);
span
=
ContextManager
.
createExitSpan
(
operationName
,
contextCarrier
,
host
+
":"
+
port
);
AbstractSpan
span
=
ContextManager
.
createExitSpan
(
operationName
,
contextCarrier
,
host
+
":"
+
port
);
CarrierItem
next
=
contextCarrier
.
items
();
while
(
next
.
hasNext
())
{
next
=
next
.
next
();
...
...
@@ -69,7 +66,7 @@ public class SofaRpcConsumerInterceptor implements InstanceMethodsAroundIntercep
@Override
public
Object
afterMethod
(
EnhancedInstance
objInst
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
argumentsTypes
,
Object
ret
)
throws
Throwable
{
Object
ret
)
throws
Throwable
{
SofaResponse
result
=
(
SofaResponse
)
ret
;
if
(
result
!=
null
&&
result
.
isError
())
{
dealException
((
Throwable
)
result
.
getAppResponse
());
...
...
@@ -81,7 +78,7 @@ public class SofaRpcConsumerInterceptor implements InstanceMethodsAroundIntercep
@Override
public
void
handleMethodException
(
EnhancedInstance
objInst
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
argumentsTypes
,
Throwable
t
)
{
Class
<?>[]
argumentsTypes
,
Throwable
t
)
{
dealException
(
t
);
}
...
...
@@ -101,9 +98,9 @@ public class SofaRpcConsumerInterceptor implements InstanceMethodsAroundIntercep
private
String
generateOperationName
(
ProviderInfo
providerInfo
,
SofaRequest
sofaRequest
)
{
StringBuilder
operationName
=
new
StringBuilder
();
operationName
.
append
(
sofaRequest
.
getInterfaceName
());
operationName
.
append
(
"."
+
sofaRequest
.
getMethodName
()
+
"("
);
operationName
.
append
(
"."
).
append
(
sofaRequest
.
getMethodName
()).
append
(
"("
);
for
(
String
arg
:
sofaRequest
.
getMethodArgSigs
())
{
operationName
.
append
(
arg
+
","
);
operationName
.
append
(
arg
).
append
(
","
);
}
if
(
sofaRequest
.
getMethodArgs
().
length
>
0
)
{
...
...
@@ -122,9 +119,9 @@ public class SofaRpcConsumerInterceptor implements InstanceMethodsAroundIntercep
*/
private
String
generateRequestURL
(
ProviderInfo
providerInfo
,
SofaRequest
sofaRequest
)
{
StringBuilder
requestURL
=
new
StringBuilder
();
requestURL
.
append
(
providerInfo
.
getProtocolType
()
+
"://"
);
requestURL
.
append
(
providerInfo
.
getProtocolType
()
).
append
(
"://"
);
requestURL
.
append
(
providerInfo
.
getHost
());
requestURL
.
append
(
":"
+
providerInfo
.
getPort
()
+
"/"
);
requestURL
.
append
(
":"
).
append
(
providerInfo
.
getPort
()).
append
(
"/"
);
requestURL
.
append
(
generateOperationName
(
providerInfo
,
sofaRequest
));
return
requestURL
.
toString
();
}
...
...
apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcProviderInterceptor.java
浏览文件 @
736dc3d3
...
...
@@ -41,8 +41,6 @@ public class SofaRpcProviderInterceptor implements InstanceMethodsAroundIntercep
MethodInterceptResult
result
)
throws
Throwable
{
SofaRequest
sofaRequest
=
(
SofaRequest
)
allArguments
[
0
];
AbstractSpan
span
=
null
;
ContextCarrier
contextCarrier
=
new
ContextCarrier
();
CarrierItem
next
=
contextCarrier
.
items
();
while
(
next
.
hasNext
())
{
...
...
@@ -55,7 +53,7 @@ public class SofaRpcProviderInterceptor implements InstanceMethodsAroundIntercep
next
.
setHeadValue
(
""
);
}
}
span
=
ContextManager
.
createEntrySpan
(
generateViewPoint
(
sofaRequest
),
contextCarrier
);
AbstractSpan
span
=
ContextManager
.
createEntrySpan
(
generateViewPoint
(
sofaRequest
),
contextCarrier
);
span
.
setComponent
(
ComponentsDefine
.
SOFARPC
);
SpanLayer
.
asRPCFramework
(
span
);
...
...
@@ -95,9 +93,9 @@ public class SofaRpcProviderInterceptor implements InstanceMethodsAroundIntercep
private
String
generateViewPoint
(
SofaRequest
sofaRequest
)
{
StringBuilder
operationName
=
new
StringBuilder
();
operationName
.
append
(
sofaRequest
.
getInterfaceName
());
operationName
.
append
(
"."
+
sofaRequest
.
getMethodName
()
+
"("
);
operationName
.
append
(
"."
).
append
(
sofaRequest
.
getMethodName
()).
append
(
"("
);
for
(
String
arg
:
sofaRequest
.
getMethodArgSigs
())
{
operationName
.
append
(
arg
+
","
);
operationName
.
append
(
arg
).
append
(
","
);
}
if
(
sofaRequest
.
getMethodArgs
().
length
>
0
)
{
...
...
oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/ClusterModuleStandaloneProvider.java
浏览文件 @
736dc3d3
...
...
@@ -25,13 +25,8 @@ import org.apache.skywalking.oap.server.library.module.ModuleConfig;
import
org.apache.skywalking.oap.server.library.module.ModuleProvider
;
import
org.apache.skywalking.oap.server.library.module.ModuleStartException
;
import
org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
public
class
ClusterModuleStandaloneProvider
extends
ModuleProvider
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
ClusterModuleStandaloneProvider
.
class
);
public
ClusterModuleStandaloneProvider
()
{
super
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录