Skip to content

Commit 9371aa9

Browse files
trasktrask
committed
Use baseVersion for custom test suites
1 parent a579949 commit 9371aa9

29 files changed

Lines changed: 119 additions & 223 deletions

File tree

‎instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,9 @@ testing {
4646
suites {
4747
val javaRouteTest by registering(JvmTestSuite::class) {
4848
dependencies {
49-
if (otelProps.testLatestDeps) {
50-
implementation("com.typesafe.akka:akka-http_2.13:latest.release")
51-
implementation("com.typesafe.akka:akka-stream_2.13:latest.release")
52-
} else {
53-
implementation("com.typesafe.akka:akka-http_2.12:10.2.0")
54-
implementation("com.typesafe.akka:akka-stream_2.12:2.6.21")
55-
}
49+
val scalaVersion = if (otelProps.testLatestDeps) "2.13" else "2.12"
50+
implementation("com.typesafe.akka:akka-http_$scalaVersion:${baseVersion("10.2.0").orLatest()}")
51+
implementation("com.typesafe.akka:akka-stream_$scalaVersion:${baseVersion("2.6.21").orLatest()}")
5652
}
5753
}
5854
}

‎instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,9 @@ testing {
2525
val testDubbo by registering(JvmTestSuite::class) {
2626
dependencies {
2727
implementation(project(":instrumentation:apache-dubbo-2.7:testing"))
28-
if (otelProps.testLatestDeps) {
29-
implementation("org.apache.dubbo:dubbo:latest.release")
30-
implementation("org.apache.dubbo:dubbo-config-api:latest.release")
31-
} else {
32-
implementation("org.apache.dubbo:dubbo:2.7.0")
33-
implementation("org.apache.dubbo:dubbo-config-api:2.7.0")
34-
}
28+
val version = baseVersion("2.7.0").orLatest()
29+
implementation("org.apache.dubbo:dubbo:$version")
30+
implementation("org.apache.dubbo:dubbo-config-api:$version")
3531
}
3632
}
3733
}

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dependencies {
6666
// needed by S3
6767
testImplementation("javax.xml.bind:jaxb-api:2.3.1")
6868

69-
// last version that does not use json protocol
69+
// 1.12.584 switches SQS to JSON protocol; these tests cover the query protocol path.
7070
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583") // documented limitation
7171
}
7272

@@ -101,12 +101,8 @@ testing {
101101
dependencies {
102102
implementation(project(":instrumentation:aws-sdk:aws-sdk-1.11:testing"))
103103

104-
if (otelProps.testLatestDeps) {
105-
// last version that does not use json protocol
106-
implementation("com.amazonaws:aws-java-sdk-sqs:1.12.583")
107-
} else {
108-
implementation("com.amazonaws:aws-java-sdk-sqs:1.11.106")
109-
}
104+
// 1.12.584 switches SQS to JSON protocol; these tests cover the query protocol path.
105+
implementation("com.amazonaws:aws-java-sdk-sqs:${baseVersion("1.11.106").orLatest("1.12.583")}")
110106
}
111107

112108
targets {
@@ -122,12 +118,8 @@ testing {
122118
dependencies {
123119
implementation(project(":instrumentation:aws-sdk:aws-sdk-1.11:testing"))
124120

125-
if (otelProps.testLatestDeps) {
126-
// last version that does not use json protocol
127-
implementation("com.amazonaws:aws-java-sdk-sqs:1.12.583")
128-
} else {
129-
implementation("com.amazonaws:aws-java-sdk-sqs:1.11.106")
130-
}
121+
// 1.12.584 switches SQS to JSON protocol; these tests cover the query protocol path.
122+
implementation("com.amazonaws:aws-java-sdk-sqs:${baseVersion("1.11.106").orLatest("1.12.583")}")
131123
}
132124
}
133125
}

‎instrumentation/azure-core/azure-core-1.14/javaagent/build.gradle.kts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,8 @@ testing {
3838
// extracted to the output directory are not available during tests
3939
val testAzure by registering(JvmTestSuite::class) {
4040
dependencies {
41-
if (otelProps.testLatestDeps) {
42-
implementation("com.azure:azure-core:1.18.0") // see azure-core-1.19 module
43-
} else {
44-
implementation("com.azure:azure-core:1.14.0")
45-
}
41+
val version = baseVersion("1.14.0").orLatest("1.18.0") // see azure-core-1.19 module
42+
implementation("com.azure:azure-core:$version")
4643
}
4744
}
4845
}

‎instrumentation/azure-core/azure-core-1.19/javaagent/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ testing {
3838
// extracted to the output directory are not available during tests
3939
val testAzure by registering(JvmTestSuite::class) {
4040
dependencies {
41-
val version = if (otelProps.testLatestDeps) "1.35.0" else "1.19.0"
41+
val version = baseVersion("1.19.0").orLatest("1.35.0")
4242
implementation("com.azure:azure-core:$version")
4343
}
4444
}

‎instrumentation/azure-core/azure-core-1.36/javaagent/build.gradle.kts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,8 @@ testing {
4444
// extracted to the output directory are not available during tests
4545
val testAzure by registering(JvmTestSuite::class) {
4646
dependencies {
47-
if (otelProps.testLatestDeps) {
48-
implementation("com.azure:azure-core:1.52.0")
49-
implementation("com.azure:azure-core-test:1.26.2")
50-
} else {
51-
implementation("com.azure:azure-core:1.36.0")
52-
implementation("com.azure:azure-core-test:1.14.1")
53-
}
47+
implementation("com.azure:azure-core:${baseVersion("1.36.0").orLatest("1.52.0")}")
48+
implementation("com.azure:azure-core-test:${baseVersion("1.14.1").orLatest("1.26.2")}")
5449
}
5550
}
5651
}

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,8 @@ testing {
6161
implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2")
6262
implementation("org.testcontainers:testcontainers-elasticsearch")
6363

64-
if (otelProps.testLatestDeps) {
65-
// 8.10+ has native, on-by-default opentelemetry instrumentation
66-
implementation("co.elastic.clients:elasticsearch-java:8.9.+")
67-
} else {
68-
implementation("co.elastic.clients:elasticsearch-java:8.0.0")
69-
}
64+
// 8.10+ has native, on-by-default opentelemetry instrumentation
65+
implementation("co.elastic.clients:elasticsearch-java:${baseVersion("8.0.0").orLatest("8.9.+")}")
7066
}
7167
}
7268
}

‎instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,41 +43,29 @@ testing {
4343
suites {
4444
val elasticsearch6Test by registering(JvmTestSuite::class) {
4545
dependencies {
46-
if (otelProps.testLatestDeps) {
47-
implementation("org.elasticsearch.client:transport:6.4.+")
48-
implementation("org.elasticsearch.plugin:transport-netty4-client:6.4.+")
49-
} else {
50-
implementation("org.elasticsearch.client:transport:6.0.0")
51-
implementation("org.elasticsearch.plugin:transport-netty4-client:6.0.0")
52-
}
46+
val version = baseVersion("6.0.0").orLatest("6.4.+")
47+
implementation("org.elasticsearch.client:transport:$version")
48+
implementation("org.elasticsearch.plugin:transport-netty4-client:$version")
5349
implementation(project(":instrumentation:elasticsearch:elasticsearch-transport-6.0:testing"))
5450
implementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing"))
5551
}
5652
}
5753

5854
val elasticsearch65Test by registering(JvmTestSuite::class) {
5955
dependencies {
60-
if (otelProps.testLatestDeps) {
61-
implementation("org.elasticsearch.client:transport:6.+")
62-
implementation("org.elasticsearch.plugin:transport-netty4-client:6.+")
63-
} else {
64-
implementation("org.elasticsearch.client:transport:6.5.0")
65-
implementation("org.elasticsearch.plugin:transport-netty4-client:6.5.0")
66-
}
56+
val version = baseVersion("6.5.0").orLatest("6.+")
57+
implementation("org.elasticsearch.client:transport:$version")
58+
implementation("org.elasticsearch.plugin:transport-netty4-client:$version")
6759
implementation(project(":instrumentation:elasticsearch:elasticsearch-transport-6.0:testing"))
6860
implementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing"))
6961
}
7062
}
7163

7264
val elasticsearch7Test by registering(JvmTestSuite::class) {
7365
dependencies {
74-
if (otelProps.testLatestDeps) {
75-
implementation("org.elasticsearch.client:transport:latest.release")
76-
implementation("org.elasticsearch.plugin:transport-netty4-client:latest.release")
77-
} else {
78-
implementation("org.elasticsearch.client:transport:7.0.0")
79-
implementation("org.elasticsearch.plugin:transport-netty4-client:7.0.0")
80-
}
66+
val version = baseVersion("7.0.0").orLatest()
67+
implementation("org.elasticsearch.client:transport:$version")
68+
implementation("org.elasticsearch.plugin:transport-netty4-client:$version")
8169
implementation(project(":instrumentation:elasticsearch:elasticsearch-transport-6.0:testing"))
8270
implementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing"))
8371
}

‎instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,10 @@ testing {
6565
implementation("org.hsqldb:hsqldb:2.0.0")
6666
implementation(project(":instrumentation:hibernate:testing"))
6767

68-
if (otelProps.testLatestDeps) {
69-
implementation("org.hibernate:hibernate-core:5.0.0.Final")
70-
implementation("org.hibernate:hibernate-entitymanager:5.0.0.Final")
71-
implementation("org.springframework.data:spring-data-jpa:2.3.0.RELEASE")
72-
} else {
73-
implementation("org.hibernate:hibernate-core:5.+")
74-
implementation("org.hibernate:hibernate-entitymanager:5.+")
75-
implementation("org.springframework.data:spring-data-jpa:(2.4.0,3)")
76-
}
68+
val hibernateVersion = baseVersion("5.+").orLatest("5.0.0.Final")
69+
implementation("org.hibernate:hibernate-core:$hibernateVersion")
70+
implementation("org.hibernate:hibernate-entitymanager:$hibernateVersion")
71+
implementation("org.springframework.data:spring-data-jpa:${baseVersion("(2.4.0,3)").orLatest("2.3.0.RELEASE")}")
7772
}
7873
}
7974
}

‎instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,7 @@ testing {
4949
implementation("com.h2database:h2:1.4.197")
5050
implementation("org.hsqldb:hsqldb:2.0.0")
5151
implementation(project(":instrumentation:hibernate:testing"))
52-
if (otelProps.testLatestDeps) {
53-
implementation("org.hibernate:hibernate-core:6.+")
54-
} else {
55-
implementation("org.hibernate:hibernate-core:6.0.0.Final")
56-
}
52+
implementation("org.hibernate:hibernate-core:${baseVersion("6.0.0.Final").orLatest("6.+")}")
5753
}
5854
}
5955

@@ -68,11 +64,7 @@ testing {
6864
implementation("com.h2database:h2:1.4.197")
6965
implementation("org.hsqldb:hsqldb:2.0.0")
7066
implementation(project(":instrumentation:hibernate:testing"))
71-
if (otelProps.testLatestDeps) {
72-
implementation("org.hibernate:hibernate-core:7.+")
73-
} else {
74-
implementation("org.hibernate:hibernate-core:7.0.0.Final")
75-
}
67+
implementation("org.hibernate:hibernate-core:${baseVersion("7.0.0.Final").orLatest("7.+")}")
7668
}
7769
}
7870
}

0 commit comments

Comments
 (0)