From c3b64a6927bd8da2e87360530c8f70406e27e1ef Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 29 Oct 2025 11:16:47 -0400 Subject: [PATCH 01/10] Bump spotless to latest version 8.0.0 --- .gitlab-ci.yml | 10 ++++++++++ .gitlab/collect_reports.sh | 1 + build.gradle.kts | 10 +++++----- buildSrc/build.gradle.kts | 2 +- .../build.gradle.kts | 4 ++-- .../armeria-grpc/application/build.gradle | 13 ++++++++++++- dd-smoke-tests/kafka-3/application/build.gradle | 2 +- .../quarkus-native/application/build.gradle | 2 +- dd-smoke-tests/quarkus/application/build.gradle | 8 +++++++- dd-smoke-tests/quarkus/build.gradle | 2 +- dd-smoke-tests/rum/wildfly-15/build.gradle | 1 + dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle | 8 +++++++- .../application/build.gradle | 8 +++++++- dd-smoke-tests/spring-boot-2.7-webflux/build.gradle | 2 +- .../spring-boot-3.0-native/application/build.gradle | 2 +- .../application/build.gradle | 2 +- .../spring-boot-3.0-webmvc/application/build.gradle | 2 +- .../spring-boot-3.3-webmvc/application/build.gradle | 2 +- dd-smoke-tests/wildfly/build.gradle | 2 +- dd-smoke-tests/wildfly/spring-ear/build.gradle | 8 +++++++- gradle/enforcement/spotless-scalafmt.conf | 2 ++ gradle/spotless.gradle | 12 ++++++------ test-published-dependencies/build.gradle | 2 +- 23 files changed, 78 insertions(+), 29 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02c99b551a6..2ff9858c6df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -360,6 +360,16 @@ spotless: script: - ./gradlew --version - ./gradlew spotlessCheck $GRADLE_ARGS + after_script: + - *cgroup_info + - source .gitlab/gitlab-utils.sh + - gitlab_section_start "collect-reports" "Collecting reports" + - .gitlab/collect_reports.sh + - gitlab_section_end "collect-reports" + artifacts: + when: always + paths: + - ./check_reports test_published_artifacts: extends: .gradle_build diff --git a/.gitlab/collect_reports.sh b/.gitlab/collect_reports.sh index 6b16d7da472..0115209056f 100755 --- a/.gitlab/collect_reports.sh +++ b/.gitlab/collect_reports.sh @@ -40,6 +40,7 @@ cp /tmp/java_pid*.hprof $REPORTS_DIR 2>/dev/null || true cp /tmp/javacore.* $REPORTS_DIR 2>/dev/null || true cp /tmp/*.trc $REPORTS_DIR 2>/dev/null || true cp /tmp/*.dmp $REPORTS_DIR 2>/dev/null || true +cp /tmp/*.hprof $REPORTS_DIR 2>/dev/null || true cp /tmp/dd-profiler/*.jfr $REPORTS_DIR 2>/dev/null || true function process_reports () { diff --git a/build.gradle.kts b/build.gradle.kts index d192d4c65f9..cae53339a4d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { id("datadog.dump-hanged-test") id("datadog.ci-jobs") - id("com.diffplug.spotless") version "6.13.0" + id("com.diffplug.spotless") version "8.0.0" id("com.github.spotbugs") version "6.4.4" id("de.thetaphi.forbiddenapis") version "3.10" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" @@ -35,7 +35,7 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) { removeUnusedImports() // This is the last Google Java Format version that supports Java 8 - googleJavaFormat("1.7") + googleJavaFormat("1.29.0") } groovyGradle { greclipse() @@ -44,13 +44,13 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) { greclipse() } kotlinGradle { - ktlint("0.41.0") + ktlint("1.7.1") } kotlin { - ktlint("0.41.0") + ktlint("1.7.1") } scala { - scalafmt("2.7.5") + scalafmt("3.9.10") } } apply(from = rootDir.resolve("gradle/spotless.gradle")) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index d93c261886a..43b0392aef5 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -3,7 +3,7 @@ plugins { `java-gradle-plugin` `kotlin-dsl` `jvm-test-suite` - id("com.diffplug.spotless") version "6.13.0" + id("com.diffplug.spotless") version "8.0.0" } java { diff --git a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts index 1fde159ccce..010d083cb70 100644 --- a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts +++ b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java groovy - id("com.diffplug.spotless") version "6.13.0" + id("com.diffplug.spotless") version "8.0.0" id("com.gradleup.shadow") version "8.3.6" } @@ -18,7 +18,7 @@ spotless { // ignore embedded test projects targetExclude("src/test/resources/**") // This is the last Google Java Format version that supports Java 8 - googleJavaFormat("1.7") + googleJavaFormat("1.29.0") } } diff --git a/dd-smoke-tests/armeria-grpc/application/build.gradle b/dd-smoke-tests/armeria-grpc/application/build.gradle index 09a490a234a..4863de99f11 100644 --- a/dd-smoke-tests/armeria-grpc/application/build.gradle +++ b/dd-smoke-tests/armeria-grpc/application/build.gradle @@ -7,11 +7,22 @@ buildscript { plugins { id 'application' id 'java' - id 'com.diffplug.spotless' version '6.13.0' + id 'com.diffplug.spotless' version '8.0.0' id 'com.gradleup.shadow' version '8.3.6' id 'com.google.protobuf' version '0.9.3' } +spotless { + java { + + // TODO: for some reason `armeriaBuild` is failing with NoClassDefFoundError. + suppressLintsFor { + step = "toggle" + shortCode = "java.lang.NoClassDefFoundError" + } + } +} + def sharedRootDir = "$rootDir/../../../" def sharedConfigDirectory = "$sharedRootDir/gradle" rootProject.ext.sharedConfigDirectory = sharedConfigDirectory diff --git a/dd-smoke-tests/kafka-3/application/build.gradle b/dd-smoke-tests/kafka-3/application/build.gradle index 32171468d86..4b40f414f3e 100644 --- a/dd-smoke-tests/kafka-3/application/build.gradle +++ b/dd-smoke-tests/kafka-3/application/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.2.2' id 'io.spring.dependency-management' version '1.1.4' - id 'com.diffplug.spotless' version '6.13.0' + id 'com.diffplug.spotless' version '8.0.0' } java { diff --git a/dd-smoke-tests/quarkus-native/application/build.gradle b/dd-smoke-tests/quarkus-native/application/build.gradle index c51e374fda3..bd501df82bb 100644 --- a/dd-smoke-tests/quarkus-native/application/build.gradle +++ b/dd-smoke-tests/quarkus-native/application/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'io.quarkus' - id 'com.diffplug.spotless' version '6.13.0' + id 'com.diffplug.spotless' version '8.0.0' } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/quarkus/application/build.gradle b/dd-smoke-tests/quarkus/application/build.gradle index 068eaf57a67..d57fab03cc3 100644 --- a/dd-smoke-tests/quarkus/application/build.gradle +++ b/dd-smoke-tests/quarkus/application/build.gradle @@ -1,7 +1,13 @@ plugins { id 'java' id 'io.quarkus' - id 'com.diffplug.spotless' version '6.13.0' + id 'com.diffplug.spotless' version '8.0.0' +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/quarkus/build.gradle b/dd-smoke-tests/quarkus/build.gradle index e85c9653377..2b5e5146d1c 100644 --- a/dd-smoke-tests/quarkus/build.gradle +++ b/dd-smoke-tests/quarkus/build.gradle @@ -17,7 +17,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew' // define the task that builds the quarkus project tasks.register('quarkusBuild', Exec) { workingDir "$appDir" - environment.JAVA_HOME = System.getenv("JAVA_8_HOME") + environment.JAVA_HOME = System.getenv("JAVA_21_HOME") environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"] commandLine "${rootDir}/${gradlewCommand}", "build", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}" diff --git a/dd-smoke-tests/rum/wildfly-15/build.gradle b/dd-smoke-tests/rum/wildfly-15/build.gradle index e5e033007d8..0a36a8f90df 100644 --- a/dd-smoke-tests/rum/wildfly-15/build.gradle +++ b/dd-smoke-tests/rum/wildfly-15/build.gradle @@ -47,6 +47,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew' // define the task that builds the quarkus project tasks.register('earBuild', Exec) { workingDir "$appDir" + environment.JAVA_HOME = System.getenv("JAVA_21_HOME") environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"] commandLine "$rootDir/${gradlewCommand}", "assemble", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}" diff --git a/dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle b/dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle index 25eb46b1db0..5e09fc5eb21 100644 --- a/dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle +++ b/dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle @@ -1,7 +1,13 @@ plugins { id 'java' id 'ear' - id 'com.diffplug.spotless' version '6.13.0' + id 'com.diffplug.spotless' version '8.0.0' +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } } def sharedRootDir = "$rootDir/../../../../" diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle index 6eaffaa238a..c913bddc394 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle +++ b/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle @@ -2,7 +2,13 @@ plugins { id 'java' id 'org.springframework.boot' version '2.7.4' id 'io.spring.dependency-management' version '1.0.14.RELEASE' - id 'com.diffplug.spotless' version '6.13.0' + id 'com.diffplug.spotless' version '8.0.0' +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle index 01e7727f436..4eec7539cc7 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle +++ b/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle @@ -14,7 +14,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew' // define the task that builds the quarkus project tasks.register('webfluxBuild', Exec) { workingDir "$appDir" - environment.JAVA_HOME = System.getenv("JAVA_8_HOME") + environment.JAVA_HOME = System.getenv("JAVA_21_HOME") environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"] commandLine "$rootDir/${gradlewCommand}", "bootJar", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}" diff --git a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle index 11145336a8f..15b0310e780 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle @@ -3,7 +3,7 @@ plugins { id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.0.14.RELEASE' id 'org.graalvm.buildtools.native' version '0.9.28' - id 'com.diffplug.spotless' version '6.13.0' + id 'com.diffplug.spotless' version '8.0.0' } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle index 582c3c5fc90..b7e9ca2e7ce 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.0.14.RELEASE' - id 'com.diffplug.spotless' version '6.13.0' + id 'com.diffplug.spotless' version '8.0.0' } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle index 303f0074cf8..bc8a51f0722 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.0.14.RELEASE' - id 'com.diffplug.spotless' version '6.13.0' + id 'com.diffplug.spotless' version '8.0.0' } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/application/build.gradle b/dd-smoke-tests/spring-boot-3.3-webmvc/application/build.gradle index 2fb70486c46..3643c976357 100644 --- a/dd-smoke-tests/spring-boot-3.3-webmvc/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/application/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.3.5' id 'io.spring.dependency-management' version '1.0.14.RELEASE' - id 'com.diffplug.spotless' version '6.13.0' + id 'com.diffplug.spotless' version '8.0.0' } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/wildfly/build.gradle b/dd-smoke-tests/wildfly/build.gradle index b35ea823fd3..4fafef86f98 100644 --- a/dd-smoke-tests/wildfly/build.gradle +++ b/dd-smoke-tests/wildfly/build.gradle @@ -47,7 +47,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew' // define the task that builds the quarkus project tasks.register('earBuild', Exec) { workingDir "$appDir" - environment.JAVA_HOME = System.getenv("JAVA_8_HOME") + environment.JAVA_HOME = System.getenv("JAVA_21_HOME") environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"] commandLine "$rootDir/${gradlewCommand}", "assemble", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}" diff --git a/dd-smoke-tests/wildfly/spring-ear/build.gradle b/dd-smoke-tests/wildfly/spring-ear/build.gradle index e9f10e11cb9..cd2c4344702 100644 --- a/dd-smoke-tests/wildfly/spring-ear/build.gradle +++ b/dd-smoke-tests/wildfly/spring-ear/build.gradle @@ -1,7 +1,13 @@ plugins { id 'java' id 'ear' - id 'com.diffplug.spotless' version '6.13.0' + id 'com.diffplug.spotless' version '8.0.0' +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } } def sharedRootDir = "$rootDir/../../../" diff --git a/gradle/enforcement/spotless-scalafmt.conf b/gradle/enforcement/spotless-scalafmt.conf index 2368ce01777..b4f583c0ec4 100644 --- a/gradle/enforcement/spotless-scalafmt.conf +++ b/gradle/enforcement/spotless-scalafmt.conf @@ -1,2 +1,4 @@ +version = 3.9.10 +runner.dialect = scala213 align.preset = more maxColumn = 100 diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle index 3c64ef5c0a0..2833f42f71a 100644 --- a/gradle/spotless.gradle +++ b/gradle/spotless.gradle @@ -22,7 +22,7 @@ spotless { // ignore embedded test projects and everything in build dir, e.g. generated sources targetExclude('src/test/resources/**', buildDirectoryFiles) // This is the last Google Java Format version that supports Java 8 - googleJavaFormat('1.7') + googleJavaFormat('1.29.0') } } @@ -46,7 +46,7 @@ spotless { target '*.gradle.kts' // ktfmt('0.40').kotlinlangStyle() // needs Java 11+ // Newer versions do not work well with the older version of kotlin in this build - ktlint('0.41.0').userData(['indent_size': '2', 'continuation_indent_size': '2']) + ktlint('1.7.1') } project.pluginManager.withPlugin('groovy') { @@ -66,21 +66,21 @@ spotless { scala { toggleOffOn() targetExclude(buildDirectoryFiles) - scalafmt('2.7.5').configFile(configPath + '/enforcement/spotless-scalafmt.conf') + scalafmt('3.9.10').configFile(configPath + '/enforcement/spotless-scalafmt.conf') } } format 'markdown', { toggleOffOn() target '*.md', '.github/**/*.md', 'src/**/*.md', 'application/**/*.md' - indentWithSpaces() + leadingTabsToSpaces() endWithNewline() } format 'misc', { toggleOffOn() target '.gitignore', '*.sh', 'tooling/*.sh', '.gitlab/*.sh' - indentWithSpaces() + leadingTabsToSpaces() trimTrailingWhitespace() endWithNewline() } @@ -91,7 +91,7 @@ spotless { // ktfmt('0.40').kotlinlangStyle() // needs Java 11+ targetExclude(buildDirectoryFiles) // Newer versions do not work well with the older version of kotlin in this build - ktlint('0.41.0').userData(['indent_size': '2', 'continuation_indent_size': '2']) + ktlint('1.7.1') } } } diff --git a/test-published-dependencies/build.gradle b/test-published-dependencies/build.gradle index 75054666df2..8f474b63507 100644 --- a/test-published-dependencies/build.gradle +++ b/test-published-dependencies/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.diffplug.spotless' version '6.13.0' + id 'com.diffplug.spotless' version '8.0.0' } def sharedConfigDirectory = "$rootDir/../gradle" From 1fdc91372272152e30bcb1d8b93a928a5d85acc0 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Thu, 30 Oct 2025 14:31:31 -0400 Subject: [PATCH 02/10] Fixed nested folders --- dd-smoke-tests/armeria-grpc/application/build.gradle | 12 ------------ dd-smoke-tests/kafka-3/application/build.gradle | 1 - dd-smoke-tests/kafka-3/build.gradle | 10 ++++++++++ .../quarkus-native/application/build.gradle | 1 - dd-smoke-tests/quarkus/application/build.gradle | 7 ------- dd-smoke-tests/quarkus/build.gradle | 2 +- dd-smoke-tests/rum/wildfly-15/build.gradle | 1 - dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle | 7 ------- .../spring-boot-2.7-webflux/application/build.gradle | 7 ------- .../spring-boot-3.0-native/application/build.gradle | 1 - .../spring-boot-3.0-webflux/application/build.gradle | 1 - .../spring-boot-3.0-webmvc/application/build.gradle | 1 - .../spring-boot-3.3-webmvc/application/build.gradle | 1 - 13 files changed, 11 insertions(+), 41 deletions(-) diff --git a/dd-smoke-tests/armeria-grpc/application/build.gradle b/dd-smoke-tests/armeria-grpc/application/build.gradle index 4863de99f11..ecdda07688a 100644 --- a/dd-smoke-tests/armeria-grpc/application/build.gradle +++ b/dd-smoke-tests/armeria-grpc/application/build.gradle @@ -7,22 +7,10 @@ buildscript { plugins { id 'application' id 'java' - id 'com.diffplug.spotless' version '8.0.0' id 'com.gradleup.shadow' version '8.3.6' id 'com.google.protobuf' version '0.9.3' } -spotless { - java { - - // TODO: for some reason `armeriaBuild` is failing with NoClassDefFoundError. - suppressLintsFor { - step = "toggle" - shortCode = "java.lang.NoClassDefFoundError" - } - } -} - def sharedRootDir = "$rootDir/../../../" def sharedConfigDirectory = "$sharedRootDir/gradle" rootProject.ext.sharedConfigDirectory = sharedConfigDirectory diff --git a/dd-smoke-tests/kafka-3/application/build.gradle b/dd-smoke-tests/kafka-3/application/build.gradle index 4b40f414f3e..65b83a76144 100644 --- a/dd-smoke-tests/kafka-3/application/build.gradle +++ b/dd-smoke-tests/kafka-3/application/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java' id 'org.springframework.boot' version '3.2.2' id 'io.spring.dependency-management' version '1.1.4' - id 'com.diffplug.spotless' version '8.0.0' } java { diff --git a/dd-smoke-tests/kafka-3/build.gradle b/dd-smoke-tests/kafka-3/build.gradle index 0d593aa2006..0c805e1e6b3 100644 --- a/dd-smoke-tests/kafka-3/build.gradle +++ b/dd-smoke-tests/kafka-3/build.gradle @@ -51,3 +51,13 @@ tasks.named('compileTestGroovy') { tasks.withType(Test).configureEach { jvmArgs "-Ddatadog.smoketest.springboot.shadowJar.path=${appBuildDir}/libs/kafka-3-smoketest.jar" } + +spotless { + java { + target "**/*.java" + } + + groovyGradle { + target '*.gradle', "**/*.gradle" + } +} diff --git a/dd-smoke-tests/quarkus-native/application/build.gradle b/dd-smoke-tests/quarkus-native/application/build.gradle index bd501df82bb..fabbf120f13 100644 --- a/dd-smoke-tests/quarkus-native/application/build.gradle +++ b/dd-smoke-tests/quarkus-native/application/build.gradle @@ -1,7 +1,6 @@ plugins { id 'java' id 'io.quarkus' - id 'com.diffplug.spotless' version '8.0.0' } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/quarkus/application/build.gradle b/dd-smoke-tests/quarkus/application/build.gradle index d57fab03cc3..100c073c108 100644 --- a/dd-smoke-tests/quarkus/application/build.gradle +++ b/dd-smoke-tests/quarkus/application/build.gradle @@ -1,13 +1,6 @@ plugins { id 'java' id 'io.quarkus' - id 'com.diffplug.spotless' version '8.0.0' -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) - } } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/quarkus/build.gradle b/dd-smoke-tests/quarkus/build.gradle index 2b5e5146d1c..e85c9653377 100644 --- a/dd-smoke-tests/quarkus/build.gradle +++ b/dd-smoke-tests/quarkus/build.gradle @@ -17,7 +17,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew' // define the task that builds the quarkus project tasks.register('quarkusBuild', Exec) { workingDir "$appDir" - environment.JAVA_HOME = System.getenv("JAVA_21_HOME") + environment.JAVA_HOME = System.getenv("JAVA_8_HOME") environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"] commandLine "${rootDir}/${gradlewCommand}", "build", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}" diff --git a/dd-smoke-tests/rum/wildfly-15/build.gradle b/dd-smoke-tests/rum/wildfly-15/build.gradle index 0a36a8f90df..e5e033007d8 100644 --- a/dd-smoke-tests/rum/wildfly-15/build.gradle +++ b/dd-smoke-tests/rum/wildfly-15/build.gradle @@ -47,7 +47,6 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew' // define the task that builds the quarkus project tasks.register('earBuild', Exec) { workingDir "$appDir" - environment.JAVA_HOME = System.getenv("JAVA_21_HOME") environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"] commandLine "$rootDir/${gradlewCommand}", "assemble", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}" diff --git a/dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle b/dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle index 5e09fc5eb21..a2f2ffc3110 100644 --- a/dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle +++ b/dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle @@ -1,13 +1,6 @@ plugins { id 'java' id 'ear' - id 'com.diffplug.spotless' version '8.0.0' -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } } def sharedRootDir = "$rootDir/../../../../" diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle index c913bddc394..c805431eb8a 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle +++ b/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle @@ -2,13 +2,6 @@ plugins { id 'java' id 'org.springframework.boot' version '2.7.4' id 'io.spring.dependency-management' version '1.0.14.RELEASE' - id 'com.diffplug.spotless' version '8.0.0' -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle index 15b0310e780..4c194e935ee 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle @@ -3,7 +3,6 @@ plugins { id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.0.14.RELEASE' id 'org.graalvm.buildtools.native' version '0.9.28' - id 'com.diffplug.spotless' version '8.0.0' } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle index b7e9ca2e7ce..2ac28b49e24 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java' id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.0.14.RELEASE' - id 'com.diffplug.spotless' version '8.0.0' } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle index bc8a51f0722..9f1aee9c483 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java' id 'org.springframework.boot' version '3.0.0' id 'io.spring.dependency-management' version '1.0.14.RELEASE' - id 'com.diffplug.spotless' version '8.0.0' } def sharedRootDir = "$rootDir/../../../" diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/application/build.gradle b/dd-smoke-tests/spring-boot-3.3-webmvc/application/build.gradle index 3643c976357..1a93418989f 100644 --- a/dd-smoke-tests/spring-boot-3.3-webmvc/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/application/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java' id 'org.springframework.boot' version '3.3.5' id 'io.spring.dependency-management' version '1.0.14.RELEASE' - id 'com.diffplug.spotless' version '8.0.0' } def sharedRootDir = "$rootDir/../../../" From 07e957eb69e2d78f904b140b78c03d3062ee6590 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Thu, 30 Oct 2025 15:19:00 -0400 Subject: [PATCH 03/10] Fixed nested folders --- dd-smoke-tests/armeria-grpc/application/build.gradle | 1 - dd-smoke-tests/kafka-3/application/build.gradle | 1 - dd-smoke-tests/quarkus-native/application/build.gradle | 1 - dd-smoke-tests/quarkus/application/build.gradle | 1 - dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle | 1 - .../spring-boot-2.7-webflux/application/build.gradle | 1 - .../spring-boot-3.0-native/application/build.gradle | 1 - .../spring-boot-3.0-webflux/application/build.gradle | 1 - .../spring-boot-3.0-webmvc/application/build.gradle | 1 - .../spring-boot-3.3-webmvc/application/build.gradle | 1 - dd-smoke-tests/wildfly/build.gradle | 2 +- dd-smoke-tests/wildfly/spring-ear/build.gradle | 8 -------- 12 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dd-smoke-tests/armeria-grpc/application/build.gradle b/dd-smoke-tests/armeria-grpc/application/build.gradle index ecdda07688a..0bb5a24d9a9 100644 --- a/dd-smoke-tests/armeria-grpc/application/build.gradle +++ b/dd-smoke-tests/armeria-grpc/application/build.gradle @@ -16,7 +16,6 @@ def sharedConfigDirectory = "$sharedRootDir/gradle" rootProject.ext.sharedConfigDirectory = sharedConfigDirectory apply from: "$sharedConfigDirectory/repositories.gradle" -apply from: "$sharedConfigDirectory/spotless.gradle" if (hasProperty('appBuildDir')) { buildDir = property('appBuildDir') diff --git a/dd-smoke-tests/kafka-3/application/build.gradle b/dd-smoke-tests/kafka-3/application/build.gradle index 65b83a76144..2386eab0cf0 100644 --- a/dd-smoke-tests/kafka-3/application/build.gradle +++ b/dd-smoke-tests/kafka-3/application/build.gradle @@ -15,7 +15,6 @@ def sharedConfigDirectory = "$sharedRootDir/gradle" rootProject.ext.sharedConfigDirectory = sharedConfigDirectory apply from: "$sharedConfigDirectory/repositories.gradle" -apply from: "$sharedConfigDirectory/spotless.gradle" if (hasProperty('appBuildDir')) { buildDir = property('appBuildDir') diff --git a/dd-smoke-tests/quarkus-native/application/build.gradle b/dd-smoke-tests/quarkus-native/application/build.gradle index fabbf120f13..50e12545671 100644 --- a/dd-smoke-tests/quarkus-native/application/build.gradle +++ b/dd-smoke-tests/quarkus-native/application/build.gradle @@ -8,7 +8,6 @@ def sharedConfigDirectory = "$sharedRootDir/gradle" rootProject.ext.sharedConfigDirectory = sharedConfigDirectory apply from: "$sharedConfigDirectory/repositories.gradle" -apply from: "$sharedConfigDirectory/spotless.gradle" if (hasProperty('appBuildDir')) { buildDir = property('appBuildDir') diff --git a/dd-smoke-tests/quarkus/application/build.gradle b/dd-smoke-tests/quarkus/application/build.gradle index 100c073c108..40d01f03d90 100644 --- a/dd-smoke-tests/quarkus/application/build.gradle +++ b/dd-smoke-tests/quarkus/application/build.gradle @@ -8,7 +8,6 @@ def sharedConfigDirectory = "$sharedRootDir/gradle" rootProject.ext.sharedConfigDirectory = sharedConfigDirectory apply from: "$sharedConfigDirectory/repositories.gradle" -apply from: "$sharedConfigDirectory/spotless.gradle" if (hasProperty('appBuildDir')) { buildDir = property('appBuildDir') diff --git a/dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle b/dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle index a2f2ffc3110..74d2ad6687f 100644 --- a/dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle +++ b/dd-smoke-tests/rum/wildfly-15/rum-ear/build.gradle @@ -8,7 +8,6 @@ def sharedConfigDirectory = "$sharedRootDir/gradle" rootProject.ext.sharedConfigDirectory = sharedConfigDirectory apply from: "$sharedConfigDirectory/repositories.gradle" -apply from: "$sharedConfigDirectory/spotless.gradle" apply plugin: 'ear' if (hasProperty('appBuildDir')) { diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle index c805431eb8a..0b434bb8aac 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle +++ b/dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle @@ -9,7 +9,6 @@ def sharedConfigDirectory = "$sharedRootDir/gradle" rootProject.ext.sharedConfigDirectory = sharedConfigDirectory apply from: "$sharedConfigDirectory/repositories.gradle" -apply from: "$sharedConfigDirectory/spotless.gradle" if (hasProperty('appBuildDir')) { buildDir = property('appBuildDir') diff --git a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle index 4c194e935ee..1c199bb08c2 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-native/application/build.gradle @@ -10,7 +10,6 @@ def sharedConfigDirectory = "$sharedRootDir/gradle" rootProject.ext.sharedConfigDirectory = sharedConfigDirectory apply from: "$sharedConfigDirectory/repositories.gradle" -apply from: "$sharedConfigDirectory/spotless.gradle" ext.withProfiler = hasProperty('profiler') diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle index 2ac28b49e24..416dea657d2 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webflux/application/build.gradle @@ -9,7 +9,6 @@ def sharedConfigDirectory = "$sharedRootDir/gradle" rootProject.ext.sharedConfigDirectory = sharedConfigDirectory apply from: "$sharedConfigDirectory/repositories.gradle" -apply from: "$sharedConfigDirectory/spotless.gradle" if (hasProperty('appBuildDir')) { buildDir = property('appBuildDir') diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle b/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle index 9f1aee9c483..d7cc7b40f60 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/application/build.gradle @@ -9,7 +9,6 @@ def sharedConfigDirectory = "$sharedRootDir/gradle" rootProject.ext.sharedConfigDirectory = sharedConfigDirectory apply from: "$sharedConfigDirectory/repositories.gradle" -apply from: "$sharedConfigDirectory/spotless.gradle" if (hasProperty('appBuildDir')) { buildDir = property('appBuildDir') diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/application/build.gradle b/dd-smoke-tests/spring-boot-3.3-webmvc/application/build.gradle index 1a93418989f..1b75d137b24 100644 --- a/dd-smoke-tests/spring-boot-3.3-webmvc/application/build.gradle +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/application/build.gradle @@ -9,7 +9,6 @@ def sharedConfigDirectory = "$sharedRootDir/gradle" rootProject.ext.sharedConfigDirectory = sharedConfigDirectory apply from: "$sharedConfigDirectory/repositories.gradle" -apply from: "$sharedConfigDirectory/spotless.gradle" if (hasProperty('appBuildDir')) { buildDir = property('appBuildDir') diff --git a/dd-smoke-tests/wildfly/build.gradle b/dd-smoke-tests/wildfly/build.gradle index 4fafef86f98..b35ea823fd3 100644 --- a/dd-smoke-tests/wildfly/build.gradle +++ b/dd-smoke-tests/wildfly/build.gradle @@ -47,7 +47,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew' // define the task that builds the quarkus project tasks.register('earBuild', Exec) { workingDir "$appDir" - environment.JAVA_HOME = System.getenv("JAVA_21_HOME") + environment.JAVA_HOME = System.getenv("JAVA_8_HOME") environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"] commandLine "$rootDir/${gradlewCommand}", "assemble", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}" diff --git a/dd-smoke-tests/wildfly/spring-ear/build.gradle b/dd-smoke-tests/wildfly/spring-ear/build.gradle index cd2c4344702..fae476be498 100644 --- a/dd-smoke-tests/wildfly/spring-ear/build.gradle +++ b/dd-smoke-tests/wildfly/spring-ear/build.gradle @@ -1,13 +1,6 @@ plugins { id 'java' id 'ear' - id 'com.diffplug.spotless' version '8.0.0' -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } } def sharedRootDir = "$rootDir/../../../" @@ -15,7 +8,6 @@ def sharedConfigDirectory = "$sharedRootDir/gradle" rootProject.ext.sharedConfigDirectory = sharedConfigDirectory apply from: "$sharedConfigDirectory/repositories.gradle" -apply from: "$sharedConfigDirectory/spotless.gradle" apply plugin: 'ear' if (hasProperty('appBuildDir')) { From 29c8aa81599b6dddc19ef6f232f85489473d1fe4 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Thu, 30 Oct 2025 16:37:50 -0400 Subject: [PATCH 04/10] Fixed nested folders --- dd-smoke-tests/spring-boot-2.7-webflux/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle index 4eec7539cc7..01e7727f436 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle +++ b/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle @@ -14,7 +14,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew' // define the task that builds the quarkus project tasks.register('webfluxBuild', Exec) { workingDir "$appDir" - environment.JAVA_HOME = System.getenv("JAVA_21_HOME") + environment.JAVA_HOME = System.getenv("JAVA_8_HOME") environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"] commandLine "$rootDir/${gradlewCommand}", "bootJar", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}" From b1b8d7772aebaf57618e6f2169f5d8f870905fcf Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 31 Oct 2025 09:57:26 -0400 Subject: [PATCH 05/10] ScalFmt 3.9.10 is not working properly --- build.gradle.kts | 2 +- gradle/enforcement/spotless-scalafmt.conf | 2 +- gradle/spotless.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cae53339a4d..2e1bf43342b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -50,7 +50,7 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) { ktlint("1.7.1") } scala { - scalafmt("3.9.10") + scalafmt("3.8.1") } } apply(from = rootDir.resolve("gradle/spotless.gradle")) diff --git a/gradle/enforcement/spotless-scalafmt.conf b/gradle/enforcement/spotless-scalafmt.conf index b4f583c0ec4..2c8df6e2185 100644 --- a/gradle/enforcement/spotless-scalafmt.conf +++ b/gradle/enforcement/spotless-scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.9.10 +version = 3.8.1 runner.dialect = scala213 align.preset = more maxColumn = 100 diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle index 2833f42f71a..fcb2624d533 100644 --- a/gradle/spotless.gradle +++ b/gradle/spotless.gradle @@ -66,7 +66,7 @@ spotless { scala { toggleOffOn() targetExclude(buildDirectoryFiles) - scalafmt('3.9.10').configFile(configPath + '/enforcement/spotless-scalafmt.conf') + scalafmt('3.8.1').configFile(configPath + '/enforcement/spotless-scalafmt.conf') } } From f3fbb3272fe0759fd217bb8f3f5ac8c0f46ca80a Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 31 Oct 2025 11:32:30 -0400 Subject: [PATCH 06/10] ScalFmt 3.8.6 --- build.gradle.kts | 2 +- gradle/enforcement/spotless-scalafmt.conf | 2 +- gradle/spotless.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2e1bf43342b..92d2633f0df 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -50,7 +50,7 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) { ktlint("1.7.1") } scala { - scalafmt("3.8.1") + scalafmt("3.8.6") } } apply(from = rootDir.resolve("gradle/spotless.gradle")) diff --git a/gradle/enforcement/spotless-scalafmt.conf b/gradle/enforcement/spotless-scalafmt.conf index 2c8df6e2185..d1e1ae77b97 100644 --- a/gradle/enforcement/spotless-scalafmt.conf +++ b/gradle/enforcement/spotless-scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.1 +version = 3.8.6 runner.dialect = scala213 align.preset = more maxColumn = 100 diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle index fcb2624d533..8b2c95bdd21 100644 --- a/gradle/spotless.gradle +++ b/gradle/spotless.gradle @@ -66,7 +66,7 @@ spotless { scala { toggleOffOn() targetExclude(buildDirectoryFiles) - scalafmt('3.8.1').configFile(configPath + '/enforcement/spotless-scalafmt.conf') + scalafmt('3.8.6').configFile(configPath + '/enforcement/spotless-scalafmt.conf') } } From bab3b3c18a76e046ece9fc6a401632f903c6bc82 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 31 Oct 2025 11:34:25 -0400 Subject: [PATCH 07/10] Fixed module --- .../agent-logs-on-java-7/build.gradle | 5 +++++ .../gradle/gradle-daemon-jvm.properties | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 test-published-dependencies/gradle/gradle-daemon-jvm.properties diff --git a/test-published-dependencies/agent-logs-on-java-7/build.gradle b/test-published-dependencies/agent-logs-on-java-7/build.gradle index 0bc7530b989..d88f2185d9d 100644 --- a/test-published-dependencies/agent-logs-on-java-7/build.gradle +++ b/test-published-dependencies/agent-logs-on-java-7/build.gradle @@ -5,6 +5,11 @@ plugins { java { disableAutoTargetJvm() + + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } + sourceCompatibility = JavaVersion.VERSION_1_7 targetCompatibility = JavaVersion.VERSION_1_7 } diff --git a/test-published-dependencies/gradle/gradle-daemon-jvm.properties b/test-published-dependencies/gradle/gradle-daemon-jvm.properties new file mode 100644 index 00000000000..136e81ad0a0 --- /dev/null +++ b/test-published-dependencies/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,3 @@ +org.gradle.java.installations.auto-detect=false +org.gradle.java.installations.auto-download=false +toolchainVersion=21 From e788586a62deb2777c4e5dc07502904556b49559 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sat, 1 Nov 2025 16:16:59 -0400 Subject: [PATCH 08/10] klint tweaks --- gradle/spotless.gradle | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle index 8b2c95bdd21..4c8fba3dd62 100644 --- a/gradle/spotless.gradle +++ b/gradle/spotless.gradle @@ -44,9 +44,11 @@ spotless { toggleOffOn() // same as kotlin, but for .gradle.kts files (defaults to '*.gradle.kts') target '*.gradle.kts' - // ktfmt('0.40').kotlinlangStyle() // needs Java 11+ - // Newer versions do not work well with the older version of kotlin in this build - ktlint('1.7.1') + ktlint('1.7.1').editorConfigOverride([ + // Disable trailing comma rules to minimize diff. + 'ktlint_standard_trailing-comma-on-call-site': 'disabled', + 'ktlint_standard_trailing-comma-on-declaration-site': 'disabled' + ]) } project.pluginManager.withPlugin('groovy') { @@ -66,6 +68,7 @@ spotless { scala { toggleOffOn() targetExclude(buildDirectoryFiles) + // TODO: For some reason Scala format is not working for latest versions. scalafmt('3.8.6').configFile(configPath + '/enforcement/spotless-scalafmt.conf') } } @@ -88,10 +91,12 @@ spotless { project.pluginManager.withPlugin('kotlin') { kotlin { toggleOffOn() - // ktfmt('0.40').kotlinlangStyle() // needs Java 11+ targetExclude(buildDirectoryFiles) - // Newer versions do not work well with the older version of kotlin in this build - ktlint('1.7.1') + ktlint('1.7.1').editorConfigOverride([ + // Disable trailing comma rules to minimize diff. + 'ktlint_standard_trailing-comma-on-call-site': 'disabled', + 'ktlint_standard_trailing-comma-on-declaration-site': 'disabled' + ]) } } } From 3dc0c6428ef9abeaf382aa3f765eacddbd37c4a7 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 3 Nov 2025 08:10:27 -0500 Subject: [PATCH 09/10] Minor cleanup & merge with master --- .gitlab-ci.yml | 16 ++++++---------- .gitlab/collect_reports.sh | 1 - build.gradle.kts | 1 + gradle/spotless.gradle | 4 ++-- .../gradle/gradle-daemon-jvm.properties | 2 -- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49d0c9959a6..1ec8fbf13da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -357,19 +357,15 @@ spotless: extends: .gradle_build stage: tests needs: [] + variables: + # TODO: Latest version of spotless is failing with OOM on CI only. + # Setting 8G memory solving this issue, but we need to solve it eventually. + GRADLE_MEM: 8G + KUBERNETES_MEMORY_REQUEST: 18Gi + KUBERNETES_MEMORY_LIMIT: 18Gi script: - ./gradlew --version - ./gradlew spotlessCheck $GRADLE_ARGS - after_script: - - *cgroup_info - - source .gitlab/gitlab-utils.sh - - gitlab_section_start "collect-reports" "Collecting reports" - - .gitlab/collect_reports.sh - - gitlab_section_end "collect-reports" - artifacts: - when: always - paths: - - ./check_reports test_published_artifacts: extends: .gradle_build diff --git a/.gitlab/collect_reports.sh b/.gitlab/collect_reports.sh index 0115209056f..6b16d7da472 100755 --- a/.gitlab/collect_reports.sh +++ b/.gitlab/collect_reports.sh @@ -40,7 +40,6 @@ cp /tmp/java_pid*.hprof $REPORTS_DIR 2>/dev/null || true cp /tmp/javacore.* $REPORTS_DIR 2>/dev/null || true cp /tmp/*.trc $REPORTS_DIR 2>/dev/null || true cp /tmp/*.dmp $REPORTS_DIR 2>/dev/null || true -cp /tmp/*.hprof $REPORTS_DIR 2>/dev/null || true cp /tmp/dd-profiler/*.jfr $REPORTS_DIR 2>/dev/null || true function process_reports () { diff --git a/build.gradle.kts b/build.gradle.kts index 92d2633f0df..992d874966d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -50,6 +50,7 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) { ktlint("1.7.1") } scala { + // TODO: For some reason Scala format is working correctly with this version only. scalafmt("3.8.6") } } diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle index 4c8fba3dd62..2a6e7a51052 100644 --- a/gradle/spotless.gradle +++ b/gradle/spotless.gradle @@ -45,7 +45,7 @@ spotless { // same as kotlin, but for .gradle.kts files (defaults to '*.gradle.kts') target '*.gradle.kts' ktlint('1.7.1').editorConfigOverride([ - // Disable trailing comma rules to minimize diff. + // Disable trailing comma rules to minimize diff. 'ktlint_standard_trailing-comma-on-call-site': 'disabled', 'ktlint_standard_trailing-comma-on-declaration-site': 'disabled' ]) @@ -68,7 +68,7 @@ spotless { scala { toggleOffOn() targetExclude(buildDirectoryFiles) - // TODO: For some reason Scala format is not working for latest versions. + // TODO: For some reason Scala format is working correctly with this version only. scalafmt('3.8.6').configFile(configPath + '/enforcement/spotless-scalafmt.conf') } } diff --git a/test-published-dependencies/gradle/gradle-daemon-jvm.properties b/test-published-dependencies/gradle/gradle-daemon-jvm.properties index 136e81ad0a0..52234b5ce85 100644 --- a/test-published-dependencies/gradle/gradle-daemon-jvm.properties +++ b/test-published-dependencies/gradle/gradle-daemon-jvm.properties @@ -1,3 +1 @@ -org.gradle.java.installations.auto-detect=false -org.gradle.java.installations.auto-download=false toolchainVersion=21 From 4d23f9f92bc658c673a722fc48330194f34ea227 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 11 Nov 2025 19:38:20 -0500 Subject: [PATCH 10/10] Merged with master and minor changes --- build.gradle.kts | 2 +- buildSrc/call-site-instrumentation-plugin/build.gradle.kts | 3 +-- gradle/spotless.gradle | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 992d874966d..5420c0fcf11 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,7 +35,7 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) { removeUnusedImports() // This is the last Google Java Format version that supports Java 8 - googleJavaFormat("1.29.0") + googleJavaFormat("1.32.0") } groovyGradle { greclipse() diff --git a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts index 010d083cb70..783bddb8bc6 100644 --- a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts +++ b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts @@ -17,8 +17,7 @@ spotless { target("src/**/*.java") // ignore embedded test projects targetExclude("src/test/resources/**") - // This is the last Google Java Format version that supports Java 8 - googleJavaFormat("1.29.0") + googleJavaFormat("1.32.0") } } diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle index 2a6e7a51052..956218c4721 100644 --- a/gradle/spotless.gradle +++ b/gradle/spotless.gradle @@ -22,7 +22,7 @@ spotless { // ignore embedded test projects and everything in build dir, e.g. generated sources targetExclude('src/test/resources/**', buildDirectoryFiles) // This is the last Google Java Format version that supports Java 8 - googleJavaFormat('1.29.0') + googleJavaFormat('1.32.0') } }