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

Allow muzzle directives to have extra dependencies

This commit is contained in:
Andrew Kent 2018-08-20 19:29:11 -07:00
parent f06eb57449
commit b6d1c18af9
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,14 +105,14 @@ class MuzzlePlugin implements Plugin<Project> {
project.getLogger().info("configured pass directive: ${pass.group}:${pass.module}:${pass.versions}") project.getLogger().info("configured pass directive: ${pass.group}:${pass.module}:${pass.versions}")
muzzleDirectiveToArtifacts(pass, system, session).collect() { Artifact singleVersion -> muzzleDirectiveToArtifacts(pass, system, session).collect() { Artifact singleVersion ->
runAfter = addMuzzleTask(true, singleVersion, project, runAfter, bootstrapProject, toolingProject) runAfter = addMuzzleTask(pass, true, singleVersion, project, runAfter, bootstrapProject, toolingProject)
} }
} }
for (MuzzleDirective fail : project.muzzle.failDirectives) { for (MuzzleDirective fail : project.muzzle.failDirectives) {
project.getLogger().info("configured fail directive: ${fail.group}:${fail.module}:${fail.versions}") project.getLogger().info("configured fail directive: ${fail.group}:${fail.module}:${fail.versions}")
muzzleDirectiveToArtifacts(fail, system, session).collect() { Artifact singleVersion -> muzzleDirectiveToArtifacts(fail, system, session).collect() { Artifact singleVersion ->
runAfter = addMuzzleTask(false, singleVersion, project, runAfter, bootstrapProject, toolingProject) runAfter = addMuzzleTask(fail, false, singleVersion, project, runAfter, bootstrapProject, toolingProject)
} }
} }
} }
@ -202,12 +202,17 @@ class MuzzlePlugin implements Plugin<Project> {
* *
* @return The created muzzle task. * @return The created muzzle task.
*/ */
private static Task addMuzzleTask(boolean assertPass, Artifact versionArtifact, Project instrumentationProject, Task runAfter, Project bootstrapProject, Project toolingProject) { private static Task addMuzzleTask(MuzzleDirective directive, boolean assertPass, Artifact versionArtifact, Project instrumentationProject, Task runAfter, Project bootstrapProject, Project toolingProject) {
def taskName = "muzzle-Assert${assertPass ? "Pass" : "Fail"}-$versionArtifact.groupId-$versionArtifact.artifactId-$versionArtifact.version" def taskName = "muzzle-Assert${assertPass ? "Pass" : "Fail"}-$versionArtifact.groupId-$versionArtifact.artifactId-$versionArtifact.version"
def config = instrumentationProject.configurations.create(taskName) def config = instrumentationProject.configurations.create(taskName)
config.dependencies.add(instrumentationProject.dependencies.create("$versionArtifact.groupId:$versionArtifact.artifactId:$versionArtifact.version") { config.dependencies.add(instrumentationProject.dependencies.create("$versionArtifact.groupId:$versionArtifact.artifactId:$versionArtifact.version") {
transitive = true transitive = true
}) })
for (String additionalDependency : directive.additionalDependencies) {
config.dependencies.add(instrumentationProject.dependencies.create(additionalDependency) {
transitive = true
})
}
def muzzleTask = instrumentationProject.task(taskName) { def muzzleTask = instrumentationProject.task(taskName) {
doLast { doLast {
@ -276,6 +281,10 @@ class MuzzleDirective {
String group String group
String module String module
String versions String versions
List<String> additionalDependencies = new ArrayList<>()
void extraDependency(String compileString) {
additionalDependencies.add(compileString)
}
} }
/** /**

8
dd-java-agent/instrumentation/akka-http-10.0/akka-http-10.0.gradle
View File

@ -21,12 +21,16 @@ muzzle {
pass { pass {
group = 'com.typesafe.akka' group = 'com.typesafe.akka'
module = 'akka-http_2.11' module = 'akka-http_2.11'
versions = "[10.0.0,10.0.12)" versions = "[10.0.0,)"
// later versions of akka-http expect streams to be provided
extraDependency 'com.typesafe.akka:akka-stream_2.11:2.4.14'
} }
pass { pass {
group = 'com.typesafe.akka' group = 'com.typesafe.akka'
module = 'akka-http_2.12' module = 'akka-http_2.12'
versions = "[10.0.0,10.0.12)" versions = "[10.0.0,)"
// later versions of akka-http expect streams to be provided
extraDependency 'com.typesafe.akka:akka-stream_2.12:2.4.14'
} }
} }