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

Muzzle inverse assertions

This commit is contained in:
Andrew Kent 2018-08-21 10:32:56 -07:00
parent 26705142bb
commit 9338faa013
2 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
buildSrc/src/main/groovy/MuzzlePlugin.groovy
View File

@ -103,6 +103,13 @@ class MuzzlePlugin implements Plugin<Project> {
muzzleDirectiveToArtifacts(muzzleDirective, system, session).collect() { Artifact singleVersion ->
runAfter = addMuzzleTask(muzzleDirective, singleVersion, project, runAfter, bootstrapProject, toolingProject)
}
if (muzzleDirective.assertInverse) {
inverseOf(muzzleDirective, system, session).collect() { MuzzleDirective inverseDirective ->
muzzleDirectiveToArtifacts(inverseDirective, system, session).collect() { Artifact singleVersion ->
runAfter = addMuzzleTask(inverseDirective, singleVersion, project, runAfter, bootstrapProject, toolingProject)
}
}
}
}
}
}
@ -179,6 +186,41 @@ class MuzzlePlugin implements Plugin<Project> {
return allVersionArtifacts
}
/**
* Create a list of muzzle directives which assert the opposite of the given MuzzleDirective.
*/
private static List<MuzzleDirective> inverseOf(MuzzleDirective muzzleDirective, RepositorySystem system, RepositorySystemSession session) {
List<MuzzleDirective> inverseDirectives = new ArrayList<>()
final Artifact allVerisonsArtifact = new DefaultArtifact(muzzleDirective.group, muzzleDirective.module, "jar", "[,)")
final Artifact directiveArtifact = new DefaultArtifact(muzzleDirective.group, muzzleDirective.module, "jar", muzzleDirective.versions)
final VersionRangeRequest allRangeRequest = new VersionRangeRequest()
allRangeRequest.setRepositories(MUZZLE_REPOS)
allRangeRequest.setArtifact(allVerisonsArtifact)
final VersionRangeResult allRangeResult = system.resolveVersionRange(session, allRangeRequest)
final VersionRangeRequest rangeRequest = new VersionRangeRequest()
rangeRequest.setRepositories(MUZZLE_REPOS)
rangeRequest.setArtifact(directiveArtifact)
final VersionRangeResult rangeResult = system.resolveVersionRange(session, rangeRequest)
filterVersion(allRangeResult.versions).collect { version ->
if (!rangeResult.versions.contains(version)) {
final MuzzleDirective inverseDirective = new MuzzleDirective()
inverseDirective.group = muzzleDirective.group
inverseDirective.module = muzzleDirective.module
inverseDirective.versions = "$version"
inverseDirective.assertPass = !muzzleDirective.assertPass
inverseDirectives.add(inverseDirective)
}
}
return inverseDirectives
}
/**
* Configure a muzzle task to pass or fail a given version.
*
@ -272,6 +314,7 @@ class MuzzleDirective {
String versions
List<String> additionalDependencies = new ArrayList<>()
boolean assertPass
boolean assertInverse = false
void extraDependency(String compileString) {
additionalDependencies.add(compileString)
}

16
dd-java-agent/instrumentation/apache-httpclient-4.3/apache-httpclient-4.3.gradle
View File

@ -1,21 +1,17 @@
apply from: "${rootDir}/gradle/java.gradle"
muzzle {
pass {
group = "org.apache.httpcomponents"
module = "httpclient"
versions = "[4.3,)"
}
fail {
group = "org.apache.httpcomponents"
module = "httpclient"
versions = "[,4.3)"
}
fail {
group = "commons-httpclient"
module = "commons-httpclient"
versions = "[,4.3)"
}
pass {
group = "org.apache.httpcomponents"
module = "httpclient"
versions = "[4.3,)"
assertInverse = true
}
}
apply plugin: 'org.unbroken-dome.test-sets'