Bump spotless to latest version 8.1.0 (#9881)

Author: AlexeyKuznetsov-DD

.gitlab-ci.yml

@@ -364,6 +364,12 @@ 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

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
   id("dd-trace-java.config-inversion-linter")
   id("dd-trace-java.ci-jobs")
 
-  id("com.diffplug.spotless") version "6.13.0"
+  id("com.diffplug.spotless") version "8.1.0"
   id("com.github.spotbugs") version "6.4.7"
   id("de.thetaphi.forbiddenapis") version "3.10"
   id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
@@ -36,7 +36,7 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) {
     removeUnusedImports()
 
     // This is the last Google Java Format version that supports Java 8
-    googleJavaFormat("1.7")
+    googleJavaFormat("1.32.0")
   }
   groovyGradle {
     greclipse()
@@ -45,13 +45,14 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) {
     greclipse()
   }
   kotlinGradle {
-    ktlint("0.41.0")
+    ktlint("1.8.0")
   }
   kotlin {
-    ktlint("0.41.0")
+    ktlint("1.8.0")
   }
   scala {
-    scalafmt("2.7.5")
+    // TODO: For some reason Scala format is working correctly with this version only.
+    scalafmt("3.8.6")
   }
 }
 apply(from = rootDir.resolve("gradle/spotless.gradle"))
@@ -145,7 +146,8 @@ testAggregate("instrumentation", listOf(":dd-java-agent:instrumentation"), empty
 testAggregate("profiling", listOf(":dd-java-agent:agent-profiling"), emptyList())
 testAggregate("debugger", listOf(":dd-java-agent:agent-debugger"), forceCoverage = true)
 testAggregate(
-  "base", listOf(":"),
+  "base",
+  listOf(":"),
   listOf(
     ":dd-java-agent:instrumentation",
     ":dd-smoke-tests",

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.1.0"
 }
 
 java {

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.1.0"
   id("com.gradleup.shadow") version "8.3.6"
 }
 
@@ -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.7")
+    googleJavaFormat("1.32.0")
   }
 }
 

components/context/src/main/java/datadog/context/ContextKey.java

@@ -10,8 +10,10 @@
  */
 public final class ContextKey<T> {
   private static final AtomicInteger NEXT_INDEX = new AtomicInteger(0);
+
   /** The key name, for debugging purpose only. */
   private final String name;
+
   /** The key unique context, related to {@link IndexedContext} implementation. */
   final int index;
 

components/context/src/main/java/datadog/context/propagation/Concern.java

@@ -8,8 +8,10 @@
 public class Concern {
   /** The concern default priority. */
   public static final int DEFAULT_PRIORITY = 100;
+
   /** The concern name, for debugging purpose only. */
   private final String name;
+
   /** The concern priority, lower value means higher priority. */
   private final int priority;
 

dd-java-agent/agent-bootstrap/build.gradle

@@ -73,5 +73,4 @@ tasks.withType(Test).configureEach {
     JavaVersion.VERSION_16,
     ['--add-opens', 'java.base/java.net=ALL-UNNAMED'] // for HostNameResolverForkedTest
     )
-
 }

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

@@ -1500,7 +1500,9 @@ private static boolean isDebugMode() {
     return false;
   }
 
-  /** @return {@code true} if the agent feature is enabled */
+  /**
+   * @return {@code true} if the agent feature is enabled
+   */
   private static boolean isFeatureEnabled(AgentFeature feature) {
     // must be kept in sync with logic from Config!
     final String featureConfigKey = feature.getConfigKey();
@@ -1530,7 +1532,9 @@ private static boolean isFeatureEnabled(AgentFeature feature) {
     }
   }
 
-  /** @see datadog.trace.api.ProductActivation#fromString(String) */
+  /**
+   * @see datadog.trace.api.ProductActivation#fromString(String)
+   */
   private static boolean isFullyDisabled(final AgentFeature feature) {
     // must be kept in sync with logic from Config!
     final String featureConfigKey = feature.getConfigKey();
@@ -1568,7 +1572,9 @@ private static String getNullIfEmpty(final String value) {
     return value;
   }
 
-  /** @return configured JMX start delay in seconds */
+  /**
+   * @return configured JMX start delay in seconds
+   */
   private static int getJmxStartDelay() {
     String startDelay = ddGetProperty("dd.dogstatsd.start-delay");
     if (startDelay == null) {

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InitializationTelemetry.java

@@ -97,7 +97,9 @@ static final class BootstrapProxy extends InitializationTelemetry {
     // DQH - Decided not to eager access MethodHandles, since exceptions are uncommon
     // However, MethodHandles are cached on lookup
 
-    /** @param bootstrapInitTelemetry - non-null BootstrapInitializationTelemetry */
+    /**
+     * @param bootstrapInitTelemetry - non-null BootstrapInitializationTelemetry
+     */
     BootstrapProxy(final Object bootstrapInitTelemetry) {
       this.bootstrapInitTelemetry = bootstrapInitTelemetry;
     }

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstanceStore.java

@@ -19,7 +19,9 @@ public final class InstanceStore<T> {
   private static final ClassValue<InstanceStore> classInstanceStore =
       GenericClassValue.of(type -> new InstanceStore<>());
 
-  /** @return global store of instances with the same common type */
+  /**
+   * @return global store of instances with the same common type
+   */
   @SuppressWarnings("unchecked")
   public static <T> InstanceStore<T> of(Class<T> type) {
     return classInstanceStore.get(type);