Skip to content

Support pekko http 1.1 #8532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amarziali merged 1 commit into from
Mar 10, 2025
Merged

Support pekko http 1.1 #8532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions dd-java-agent/instrumentation/pekko-http-1.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ apply plugin: 'call-site-instrumentation'
// version is not inherited
addTestSuite('baseTest')
addTestSuite('latestDepTest')
addTestSuiteForDir('latestPekko10Test', 'latestDepTest')
addTestSuite('iastTest')
addTestSuiteForDir 'latestDepIastTest', 'iastTest'

Expand All @@ -32,13 +33,14 @@ muzzle {

configurations {
iastTestImplementation.extendsFrom(baseTestImplementation)

latestDepIastTestRuntimeOnly.extendsFrom(iastTestRuntimeOnly)
}

sourceSets {
latestDepTest.groovy.srcDir sourceSets.baseTest.groovy
latestDepTest.scala.srcDir sourceSets.baseTest.scala
latestPekko10Test.groovy.srcDir sourceSets.baseTest.groovy
latestPekko10Test.scala.srcDir sourceSets.baseTest.scala
}

dependencies {
Expand Down Expand Up @@ -66,10 +68,14 @@ dependencies {
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.12')
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')

latestPekko10TestImplementation libs.scala213
latestPekko10TestImplementation group: 'org.apache.pekko', name: 'pekko-http_2.13', version: '1.0.+'
latestPekko10TestImplementation group: 'org.apache.pekko', name: 'pekko-stream_2.13', version: '1.0.+'
latestPekko10TestImplementation group: 'org.scala-lang.modules', name: 'scala-java8-compat_2.13', version: '1.+'

latestDepTestImplementation libs.scala213
// Limit version to 1.0+: https://datadoghq.atlassian.net/browse/AIDM-158
latestDepTestImplementation group: 'org.apache.pekko', name: 'pekko-http_2.13', version: '1.0.+'
latestDepTestImplementation group: 'org.apache.pekko', name: 'pekko-stream_2.13', version: '1.0.+'
latestDepTestImplementation group: 'org.apache.pekko', name: 'pekko-http_2.13', version: '1.+'
latestDepTestImplementation group: 'org.apache.pekko', name: 'pekko-stream_2.13', version: '1.+'
latestDepTestImplementation group: 'org.scala-lang.modules', name: 'scala-java8-compat_2.13', version: '1.+'

latestDepIastTestImplementation libs.scala213
Expand Down Expand Up @@ -100,3 +106,8 @@ compileLatestDepTestGroovy {
classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
dependsOn "compileLatestDepTestScala"
}

compileLatestPekko10TestGroovy {
classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
dependsOn "compileLatestDepTestScala"
}
Loading
Loading