Skip to content

Commit 6549d20

Browse files
Add akka repository token to be used by Gradle and revert akka downgrade. (#9668)
1 parent 70b85a8 commit 6549d20

File tree

3 files changed

+10
-17
lines changed

3 files changed

+10
-17
lines changed

.github/workflows/run-system-tests.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ jobs:
3939
${{ runner.os }}-gradle-
4040
4141
- name: Build dd-trace-java
42+
env:
43+
ORG_GRADLE_PROJECT_akkaRepositoryToken: ${{ secrets.AKKA_REPO_TOKEN }}
4244
run: |
4345
GRADLE_OPTS="-Xms2g -Xmx4g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC" \
4446
JAVA_HOME=$JAVA_HOME_8_X64 \

dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ ext {
55

66
apply from: "$rootDir/gradle/java.gradle"
77
apply plugin: 'scala'
8-
// temporary workaround to avoid early resolution of test classpath
9-
// ( Akka instrumentation doesn't require call-site instrumentation )
10-
// apply plugin: 'call-site-instrumentation'
8+
apply plugin: 'call-site-instrumentation'
119

1210

1311
muzzle {
@@ -71,10 +69,8 @@ tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
7169

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

7975
//testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
8076
testImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'

dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,29 +57,24 @@ com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestR
5757
com.squareup.okio:okio:1.17.5=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5858
com.swoval:file-tree-views:2.1.12=zinc
5959
com.thoughtworks.qdox:qdox:1.12.1=codenarc,latestDepTestRuntimeClasspath,testRuntimeClasspath
60-
com.typesafe.akka:akka-actor_2.13:2.8.8=main_java11CompileClasspath
6160
com.typesafe.akka:akka-actor_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
62-
com.typesafe.akka:akka-actor_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath
63-
com.typesafe.akka:akka-http-core_2.13:10.6.0-M1=main_java11CompileClasspath
64-
com.typesafe.akka:akka-http-core_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
61+
com.typesafe.akka:akka-actor_2.13:2.9.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
62+
com.typesafe.akka:akka-http-core_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
6563
com.typesafe.akka:akka-http-core_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6664
com.typesafe.akka:akka-http-jackson_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
6765
com.typesafe.akka:akka-http-jackson_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6866
com.typesafe.akka:akka-http-spray-json_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
6967
com.typesafe.akka:akka-http-spray-json_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
70-
com.typesafe.akka:akka-http_2.13:10.6.0-M1=main_java11CompileClasspath
71-
com.typesafe.akka:akka-http_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
68+
com.typesafe.akka:akka-http_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
7269
com.typesafe.akka:akka-http_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
73-
com.typesafe.akka:akka-parsing_2.13:10.6.0-M1=main_java11CompileClasspath
74-
com.typesafe.akka:akka-parsing_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
70+
com.typesafe.akka:akka-parsing_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
7571
com.typesafe.akka:akka-parsing_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7672
com.typesafe.akka:akka-pki_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7773
com.typesafe.akka:akka-protobuf-v3_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7874
com.typesafe.akka:akka-protobuf-v3_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath
7975
com.typesafe.akka:akka-stream_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
8076
com.typesafe.akka:akka-stream_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath
81-
com.typesafe:config:1.4.2=main_java11CompileClasspath
82-
com.typesafe:config:1.4.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
77+
com.typesafe:config:1.4.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
8378
commons-codec:commons-codec:1.15=spotbugs
8479
commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
8580
commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)