From b8f733c55045c1ac01210afdf3678458fbde7377 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 25 May 2023 18:40:13 +0300 Subject: [PATCH] Fix elasticsearch muzzle failure (#8573) --- .../elasticsearch-transport-5.0/javaagent/build.gradle.kts | 4 ++++ .../elasticsearch-transport-5.3/javaagent/build.gradle.kts | 4 ++++ .../elasticsearch-transport-6.0/javaagent/build.gradle.kts | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts index 7949e441bd84..b9b1bf2e1505 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts @@ -11,6 +11,8 @@ muzzle { // org.elasticsearch:elasticsearch-plugin-classloader:7.11.0 which does not exist // version 7.17.8 has broken module metadata skip("7.11.0", "7.17.8") + // version 8.8.0 depends on elasticsearch:elasticsearch-preallocate which doesn't exist + excludeDependency("org.elasticsearch:elasticsearch-preallocate") assertInverse.set(true) } pass { @@ -20,6 +22,8 @@ muzzle { // version 7.11.0 depends on org.elasticsearch:elasticsearch:7.11.0 which depends on // org.elasticsearch:elasticsearch-plugin-classloader:7.11.0 which does not exist skip("7.11.0") + // version 8.8.0 depends on elasticsearch:elasticsearch-preallocate which doesn't exist + excludeDependency("org.elasticsearch:elasticsearch-preallocate") assertInverse.set(true) } } diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts index 9cca3753f3ef..934d51f6805c 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts @@ -11,6 +11,8 @@ muzzle { // org.elasticsearch:elasticsearch-plugin-classloader:7.11.0 which does not exist // version 7.17.8 has broken module metadata skip("7.11.0", "7.17.8") + // version 8.8.0 depends on elasticsearch:elasticsearch-preallocate which doesn't exist + excludeDependency("org.elasticsearch:elasticsearch-preallocate") assertInverse.set(true) } pass { @@ -20,6 +22,8 @@ muzzle { // version 7.11.0 depends on org.elasticsearch:elasticsearch-plugin-classloader:7.11.0 // which does not exist skip("7.11.0") + // version 8.8.0 depends on elasticsearch:elasticsearch-preallocate which doesn't exist + excludeDependency("org.elasticsearch:elasticsearch-preallocate") assertInverse.set(true) } } diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts index eaf4940c9597..e02f775cb75a 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts @@ -11,6 +11,8 @@ muzzle { // org.elasticsearch:elasticsearch-plugin-classloader:7.11.0 which does not exist // version 7.17.8 has broken module metadata skip("7.11.0", "7.17.8") + // version 8.8.0 depends on elasticsearch:elasticsearch-preallocate which doesn't exist + excludeDependency("org.elasticsearch:elasticsearch-preallocate") assertInverse.set(true) } pass { @@ -20,6 +22,8 @@ muzzle { // version 7.11.0 depends on org.elasticsearch:elasticsearch:7.11.0 which depends on // org.elasticsearch:elasticsearch-plugin-classloader:7.11.0 which does not exist skip("7.11.0") + // version 8.8.0 depends on elasticsearch:elasticsearch-preallocate which doesn't exist + excludeDependency("org.elasticsearch:elasticsearch-preallocate") assertInverse.set(true) } }