kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix/lettucev5 plugin (#6453)

This commit is contained in:
Jasper Zhong 2021-02-27 00:01:42 +08:00 committed by GitHub
parent 92a0b893b5
commit 3a6c39c684
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -15,6 +15,7 @@ Release Notes.
* Fix NPE when Kafka reporter activated.
* Enhance gRPC log appender to allow layout pattern.
* Fix apm-dubbo-2.7.x-plugin memory leak due to some Dubbo RpcExceptions.
* Fix lettuce-5.x-plugin get null host in redis sentinel mode.
#### OAP-Backend
* Allow user-defined `JAVA_OPTS` in the startup script.

13
apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisClientConstructorInterceptor.java
View File

@ -22,6 +22,9 @@ import io.lettuce.core.RedisClient;
import io.lettuce.core.RedisURI;
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.util.StringUtil;
import java.util.stream.Collectors;
public class RedisClientConstructorInterceptor implements InstanceConstructorInterceptor {
@ -30,6 +33,14 @@ public class RedisClientConstructorInterceptor implements InstanceConstructorInt
RedisURI redisURI = (RedisURI) allArguments[1];
RedisClient redisClient = (RedisClient) objInst;
EnhancedInstance optionsInst = (EnhancedInstance) redisClient.getOptions();
optionsInst.setSkyWalkingDynamicField(redisURI.getHost() + ":" + redisURI.getPort());
StringBuilder redisPeer = new StringBuilder();
if (StringUtil.isNotBlank(redisURI.getSentinelMasterId())) {
redisPeer.append(redisURI.getSentinelMasterId()).append("[").append(
redisURI.getSentinels().stream().map(r -> r.getHost() + ":" + r.getPort())
.collect(Collectors.joining(","))).append("]");
} else {
redisPeer.append(redisURI.getHost()).append(":").append(redisURI.getPort());
}
optionsInst.setSkyWalkingDynamicField(redisPeer.toString());
}
}