From 55085130dd283a61c84d26c51d736682f80ec661 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Tue, 3 Jun 2025 19:58:19 -0400 Subject: [PATCH 1/2] Fix lettuce latestDep test failures --- .../lettuce/lettuce-5.1/javaagent/build.gradle.kts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts b/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts index 654a6172715d..932c7a505578 100644 --- a/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts +++ b/instrumentation/lettuce/lettuce-5.1/javaagent/build.gradle.kts @@ -25,8 +25,17 @@ dependencies { tasks { withType().configureEach { - systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) + val testLatestDeps = findProperty("testLatestDeps") as Boolean + systemProperty("testLatestDeps", testLatestDeps) usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + + dependencies { + if (testLatestDeps) { + // This is only needed for 6.7.0, can be removed when 6.7.1 is released. + // See https://github.com/redis/lettuce/issues/3317 + testLibrary("io.micrometer:micrometer-core:1.5.0") + } + } } val testStableSemconv by registering(Test::class) { From 63e08c3ac993e4b864e27230eb17bdf3840283df Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Tue, 3 Jun 2025 20:12:41 -0400 Subject: [PATCH 2/2] library too --- .../lettuce/lettuce-5.1/library/build.gradle.kts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts b/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts index 1ea17a553d5d..09e9678e7640 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts +++ b/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts @@ -14,8 +14,17 @@ dependencies { tasks { withType().configureEach { - systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) + val testLatestDeps = findProperty("testLatestDeps") as Boolean + systemProperty("testLatestDeps", testLatestDeps) usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + + dependencies { + if (testLatestDeps) { + // This is only needed for 6.7.0, can be removed when 6.7.1 is released. + // See https://github.com/redis/lettuce/issues/3317 + testLibrary("io.micrometer:micrometer-core:1.5.0") + } + } } val testStableSemconv by registering(Test::class) {