Skip to content

Commit 01d3277

Browse files
authored
Support pekko http 1.1 (#8532)
1 parent 735b705 commit 01d3277

File tree

4 files changed

+193
-137
lines changed

4 files changed

+193
-137
lines changed

dd-java-agent/instrumentation/pekko-http-1.0/build.gradle

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ apply plugin: 'call-site-instrumentation'
77
// version is not inherited
88
addTestSuite('baseTest')
99
addTestSuite('latestDepTest')
10+
addTestSuiteForDir('latestPekko10Test', 'latestDepTest')
1011
addTestSuite('iastTest')
1112
addTestSuiteForDir 'latestDepIastTest', 'iastTest'
1213

@@ -32,13 +33,14 @@ muzzle {
3233

3334
configurations {
3435
iastTestImplementation.extendsFrom(baseTestImplementation)
35-
3636
latestDepIastTestRuntimeOnly.extendsFrom(iastTestRuntimeOnly)
3737
}
3838

3939
sourceSets {
4040
latestDepTest.groovy.srcDir sourceSets.baseTest.groovy
4141
latestDepTest.scala.srcDir sourceSets.baseTest.scala
42+
latestPekko10Test.groovy.srcDir sourceSets.baseTest.groovy
43+
latestPekko10Test.scala.srcDir sourceSets.baseTest.scala
4244
}
4345

4446
dependencies {
@@ -66,10 +68,14 @@ dependencies {
6668
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.12')
6769
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
6870

71+
latestPekko10TestImplementation libs.scala213
72+
latestPekko10TestImplementation group: 'org.apache.pekko', name: 'pekko-http_2.13', version: '1.0.+'
73+
latestPekko10TestImplementation group: 'org.apache.pekko', name: 'pekko-stream_2.13', version: '1.0.+'
74+
latestPekko10TestImplementation group: 'org.scala-lang.modules', name: 'scala-java8-compat_2.13', version: '1.+'
75+
6976
latestDepTestImplementation libs.scala213
70-
// Limit version to 1.0+: https://datadoghq.atlassian.net/browse/AIDM-158
71-
latestDepTestImplementation group: 'org.apache.pekko', name: 'pekko-http_2.13', version: '1.0.+'
72-
latestDepTestImplementation group: 'org.apache.pekko', name: 'pekko-stream_2.13', version: '1.0.+'
77+
latestDepTestImplementation group: 'org.apache.pekko', name: 'pekko-http_2.13', version: '1.+'
78+
latestDepTestImplementation group: 'org.apache.pekko', name: 'pekko-stream_2.13', version: '1.+'
7379
latestDepTestImplementation group: 'org.scala-lang.modules', name: 'scala-java8-compat_2.13', version: '1.+'
7480

7581
latestDepIastTestImplementation libs.scala213
@@ -100,3 +106,8 @@ compileLatestDepTestGroovy {
100106
classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
101107
dependsOn "compileLatestDepTestScala"
102108
}
109+
110+
compileLatestPekko10TestGroovy {
111+
classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
112+
dependsOn "compileLatestDepTestScala"
113+
}

0 commit comments

Comments
 (0)