Skip to content

Refactor akka instrumentation modules #9060

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
merged 1 commit into from
Jul 11, 2025
Merged

Refactor akka instrumentation modules #9060

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
30 changes: 0 additions & 30 deletions dd-java-agent/instrumentation/akka-init/build.gradle
View file
Open in desktop

This file was deleted.

207 changes: 0 additions & 207 deletions dd-java-agent/instrumentation/akka-init/gradle.lockfile
View file
Open in desktop

This file was deleted.

0 ...trumentation/akka-concurrent/build.gradle → ...entation/akka/akka-actor-2.5/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...mentation/akka-concurrent/gradle.lockfile → ...ation/akka/akka-actor-2.5/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...rc/akka23Test/groovy/AkkaActorTest.groovy → ...rc/akka23Test/groovy/AkkaActorTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...ent/src/akka23Test/scala/AkkaActors.scala → ...2.5/src/akka23Test/scala/AkkaActors.scala
View file
Open in desktop
File renamed without changes.
0 ...current/AkkaActorCellInstrumentation.java → ...current/AkkaActorCellInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ncurrent/AkkaEnvelopeInstrumentation.java → ...ncurrent/AkkaEnvelopeInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...aForkJoinExecutorTaskInstrumentation.java → ...aForkJoinExecutorTaskInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...rent/AkkaForkJoinPoolInstrumentation.java → ...rent/AkkaForkJoinPoolInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...rent/AkkaForkJoinTaskInstrumentation.java → ...rent/AkkaForkJoinTaskInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...oncurrent/AkkaMailboxInstrumentation.java → ...oncurrent/AkkaMailboxInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...t/AkkaRoutedActorCellInstrumentation.java → ...t/AkkaRoutedActorCellInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...sableTracingActorInitInstrumentation.java → ...sableTracingActorInitInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...init/src/test/groovy/ActorInitTest.groovy → ...-2.5/src/test/groovy/ActorInitTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...rrent/src/test/groovy/AkkaAsyncChild.java → ...r-2.5/src/test/groovy/AkkaAsyncChild.java
View file
Open in desktop
File renamed without changes.
0 ...vy/AkkaExecutorInstrumentationTest.groovy → ...vy/AkkaExecutorInstrumentationTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...groovy/ForkJoinPoolPropagationTest.groovy → ...groovy/ForkJoinPoolPropagationTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../test/groovy/RejectedExecutionTest.groovy → .../test/groovy/RejectedExecutionTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...-concurrent/src/test/java/LinearTask.java → ...a-actor-2.5/src/test/java/LinearTask.java
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ion/akka-http/akka-http-10.0/build.gradle → ...kka/akka-http/akka-http-10.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ dependencies {
// These are the common dependencies that are inherited by the other test sets
testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:akka-concurrent')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
Expand All @@ -121,7 +121,7 @@ dependencies {
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core')
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.8')
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:akka-http:akka-http-10.2-iast')
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.2-iast')

// There are some internal API changes in 10.1 that we would like to test separately for
version101TestImplementation libs.scala212
Expand Down Expand Up @@ -166,7 +166,7 @@ dependencies {

lagomTestImplementation libs.scala211
lagomTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0'
lagomTestImplementation project(':dd-java-agent:instrumentation:akka-init')
lagomTestImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
lagomTestImplementation group: 'com.lightbend.lagom', name: 'lagom-javadsl-testkit_2.11', version: '1.4.0'
}

Expand Down
0 .../akka-http/akka-http-10.0/gradle.lockfile → .../akka-http/akka-http-10.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 .../AkkaHttpClientInstrumentationTest.groovy → .../AkkaHttpClientInstrumentationTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../AkkaHttpServerInstrumentationTest.groovy → .../AkkaHttpServerInstrumentationTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...0/src/baseTest/resources/application.conf → ...0/src/baseTest/resources/application.conf
View file
Open in desktop
File renamed without changes.
0 ...aseTest/scala/AkkaHttpTestWebServer.scala → ...aseTest/scala/AkkaHttpTestWebServer.scala
View file
Open in desktop
File renamed without changes.
0 ...kkahttp/iast/AkkaIastTestWebServer.groovy → ...kkahttp/iast/AkkaIastTestWebServer.groovy
View file
Open in desktop
File renamed without changes.
0 ...ntation/akkahttp/iast/IastAkkaTest.groovy → ...ntation/akkahttp/iast/IastAkkaTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../foo/bar/WithInstrumentedCallSites.groovy → .../foo/bar/WithInstrumentedCallSites.groovy
View file
Open in desktop
File renamed without changes.
0 ...0.0/src/lagomTest/groovy/LagomTest.groovy → ...0.0/src/lagomTest/groovy/LagomTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...-10.0/src/lagomTest/java/EchoService.java → ...-10.0/src/lagomTest/java/EchoService.java
View file
Open in desktop
File renamed without changes.
0 ...0/src/lagomTest/java/EchoServiceImpl.java → ...0/src/lagomTest/java/EchoServiceImpl.java
View file
Open in desktop
File renamed without changes.
0 ...src/lagomTest/java/ServiceTestModule.java → ...src/lagomTest/java/ServiceTestModule.java
View file
Open in desktop
File renamed without changes.
0 .../src/lagomTest/resources/application.conf → .../src/lagomTest/resources/application.conf
View file
Open in desktop
File renamed without changes.
0 ...aHttp102ServerInstrumentationTests.groovy → ...aHttp102ServerInstrumentationTests.groovy
View file
Open in desktop
File renamed without changes.
0 ...Test/scala/AkkaHttp102TestWebServer.scala → ...Test/scala/AkkaHttp102TestWebServer.scala
View file
Open in desktop
File renamed without changes.
0 ...ahttp/AkkaHttp2ServerInstrumentation.java → ...ahttp/AkkaHttp2ServerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ion/akkahttp/AkkaHttpClientDecorator.java → ...ion/akkahttp/AkkaHttpClientDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...ation/akkahttp/AkkaHttpClientHelpers.java → ...ation/akkahttp/AkkaHttpClientHelpers.java
View file
Open in desktop
File renamed without changes.
0 ...ion/akkahttp/AkkaHttpServerDecorator.java → ...ion/akkahttp/AkkaHttpServerDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...ation/akkahttp/AkkaHttpServerHeaders.java → ...ation/akkahttp/AkkaHttpServerHeaders.java
View file
Open in desktop
File renamed without changes.
0 ...kahttp/AkkaHttpServerInstrumentation.java → ...kahttp/AkkaHttpServerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...AkkaHttpSingleRequestInstrumentation.java → ...AkkaHttpSingleRequestInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...p/AkkaPoolMasterActorInstrumentation.java → ...p/AkkaPoolMasterActorInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../akkahttp/DatadogAsyncHandlerWrapper.java → .../akkahttp/DatadogAsyncHandlerWrapper.java
View file
Open in desktop
File renamed without changes.
0 ...adogServerRequestResponseFlowWrapper.java → ...adogServerRequestResponseFlowWrapper.java
View file
Open in desktop
File renamed without changes.
0 ...tation/akkahttp/DatadogWrapperHelper.java → ...tation/akkahttp/DatadogWrapperHelper.java
View file
Open in desktop
File renamed without changes.
0 ...faultExceptionHandlerInstrumentation.java → ...faultExceptionHandlerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ntation/akkahttp/MarkSpanAsErroredPF.java → ...ntation/akkahttp/MarkSpanAsErroredPF.java
View file
Open in desktop
File renamed without changes.
0 ...kahttp/RecoverFromBlockedExceptionPF.java → ...kahttp/RecoverFromBlockedExceptionPF.java
View file
Open in desktop
File renamed without changes.
0 .../instrumentation/akkahttp/UriAdapter.java → .../instrumentation/akkahttp/UriAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...ttp/appsec/AkkaBlockResponseFunction.java → ...ttp/appsec/AkkaBlockResponseFunction.java
View file
Open in desktop
File renamed without changes.
0 ...kahttp/appsec/BlockingResponseHelper.java → ...kahttp/appsec/BlockingResponseHelper.java
View file
Open in desktop
File renamed without changes.
0 ...kahttp/appsec/Bug4304Instrumentation.java → ...kahttp/appsec/Bug4304Instrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...deRemoteAddressHeaderInstrumentation.java → ...deRemoteAddressHeaderInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...psec/FormDataToStrictInstrumentation.java → ...psec/FormDataToStrictInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...c/JacksonUnmarshallerInstrumentation.java → ...c/JacksonUnmarshallerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ultipartUnmarshallersInstrumentation.java → ...ultipartUnmarshallersInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...omEntityUnmarshallersInstrumentation.java → ...omEntityUnmarshallersInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...n/akkahttp/appsec/ScalaListCollector.java → ...n/akkahttp/appsec/ScalaListCollector.java
View file
Open in desktop
File renamed without changes.
0 ...c/ScalaListCollectorMuzzleReferences.java → ...c/ScalaListCollectorMuzzleReferences.java
View file
Open in desktop
File renamed without changes.
0 ...sec/SprayUnmarshallerInstrumentation.java → ...sec/SprayUnmarshallerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...c/StrictFormCompanionInstrumentation.java → ...c/StrictFormCompanionInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../akkahttp/appsec/UnmarshallerHelpers.java → .../akkahttp/appsec/UnmarshallerHelpers.java
View file
Open in desktop
File renamed without changes.
0 ...iast/CookieDirectivesInstrumentation.java → ...iast/CookieDirectivesInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ttp/iast/CookieHeaderInstrumentation.java → ...ttp/iast/CookieHeaderInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ast/ExtractDirectivesInstrumentation.java → ...ast/ExtractDirectivesInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...kkahttp/iast/FormDataInstrumentation.java → ...kkahttp/iast/FormDataInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...t/FormFieldDirectivesInstrumentation.java → ...t/FormFieldDirectivesInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ion/akkahttp/iast/HeaderNameCallSite.java → ...ion/akkahttp/iast/HeaderNameCallSite.java
View file
Open in desktop
File renamed without changes.
0 .../HttpHeaderSubclassesInstrumentation.java → .../HttpHeaderSubclassesInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...http/iast/HttpRequestInstrumentation.java → ...http/iast/HttpRequestInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...tp/iast/MakeTaintableInstrumentation.java → ...tp/iast/MakeTaintableInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...MarshallingDirectivesInstrumentation.java → ...MarshallingDirectivesInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...t/ParameterDirectivesInstrumentation.java → ...t/ParameterDirectivesInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...http/iast/PathMatcherInstrumentation.java → ...http/iast/PathMatcherInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...p/iast/RequestContextInstrumentation.java → ...p/iast/RequestContextInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...on/akkahttp/iast/TraitMethodMatchers.java → ...on/akkahttp/iast/TraitMethodMatchers.java
View file
Open in desktop
File renamed without changes.
0 ...ttp/iast/UnmarshallerInstrumentation.java → ...ttp/iast/UnmarshallerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ion/akkahttp/iast/UriInstrumentation.java → ...ion/akkahttp/iast/UriInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...on/akkahttp/iast/helpers/ScalaToJava.java → ...on/akkahttp/iast/helpers/ScalaToJava.java
View file
Open in desktop
File renamed without changes.
0 ...ttp/iast/helpers/TaintCookieFunction.java → ...ttp/iast/helpers/TaintCookieFunction.java
View file
Open in desktop
File renamed without changes.
0 ...ahttp/iast/helpers/TaintFutureHelper.java → ...ahttp/iast/helpers/TaintFutureHelper.java
View file
Open in desktop
File renamed without changes.
0 ...kahttp/iast/helpers/TaintMapFunction.java → ...kahttp/iast/helpers/TaintMapFunction.java
View file
Open in desktop
File renamed without changes.
0 ...p/iast/helpers/TaintMultiMapFunction.java → ...p/iast/helpers/TaintMultiMapFunction.java
View file
Open in desktop
File renamed without changes.
0 .../helpers/TaintOptionalCookieFunction.java → .../helpers/TaintOptionalCookieFunction.java
View file
Open in desktop
File renamed without changes.
0 .../helpers/TaintRequestContextFunction.java → .../helpers/TaintRequestContextFunction.java
View file
Open in desktop
File renamed without changes.
0 ...tp/iast/helpers/TaintRequestFunction.java → ...tp/iast/helpers/TaintRequestFunction.java
View file
Open in desktop
File renamed without changes.
0 ...kahttp/iast/helpers/TaintSeqFunction.java → ...kahttp/iast/helpers/TaintSeqFunction.java
View file
Open in desktop
File renamed without changes.
0 ...helpers/TaintSingleParameterFunction.java → ...helpers/TaintSingleParameterFunction.java
View file
Open in desktop
File renamed without changes.
0 ...ahttp/iast/helpers/TaintUnmarshaller.java → ...ahttp/iast/helpers/TaintUnmarshaller.java
View file
Open in desktop
File renamed without changes.
0 ...kahttp/iast/helpers/TaintUriFunction.java → ...kahttp/iast/helpers/TaintUriFunction.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...kka-http/akka-http-10.2-iast/build.gradle → ...kka-http/akka-http-10.2-iast/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ dependencies {
compileOnly group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.2.0'
}

// testing happens in :dd-java-agent:instrumentation:akka-http-10.0:latestDepIastTest
// testing happens in :dd-java-agent:instrumentation:akka:akka-http-10.0:latestDepIastTest
0 ...-http/akka-http-10.2-iast/gradle.lockfile → ...-http/akka-http-10.2-iast/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...rmFieldDirectivesImplInstrumentation.java → ...rmFieldDirectivesImplInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...rameterDirectivesImplInstrumentation.java → ...rameterDirectivesImplInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...iast/helpers/TaintParametersFunction.java → ...iast/helpers/TaintParametersFunction.java
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ion/akka-http/akka-http-10.6/build.gradle → ...kka/akka-http/akka-http-10.6/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ dependencies {
testImplementation group: 'com.typesafe.akka', name: 'akka-http-spray-json_2.13', version: '10.6.0'
testImplementation libs.scala213
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:akka-concurrent')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
testImplementation project(':dd-java-agent:instrumentation:akka-http:akka-http-10.0')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')

latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '+'
Expand Down
0 .../akka-http/akka-http-10.6/gradle.lockfile → .../akka-http/akka-http-10.6/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...AkkaHttpSingleRequestInstrumentation.java → ...AkkaHttpSingleRequestInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../akkahttp106/AkkaHttpClientDecorator.java → .../akkahttp106/AkkaHttpClientDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...on/akkahttp106/AkkaHttpClientHelpers.java → ...on/akkahttp106/AkkaHttpClientHelpers.java
View file
Open in desktop
File renamed without changes.
0 ...tion/akkahttp106/SingleRequestAdvice.java → ...tion/akkahttp106/SingleRequestAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...aHttp102ServerInstrumentationTests.groovy → ...aHttp102ServerInstrumentationTests.groovy
View file
Open in desktop
File renamed without changes.
0 .../AkkaHttpClientInstrumentationTest.groovy → .../AkkaHttpClientInstrumentationTest.groovy
View file
Open in desktop
File renamed without changes.
0 .../AkkaHttpServerInstrumentationTest.groovy → .../AkkaHttpServerInstrumentationTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...-10.6/src/test/resources/application.conf → ...-10.6/src/test/resources/application.conf
View file
Open in desktop
File renamed without changes.
0 ...test/scala/AkkaHttp102TestWebServer.scala → ...test/scala/AkkaHttp102TestWebServer.scala
View file
Open in desktop
File renamed without changes.
0 ...rc/test/scala/AkkaHttpTestWebServer.scala → ...rc/test/scala/AkkaHttpTestWebServer.scala
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions dd-java-agent/instrumentation/play-2.3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ dependencies {
compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.3.9'

testImplementation project(':dd-java-agent:instrumentation:netty-3.8')
testImplementation project(':dd-java-agent:instrumentation:akka-concurrent')
testImplementation project(':dd-java-agent:instrumentation:akka-init')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
Expand Down
5 changes: 2 additions & 3 deletions dd-java-agent/instrumentation/play-2.4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,8 @@ dependencies {

testRuntimeOnly project(':dd-java-agent:instrumentation:netty-4.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:netty-4.1')
testRuntimeOnly project(':dd-java-agent:instrumentation:akka-http:akka-http-10.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:akka-concurrent')
testRuntimeOnly project(':dd-java-agent:instrumentation:akka-init')
testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
testRuntimeOnly project(':dd-java-agent:instrumentation:scala-concurrent')
testRuntimeOnly project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
testRuntimeOnly project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
Expand Down
5 changes: 2 additions & 3 deletions dd-java-agent/instrumentation/play-2.6/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,8 @@ dependencies {

testRuntimeOnly project(':dd-java-agent:instrumentation:netty-4.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:netty-4.1')
testRuntimeOnly project(':dd-java-agent:instrumentation:akka-http:akka-http-10.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:akka-concurrent')
testRuntimeOnly project(':dd-java-agent:instrumentation:akka-init')
testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
testRuntimeOnly project(':dd-java-agent:instrumentation:scala-concurrent')
testRuntimeOnly project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
testRuntimeOnly project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
Expand Down
5 changes: 2 additions & 3 deletions dd-java-agent/instrumentation/play-ws-1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@ dependencies {
// These are to ensure cross compatibility
testImplementation project(':dd-java-agent:instrumentation:netty-4.0')
testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:akka-http:akka-http-10.0')
testImplementation project(':dd-java-agent:instrumentation:akka-concurrent')
testImplementation project(':dd-java-agent:instrumentation:akka-init')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
Expand Down
5 changes: 2 additions & 3 deletions dd-java-agent/instrumentation/play-ws-2.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ dependencies {
// These are to ensure cross compatibility
testImplementation project(':dd-java-agent:instrumentation:netty-4.0')
testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:akka-http:akka-http-10.0')
testImplementation project(':dd-java-agent:instrumentation:akka-concurrent')
testImplementation project(':dd-java-agent:instrumentation:akka-init')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
Expand Down
5 changes: 2 additions & 3 deletions dd-java-agent/instrumentation/play-ws-2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ dependencies {
// These are to ensure cross compatibility
testImplementation project(':dd-java-agent:instrumentation:netty-4.0')
testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
testImplementation project(':dd-java-agent:instrumentation:akka-http:akka-http-10.0')
testImplementation project(':dd-java-agent:instrumentation:akka-concurrent')
testImplementation project(':dd-java-agent:instrumentation:akka-init')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
Expand Down
9 changes: 4 additions & 5 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,10 @@ include ':dd-java-agent:instrumentation-annotation-processor'

// instrumentation:
include ':dd-java-agent:instrumentation:aerospike-4'
include ':dd-java-agent:instrumentation:akka-concurrent'
include ':dd-java-agent:instrumentation:akka-http:akka-http-10.0'
include ':dd-java-agent:instrumentation:akka-http:akka-http-10.2-iast'
include ':dd-java-agent:instrumentation:akka-http:akka-http-10.6'
include ':dd-java-agent:instrumentation:akka-init'
include ':dd-java-agent:instrumentation:akka:akka-actor-2.5'
include ':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0'
include ':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.2-iast'
include ':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.6'
include ':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0'
include ':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0'
include ':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-5.0'
Expand Down