From b1b144480d33ad2c8e5c1ff8da3182f5ac404145 Mon Sep 17 00:00:00 2001
From: yangy <root@jcod3r.com>
Date: Sat, 20 Jun 2020 21:21:22 +0800
Subject: [PATCH] fix issue 4879 (#4954)

---
 .../apm/plugin/lettuce/v5/AsyncCommandMethodInterceptor.java  | 4 ++++
 .../apache/skywalking/apm/plugin/lettuce/v5/SWBiConsumer.java | 4 ++++
 .../apache/skywalking/apm/plugin/lettuce/v5/SWConsumer.java   | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AsyncCommandMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AsyncCommandMethodInterceptor.java
index 715244373a..951ec85d1a 100644
--- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AsyncCommandMethodInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AsyncCommandMethodInterceptor.java
@@ -20,7 +20,9 @@ package org.apache.skywalking.apm.plugin.lettuce.v5;
 
 import io.lettuce.core.protocol.AsyncCommand;
 import org.apache.skywalking.apm.agent.core.context.ContextManager;
+import org.apache.skywalking.apm.agent.core.context.tag.Tags;
 import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
+import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer;
 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;
@@ -40,6 +42,8 @@ public class AsyncCommandMethodInterceptor implements InstanceMethodsAroundInter
         String operationName = "Lettuce/" + asyncCommand.getType().name();
         AbstractSpan span = ContextManager.createLocalSpan(operationName + "/onComplete");
         span.setComponent(ComponentsDefine.LETTUCE);
+        Tags.DB_TYPE.set(span, "Redis");
+        SpanLayer.asCache(span);
         if (allArguments[0] instanceof Consumer) {
             allArguments[0] = new SWConsumer((Consumer) allArguments[0], ContextManager.capture(), operationName);
         } else {
diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWBiConsumer.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWBiConsumer.java
index e44ceae151..680c3b13fd 100644
--- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWBiConsumer.java
+++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWBiConsumer.java
@@ -20,7 +20,9 @@ package org.apache.skywalking.apm.plugin.lettuce.v5;
 
 import org.apache.skywalking.apm.agent.core.context.ContextManager;
 import org.apache.skywalking.apm.agent.core.context.ContextSnapshot;
+import org.apache.skywalking.apm.agent.core.context.tag.Tags;
 import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
+import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer;
 import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
 
 import java.util.function.BiConsumer;
@@ -41,6 +43,8 @@ public class SWBiConsumer<T, U> implements BiConsumer<T, U> {
     public void accept(T t, U u) {
         AbstractSpan span = ContextManager.createLocalSpan(operationName + "/accept");
         span.setComponent(ComponentsDefine.LETTUCE);
+        Tags.DB_TYPE.set(span, "Redis");
+        SpanLayer.asCache(span);
         try {
             ContextManager.continued(snapshot);
             biConsumer.accept(t, u);
diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWConsumer.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWConsumer.java
index b6d778578b..5a3392cfd3 100644
--- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWConsumer.java
+++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWConsumer.java
@@ -20,7 +20,9 @@ package org.apache.skywalking.apm.plugin.lettuce.v5;
 
 import org.apache.skywalking.apm.agent.core.context.ContextManager;
 import org.apache.skywalking.apm.agent.core.context.ContextSnapshot;
+import org.apache.skywalking.apm.agent.core.context.tag.Tags;
 import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
+import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer;
 import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
 
 import java.util.function.Consumer;
@@ -41,6 +43,8 @@ public class SWConsumer<T> implements Consumer<T> {
     public void accept(T t) {
         AbstractSpan span = ContextManager.createLocalSpan(operationName + "/accept");
         span.setComponent(ComponentsDefine.LETTUCE);
+        Tags.DB_TYPE.set(span, "Redis");
+        SpanLayer.asCache(span);
         try {
             ContextManager.continued(snapshot);
             consumer.accept(t);
-- 
GitLab