spotless appllied to test on CI

Author: AlexeyKuznetsov-DD

build.gradle.kts

@@ -61,13 +61,15 @@ allprojects {
   group = "com.datadoghq"
 
   if (isCI.isPresent) {
-    layout.buildDirectory = providers.provider {
-      val newProjectCIPath = projectDir.path.replace(
-        rootDir.path,
-        ""
-      )
-      rootDir.resolve("workspace/$newProjectCIPath/build/")
-    }
+    layout.buildDirectory =
+      providers.provider {
+        val newProjectCIPath =
+          projectDir.path.replace(
+            rootDir.path,
+            "",
+          )
+        rootDir.resolve("workspace/$newProjectCIPath/build/")
+      }
   }
 
   apply(from = rootDir.resolve("gradle/dependencies.gradle"))
@@ -84,7 +86,7 @@ allprojects {
       jvmArgs(
         "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
         "-XX:+HeapDumpOnOutOfMemoryError",
-        "-XX:HeapDumpPath=/tmp"
+        "-XX:HeapDumpPath=/tmp",
       )
     }
   }
@@ -123,15 +125,24 @@ nexusPublishing {
   }
 }
 
-val writeMainVersionFileTask = tasks.register("writeMainVersionFile") {
-  val versionFile = rootProject.layout.buildDirectory.file("main.version")
-  inputs.property("version", project.version)
-  outputs.file(versionFile)
-  doFirst {
-    require(versionFile.get().asFile.parentFile.mkdirs() || versionFile.get().asFile.parentFile.isDirectory)
-    versionFile.get().asFile.writeText(project.version.toString())
+val writeMainVersionFileTask =
+  tasks.register("writeMainVersionFile") {
+    val versionFile = rootProject.layout.buildDirectory.file("main.version")
+    inputs.property("version", project.version)
+    outputs.file(versionFile)
+    doFirst {
+      require(
+        versionFile
+          .get()
+          .asFile.parentFile
+          .mkdirs() ||
+          versionFile
+            .get()
+            .asFile.parentFile.isDirectory,
+      )
+      versionFile.get().asFile.writeText(project.version.toString())
+    }
   }
-}
 
 allprojects {
   tasks.withType<PublishToMavenLocal>().configureEach {
@@ -144,11 +155,12 @@ 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",
     ":dd-java-agent:agent-profiling",
-    ":dd-java-agent:agent-debugger"
-  )
+    ":dd-java-agent:agent-debugger",
+  ),
 )

communication/build.gradle.kts

@@ -29,7 +29,10 @@ dependencies {
   testImplementation(
     group = "com.squareup.okhttp3",
     name = "mockwebserver",
-    version = libs.versions.okhttp.legacy.get() // actually a version range
+    version =
+      libs.versions.okhttp.legacy
+        .get(),
+    // actually a version range
   )
 }
 
@@ -57,15 +60,15 @@ val excludedClassesCoverage by extra(
     "datadog.communication.IntakeApi",
     "datadog.communication.util.IOUtils",
     "datadog.communication.util.IOUtils.1",
-  )
+  ),
 )
 val excludedClassesBranchCoverage by extra(
   listOf(
     "datadog.communication.ddagent.TracerVersion",
     "datadog.communication.BackendApiFactory",
     "datadog.communication.EvpProxyApi",
     "datadog.communication.IntakeApi",
-  )
+  ),
 )
 val excludedClassesInstructionCoverage by extra(
   listOf(
@@ -79,5 +82,5 @@ val excludedClassesInstructionCoverage by extra(
     "datadog.communication.IntakeApi",
     "datadog.communication.util.IOUtils",
     "datadog.communication.util.IOUtils.1",
-  )
+  ),
 )

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

@@ -75,5 +75,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

@@ -1468,7 +1468,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();
@@ -1498,7 +1500,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();
@@ -1536,7 +1540,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);

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/Java8BytecodeBridge.java

@@ -10,27 +10,37 @@
  * were not supported prior to Java 8 and will lead to a class verification error.
  */
 public class Java8BytecodeBridge {
-  /** @see Context#root() */
+  /**
+   * @see Context#root()
+   */
   public static Context getRootContext() {
     return Context.root();
   }
 
-  /** @see Context#current() */
+  /**
+   * @see Context#current()
+   */
   public static Context getCurrentContext() {
     return Context.current();
   }
 
-  /** @see Context#from(Object) */
+  /**
+   * @see Context#from(Object)
+   */
   public static Context getContextFrom(Object carrier) {
     return Context.from(carrier);
   }
 
-  /** @see Context#detachFrom(Object) */
+  /**
+   * @see Context#detachFrom(Object)
+   */
   public static Context detachContextFrom(Object carrier) {
     return Context.detachFrom(carrier);
   }
 
-  /** @see AgentSpan#fromContext(Context) */
+  /**
+   * @see AgentSpan#fromContext(Context)
+   */
   public static AgentSpan spanFromContext(Context context) {
     return AgentSpan.fromContext(context);
   }

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextPropagator.java

@@ -62,7 +62,9 @@ private boolean checkIfContextCanBePassed(
     return result;
   }
 
-  /** @return {@code true} when no error happened during call */
+  /**
+   * @return {@code true} when no error happened during call
+   */
   private boolean syntheticCall(
       final Connection c, final ContextPayload payload, final int operationId) {
     final StreamRemoteCall shareContextCall = new StreamRemoteCall(c);