From 97b209b7e4e9a96cec7be07a3c09cd0faea29dc1 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Thu, 17 Jul 2025 09:02:34 +0200 Subject: [PATCH] Exclude akka http build outside the CI --- .../akka-http/akka-http-10.6/build.gradle | 132 +++++++++--------- 1 file changed, 65 insertions(+), 67 deletions(-) diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle index b5f98607882..3332dcd3ca3 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle @@ -3,90 +3,88 @@ ext { minJavaVersionForTests = JavaVersion.VERSION_11 } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' -apply plugin: 'call-site-instrumentation' +if (project.rootProject.hasProperty("akkaRepositoryToken")) { + apply from: "$rootDir/gradle/java.gradle" + apply plugin: 'scala' + apply plugin: 'call-site-instrumentation' -muzzle { - pass { - group = 'com.typesafe.akka' - module = 'akka-http_2.13' - versions = "[10.6.0,)" - javaVersion = "11" - extraDependency 'com.typesafe.akka:akka-stream_2.13:2.9.0' - if (project.rootProject.hasProperty("akkaRepositoryToken")) { + muzzle { + pass { + group = 'com.typesafe.akka' + module = 'akka-http_2.13' + versions = "[10.6.0,)" + javaVersion = "11" + extraDependency 'com.typesafe.akka:akka-stream_2.13:2.9.0' + extraRepository('akka', "https://repo.akka.io/${project.rootProject.property("akkaRepositoryToken")}/secure") - } else { - extraRepository('akka', 'https://repo.akka.io/maven') + assertInverse = true } - assertInverse = true } -} - -repositories { - if (project.rootProject.hasProperty("akkaRepositoryToken")) { - maven { - url "https://repo.akka.io/${project.rootProject.property("akkaRepositoryToken")}/secure" - } - } else { - maven { - url "https://repo.akka.io/maven" + repositories { + if (project.rootProject.hasProperty("akkaRepositoryToken")) { + maven { + url "https://repo.akka.io/${project.rootProject.property("akkaRepositoryToken")}/secure" + } + } else { + maven { + url "https://repo.akka.io/maven" + } } } -} -addTestSuiteForDir('latestDepTest', 'test') + addTestSuiteForDir('latestDepTest', 'test') -[compileMain_java11Java, compileTestScala, compileLatestDepTestScala].each { - it.configure { - setJavaVersion(it, 11) - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + [compileMain_java11Java, compileTestScala, compileLatestDepTestScala].each { + it.configure { + setJavaVersion(it, 11) + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } } -} -compileTestGroovy { - javaLauncher = getJavaLauncherFor(11) - dependsOn compileTestScala - classpath += files(compileTestScala.destinationDirectory) -} + compileTestGroovy { + javaLauncher = getJavaLauncherFor(11) + dependsOn compileTestScala + classpath += files(compileTestScala.destinationDirectory) + } -compileLatestDepTestGroovy { - javaLauncher = getJavaLauncherFor(11) - dependsOn compileLatestDepTestScala - classpath += files(compileLatestDepTestScala.destinationDirectory) -} + compileLatestDepTestGroovy { + javaLauncher = getJavaLauncherFor(11) + dependsOn compileLatestDepTestScala + classpath += files(compileLatestDepTestScala.destinationDirectory) + } -dependencies { - main_java11CompileOnly libs.scala213 - 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' + dependencies { + main_java11CompileOnly libs.scala213 + 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' - testImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '2.9.0' - testImplementation group: 'com.typesafe.akka', name: 'akka-http-jackson_2.13', version: '10.6.0' - 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:akka-actor-2.5') - testImplementation project(':dd-java-agent:instrumentation:scala-concurrent') - 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') + //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' + testImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '2.9.0' + testImplementation group: 'com.typesafe.akka', name: 'akka-http-jackson_2.13', version: '10.6.0' + 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:akka-actor-2.5') + testImplementation project(':dd-java-agent:instrumentation:scala-concurrent') + 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: '+' - latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '+' - latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-pki_2.13', version: '+' - latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-protobuf-v3_2.13', version: '+' - latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http-jackson_2.13', version: '+' - latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http-spray-json_2.13', version: '+' - latestDepTestImplementation group: 'org.scala-lang.modules', name: 'scala-java8-compat_2.13', version: '1.0.+' -} + latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '+' + latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '+' + latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-pki_2.13', version: '+' + latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-protobuf-v3_2.13', version: '+' + latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http-jackson_2.13', version: '+' + latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http-spray-json_2.13', version: '+' + latestDepTestImplementation group: 'org.scala-lang.modules', name: 'scala-java8-compat_2.13', version: '1.0.+' + } -configurations.getByName("latestDepTestRuntimeClasspath").resolutionStrategy { - it.force libs.slf4j + configurations.getByName("latestDepTestRuntimeClasspath").resolutionStrategy { + it.force libs.slf4j + } }