From 9828aa5e12f25e4b3095468c39e752d3dd43176e Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Wed, 4 May 2022 10:34:38 -0700
Subject: [PATCH] Maybe fix (#5966)

* Make muzzle work

* Revert unrelated change

* Maybe fix

* fix

* Add comment
---
 .../io.opentelemetry.instrumentation.muzzle-check.gradle.kts   | 1 +
 .../jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts         | 3 ++-
 instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts b/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts
index 1ed9953219..5bcb7a43b4 100644
--- a/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts
+++ b/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts
@@ -349,6 +349,7 @@ fun inverseOf(muzzleDirective: MuzzleDirective, system: RepositorySystem, sessio
       classifier.set(muzzleDirective.classifier)
       versions.set(version)
       assertPass.set(!muzzleDirective.assertPass.get())
+      additionalDependencies.set(muzzleDirective.additionalDependencies)
       excludedDependencies.set(muzzleDirective.excludedDependencies)
       excludedInstrumentationModules.set(muzzleDirective.excludedInstrumentationModules)
     }
diff --git a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts
index 2d6adb3408..a024bb6866 100644
--- a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts
+++ b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts
@@ -6,8 +6,9 @@ muzzle {
   pass {
     group.set("org.apache.cxf")
     module.set("cxf-rt-frontend-jaxws")
+    // all earlier versions in maven central also pass muzzle check,
+    // but 3.0.0 is already 8 years old and testing earlier versions adds complexity
     versions.set("[3.0.0,)")
-    assertInverse.set(true)
     extraDependency("javax.servlet:javax.servlet-api:3.0.1")
   }
 }
diff --git a/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts
index 907bb69d22..7a74b35f68 100644
--- a/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts
+++ b/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts
@@ -9,6 +9,7 @@ muzzle {
     versions.set("[3.1.0.RELEASE,)")
     extraDependency("io.opentelemetry:opentelemetry-api:1.0.0")
     assertInverse.set(true)
+    excludeInstrumentationModule("io.opentelemetry.javaagent.instrumentation.opentelemetryapi.OpenTelemetryApiInstrumentationModule")
   }
 }