Skip to content

Commit e5cb0be

Browse files
committed
try
1 parent 1ac3dee commit e5cb0be

File tree

55 files changed

+114
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+114
-125
lines changed

.github/scripts/find-instrumentation-with-upper-version-limits.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@
33
grep -r --include build.gradle.kts latestDepTestLibrary instrumentation \
44
| grep -v :+\" \
55
| grep -v "// see .* module" \
6-
| grep -v "// documented limitation"
6+
| grep -v "// see test suite below" \
7+
| grep -v "// documented limitation" \
8+
| grep -v "// related dependency" \
9+
| grep -v "// native on-by-default instrumentation after this version" \
10+
| grep -vF ":+\"\)"

docs/supported-libraries.md

Lines changed: 12 additions & 11 deletions
Large diffs are not rendered by default.

instrumentation/apache-shenyu-2.4/javaagent/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ muzzle {
1212
}
1313

1414
dependencies {
15-
compileOnly("org.apache.shenyu:shenyu-web:2.4.0")
15+
library("org.apache.shenyu:shenyu-web:2.4.0")
1616
compileOnly("com.google.auto.value:auto-value-annotations")
1717
annotationProcessor("com.google.auto.value:auto-value")
1818

@@ -27,7 +27,7 @@ dependencies {
2727
}
2828

2929
// the latest version of apache shenyu uses spring-boot 2.7
30-
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:2.7.+")
30+
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:2.7.+") // related dependency
3131

3232
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
3333
}

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ dependencies {
6363
testImplementation("javax.xml.bind:jaxb-api:2.3.1")
6464

6565
// last version that does not use json protocol
66-
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583")
66+
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583") // documented limitation
6767
}
6868

6969
testing {

instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
testLibrary("com.amazonaws:aws-java-sdk-sqs:1.11.106")
2121

2222
// last version that does not use json protocol
23-
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583")
23+
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583") // documented limitation
2424
}
2525

2626
tasks {

instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
testLibrary("com.amazonaws:aws-java-sdk-sns:1.11.106")
2020

2121
// last version that does not use json protocol
22-
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583")
22+
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583") // documented limitation
2323
}
2424

2525
if (!(findProperty("testLatestDeps") as Boolean)) {

instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ dependencies {
2626

2727
testImplementation(project(":instrumentation:couchbase:couchbase-common:testing"))
2828

29-
// later versions are tested with couchbase-2.6 instrumentation
30-
latestDepTestLibrary("org.springframework.data:spring-data-couchbase:2.+")
31-
latestDepTestLibrary("com.couchbase.client:java-client:2.5.+")
29+
latestDepTestLibrary("org.springframework.data:spring-data-couchbase:2.+") // see couchbase-2.6 module
30+
latestDepTestLibrary("com.couchbase.client:java-client:2.5.+") // see couchbase-2.6 module
3231
}
3332

3433
tasks {

instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ dependencies {
3030
testLibrary("org.springframework.data:spring-data-couchbase:3.1.0.RELEASE")
3131
testLibrary("com.couchbase.client:encryption:1.0.0")
3232

33-
latestDepTestLibrary("org.springframework.data:spring-data-couchbase:3.1.+")
34-
latestDepTestLibrary("com.couchbase.client:java-client:2.+")
33+
latestDepTestLibrary("org.springframework.data:spring-data-couchbase:3.1.+") // see couchbase-3.1 module
34+
latestDepTestLibrary("com.couchbase.client:java-client:2.+") // see couchbase-3.1 module
3535
}
3636

3737
tasks {

instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies {
4242
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.14.2")
4343
testImplementation("org.testcontainers:elasticsearch")
4444

45-
latestDepTestLibrary("co.elastic.clients:elasticsearch-java:7.17.19")
45+
latestDepTestLibrary("co.elastic.clients:elasticsearch-java:7.17.19") // native on-by-default instrumentation after this version
4646
}
4747

4848
val latestDepTest = findProperty("testLatestDeps") as Boolean

instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ dependencies {
4545
testLibrary("org.elasticsearch.plugin:transport-netty3-client:5.0.0")
4646
testLibrary("org.elasticsearch.client:transport:5.0.0")
4747

48-
latestDepTestLibrary("org.elasticsearch.plugin:transport-netty3-client:5.0.0")
49-
latestDepTestLibrary("org.elasticsearch.client:transport:5.0.0")
48+
latestDepTestLibrary("org.elasticsearch.plugin:transport-netty3-client:5.2.+") // see elasticsearch-transport-5.3 module
49+
latestDepTestLibrary("org.elasticsearch.client:transport:5.2.+") // see elasticsearch-transport-5.3 module
5050
}
5151

5252
tasks {

0 commit comments

Comments
 (0)