From 3c259c2190ab0a19733ff842ff4e03698c5e818f Mon Sep 17 00:00:00 2001 From: tbradellis Date: Wed, 2 Mar 2022 15:46:51 -0800 Subject: [PATCH] remove NewField usage from pubsub --- instrumentation/jedis-4.0.0/build.gradle | 2 ++ .../clients/jedis/JedisPubSub_Instrumentation.java | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/instrumentation/jedis-4.0.0/build.gradle b/instrumentation/jedis-4.0.0/build.gradle index 71dd01a388..fa936d9b45 100644 --- a/instrumentation/jedis-4.0.0/build.gradle +++ b/instrumentation/jedis-4.0.0/build.gradle @@ -14,6 +14,8 @@ verifyInstrumentation { passes 'redis.clients:jedis:[4.0.0,)' fails 'redis.clients:jedis:[1.4.0,3.8.0]' excludeRegex 'redis.clients:jedis:.*-(m|rc|RC|beta)[0-9]*' + exclude 'redis.clients:jedis:3.6.2' + } site { diff --git a/instrumentation/jedis-4.0.0/src/main/java/redis/clients/jedis/JedisPubSub_Instrumentation.java b/instrumentation/jedis-4.0.0/src/main/java/redis/clients/jedis/JedisPubSub_Instrumentation.java index 6902183950..fcc2a88818 100644 --- a/instrumentation/jedis-4.0.0/src/main/java/redis/clients/jedis/JedisPubSub_Instrumentation.java +++ b/instrumentation/jedis-4.0.0/src/main/java/redis/clients/jedis/JedisPubSub_Instrumentation.java @@ -16,11 +16,19 @@ import com.newrelic.api.agent.weaver.Weaver; @SuppressWarnings({ "ResultOfMethodCallIgnored", "unused" }) -@Weave(type = MatchType.BaseClass, originalName = "redis.clients.jedis.JedisPubSub") +@Weave(type = MatchType.ExactClass, originalName = "redis.clients.jedis.JedisPubSub") public class JedisPubSub_Instrumentation { private volatile Connection client; + public void proceed(Connection client, String... channels) { + Weaver.callOriginal(); + } + + public void proceedWithPatterns(Connection client, String... channels) { + Weaver.callOriginal(); + } + @Trace public void onMessage(String channel, String message) { Weaver.callOriginal(); @@ -70,5 +78,6 @@ private void reportMethodAsExternal(String commandName) { .operation(commandName) .instance(client.getHostAndPort().getHost(), client.getHostAndPort().getPort()) .build()); + } }