This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/main by this push: new e91514c634 Fix unexpected whitespace of the command catalogs in several Redis plugins. (#480) e91514c634 is described below commit e91514c634b90b86d4d8b30bb8671366e9f87d79 Author: SWHHEART <38898201+swhhe...@users.noreply.github.com> AuthorDate: Thu Mar 23 20:46:04 2023 +0800 Fix unexpected whitespace of the command catalogs in several Redis plugins. (#480) --- CHANGES.md | 1 + .../apm/plugin/jedis/v3/JedisPluginConfig.java | 22 +++++++++++----------- .../apm/plugin/jedis/v4/JedisPluginConfig.java | 22 +++++++++++----------- .../apm/plugin/lettuce/v5/LettucePluginConfig.java | 22 +++++++++++----------- 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a238a5876e..02da739e32 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -21,6 +21,7 @@ Release Notes. * Fix tomcat-10x-plugin and add test case to support tomcat7.x-8.x-9.x. * Fix thrift plugin generate duplicate traceid when `sendBase` error occurs * Support keep trace profiling when cross-thread. +* Fix unexpected whitespace of the command catalogs in several Redis plugins. #### Documentation * Update docs of Tracing APIs, reorganize the API docs into six parts. diff --git a/apm-sniffer/apm-sdk-plugin/jedis-plugins/jedis-2.x-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v3/JedisPluginConfig.java b/apm-sniffer/apm-sdk-plugin/jedis-plugins/jedis-2.x-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v3/JedisPluginConfig.java index 92a5ebee32..6e38ac1289 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-plugins/jedis-2.x-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v3/JedisPluginConfig.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-plugins/jedis-2.x-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v3/JedisPluginConfig.java @@ -51,22 +51,22 @@ public class JedisPluginConfig { "getset", "set", "setbit", - "setex ", - "setnx ", + "setex", + "setnx", "setrange", - "strlen ", + "strlen", "mset", - "msetnx ", + "msetnx", "psetex", - "incr ", - "incrby ", + "incr", + "incrby", "incrbyfloat", - "decr ", - "decrby ", - "append ", + "decr", + "decrby", + "append", "hmset", "hset", - "hsetnx ", + "hsetnx", "hincrby", "hincrbyfloat", "hdel", @@ -118,7 +118,7 @@ public class JedisPluginConfig { */ public static Set<String> OPERATION_MAPPING_READ = new HashSet<>(Arrays.asList( "getrange", - "getbit ", + "getbit", "mget", "hvals", "hkeys", diff --git a/apm-sniffer/apm-sdk-plugin/jedis-plugins/jedis-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v4/JedisPluginConfig.java b/apm-sniffer/apm-sdk-plugin/jedis-plugins/jedis-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v4/JedisPluginConfig.java index 3921fb7eba..02b406f668 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-plugins/jedis-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v4/JedisPluginConfig.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-plugins/jedis-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v4/JedisPluginConfig.java @@ -52,22 +52,22 @@ public class JedisPluginConfig { "getset", "set", "setbit", - "setex ", - "setnx ", + "setex", + "setnx", "setrange", - "strlen ", + "strlen", "mset", - "msetnx ", + "msetnx", "psetex", - "incr ", - "incrby ", + "incr", + "incrby", "incrbyfloat", - "decr ", - "decrby ", - "append ", + "decr", + "decrby", + "append", "hmset", "hset", - "hsetnx ", + "hsetnx", "hincrby", "hincrbyfloat", "hdel", @@ -119,7 +119,7 @@ public class JedisPluginConfig { */ public static Set<String> OPERATION_MAPPING_READ = new HashSet<>(Arrays.asList("get", "getrange", - "getbit ", + "getbit", "mget", "hvals", "hkeys", diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/LettucePluginConfig.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/LettucePluginConfig.java index 4f6668d32e..a20ca1cb45 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/LettucePluginConfig.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/LettucePluginConfig.java @@ -52,22 +52,22 @@ public class LettucePluginConfig { "getset", "set", "setbit", - "setex ", - "setnx ", + "setex", + "setnx", "setrange", - "strlen ", + "strlen", "mset", - "msetnx ", + "msetnx", "psetex", - "incr ", - "incrby ", + "incr", + "incrby", "incrbyfloat", - "decr ", - "decrby ", - "append ", + "decr", + "decrby", + "append", "hmset", "hset", - "hsetnx ", + "hsetnx", "hincrby", "hincrbyfloat", "hdel", @@ -119,7 +119,7 @@ public class LettucePluginConfig { */ public static Set<String> OPERATION_MAPPING_READ = new HashSet<>(Arrays.asList( "getrange", - "getbit ", + "getbit", "mget", "hvals", "hkeys",