Skip to content

Add akka repository token to be used by Gradle and revert akka downgrade. #9668

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
Oct 3, 2025
Merged

Add akka repository token to be used by Gradle and revert akka downgrade. #9668

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
2 changes: 2 additions & 0 deletions .github/workflows/run-system-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ jobs:
${{ runner.os }}-gradle-

- name: Build dd-trace-java
env:
ORG_GRADLE_PROJECT_akkaRepositoryToken: ${{ secrets.AKKA_REPO_TOKEN }}
run: |
GRADLE_OPTS="-Xms2g -Xmx4g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC" \
JAVA_HOME=$JAVA_HOME_8_X64 \
Expand Down
10 changes: 3 additions & 7 deletions dd-java-agent/instrumentation/akka/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 @@ -5,9 +5,7 @@ ext {

apply from: "$rootDir/gradle/java.gradle"
apply plugin: 'scala'
// temporary workaround to avoid early resolution of test classpath
// ( Akka instrumentation doesn't require call-site instrumentation )
// apply plugin: 'call-site-instrumentation'
apply plugin: 'call-site-instrumentation'
Copy link
Contributor

@amarziali amarziali Oct 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

side note: this can be removed but it can. be done in a separate pr

Copy link
Contributor Author

@AlexeyKuznetsov-DD AlexeyKuznetsov-DD Oct 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, will open another PR



muzzle {
Expand Down Expand Up @@ -71,10 +69,8 @@ tasks.named("compileLatestDepTestGroovy", GroovyCompile) {

dependencies {
main_java11CompileOnly libs.scala213
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0-M1'
// should be 2.9.0 on compileOnly but this has been temporary downgraded for the CI
// for the advice compilation it should not change.
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-actor_2.13', version: '2.8.8'
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-actor_2.13', version: '2.9.0'

//testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
testImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
Expand Down
15 changes: 5 additions & 10 deletions dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,29 +57,24 @@ com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestR
com.squareup.okio:okio:1.17.5=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.swoval:file-tree-views:2.1.12=zinc
com.thoughtworks.qdox:qdox:1.12.1=codenarc,latestDepTestRuntimeClasspath,testRuntimeClasspath
com.typesafe.akka:akka-actor_2.13:2.8.8=main_java11CompileClasspath
com.typesafe.akka:akka-actor_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
com.typesafe.akka:akka-actor_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath
com.typesafe.akka:akka-http-core_2.13:10.6.0-M1=main_java11CompileClasspath
com.typesafe.akka:akka-http-core_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
com.typesafe.akka:akka-actor_2.13:2.9.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
com.typesafe.akka:akka-http-core_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
com.typesafe.akka:akka-http-core_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
com.typesafe.akka:akka-http-jackson_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
com.typesafe.akka:akka-http-jackson_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
com.typesafe.akka:akka-http-spray-json_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
com.typesafe.akka:akka-http-spray-json_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
com.typesafe.akka:akka-http_2.13:10.6.0-M1=main_java11CompileClasspath
com.typesafe.akka:akka-http_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
com.typesafe.akka:akka-http_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
com.typesafe.akka:akka-http_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
com.typesafe.akka:akka-parsing_2.13:10.6.0-M1=main_java11CompileClasspath
com.typesafe.akka:akka-parsing_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
com.typesafe.akka:akka-parsing_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
com.typesafe.akka:akka-parsing_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
com.typesafe.akka:akka-pki_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
com.typesafe.akka:akka-protobuf-v3_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
com.typesafe.akka:akka-protobuf-v3_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath
com.typesafe.akka:akka-stream_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
com.typesafe.akka:akka-stream_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath
com.typesafe:config:1.4.2=main_java11CompileClasspath
com.typesafe:config:1.4.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.typesafe:config:1.4.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
commons-codec:commons-codec:1.15=spotbugs
commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down