Skip to content

bugfix: redis plugin parent span loss #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bugfix: redis plugin parent span loss #504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ...ain/java/com/sofa/alipay/tracer/plugins/spring/redis/common/RedisActionWrapperHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,26 +55,31 @@ private static String deserialize(byte[] bytes) {
}

public <T> T doInScope(String command, byte[] key, Supplier<T> supplier) {
redisSofaTracer.clientSend(command);
Span span = buildSpan(command, deserialize(key));
return activateAndCloseSpan(span, supplier);
}

public <T> T doInScope(String command, Supplier<T> supplier) {
redisSofaTracer.clientSend(command);
Span span = buildSpan(command);
return activateAndCloseSpan(span, supplier);
}

public void doInScope(String command, byte[] key, Runnable runnable) {
redisSofaTracer.clientSend(command);
Span span = buildSpan(command, deserialize(key));
activateAndCloseSpan(span, runnable);
}

public void doInScope(String command, Runnable runnable) {
redisSofaTracer.clientSend(command);
Span span = buildSpan(command);
activateAndCloseSpan(span, runnable);
}

public <T> T doInScope(String command, byte[][] keys, Supplier<T> supplier) {
redisSofaTracer.clientSend(command);
Span span = buildSpan(command);
span.setTag("keys", toStringWithDeserialization(limitKeys(keys)));
return activateAndCloseSpan(span, supplier);
Expand All @@ -88,6 +93,7 @@ <T> T[] limitKeys(T[] keys) {
}

public <T> T decorate(Supplier<T> supplier, String operateName) {
redisSofaTracer.clientSend(operateName);
Span span = buildSpan(operateName);
Throwable candidateThrowable = null;
try {
Expand All @@ -106,6 +112,7 @@ public <T> T decorate(Supplier<T> supplier, String operateName) {
}

public void decorate(Action action, String operateName) {
redisSofaTracer.clientSend(operateName);
Span span = buildSpan(operateName);
Throwable candidateThrowable = null;
try {
Expand All @@ -123,8 +130,8 @@ public void decorate(Action action, String operateName) {
}
}

public <T extends Exception> void decorateThrowing(ThrowingAction<T> action, String operateName)
throws T {
public <T extends Exception> void decorateThrowing(ThrowingAction<T> action, String operateName) throws T {
redisSofaTracer.clientSend(operateName);
Span span = buildSpan(operateName);
Throwable candidateThrowable = null;
try {
Expand All @@ -144,7 +151,7 @@ public <T extends Exception> void decorateThrowing(ThrowingAction<T> action, Str

public <T extends Exception, V> V decorateThrowing(ThrowingSupplier<T, V> supplier,
String operateName) throws T {

redisSofaTracer.clientSend(operateName);
Span span = buildSpan(operateName);
Throwable candidateThrowable = null;
try {
Expand Down