From 5b43ea4a3a33980ebb0e56c5529fa3345ba178f9 Mon Sep 17 00:00:00 2001
From: idawda <idawda@newrelic.com>
Date: Fri, 13 Dec 2024 18:04:44 +0530
Subject: [PATCH] Add instrumentation support for lettuce 6.5.0 and above

---
 instrumentation-security/lettuce-5.0/build.gradle             | 4 ++--
 .../core/AbstractRedisAsyncCommands_Instrumentation.java      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/instrumentation-security/lettuce-5.0/build.gradle b/instrumentation-security/lettuce-5.0/build.gradle
index d06e3cd4f..1a9499384 100644
--- a/instrumentation-security/lettuce-5.0/build.gradle
+++ b/instrumentation-security/lettuce-5.0/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     implementation(project(":newrelic-security-api"))
     implementation("com.newrelic.agent.java:newrelic-api:${nrAPIVersion}")
     implementation("com.newrelic.agent.java:newrelic-weaver-api:${nrAPIVersion}")
-    implementation group: 'io.lettuce', name: 'lettuce-core', version: '5.0.3.RELEASE'
+    implementation ("io.lettuce:lettuce-core:5.0.3.RELEASE")
     testImplementation('org.testcontainers:testcontainers:1.20.1')
 }
 
@@ -13,7 +13,7 @@ jar {
 }
 
 verifyInstrumentation {
-    passesOnly 'io.lettuce:lettuce-core:[5.0.0.RELEASE,6.5.0.RELEASE)'
+    passesOnly 'io.lettuce:lettuce-core:[5.0.0.RELEASE,)'
     excludeRegex '.*(RC|M).*'
 }
 
diff --git a/instrumentation-security/lettuce-5.0/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands_Instrumentation.java b/instrumentation-security/lettuce-5.0/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands_Instrumentation.java
index 548d97e90..5920ed508 100644
--- a/instrumentation-security/lettuce-5.0/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands_Instrumentation.java
+++ b/instrumentation-security/lettuce-5.0/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands_Instrumentation.java
@@ -68,7 +68,7 @@ private void registerExitOperation(boolean isProcessingAllowed, com.newrelic.api
 
     private <T> AbstractOperation preprocessSecurityHook(RedisCommand_Instrumentation<K,V,T> cmd, String methodDispatch) {
         try {
-            String type = cmd.getType().name();
+            String type = cmd.getType().toString();
             CommandArgs_Instrumentation commandArgs = cmd.getArgs();
             List<Object> arguments = new ArrayList<>();
             for(int i=0 ; i<commandArgs.count(); i++){