Muzzle review (open-telemetry#6437)

* Muzzle review * Fix
PeterF778 · Aug 8, 2022 · 9366e3a · 9366e3a
1 parent c3d0498
commit 9366e3a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 37 deletions.
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts b/instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts
@@ -7,38 +7,26 @@ muzzle {
  pass {
  group.set("com.typesafe.akka")
  module.set("akka-http_2.11")
- versions.set("[10.0.0,10.1.0)")
+ versions.set("[10,)")
+ assertInverse.set(true)
  // later versions of akka-http expect streams to be provided
- extraDependency("com.typesafe.akka:akka-stream_2.11:2.4.14")
+ extraDependency("com.typesafe.akka:akka-stream_2.11:2.5.32")
  }
  pass {
  group.set("com.typesafe.akka")
  module.set("akka-http_2.12")
- versions.set("[10.0.0,10.1.0)")
+ versions.set("[10,)")
+ assertInverse.set(true)
  // later versions of akka-http expect streams to be provided
- extraDependency("com.typesafe.akka:akka-stream_2.12:2.4.14")
+ extraDependency("com.typesafe.akka:akka-stream_2.12:2.5.32")
  }
- pass {
- group.set("com.typesafe.akka")
- module.set("akka-http_2.11")
- versions.set("[10.1.0,)")
- // later versions of akka-http expect streams to be provided
- extraDependency("com.typesafe.akka:akka-stream_2.11:2.5.11")
- }
- pass {
- group.set("com.typesafe.akka")
- module.set("akka-http_2.12")
- versions.set("[10.1.0,)")
- // later versions of akka-http expect streams to be provided
- extraDependency("com.typesafe.akka:akka-stream_2.12:2.5.11")
- }
- // There is no akka-http 10.0.x series for scala 2.13
  pass {
  group.set("com.typesafe.akka")
  module.set("akka-http_2.13")
- versions.set("[10.1.8,)")
+ versions.set("[10,)")
+ assertInverse.set(true)
  // later versions of akka-http expect streams to be provided
- extraDependency("com.typesafe.akka:akka-stream_2.13:2.5.23")
+ extraDependency("com.typesafe.akka:akka-stream_2.13:2.5.32")
  }
 }
 

diff --git a/instrumentation/apache-camel-2.20/javaagent/build.gradle.kts b/instrumentation/apache-camel-2.20/javaagent/build.gradle.kts
@@ -6,7 +6,8 @@ muzzle {
  pass {
  group.set("org.apache.camel")
  module.set("camel-core")
- versions.set("[2.20.1,3)")
+ versions.set("[2.20,3)")
+ assertInverse.set(true)
  }
 }
 

diff --git a/instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts b/instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts
@@ -6,7 +6,7 @@ muzzle {
  pass {
  group.set("org.apache.commons")
  module.set("commons-dbcp2")
- versions.set("[2.0,)")
+ versions.set("[2,)")
  assertInverse.set(true)
  }
 }

diff --git a/instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts b/instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts
@@ -6,7 +6,8 @@ muzzle {
  pass {
  group.set("org.apache.dubbo")
  module.set("dubbo")
- versions.set("[2.7.0,)")
+ versions.set("[2.7,)")
+ assertInverse.set(true)
  }
 }
 

diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts
@@ -3,22 +3,13 @@ plugins {
 }
 
 muzzle {
- // Version 2.7.5 and 2.7.8 were not released properly and muzzle cannot test against it causing failure.
- // So we have to skip them resulting in this verbose setup.
  pass {
  group.set("com.couchbase.client")
  module.set("java-client")
- versions.set("[2.0.0,2.7.5)")
- }
- pass {
- group.set("com.couchbase.client")
- module.set("java-client")
- versions.set("[2.7.6,2.7.8)")
- }
- pass {
- group.set("com.couchbase.client")
- module.set("java-client")
- versions.set("[2.7.9,3.0.0)")
+ versions.set("[2,3)")
+ // these versions were released as ".bundle" instead of ".jar"
+ skip("2.7.5", "2.7.8")
+ assertInverse.set(true)
  }
  fail {
  group.set("com.couchbase.client")