open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Maybe fix (#5966) 

* Make muzzle work

* Revert unrelated change

* Maybe fix

* fix

* Add comment
This commit is contained in:
Trask Stalnaker 2022-05-04 10:34:38 -07:00 committed by GitHub
parent c82fb91fa1
commit 9828aa5e12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts
View File

@ -349,6 +349,7 @@ fun inverseOf(muzzleDirective: MuzzleDirective, system: RepositorySystem, sessio
classifier.set(muzzleDirective.classifier) classifier.set(muzzleDirective.classifier)
versions.set(version) versions.set(version)
assertPass.set(!muzzleDirective.assertPass.get()) assertPass.set(!muzzleDirective.assertPass.get())
additionalDependencies.set(muzzleDirective.additionalDependencies)
excludedDependencies.set(muzzleDirective.excludedDependencies) excludedDependencies.set(muzzleDirective.excludedDependencies)
excludedInstrumentationModules.set(muzzleDirective.excludedInstrumentationModules) excludedInstrumentationModules.set(muzzleDirective.excludedInstrumentationModules)
} }

3
instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts
View File

@ -6,8 +6,9 @@ muzzle {
pass { pass {
group.set("org.apache.cxf") group.set("org.apache.cxf")
module.set("cxf-rt-frontend-jaxws") 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,)") versions.set("[3.0.0,)")
assertInverse.set(true)
extraDependency("javax.servlet:javax.servlet-api:3.0.1") extraDependency("javax.servlet:javax.servlet-api:3.0.1")
} }
} }

1
instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts
View File

@ -9,6 +9,7 @@ muzzle {
versions.set("[3.1.0.RELEASE,)") versions.set("[3.1.0.RELEASE,)")
extraDependency("io.opentelemetry:opentelemetry-api:1.0.0") extraDependency("io.opentelemetry:opentelemetry-api:1.0.0")
assertInverse.set(true) assertInverse.set(true)
excludeInstrumentationModule("io.opentelemetry.javaagent.instrumentation.opentelemetryapi.OpenTelemetryApiInstrumentationModule")
} }
} }