Skip to content

Commit fc9989c

Browse files
authored
Use embedded kafka for 3.8+ testing (#8588)
1 parent c67bed5 commit fc9989c

File tree

5 files changed

+199
-261
lines changed

5 files changed

+199
-261
lines changed

dd-java-agent/instrumentation/kafka-clients-3.8/build.gradle

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,27 @@ dependencies {
4343
implementation project(':dd-java-agent:instrumentation:span-origin')
4444

4545
testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '3.8.0'
46-
testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '3.1.0'
47-
testImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '3.1.0'
48-
testImplementation group: 'org.testcontainers', name: 'kafka', version: '1.17.0'
46+
47+
testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '3.3.4', {
48+
exclude group: 'org.apache.kafka'
49+
}
50+
testImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '3.3.4', {
51+
exclude group: 'org.apache.kafka'
52+
}
53+
testImplementation 'org.apache.kafka:kafka-clients:3.8.0:test'
54+
testImplementation group: 'org.apache.kafka', name: 'kafka_2.13', version: '3.8.0'
55+
testImplementation 'org.apache.kafka:kafka_2.13:3.8.0:test'
56+
4957
testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
5058
testImplementation group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
5159
testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
5260
testRuntimeOnly project(':dd-java-agent:instrumentation:spring-scheduling-3.1')
5361

54-
55-
// Include latest version of kafka itself along with latest version of client libs.
56-
// This seems to help with jar compatibility hell.
57-
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka_2.13', version: '2.+'
58-
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '+'
5962
latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '+'
6063
latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '+'
61-
latestDepTestImplementation group: 'org.assertj', name: 'assertj-core', version: '3.19.+'
64+
//latestDepTestImplementation group: 'org.assertj', name: 'assertj-core', version: '3.19.+'
65+
latestDepTestImplementation group: 'io.dropwizard.metrics', name: 'metrics-core', version: '+'
66+
6267
latestDepTestImplementation libs.guava
6368

6469
}
@@ -67,9 +72,3 @@ configurations.testRuntimeClasspath {
6772
// spock-core depends on assertj version that is not compatible with kafka-clients
6873
resolutionStrategy.force 'org.assertj:assertj-core:2.9.1'
6974
}
70-
71-
project.afterEvaluate {
72-
tasks.withType(Test).configureEach {
73-
usesService(testcontainersLimit)
74-
}
75-
}

0 commit comments

Comments
 (0)