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

Create abstraction for library dependencies for instrumentation. (#977) 

* Create abstraction for library dependencies for instrumentation.

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
This commit is contained in:
Anuraag Agrawal 2020-08-19 08:57:31 +09:00 committed by GitHub
parent 6df6e6f7c3
commit bbfdbb39c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
78 changed files with 335 additions and 904 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/nightly.yaml vendored
View File

@ -74,7 +74,7 @@ jobs:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
with:
command: ./gradlew latestDepTest --stacktrace
command: ./gradlew test -PtestLatestDeps=true --stacktrace
timeout_minutes: 60
max_attempts: 3

76
gradle/instrumentation-common.gradle Normal file
View File

@ -0,0 +1,76 @@
/** Common setup for manual instrumentation of libraries and auto instrumentation. */
/**
* We define three dependency configurations to use when adding dependencies to libraries being
* instrumented.
*
* - library: A dependency on the instrumented library. Results in the dependency being added to
* compileOnly and testImplementation. If the build is run with -PtestLatestDeps=true, the
* version when added to testImplementation will be overridden by `+`, the latest version
* possible. For simple libraries without different behavior between versions, it is possible
* to have a single dependency on library only.
*
* - testLibrary: A dependency on a library for testing. This will usually be used to either
* a) use a different version of the library for compilation and testing and b) to add a helper
* that is only required for tests (e.g., library-testing artifact). The dependency will be
* added to testImplementation and will have a version of `+` when testing latest deps as
* described above.
*
* - latestDepTestLibrary: A dependency on a library for testing when testing of latest dependency
* version is enabled. This dependency will be added as-is to testImplementation, but only if
* -PtestLatestDeps=true. The version will not be modified but it will be given highest
* precedence. Use this to restrict the latest version dependency from the default `+`, for
* example to restrict to just a major version by specifying `2.+`.
*/
ext.testLatestDeps = findProperty('testLatestDeps')
configurations {
// library is where to define dependencies on the library that is being instrumented. It will not
// be packaged in the agent but will be available at runtime for tests.
library {
canBeResolved = false
canBeConsumed = false
}
testLibrary {
canBeResolved = false
canBeConsumed = false
}
latestDepTestLibrary {
canBeResolved = false
canBeConsumed = false
}
[library, testLibrary].each {configuration ->
// We use whenObjectAdded and copy into the real configurations instead of extension to allow
// mutating the version for latest dep tests.
configuration.dependencies.whenObjectAdded {
def dep = it.copy()
if (testLatestDeps) {
dep.version {
it.require '+'
}
}
testImplementation.dependencies.add(dep)
}
}
if (testLatestDeps) {
latestDepTestLibrary.dependencies.whenObjectAdded {
def dep = it.copy()
def declaredVersion = dep.version
dep.version {
it.strictly declaredVersion
}
testImplementation.dependencies.add(dep)
}
}
compileOnly.extendsFrom(library)
}
if (testLatestDeps) {
afterEvaluate {
def latestDepTest = tasks.findByName('latestDepTest')
if (latestDepTest) {
tasks.test.dependsOn latestDepTest
}
}
}

1
gradle/instrumentation-library.gradle
View File

@ -2,6 +2,7 @@ group = 'io.opentelemetry.instrumentation'
apply from: "$rootDir/gradle/java.gradle"
apply from: "$rootDir/gradle/publish.gradle"
apply from: "$rootDir/gradle/instrumentation-common.gradle"
archivesBaseName = projectDir.parentFile.name

2
gradle/instrumentation.gradle
View File

@ -21,6 +21,8 @@ if (project.ext.find("skipPublish") != true) {
apply from: "$rootDir/gradle/publish.gradle"
}
apply from: "$rootDir/gradle/instrumentation-common.gradle"
afterEvaluate {
byteBuddy {
transformation {

22
instrumentation-core/reactor-3.1/reactor-3.1.gradle
View File

@ -20,26 +20,12 @@ ext {
group = 'io.opentelemetry.instrumentation'
apply from: "$rootDir/gradle/java.gradle"
apply from: "$rootDir/gradle/publish.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
testSets {
latestDepTest {
dirName = 'test'
}
}
apply from: "$rootDir/gradle/instrumentation-library.gradle"
dependencies {
compileOnly group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
library group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
implementation deps.opentelemetryApi
testImplementation project(':testing-common')
testImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
latestDepTestImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.+'
latestDepTestLibrary group: 'io.projectreactor', name: 'reactor-core', version: '3.+'
// Looks like later versions on reactor need this dependency for some reason even though it is marked as optional.
latestDepTestImplementation group: 'io.micrometer', name: 'micrometer-core', version: '1.+'
latestDepTestLibrary group: 'io.micrometer', name: 'micrometer-core', version: '1.+'
}

17
instrumentation/akka-http-10.0/akka-http-10.0.gradle
View File

@ -13,10 +13,6 @@ testSets {
version101Test {
dirName = 'test'
}
latestDepTest {
dirName = 'test'
}
}
compileLagomTestJava {
@ -29,7 +25,6 @@ compileLagomTestGroovy {
targetCompatibility = 1.8
}
muzzle {
pass {
group = 'com.typesafe.akka'
@ -70,13 +65,13 @@ muzzle {
}
dependencies {
compileOnly group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0'
library group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0'
library group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '2.4.14'
implementation project(':javaagent-tooling')
implementation deps.autoservice
annotationProcessor deps.autoservice
testImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0'
testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
lagomTestImplementation project(':instrumentation:akka-http-10.0')
@ -86,9 +81,6 @@ dependencies {
// There are some internal API changes in 10.1 that we would like to test separately for
version101TestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.1.0'
version101TestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '2.5.11'
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '+'
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '+'
}
test.dependsOn lagomTest
@ -99,11 +91,6 @@ compileVersion101TestGroovy {
dependsOn compileVersion101TestScala
}
compileLatestDepTestGroovy {
classpath = classpath.plus(files(compileLatestDepTestScala.destinationDir))
dependsOn compileLatestDepTestScala
}
// Lagom test supports running only on java 8 for now.
// To run it on java 11 requires some complicated juggling of scala dependencies
// At the same time, "minJavaVersionForTests"/"maxJavaVersionForTests" functionality

13
instrumentation/apache-httpasyncclient-4.0/apache-httpasyncclient-4.0.gradle
View File

@ -3,7 +3,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -14,16 +13,6 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.0'
testImplementation group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.0'
latestDepTestImplementation group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '+'
library group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.0'
}

13
instrumentation/apache-httpclient/apache-httpclient-2.0/apache-httpclient-2.0.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -11,16 +10,6 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'commons-httpclient', name: 'commons-httpclient', version: '2.0'
testImplementation group: 'commons-httpclient', name: 'commons-httpclient', version: '2.0'
latestDepTestImplementation group: 'commons-httpclient', name: 'commons-httpclient', version: '+'
library group: 'commons-httpclient', name: 'commons-httpclient', version: '2.0'
}

13
instrumentation/apache-httpclient/apache-httpclient-4.0/apache-httpclient-4.0.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
fail {
@ -23,16 +22,6 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
testImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
latestDepTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '+'
library group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
}

2
instrumentation/armeria-1.0/auto/armeria-1.0-auto.gradle
View File

@ -18,7 +18,7 @@ muzzle {
dependencies {
implementation project(':instrumentation:armeria-1.0:library')
compileOnly group: 'com.linecorp.armeria', name: 'armeria', version: '0.99.8'
library group: 'com.linecorp.armeria', name: 'armeria', version: '0.99.8'
testImplementation project(':instrumentation:armeria-1.0:testing')
}

2
instrumentation/armeria-1.0/library/armeria-1.0-library.gradle
View File

@ -5,7 +5,7 @@ ext {
apply from: "$rootDir/gradle/instrumentation-library.gradle"
dependencies {
compileOnly group: 'com.linecorp.armeria', name: 'armeria', version: '0.99.8'
library group: 'com.linecorp.armeria', name: 'armeria', version: '0.99.8'
testImplementation project(':instrumentation:armeria-1.0:testing')
}

29
instrumentation/aws-sdk/aws-sdk-1.11/aws-sdk-1.11.gradle
View File

@ -27,10 +27,6 @@ testSets {
test_before_1_11_106 {
dirName = 'test_before_1_11_106'
}
latestDepTest {
dirName = 'test'
}
}
configurations {
@ -45,16 +41,16 @@ configurations {
}
dependencies {
compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.0'
library group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.0'
// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
testImplementation project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.106'
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '1.11.106'
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '1.11.106'
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-kinesis', version: '1.11.106'
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '1.11.106'
testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '1.11.106'
testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.11.106'
testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '1.11.106'
testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '1.11.106'
testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-kinesis', version: '1.11.106'
testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '1.11.106'
testLibrary group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '1.11.106'
// needed for kinesis:
testImplementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: versions.jackson
@ -65,13 +61,8 @@ dependencies {
test_before_1_11_106Implementation(group: 'com.amazonaws', name: 'aws-java-sdk-kinesis', version: '1.11.0')
test_before_1_11_106Implementation(group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '1.11.0')
test_before_1_11_106Implementation(group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '1.11.0')
latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '+'
latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '+'
latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-ec2', version: '+'
latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-kinesis', version: '+'
latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-sqs', version: '+'
latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '+'
}
test.dependsOn test_before_1_11_106
if (!testLatestDeps) {
test.dependsOn test_before_1_11_106
}

17
instrumentation/aws-sdk/aws-sdk-2.2/auto/aws-sdk-2.2-auto.gradle
View File

@ -3,7 +3,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
// TODO(anuraaga): Move into instrumentation.gradle
archivesBaseName = projectDir.parentFile.name
@ -16,24 +15,10 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
implementation project(':instrumentation:aws-sdk:aws-sdk-2.2:library')
compileOnly group: 'software.amazon.awssdk', name: 'aws-core', version: '2.2.0'
library group: 'software.amazon.awssdk', name: 'aws-core', version: '2.2.0'
testImplementation project(':instrumentation:aws-sdk:aws-sdk-2.2:testing')
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: '+'
latestDepTestImplementation group: 'software.amazon.awssdk', name: 's3', version: '+'
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'rds', version: '+'
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'ec2', version: '+'
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'sqs', version: '+'
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'dynamodb', version: '+'
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'kinesis', version: '+'
}

17
instrumentation/aws-sdk/aws-sdk-2.2/library/aws-sdk-2.2-library.gradle
View File

@ -3,24 +3,9 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation-library.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'software.amazon.awssdk', name: 'aws-core', version: '2.2.0'
library group: 'software.amazon.awssdk', name: 'aws-core', version: '2.2.0'
testImplementation project(':instrumentation:aws-sdk:aws-sdk-2.2:testing')
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: '+'
latestDepTestImplementation group: 'software.amazon.awssdk', name: 's3', version: '+'
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'rds', version: '+'
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'ec2', version: '+'
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'sqs', version: '+'
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'dynamodb', version: '+'
latestDepTestImplementation group: 'software.amazon.awssdk', name: 'kinesis', version: '+'
}

13
instrumentation/cassandra/cassandra-3.0/cassandra-3.0.gradle
View File

@ -9,7 +9,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
// TODO switch to container-based tests (away from cassandraunit)
// then we can run tests using Java 7 (see above) and won't need this override section
@ -46,17 +45,11 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.0.0'
library group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.0.0'
testImplementation group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
testLibrary group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
testImplementation group: 'org.cassandraunit', name: 'cassandra-unit', version: '3.1.3.2'
latestDepTestImplementation group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.+'
latestDepTestLibrary group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.+'
}

12
instrumentation/cassandra/cassandra-4.0/cassandra-4.0.gradle
View File

@ -6,7 +6,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -17,17 +16,10 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'com.datastax.oss', name: 'java-driver-core', version: '4.0.0'
library group: 'com.datastax.oss', name: 'java-driver-core', version: '4.0.0'
testImplementation group: 'com.datastax.oss', name: 'java-driver-core', version: '4.0.0'
testImplementation group: 'org.cassandraunit', name: 'cassandra-unit', version: '4.3.1.0'
latestDepTestImplementation group: 'com.datastax.oss', name: 'java-driver-core', version: '4.+'
latestDepTestLibrary group: 'com.datastax.oss', name: 'java-driver-core', version: '4.+'
}

20
instrumentation/cdi-testing/cdi-testing.gradle
View File

@ -1,20 +1,12 @@
ext.skipPublish = true
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
testImplementation group: 'org.jboss.weld', name: 'weld-core', version: '2.3.0.Final'
testImplementation group: 'org.jboss.weld.se', name: 'weld-se', version: '2.3.0.Final'
testImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.3.0.Final'
testLibrary group: 'org.jboss.weld', name: 'weld-core', version: '2.3.0.Final'
testLibrary group: 'org.jboss.weld.se', name: 'weld-se', version: '2.3.0.Final'
testLibrary group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.3.0.Final'
// Beyond 2.x is CDI 2+ and requires Java 8
latestDepTestImplementation group: 'org.jboss.weld', name: 'weld-core', version: '2.+'
latestDepTestImplementation group: 'org.jboss.weld.se', name: 'weld-se', version: '2.+'
latestDepTestImplementation group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.+'
latestDepTestLibrary group: 'org.jboss.weld', name: 'weld-core', version: '2.+'
latestDepTestLibrary group: 'org.jboss.weld.se', name: 'weld-se', version: '2.+'
latestDepTestLibrary group: 'org.jboss.weld.se', name: 'weld-se-core', version: '2.+'
}

14
instrumentation/couchbase/couchbase-2.0/couchbase-2.0.gradle
View File

@ -4,13 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
testSets {
latestDepTest {
dirName = 'test'
}
}
muzzle {
// Version 2.7.5 and 2.7.8 were not released properly and muzzle cannot test against it causing failure.
@ -40,11 +33,10 @@ muzzle {
dependencies {
implementation project(':instrumentation:rxjava-1.0')
compileOnly group: 'com.couchbase.client', name: 'java-client', version: '2.0.0'
library group: 'com.couchbase.client', name: 'java-client', version: '2.0.0'
testImplementation project(':instrumentation:couchbase:couchbase-testing')
latestDepTestImplementation group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.+'
latestDepTestImplementation group: 'com.couchbase.client', name: 'java-client', version: '2.+'
latestDepTestImplementation group: 'com.couchbase.client', name: 'encryption', version: '+'
latestDepTestLibrary group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.+'
latestDepTestLibrary group: 'com.couchbase.client', name: 'java-client', version: '2.+'
}

21
instrumentation/couchbase/couchbase-2.6/couchbase-2.6.gradle
View File

@ -4,13 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
testSets {
latestDepTest {
dirName = 'test'
}
}
muzzle {
// Version 2.7.5 and 2.7.8 were not released properly and muzzle cannot test against it causing failure.
@ -45,18 +38,14 @@ muzzle {
dependencies {
implementation project(':instrumentation:rxjava-1.0')
compileOnly group: 'com.couchbase.client', name: 'java-client', version: '2.6.0'
library group: 'com.couchbase.client', name: 'java-client', version: '2.6.0'
testImplementation project(':instrumentation:couchbase:couchbase-2.0')
testImplementation group: 'com.couchbase.mock', name: 'CouchbaseMock', version: '1.5.19'
testImplementation project(':instrumentation:couchbase:couchbase-testing')
testImplementation group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.1.0.RELEASE'
testImplementation group: 'com.couchbase.client', name: 'java-client', version: '2.6.0'
testImplementation group: 'com.couchbase.client', name: 'encryption', version: '1.0.0'
testLibrary group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.1.0.RELEASE'
testLibrary group: 'com.couchbase.client', name: 'encryption', version: '1.0.0'
latestDepTestImplementation group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.1+'
latestDepTestImplementation group: 'com.couchbase.client', name: 'java-client', version: '2.+'
latestDepTestImplementation group: 'com.couchbase.client', name: 'encryption', version: '+'
latestDepTestLibrary group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.1+'
latestDepTestLibrary group: 'com.couchbase.client', name: 'java-client', version: '2.+'
}

10
instrumentation/dropwizard-testing/dropwizard-testing.gradle
View File

@ -3,14 +3,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
//apply plugin: 'org.unbroken-dome.test-sets'
//
//testSets {
// latestDepTest {
// dirName = 'test'
// }
//}
dependencies {
testImplementation project(':instrumentation:jaxrs:jaxrs-2.0')
testImplementation project(':instrumentation:servlet:servlet-3.0')
@ -21,5 +13,5 @@ dependencies {
testImplementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner', version: '2.9.10'
// Anything 1.0+ fails with a java.lang.NoClassDefFoundError: org/eclipse/jetty/server/RequestLog
// latestDepTestImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '1.+'
// latestDepTestLibrary group: 'io.dropwizard', name: 'dropwizard-testing', version: '1.+'
}

20
instrumentation/elasticsearch/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle
View File

@ -4,7 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -21,14 +20,8 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '5.3.0'
library group: 'org.elasticsearch.client', name: 'transport', version: '5.3.0'
implementation project(':instrumentation:elasticsearch:elasticsearch-transport-common')
@ -39,13 +32,12 @@ dependencies {
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.3.0'
testImplementation group: 'org.elasticsearch.client', name: 'transport', version: '5.3.0'
testLibrary group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.3.0'
// Unfortunately this will bump the transport version up to 5.5.0.
testImplementation group: 'org.springframework.data', name: 'spring-data-elasticsearch', version: '3.0.0.RELEASE'
testLibrary group: 'org.springframework.data', name: 'spring-data-elasticsearch', version: '3.0.0.RELEASE'
latestDepTestImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.+'
latestDepTestImplementation group: 'org.elasticsearch.client', name: 'transport', version: '5.+'
latestDepTestImplementation group: 'org.springframework.data', name: 'spring-data-elasticsearch', version: '3.0.+'
latestDepTestLibrary group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.+'
latestDepTestLibrary group: 'org.elasticsearch.client', name: 'transport', version: '5.+'
latestDepTestLibrary group: 'org.springframework.data', name: 'spring-data-elasticsearch', version: '3.0.+'
}

16
instrumentation/elasticsearch/elasticsearch-transport-6.0/elasticsearch-transport-6.0.gradle
View File

@ -4,7 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -21,14 +20,8 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '6.0.0'
library group: 'org.elasticsearch.client', name: 'transport', version: '6.0.0'
implementation project(':instrumentation:elasticsearch:elasticsearch-transport-common')
@ -37,13 +30,12 @@ dependencies {
testImplementation project(':instrumentation:apache-httpasyncclient-4.0')
testImplementation project(':instrumentation:netty:netty-4.1')
testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.0.0'
testImplementation group: 'org.elasticsearch.client', name: 'transport', version: '6.0.0'
testLibrary group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.0.0'
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
// Limit tests to <6.5 as the latest versions have a breaking change for the tests.
latestDepTestImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '(6.1,6.5)'
latestDepTestImplementation group: 'org.elasticsearch.client', name: 'transport', version: '(6.1,6.5)'
latestDepTestLibrary group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '(6.1,6.5)'
latestDepTestLibrary group: 'org.elasticsearch.client', name: 'transport', version: '(6.1,6.5)'
}

28
instrumentation/finatra-2.9/finatra-2.9.gradle
View File

@ -5,14 +5,6 @@ ext {
apply from: "$rootDir/gradle/instrumentation.gradle"
apply from: "$rootDir/gradle/test-with-scala.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
testSets {
latestDepTest {
dirName = 'test'
}
}
muzzle {
// There are some weird library issues below 2.9 so can't assert inverse
@ -30,21 +22,19 @@ muzzle {
}
dependencies {
// TODO(anuraaga): Something about library configuration doesn't work well with scala compilation
// here.
compileOnly group: 'com.twitter', name: 'finatra-http_2.11', version: '2.9.0'
testImplementation project(':instrumentation:netty:netty-4.1')
testImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0'
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
// TODO(anuraaga): Something about finatra test compilation doesn't work well when this is
// present with testLatestDeps.
if (!testLatestDeps) {
testLibrary group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0'
}
testLibrary(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
// Required for older versions of finatra on JDKs >= 11
testImplementation group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0'
latestDepTestImplementation project(':instrumentation:netty:netty-4.1')
latestDepTestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '20.6.+'
latestDepTestImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.0')
}
compileLatestDepTestGroovy {
classpath = classpath.plus(files(compileLatestDepTestScala.destinationDir))
dependsOn compileLatestDepTestScala
latestDepTestLibrary group: 'com.twitter', name: 'finatra-http_2.11', version: '20.6.+'
}

13
instrumentation/geode-1.4/geode-1.4.gradle
View File

@ -5,8 +5,6 @@ ext {
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
group = "org.apache.geode"
@ -15,15 +13,6 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'org.apache.geode', name: 'geode-core', version: '1.4.0'
testImplementation group: 'org.apache.geode', name: 'geode-core', version: '1.4.0'
latestDepTestImplementation group: 'org.apache.geode', name: 'geode-core', version: '+'
library group: 'org.apache.geode', name: 'geode-core', version: '1.4.0'
}

13
instrumentation/google-http-client-1.19/google-http-client-1.19.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -11,16 +10,6 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'com.google.http-client', name: 'google-http-client', version: '1.19.0'
testImplementation group: 'com.google.http-client', name: 'google-http-client', version: '1.19.0'
latestDepTestImplementation group: 'com.google.http-client', name: 'google-http-client', version: '+'
library group: 'com.google.http-client', name: 'google-http-client', version: '1.19.0'
}

14
instrumentation/grizzly-2.0/grizzly-2.0.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -10,20 +9,13 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'org.glassfish.grizzly', name: 'grizzly-http', version: '2.0'
testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
testImplementation group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0'
testImplementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '2.0'
testLibrary group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '2.0'
latestDepTestImplementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '2.+'
latestDepTestImplementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.+'
latestDepTestLibrary group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '2.+'
latestDepTestLibrary group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.+'
}

13
instrumentation/grizzly-client-1.9/grizzly-client-1.9.gradle
View File

@ -3,7 +3,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -20,16 +19,10 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'org.glassfish.grizzly', name: 'grizzly-http-client', version: '1.9'
library group: 'org.glassfish.grizzly', name: 'grizzly-http-client', version: '1.9'
// for some reason, the tests don't *load* until 1.12, but muzzles works as far back as 1.9
testImplementation group: 'org.glassfish.grizzly', name: 'grizzly-http-client', version: '1.12'
testLibrary group: 'org.glassfish.grizzly', name: 'grizzly-http-client', version: '1.12'
latestDepTestImplementation group: 'org.glassfish.grizzly', name: 'grizzly-http-client', version: '1.16'
latestDepTestLibrary group: 'org.glassfish.grizzly', name: 'grizzly-http-client', version: '1.16'
}

21
instrumentation/grpc-1.5/grpc-1.5.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
apply plugin: 'com.google.protobuf'
apply plugin: 'idea'
@ -37,25 +36,15 @@ protobuf {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'io.grpc', name: 'grpc-core', version: grpcVersion
library group: 'io.grpc', name: 'grpc-core', version: grpcVersion
testLibrary group: 'io.grpc', name: 'grpc-netty', version: grpcVersion
testLibrary group: 'io.grpc', name: 'grpc-protobuf', version: grpcVersion
testLibrary group: 'io.grpc', name: 'grpc-stub', version: grpcVersion
testImplementation group: 'io.grpc', name: 'grpc-netty', version: grpcVersion
testImplementation group: 'io.grpc', name: 'grpc-protobuf', version: grpcVersion
testImplementation group: 'io.grpc', name: 'grpc-stub', version: grpcVersion
testImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
latestDepTestImplementation sourceSets.test.output // include the protobuf generated classes
latestDepTestImplementation group: 'io.grpc', name: 'grpc-netty', version: '+'
latestDepTestImplementation group: 'io.grpc', name: 'grpc-protobuf', version: '+'
latestDepTestImplementation group: 'io.grpc', name: 'grpc-stub', version: '+'
// this instrumentation needs to be able to be able to reference the OpenTelemetry API's gRPC Context
// that is shaded in the bootstrap class loader (for sending telemetry to the agent),
// separately from the gRPC Context that is brought by gRPC

21
instrumentation/hibernate/hibernate-3.3/hibernate-3.3.gradle
View File

@ -6,7 +6,6 @@
*/
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -17,14 +16,8 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '3.3.0.GA'
library group: 'org.hibernate', name: 'hibernate-core', version: '3.3.0.GA'
implementation project(':instrumentation:hibernate:hibernate-common')
@ -33,7 +26,7 @@ dependencies {
testImplementation project(':instrumentation:hibernate:hibernate-4.0')
testImplementation project(':instrumentation:hibernate:hibernate-4.3')
testImplementation group: 'org.hibernate', name: 'hibernate-core', version: '3.3.0.SP1'
testLibrary group: 'org.hibernate', name: 'hibernate-core', version: '3.3.0.SP1'
testImplementation group: 'org.hibernate', name: 'hibernate-annotations', version: '3.4.0.GA'
testImplementation group: 'javassist', name: 'javassist', version: '+'
testImplementation group: 'com.h2database', name: 'h2', version: '1.4.197'
@ -42,10 +35,12 @@ dependencies {
testImplementation "com.sun.xml.bind:jaxb-impl:2.2.11"
testImplementation "javax.activation:activation:1.1.1"
latestDepTestImplementation group: 'org.hibernate', name: 'hibernate-core', version: '3.+'
latestDepTestLibrary group: 'org.hibernate', name: 'hibernate-core', version: '3.+'
}
configurations {
// Needed for test, but for latestDepTest this would otherwise bundle a second incompatible version of hibernate-core.
latestDepTestImplementation.exclude group: 'org.hibernate', module: 'hibernate-annotations'
if (findProperty('testLatestDeps')) {
configurations {
// Needed for test, but for latestDepTest this would otherwise bundle a second incompatible version of hibernate-core.
testImplementation.exclude group: 'org.hibernate', module: 'hibernate-annotations'
}
}

15
instrumentation/hibernate/hibernate-4.0/hibernate-4.0.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -10,14 +9,8 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '4.0.0.Final'
library group: 'org.hibernate', name: 'hibernate-core', version: '4.0.0.Final'
implementation project(':instrumentation:hibernate:hibernate-common')
@ -26,15 +19,11 @@ dependencies {
testImplementation project(':instrumentation:hibernate:hibernate-3.3')
testImplementation project(':instrumentation:hibernate:hibernate-4.3')
testImplementation group: 'org.hibernate', name: 'hibernate-core', version: '4.0.0.Final'
testImplementation group: 'com.h2database', name: 'h2', version: '1.4.197'
testImplementation "javax.xml.bind:jaxb-api:2.2.11"
testImplementation "com.sun.xml.bind:jaxb-core:2.2.11"
testImplementation "com.sun.xml.bind:jaxb-impl:2.2.11"
testImplementation "javax.activation:activation:1.1.1"
latestDepTestImplementation group: 'org.hibernate', name: 'hibernate-core', version: '4.2.+'
latestDepTestImplementation group: 'com.h2database', name: 'h2', version: '1.4.197'
// Test that the incremental instrumentation for hibernate 4.3 doesn't cause issues.
latestDepTestImplementation project(':instrumentation:hibernate:hibernate-4.3')
latestDepTestLibrary group: 'org.hibernate', name: 'hibernate-core', version: '4.2.+'
}

22
instrumentation/hibernate/hibernate-4.3/hibernate-4.3.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -10,14 +9,8 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '4.3.0.Final'
library group: 'org.hibernate', name: 'hibernate-core', version: '4.3.0.Final'
implementation project(':instrumentation:hibernate:hibernate-common')
@ -26,13 +19,12 @@ dependencies {
testImplementation project(':instrumentation:hibernate:hibernate-3.3')
testImplementation project(':instrumentation:hibernate:hibernate-4.0')
testImplementation group: 'org.hibernate', name: 'hibernate-core', version: '4.3.0.Final'
testImplementation group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.0.Final'
testLibrary group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.0.Final'
testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
testImplementation group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.5.1.RELEASE'
testLibrary group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.5.1.RELEASE'
latestDepTestImplementation group: 'org.hibernate', name: 'hibernate-core', version: '(,6.0.0.Final)'
latestDepTestImplementation group: 'org.hibernate', name: 'hibernate-entitymanager', version: '(,6.0.0.Final)'
latestDepTestImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
latestDepTestImplementation group: 'org.springframework.data', name: 'spring-data-jpa', version: '+'
// TODO(anuraaga): Investigate why these tests don't pass on 5 or 6
// https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/1042
latestDepTestLibrary group: 'org.hibernate', name: 'hibernate-core', version: '4.+'
latestDepTestLibrary group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.+'
}

17
instrumentation/hystrix-1.4/hystrix-1.4.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -9,21 +8,9 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
implementation project(':instrumentation:rxjava-1.0')
compileOnly group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
compileOnly group: 'io.reactivex', name: 'rxjava', version: '1.0.7'
testImplementation group: 'io.reactivex', name: 'rxjava', version: '1.0.7'
testImplementation group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
latestDepTestImplementation group: 'io.reactivex', name: 'rxjava', version: '+'
latestDepTestImplementation group: 'com.netflix.hystrix', name: 'hystrix-core', version: '+'
library group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
library group: 'io.reactivex', name: 'rxjava', version: '1.0.7'
}

15
instrumentation/java-classloader/tomcat-testing/tomcat-testing.gradle
View File

@ -1,7 +1,6 @@
ext.skipPublish = true
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -12,18 +11,10 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
testImplementation project(':instrumentation:java-classloader')
//This seems to be the earliest version that has org.apache.catalina.loader.WebappClassLoaderBase
//Older versions would require slightly different instrumentation.
testImplementation group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '8.0.14'
latestDepTestImplementation group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '+'
// This is the earliest version that has org.apache.catalina.loader.ParallelWebappClassLoader
// which is used in the test
testLibrary group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '8.0.14'
}

13
instrumentation/jaxrs-client/jaxrs-client-1.1/jaxrs-client-1.1.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -11,16 +10,6 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'com.sun.jersey', name: 'jersey-client', version: '1.1.4'
testImplementation group: 'com.sun.jersey', name: 'jersey-client', version: '1.1.4'
latestDepTestImplementation group: 'com.sun.jersey', name: 'jersey-client', version: '+'
library group: 'com.sun.jersey', name: 'jersey-client', version: '1.1.4'
}

21
instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -16,12 +15,6 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0.1'
compileOnly group: 'javax.annotation', name: 'javax.annotation-api', version: '1.2'
@ -31,17 +24,17 @@ dependencies {
testImplementation group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0.1'
testImplementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.0'
testImplementation group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.5.Final'
testLibrary group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.0'
testLibrary group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.5.Final'
// ^ This version has timeouts https://issues.redhat.com/browse/RESTEASY-975
testImplementation group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '3.1.0'
testLibrary group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '3.1.0'
// Doesn't work with CXF 3.0.x because their context is wrong:
// https://github.com/apache/cxf/commit/335c7bad2436f08d6d54180212df5a52157c9f21
testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
latestDepTestImplementation group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.27'
latestDepTestImplementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.27'
latestDepTestImplementation group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '3.2.6'
latestDepTestImplementation group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.26.Final'
latestDepTestLibrary group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.27'
latestDepTestLibrary group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.27'
latestDepTestLibrary group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '3.2.6'
latestDepTestLibrary group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.26.Final'
}

12
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0.gradle
View File

@ -15,10 +15,6 @@ muzzle {
}
testSets {
latestDepTest {
dirName = 'test'
}
resteasy31Test {
dirName = 'test'
}
@ -34,18 +30,16 @@ dependencies {
// Jersey
// First version with DropwizardTestSupport:
testImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.8.0'
testLibrary group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.8.0'
testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
testImplementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-afterburner', version: '2.9.10'
latestDepTestImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '1.+'
latestDepTestLibrary group: 'io.dropwizard', name: 'dropwizard-testing', version: '1.+'
// Resteasy
testImplementation group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.0.0.Final'
testLibrary group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.0.0.Final'
resteasy31TestImplementation(group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '3.1.0.Final')
latestDepTestImplementation group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '+'
}
test.dependsOn resteasy31Test

30
instrumentation/jdbc/jdbc.gradle
View File

@ -3,7 +3,6 @@ plugins {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
@ -25,32 +24,19 @@ tasks.withType(Checkstyle).configureEach {
exclude '**/jdbc/normalizer/*.java'
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
// jdbc unit testing
testImplementation group: 'com.h2database', name: 'h2', version: '1.3.169'
testLibrary group: 'com.h2database', name: 'h2', version: '1.3.169'
// first version jdk 1.6 compatible
testImplementation group: 'org.apache.derby', name: 'derby', version: '10.6.1.0'
testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
testLibrary group: 'org.apache.derby', name: 'derby', version: '10.6.1.0'
testLibrary group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
testImplementation group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '7.0.19'
testLibrary group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '7.0.19'
// tomcat needs this to run
testImplementation group: 'org.apache.tomcat', name: 'tomcat-juli', version: '7.0.19'
testImplementation group: 'com.zaxxer', name: 'HikariCP', version: '2.4.0'
testImplementation group: 'com.mchange', name: 'c3p0', version: '0.9.5'
testLibrary group: 'org.apache.tomcat', name: 'tomcat-juli', version: '7.0.19'
testLibrary group: 'com.zaxxer', name: 'HikariCP', version: '2.4.0'
testLibrary group: 'com.mchange', name: 'c3p0', version: '0.9.5'
latestDepTestImplementation group: 'com.h2database', name: 'h2', version: '+'
latestDepTestImplementation group: 'org.apache.derby', name: 'derby', version: '10.14.+'
latestDepTestImplementation group: 'org.hsqldb', name: 'hsqldb', version: '+'
latestDepTestImplementation group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '+'
latestDepTestImplementation group: 'org.apache.tomcat', name: 'tomcat-juli', version: '+'
latestDepTestImplementation group: 'com.zaxxer', name: 'HikariCP', version: '+'
latestDepTestImplementation group: 'com.mchange', name: 'c3p0', version: '+'
latestDepTestLibrary group: 'org.apache.derby', name: 'derby', version: '10.14.+'
}

12
instrumentation/jedis/jedis-1.4/jedis-1.4.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -10,18 +9,11 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'redis.clients', name: 'jedis', version: '1.4.0'
library group: 'redis.clients', name: 'jedis', version: '1.4.0'
testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
testImplementation group: 'redis.clients', name: 'jedis', version: '1.4.0'
// Jedis 3.0 has API changes that prevent instrumentation from applying
latestDepTestImplementation group: 'redis.clients', name: 'jedis', version: '2.+'
latestDepTestLibrary group: 'redis.clients', name: 'jedis', version: '2.+'
}

12
instrumentation/jedis/jedis-3.0/jedis-3.0.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
fail {
@ -15,20 +14,13 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'redis.clients', name: 'jedis', version: '3.0.0'
library group: 'redis.clients', name: 'jedis', version: '3.0.0'
testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
testImplementation group: 'redis.clients', name: 'jedis', version: '3.0.0'
// ensures jedis-1.4 instrumentation does not load with jedis 3.0+ by failing
// the tests in the event it does. The tests will end up with double spans
testImplementation project(':instrumentation:jedis:jedis-1.4')
latestDepTestImplementation group: 'redis.clients', name: 'jedis', version: '3.+'
testLibrary group: 'redis.clients', name: 'jedis', version: '3.+'
}

20
instrumentation/jetty-8.0/jetty-8.0.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -10,14 +9,8 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901'
library group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901'
implementation project(':instrumentation:servlet:servlet-3.0')
// Don't want to conflict with jetty from the test server.
@ -25,13 +18,12 @@ dependencies {
exclude group: 'org.eclipse.jetty', module: 'jetty-server'
}
testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901'
testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901'
testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '8.0.0.v20110901'
testLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901'
testLibrary group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '8.0.0.v20110901'
// Jetty 10 seems to refuse to run on java8.
// TODO: we need to setup separate test for Jetty 10 when that is released.
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+'
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+'
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.+'
latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+'
latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+'
latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.+'
}

23
instrumentation/jsp-2.3/jsp-2.3.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -10,12 +9,6 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
// compiling against tomcat 7.0.20 because there seems to be some issues with Tomcat's dependency < 7.0.20
compileOnly group: 'org.apache.tomcat', name: 'tomcat-jasper', version: '7.0.20'
@ -25,13 +18,13 @@ dependencies {
testImplementation project(':instrumentation:servlet:servlet-3.0')
// using tomcat 7.0.37 because there seems to be some issues with Tomcat's jar scanning in versions < 7.0.37
// https://stackoverflow.com/questions/23484098/org-apache-tomcat-util-bcel-classfile-classformatexception-invalid-byte-tag-in
testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.37'
testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '7.0.37'
testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '7.0.37'
testLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.37'
testLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '7.0.37'
testLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '7.0.37'
latestDepTestImplementation group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '+'
latestDepTestImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '+'
latestDepTestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.+'
latestDepTestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '9.+'
latestDepTestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '9.+'
latestDepTestLibrary group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '+'
latestDepTestLibrary group: 'javax.servlet', name: 'javax.servlet-api', version: '+'
latestDepTestLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.+'
latestDepTestLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '9.+'
latestDepTestLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '9.+'
}

26
instrumentation/kafka-clients-0.11/kafka-clients-0.11.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -10,29 +9,22 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
library group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
testImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE'
testLibrary group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
testLibrary group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE'
testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
testImplementation group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
testLibrary group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
// Include latest version of kafka itself along with latest version of client libs.
// This seems to help with jar compatibility hell.
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka_2.11', version: '2.3.+'
latestDepTestLibrary group: 'org.apache.kafka', name: 'kafka_2.11', version: '2.3.+'
// (Pinning to 2.3.x: 2.4.0 introduces an error when executing compileLatestDepTestGroovy)
// Caused by: java.lang.NoClassDefFoundError: org.I0Itec.zkclient.ZkClient
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.3.+'
latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.2.+'
latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.2.+'
latestDepTestImplementation group: 'org.assertj', name: 'assertj-core', version: '3.+'
latestDepTestLibrary group: 'org.apache.kafka', name: 'kafka-clients', version: '2.3.+'
latestDepTestLibrary group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.2.+'
latestDepTestLibrary group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.2.+'
latestDepTestLibrary group: 'org.assertj', name: 'assertj-core', version: '3.+'
}

30
instrumentation/kafka-streams-0.11/kafka-streams-0.11.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -9,35 +8,28 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'org.apache.kafka', name: 'kafka-streams', version: '0.11.0.0'
library group: 'org.apache.kafka', name: 'kafka-streams', version: '0.11.0.0'
// Include kafka-clients instrumentation for tests.
testImplementation project(':instrumentation:kafka-clients-0.11')
testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
testImplementation group: 'org.apache.kafka', name: 'kafka-streams', version: '0.11.0.0'
testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
testImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE'
testLibrary group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
testLibrary group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
testLibrary group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE'
testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
testImplementation group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
testLibrary group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
// Include latest version of kafka itself along with latest version of client libs.
// This seems to help with jar compatibility hell.
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka_2.11', version: '2.3.+'
latestDepTestLibrary group: 'org.apache.kafka', name: 'kafka_2.11', version: '2.3.+'
// (Pinning to 2.3.x: 2.4.0 introduces an error when executing compileLatestDepTestGroovy)
// Caused by: java.lang.NoClassDefFoundError: org.I0Itec.zkclient.ZkClient
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.3.+'
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-streams', version: '2.3.+'
latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.2.+'
latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.2.+'
latestDepTestImplementation group: 'org.assertj', name: 'assertj-core', version: '3.+'
latestDepTestLibrary group: 'org.apache.kafka', name: 'kafka-clients', version: '2.3.+'
latestDepTestLibrary group: 'org.apache.kafka', name: 'kafka-streams', version: '2.3.+'
latestDepTestLibrary group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.2.+'
latestDepTestLibrary group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.2.+'
latestDepTestLibrary group: 'org.assertj', name: 'assertj-core', version: '3.+'
}

12
instrumentation/khttp-0.1/khttp-0.1.gradle
View File

@ -3,7 +3,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -14,15 +13,6 @@ muzzle {
}
}
testSets {
latestDepTest
}
dependencies {
compileOnly group: 'khttp', name: 'khttp', version: '0.1.0'
testImplementation group: 'khttp', name: 'khttp', version: '0.1.0'
latestDepTestImplementation group: 'khttp', name: 'khttp', version: '+'
library group: 'khttp', name: 'khttp', version: '0.1.0'
}

14
instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
ext {
minJavaVersionForTests = JavaVersion.VERSION_1_8
@ -14,20 +13,9 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly(group: 'io.kubernetes', name: 'client-java-api', version: '7.0.0')
library(group: 'io.kubernetes', name: 'client-java-api', version: '7.0.0')
implementation project(':javaagent-tooling')
testImplementation group: 'io.kubernetes', name: 'client-java-api', version: '7.0.0'
latestDepTestImplementation group: 'io.kubernetes', name: 'client-java-api', version: '+'
}

11
instrumentation/lettuce/lettuce-4.0/lettuce-4.0.gradle
View File

@ -4,7 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -15,17 +14,11 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'biz.paluch.redis', name: 'lettuce', version: '4.0.Final'
library group: 'biz.paluch.redis', name: 'lettuce', version: '4.0.Final'
testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
testImplementation group: 'biz.paluch.redis', name: 'lettuce', version: '4.0.Final'
latestDepTestImplementation group: 'biz.paluch.redis', name: 'lettuce', version: '4.+'
latestDepTestLibrary group: 'biz.paluch.redis', name: 'lettuce', version: '4.+'
}

1
instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle
View File

@ -4,7 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {

13
instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle
View File

@ -4,7 +4,6 @@ ext {
}
apply from: "${rootDir}/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -15,19 +14,13 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'io.lettuce', name: 'lettuce-core', version: '5.1.0.RELEASE'
library group: 'io.lettuce', name: 'lettuce-core', version: '5.1.0.RELEASE'
testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
// Only 5.2+ will have command arguments in the db.statement tag.
testImplementation group: 'io.lettuce', name: 'lettuce-core', version: '5.2.0.RELEASE'
testLibrary group: 'io.lettuce', name: 'lettuce-core', version: '5.2.0.RELEASE'
testImplementation project(':instrumentation:reactor-3.1')
latestDepTestImplementation group: 'io.lettuce', name: 'lettuce-core', version: '5.+'
latestDepTestLibrary group: 'io.lettuce', name: 'lettuce-core', version: '5.+'
}

12
instrumentation/log4j/log4j-2.13.2/library/log4j-2.13.2-library.gradle
View File

@ -3,22 +3,12 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation-library.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.2'
library group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.2'
annotationProcessor deps.autoservice
compileOnly deps.autoservice
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.2'
testAnnotationProcessor group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.2'
latestDepTestImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '+'
}

12
instrumentation/mongo/mongo-3.1/mongo-3.1.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -10,20 +9,11 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
implementation(project(':instrumentation:mongo:mongo-common'))
compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0'
library group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0'
testImplementation project(':instrumentation:mongo:mongo-testing')
testImplementation group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5'
testImplementation group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0'
latestDepTestImplementation group: 'org.mongodb', name: 'mongo-java-driver', version: '+'
}

12
instrumentation/mongo/mongo-3.7/mongo-3.7.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -10,21 +9,12 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
implementation(project(':instrumentation:mongo:mongo-common'))
// a couple of test attribute verifications don't pass until 3.8.0
compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.8.0'
library group: 'org.mongodb', name: 'mongo-java-driver', version: '3.8.0'
testImplementation project(':instrumentation:mongo:mongo-testing')
testImplementation group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5'
testImplementation group: 'org.mongodb', name: 'mongo-java-driver', version: '3.8.0'
latestDepTestImplementation group: 'org.mongodb', name: 'mongo-java-driver', version: '+'
}

12
instrumentation/mongo/mongo-async-3.3/mongo-async-3.3.gradle
View File

@ -5,7 +5,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -17,22 +16,13 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
implementation(project(':instrumentation:mongo:mongo-common'))
compileOnly group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.3.0'
library group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.3.0'
testImplementation project(':instrumentation:mongo:mongo-testing')
testImplementation group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5'
testImplementation group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.3.0'
latestDepTestImplementation group: 'org.mongodb', name: 'mongodb-driver-async', version: '+'
testImplementation project(':instrumentation:mongo:mongo-3.7')
}

16
instrumentation/netty/netty-4.0/netty-4.0.gradle
View File

@ -4,7 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -32,20 +31,13 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'io.netty', name: 'netty-codec-http', version: '4.0.0.Final'
library group: 'io.netty', name: 'netty-codec-http', version: '4.0.0.Final'
testImplementation group: 'io.netty', name: 'netty-codec-http', version: '4.0.0.Final'
testImplementation group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.9'
testLibrary group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.9'
latestDepTestImplementation group: 'io.netty', name: 'netty-codec-http', version: '4.0.56.Final'
latestDepTestImplementation group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.+'
latestDepTestLibrary group: 'io.netty', name: 'netty-codec-http', version: '4.0.56.Final'
latestDepTestLibrary group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.+'
}
// We need to force the dependency to the earliest supported version because other libraries declare newer versions.

15
instrumentation/netty/netty-4.1/netty-4.1.gradle
View File

@ -4,7 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -32,21 +31,13 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final'
library group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final'
testImplementation group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final'
testImplementation group: 'org.asynchttpclient', name: 'async-http-client', version: '2.1.0'
testLibrary group: 'org.asynchttpclient', name: 'async-http-client', version: '2.1.0'
latestDepTestImplementation group: 'io.netty', name: 'netty-codec-http', version: '(,5.0)'
latestDepTestLibrary group: 'io.netty', name: 'netty-codec-http', version: '(,5.0)'
// latest async-http-client incompatable with 5.0+ netty
latestDepTestImplementation group: 'org.asynchttpclient', name: 'async-http-client', version: '+'
}
// We need to force the dependency to the earliest supported version because other libraries declare newer versions.

12
instrumentation/okhttp/okhttp-2.2/okhttp-2.2.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
/*
Note: The Interceptor class for OkHttp was not introduced until 2.2+, so we need to make sure the
@ -14,21 +13,14 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly(group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0')
library(group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0')
implementation project(':javaagent-tooling')
testImplementation project(':instrumentation:java-concurrent')
testImplementation group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0'
latestDepTestImplementation group: 'com.squareup.okhttp', name: 'okhttp', version: '[2.6,3)'
latestDepTestLibrary group: 'com.squareup.okhttp', name: 'okhttp', version: '[2.6,3)'
}

12
instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -10,12 +9,6 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
/*
Note: there is a bit of dependency exclusion magic goin on.
We have to exclude all transitive dependencies on 'okhttp' because we would like to force
@ -26,15 +19,14 @@ because it looks like exclusions using configurations excludes dependency even i
not transitive.
*/
dependencies {
compileOnly(group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0')
library(group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0')
implementation project(':javaagent-tooling')
testImplementation(project(':testing-common')) {
exclude module: 'okhttp'
}
testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0'
// 4.x.x-alpha has been released and it looks like there are lots of incompatible changes
latestDepTestImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '[3.11.0, 4.0.0*)'
latestDepTestLibrary group: 'com.squareup.okhttp3', name: 'okhttp', version: '[3.11.0, 4.0.0*)'
}

13
instrumentation/play-ws/play-ws-1.0/play-ws-1.0.gradle
View File

@ -4,13 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
testSets {
latestDepTest {
dirName = 'test'
}
}
muzzle {
pass {
@ -35,7 +28,7 @@ muzzle {
def scalaVersion = '2.12'
dependencies {
compileOnly group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.0.2'
library group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.0.2'
implementation project(':instrumentation:play-ws:play-ws-common')
@ -46,7 +39,5 @@ dependencies {
testImplementation project(':instrumentation:netty:netty-4.1')
testImplementation project(':instrumentation:akka-http-10.0')
testImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.0.2'
latestDepTestImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.+'
latestDepTestLibrary group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '1.+'
}

13
instrumentation/play-ws/play-ws-2.0/play-ws-2.0.gradle
View File

@ -4,13 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
testSets {
latestDepTest {
dirName = 'test'
}
}
muzzle {
@ -40,7 +33,7 @@ muzzle {
def scalaVersion = '2.12'
dependencies {
compileOnly group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.0.0'
library group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.0.0'
implementation project(':instrumentation:play-ws:play-ws-common')
@ -51,7 +44,5 @@ dependencies {
testImplementation project(':instrumentation:netty:netty-4.1')
testImplementation project(':instrumentation:akka-http-10.0')
testImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.0.0'
latestDepTestImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.0.+'
latestDepTestLibrary group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.0.+'
}

13
instrumentation/play-ws/play-ws-2.1/play-ws-2.1.gradle
View File

@ -4,13 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
testSets {
latestDepTest {
dirName = 'test'
}
}
muzzle {
@ -40,7 +33,7 @@ muzzle {
def scalaVersion = '2.12'
dependencies {
compileOnly group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.1.0'
library group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.1.0'
implementation project(':instrumentation:play-ws:play-ws-common')
@ -50,8 +43,4 @@ dependencies {
testImplementation project(':instrumentation:netty:netty-4.0')
testImplementation project(':instrumentation:netty:netty-4.1')
testImplementation project(':instrumentation:akka-http-10.0')
testImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '2.1.0'
latestDepTestImplementation group: 'com.typesafe.play', name: "play-ahc-ws-standalone_$scalaVersion", version: '+'
}

25
instrumentation/play/play-2.3/play-2.3.gradle
View File

@ -6,7 +6,6 @@ ext {
apply from: "$rootDir/gradle/instrumentation.gradle"
apply from: "$rootDir/gradle/test-with-scala.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -27,31 +26,21 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
// TODO(anuraaga): Something about library configuration doesn't work well with scala compilation
// here.
compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.3.0'
testImplementation project(':instrumentation:netty:netty-3.8')
testImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.3.0'
testImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.3.0'
testImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.3.0') {
testLibrary group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.3.0'
testLibrary(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.3.0') {
exclude group: 'org.eclipse.jetty', module: 'jetty-websocket'
}
latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.3.+'
latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.3.+'
latestDepTestImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.3.+') {
latestDepTestLibrary group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.3.+'
latestDepTestLibrary group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.3.+'
latestDepTestLibrary(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.3.+') {
exclude group: 'org.eclipse.jetty', module: 'jetty-websocket'
}
}
compileLatestDepTestGroovy {
classpath = classpath.plus(files(compileLatestDepTestScala.destinationDir))
dependsOn compileLatestDepTestScala
}

21
instrumentation/play/play-2.4/play-2.4.gradle
View File

@ -5,7 +5,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -26,13 +25,9 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
// TODO(anuraaga): Something about library configuration doesn't work well with scala compilation
// here.
compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.4.0'
testImplementation project(':instrumentation:netty:netty-4.0')
@ -40,15 +35,15 @@ dependencies {
testImplementation project(':instrumentation:akka-http-10.0')
// Before 2.5, play used netty 3.x which isn't supported, so for better test consistency, we test with just 2.5
testImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.0'
testImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.0'
testImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.0') {
testLibrary group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.0'
testLibrary group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.0'
testLibrary(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.0') {
exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
}
latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.+'
latestDepTestImplementation group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.+'
latestDepTestImplementation(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.+') {
latestDepTestLibrary group: 'com.typesafe.play', name: 'play-java_2.11', version: '2.5.+'
latestDepTestLibrary group: 'com.typesafe.play', name: 'play-java-ws_2.11', version: '2.5.+'
latestDepTestLibrary(group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.5.+') {
exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
}
}

17
instrumentation/play/play-2.6/play-2.6.gradle
View File

@ -5,7 +5,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
def scalaVersion = '2.11'
def playVersion = '2.6.0'
@ -31,28 +30,24 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
// TODO(anuraaga): Something about library configuration doesn't work well with scala compilation
// here.
compileOnly group: 'com.typesafe.play', name: "play_$scalaVersion", version: playVersion
testImplementation project(':instrumentation:netty:netty-4.0')
testImplementation project(':instrumentation:netty:netty-4.1')
testImplementation project(':instrumentation:akka-http-10.0')
testImplementation group: 'com.typesafe.play', name: "play-java_$scalaVersion", version: playVersion
testLibrary group: 'com.typesafe.play', name: "play-java_$scalaVersion", version: playVersion
// TODO: Play WS is a separately versioned library starting with 2.6 and needs separate instrumentation.
testImplementation(group: 'com.typesafe.play', name: "play-test_$scalaVersion", version: playVersion) {
testLibrary(group: 'com.typesafe.play', name: "play-test_$scalaVersion", version: playVersion) {
exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
}
// TODO: This should be changed to the latest in scala 2.13 instead of 2.11 since its ahead
latestDepTestImplementation group: 'com.typesafe.play', name: "play-java_$scalaVersion", version: '2.+'
latestDepTestImplementation(group: 'com.typesafe.play', name: "play-test_$scalaVersion", version: '2.+') {
latestDepTestLibrary group: 'com.typesafe.play', name: "play-java_$scalaVersion", version: '2.+'
latestDepTestLibrary(group: 'com.typesafe.play', name: "play-test_$scalaVersion", version: '2.+') {
exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
}
}

15
instrumentation/rabbitmq-2.7/rabbitmq-2.7.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -10,22 +9,12 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'com.rabbitmq', name: 'amqp-client', version: '2.7.0'
library group: 'com.rabbitmq', name: 'amqp-client', version: '2.7.0'
testImplementation group: 'com.rabbitmq', name: 'amqp-client', version: '2.7.0'
testImplementation group: 'org.springframework.amqp', name: 'spring-rabbit', version: '1.1.0.RELEASE'
testLibrary group: 'org.springframework.amqp', name: 'spring-rabbit', version: '1.1.0.RELEASE'
testImplementation deps.testcontainers
latestDepTestImplementation group: 'com.rabbitmq', name: 'amqp-client', version: '+'
latestDepTestImplementation group: 'org.springframework.amqp', name: 'spring-rabbit', version: '+'
}
configurations.testRuntime {

12
instrumentation/ratpack-1.4/ratpack-1.4.gradle
View File

@ -4,7 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -15,18 +14,11 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'io.ratpack', name: 'ratpack-core', version: '1.4.0'
library group: 'io.ratpack', name: 'ratpack-core', version: '1.4.0'
testLibrary group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.4.0'
testImplementation project(':instrumentation:netty:netty-4.1')
testImplementation group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.4.0'
latestDepTestImplementation group: 'io.ratpack', name: 'ratpack-groovy-test', version: '+'
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
testImplementation group: 'com.sun.activation', name: 'jakarta.activation', version: '1.2.2'
}

13
instrumentation/reactor-3.1/reactor-3.1.gradle
View File

@ -4,7 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -15,18 +14,12 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
implementation project(':instrumentation-core:reactor-3.1')
testImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
testLibrary group: 'io.projectreactor', name: 'reactor-core', version: '3.1.0.RELEASE'
latestDepTestImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.+'
latestDepTestLibrary group: 'io.projectreactor', name: 'reactor-core', version: '3.+'
// Looks like later versions on reactor need this dependency for some reason even though it is marked as optional.
latestDepTestImplementation group: 'io.micrometer', name: 'micrometer-core', version: '1.+'
latestDepTestLibrary group: 'io.micrometer', name: 'micrometer-core', version: '1.+'
}

12
instrumentation/rediscala-1.8/rediscala-1.8.gradle
View File

@ -3,7 +3,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -49,17 +48,8 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'com.github.etaty', name: 'rediscala_2.11', version: '1.8.0'
library group: 'com.github.etaty', name: 'rediscala_2.11', version: '1.8.0'
testImplementation group: 'com.github.etaty', name: 'rediscala_2.11', version: '1.8.0'
testImplementation group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
latestDepTestImplementation group: 'com.github.etaty', name: 'rediscala_2.11', version: '+'
}

10
instrumentation/servlet/glassfish-testing/glassfish-testing.gradle
View File

@ -4,19 +4,11 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
testImplementation project(':instrumentation:servlet:servlet-3.0')
testImplementation project(':instrumentation:grizzly-2.0')
testImplementation group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '4.0'
latestDepTestImplementation group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '+'
testLibrary group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '4.0'
}

15
instrumentation/servlet/servlet-2.2/servlet-2.2.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -16,12 +15,6 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.2'
api(project(':instrumentation-core:servlet'))
@ -29,9 +22,9 @@ dependencies {
testImplementation(project(':testing-common')) {
exclude group: 'org.eclipse.jetty', module: 'jetty-server'
}
testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005'
testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.0.0.v20091005'
testLibrary group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005'
testLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.0.0.v20091005'
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.+'
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.+'
latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.+'
latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.+'
}

23
instrumentation/servlet/servlet-3.0/servlet-3.0.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -15,12 +14,6 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
api(project(':instrumentation-core:servlet'))
@ -28,17 +21,17 @@ dependencies {
testImplementation(project(':testing-common')) {
exclude group: 'org.eclipse.jetty', module: 'jetty-server'
}
testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901'
testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901'
testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '8.0.41'
testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '8.0.41'
testLibrary group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901'
testLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901'
testLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '8.0.41'
testLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '8.0.41'
// Jetty 10 seems to refuse to run on java8.
// TODO: we need to setup separate test for Jetty 10 when that is released.
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+'
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+'
latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+'
latestDepTestLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+'
// FIXME: 9.0.24 seems to have changed something...
latestDepTestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.22'
latestDepTestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '9.0.22'
latestDepTestLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.22'
latestDepTestLibrary group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '9.0.22'
}

12
instrumentation/servlet/servlet-common/servlet-common.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -10,19 +9,12 @@ muzzle {
}
}
testSets {
latestDepTest
}
dependencies {
compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.3'
testImplementation(project(':testing-common')) {
exclude group: 'org.eclipse.jetty', module: 'jetty-server'
}
testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005'
testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.0.0.v20091005'
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '+'
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '+'
testLibrary group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005'
testLibrary group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.0.0.v20091005'
}

18
instrumentation/spark-web-framework-2.3/spark-web-framework-2.3.gradle
View File

@ -4,7 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
// building against 2.3 and testing against 2.4 because JettyHandler is available since 2.4 only
muzzle {
@ -16,17 +15,6 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
latestDepTest {
sourceCompatibility = "1.8"
targetCompatibility = "1.8"
}
compileTestJava {
sourceCompatibility = "1.8"
targetCompatibility = "1.8"
@ -38,11 +26,9 @@ compileJava {
}
dependencies {
compileOnly group: 'com.sparkjava', name: 'spark-core', version: '2.3'
library group: 'com.sparkjava', name: 'spark-core', version: '2.3'
testImplementation project(':instrumentation:jetty-8.0')
testImplementation group: 'com.sparkjava', name: 'spark-core', version: '2.4'
latestDepTestImplementation group: 'com.sparkjava', name: 'spark-core', version: '+'
testLibrary group: 'com.sparkjava', name: 'spark-core', version: '2.4'
}

13
instrumentation/spring-data-1.8/spring-data-1.8.gradle
View File

@ -1,7 +1,6 @@
// This file includes software developed at SignalFx
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
// We have two independent covariants, so we have to test them independently.
@ -31,23 +30,19 @@ testSets {
// For now, that limits support to spring-data-commons 1.9.0 (maybe 1.8.0).
// For testing, chose a couple spring-data modules that are old enough to work with 1.9.0.
dependencies {
compileOnly(group: 'org.springframework.data', name: 'spring-data-commons', version: '1.8.0.RELEASE')
library group: 'org.springframework.data', name: 'spring-data-commons', version: '1.8.0.RELEASE'
compileOnly(group: 'org.springframework', name: 'spring-aop', version: '1.2')
testImplementation group: 'org.spockframework', name: 'spock-spring', version: "$versions.spock"
testImplementation group: 'org.springframework', name: 'spring-test', version: '3.0.0.RELEASE'
testLibrary group: 'org.springframework', name: 'spring-test', version: '3.0.0.RELEASE'
// JPA dependencies
testImplementation project(':instrumentation:jdbc')
testImplementation group: 'org.springframework.data', name: 'spring-data-jpa', version: '1.8.0.RELEASE'
testLibrary group: 'org.springframework.data', name: 'spring-data-jpa', version: '+'
testImplementation group: 'com.mysema.querydsl', name: 'querydsl-jpa', version: '3.7.4'
testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'
testImplementation group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.3.0.Final'
latestDepTestImplementation group: 'org.springframework', name: 'spring-test', version: '+'
latestDepTestImplementation group: 'org.springframework', name: 'spring-context', version: '+'
latestDepTestImplementation group: 'org.springframework.data', name: 'spring-data-commons', version: '+'
latestDepTestImplementation group: 'org.springframework.data', name: 'spring-data-jpa', version: '+'
latestDepTestLibrary group: 'org.springframework', name: 'spring-context', version: '+'
}

13
instrumentation/spring-scheduling-3.1/spring-scheduling-3.1.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -10,18 +9,12 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
// 3.2.3 is the first version with which the tests will run. Lower versions require other
// classes and packages to be imported. Versions 3.1.0+ work with the instrumentation.
compileOnly group: 'org.springframework', name: 'spring-context', version: '3.1.0.RELEASE'
testImplementation group: 'org.springframework', name: 'spring-context', version: '3.2.3.RELEASE'
library group: 'org.springframework', name: 'spring-context', version: '3.1.0.RELEASE'
testLibrary group: 'org.springframework', name: 'spring-context', version: '3.2.3.RELEASE'
// this is the latest version that supports Java 7
latestDepTestImplementation group: 'org.springframework', name: 'spring-context', version: '4.+'
latestDepTestLibrary group: 'org.springframework', name: 'spring-context', version: '4.+'
}

19
instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle
View File

@ -4,7 +4,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -23,12 +22,6 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
implementation project(':instrumentation-core:spring:spring-webflux-5.0')
compileOnly group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE'
@ -37,13 +30,13 @@ dependencies {
testImplementation project(':instrumentation:netty:netty-4.1')
testImplementation project(':instrumentation:reactor-3.1')
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '2.0.0.RELEASE'
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.0.0.RELEASE'
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: '2.0.0.RELEASE'
testLibrary group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '2.0.0.RELEASE'
testLibrary group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.0.0.RELEASE'
testLibrary group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: '2.0.0.RELEASE'
testImplementation group: 'org.spockframework', name: 'spock-spring', version: '1.1-groovy-2.4'
// FIXME: reactor-netty packages have changed so test imports are failing
latestDepTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '2.0.+'
latestDepTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.0.+'
latestDepTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: '2.0.+'
latestDepTestLibrary group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '2.0.+'
latestDepTestLibrary group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.0.+'
latestDepTestLibrary group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: '2.0.+'
}

12
instrumentation/spymemcached-2.12/spymemcached-2.12.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -10,17 +9,8 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
dependencies {
compileOnly group: 'net.spy', name: 'spymemcached', version: '2.12.0'
library group: 'net.spy', name: 'spymemcached', version: '2.12.0'
testImplementation group: 'net.spy', name: 'spymemcached', version: '2.12.0'
testImplementation deps.testcontainers
latestDepTestImplementation group: 'net.spy', name: 'spymemcached', version: '+'
}

10
instrumentation/twilio-6.6/twilio-6.6.gradle
View File

@ -1,5 +1,4 @@
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -9,16 +8,9 @@ muzzle {
}
}
testSets {
latestDepTest
}
dependencies {
compileOnly group: 'com.twilio.sdk', name: 'twilio', version: '6.6.9'
library group: 'com.twilio.sdk', name: 'twilio', version: '6.6.9'
testImplementation group: 'com.twilio.sdk', name: 'twilio', version: '6.6.9'
testImplementation project(':instrumentation:apache-httpclient:apache-httpclient-4.0')
testImplementation group: 'nl.jqno.equalsverifier', name: 'equalsverifier', version: '2.5.2' // Last version to support Java7
latestDepTestImplementation group: 'com.twilio.sdk', name: 'twilio', version: '+'
}

14
instrumentation/vertx-3.0/vertx-3.0.gradle
View File

@ -4,7 +4,6 @@ ext {
}
apply from: "${rootDir}/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -14,26 +13,19 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
ext.vertxVersion = '3.0.0'
dependencies {
compileOnly group: 'io.vertx', name: 'vertx-web', version: vertxVersion
library group: 'io.vertx', name: 'vertx-web', version: vertxVersion
//We need both version as different versions of Vert.x use different versions of Netty
testImplementation project(':instrumentation:netty:netty-4.0')
testImplementation project(':instrumentation:netty:netty-4.1')
testImplementation project(':instrumentation:jdbc')
testImplementation group: 'io.vertx', name: 'vertx-web', version: vertxVersion
testImplementation group: 'io.vertx', name: 'vertx-jdbc-client', version: vertxVersion
// Vert.x 4.0 is incompatible with our tests.
latestDepTestImplementation group: 'io.vertx', name: 'vertx-web', version: '3.+'
latestDepTestImplementation group: 'io.vertx', name: 'vertx-web-client', version: '3.+'
latestDepTestLibrary group: 'io.vertx', name: 'vertx-web', version: '3.+'
latestDepTestLibrary group: 'io.vertx', name: 'vertx-web-client', version: '3.+'
}

29
instrumentation/vertx-reactive-3.5/vertx-reactive-3.5.gradle
View File

@ -3,7 +3,6 @@ ext {
}
apply from: "$rootDir/gradle/instrumentation.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
muzzle {
pass {
@ -13,34 +12,26 @@ muzzle {
}
}
testSets {
latestDepTest {
dirName = 'test'
}
}
//The first Vert.x version that uses rx-java 2
ext.vertxVersion = '3.5.0'
dependencies {
compileOnly group: 'io.vertx', name: 'vertx-web', version: vertxVersion
compileOnly group: 'io.vertx', name: 'vertx-rx-java2', version: vertxVersion
library group: 'io.vertx', name: 'vertx-web', version: vertxVersion
library group: 'io.vertx', name: 'vertx-rx-java2', version: vertxVersion
testImplementation project(':instrumentation:jdbc')
testImplementation project(':instrumentation:netty:netty-4.1')
testImplementation project(':instrumentation:vertx-3.0')
testImplementation group: 'io.vertx', name: 'vertx-web', version: vertxVersion
testImplementation group: 'io.vertx', name: 'vertx-web-client', version: vertxVersion
testImplementation group: 'io.vertx', name: 'vertx-jdbc-client', version: vertxVersion
testImplementation group: 'io.vertx', name: 'vertx-circuit-breaker', version: vertxVersion
testImplementation group: 'io.vertx', name: 'vertx-rx-java2', version: vertxVersion
testLibrary group: 'io.vertx', name: 'vertx-web-client', version: vertxVersion
testLibrary group: 'io.vertx', name: 'vertx-jdbc-client', version: vertxVersion
testLibrary group: 'io.vertx', name: 'vertx-circuit-breaker', version: vertxVersion
testImplementation 'org.hsqldb:hsqldb:2.3.4'
// Vert.x 4.0 is incompatible with our tests.
latestDepTestImplementation group: 'io.vertx', name: 'vertx-web', version: '3.+'
latestDepTestImplementation group: 'io.vertx', name: 'vertx-web-client', version: '3.+'
latestDepTestImplementation group: 'io.vertx', name: 'vertx-jdbc-client', version: '3.+'
latestDepTestImplementation group: 'io.vertx', name: 'vertx-circuit-breaker', version: '3.+'
latestDepTestImplementation group: 'io.vertx', name: 'vertx-rx-java2', version: '3.+'
latestDepTestLibrary group: 'io.vertx', name: 'vertx-web', version: '3.+'
latestDepTestLibrary group: 'io.vertx', name: 'vertx-web-client', version: '3.+'
latestDepTestLibrary group: 'io.vertx', name: 'vertx-jdbc-client', version: '3.+'
latestDepTestLibrary group: 'io.vertx', name: 'vertx-circuit-breaker', version: '3.+'
latestDepTestLibrary group: 'io.vertx', name: 'vertx-rx-java2', version: '3.+'
}