style: spotless and codenarc

Author: daniel-mohedano

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityServices.java

@@ -14,6 +14,7 @@
 import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector;
 import datadog.trace.api.civisibility.telemetry.tag.Command;
 import datadog.trace.api.git.GitInfoProvider;
+import datadog.trace.api.intake.Intake;
 import datadog.trace.civisibility.ci.CIProviderInfoFactory;
 import datadog.trace.civisibility.ci.env.CiEnvironment;
 import datadog.trace.civisibility.ci.env.CiEnvironmentImpl;
@@ -34,7 +35,6 @@
 import datadog.trace.civisibility.source.LinesResolver;
 import datadog.trace.civisibility.source.index.*;
 import datadog.trace.civisibility.utils.ShellCommandExecutor;
-import datadog.trace.api.intake.Intake;
 import java.io.File;
 import java.lang.reflect.Type;
 import java.net.InetSocketAddress;
@@ -84,8 +84,7 @@ public class CiVisibilityServices {
     this.processHierarchy = new ProcessHierarchy();
     this.config = config;
     this.metricCollector = metricCollector;
-    this.backendApi =
-        new BackendApiFactory(config, sco).createBackendApi(Intake.API);
+    this.backendApi = new BackendApiFactory(config, sco).createBackendApi(Intake.API);
     this.jvmInfoFactory = new CachingJvmInfoFactory(config, new JvmInfoFactoryImpl());
     this.gitClientFactory = buildGitClientFactory(config, metricCollector);
 

dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsWriterImpl.java

@@ -5,9 +5,9 @@
 import datadog.communication.BackendApi;
 import datadog.communication.BackendApiFactory;
 import datadog.trace.api.Config;
+import datadog.trace.api.intake.Intake;
 import datadog.trace.api.logging.intake.LogsWriter;
 import datadog.trace.util.AgentThreadFactory;
-import datadog.trace.api.intake.Intake;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

dd-smoke-tests/junit-console/src/test/groovy/datadog/smoketest/JUnitConsoleSmokeTest.groovy

@@ -21,7 +21,8 @@ import spock.lang.TempDir
 import spock.util.environment.Jvm
 
 class JUnitConsoleSmokeTest extends CiVisibilitySmokeTest {
-
+  // CodeNarc incorrectly thinks ".class" is unnecessary in getLogger
+  @SuppressWarnings('UnnecessaryDotClass')
   private static final Logger LOGGER = LoggerFactory.getLogger(JUnitConsoleSmokeTest.class)
 
   private static final String TEST_SERVICE_NAME = "test-headless-service"
@@ -53,8 +54,10 @@ class JUnitConsoleSmokeTest extends CiVisibilitySmokeTest {
 
     def exitCode = whenRunningJUnitConsole([
       "${Strings.propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_COUNT)}=2" as String,
-      "${Strings.propertyNameToSystemPropertyName(GeneralConfig.AGENTLESS_LOG_SUBMISSION_URL)}=${mockBackend.intakeUrl}" as String],
-      [:])
+      "${Strings.propertyNameToSystemPropertyName(GeneralConfig.AGENTLESS_LOG_SUBMISSION_URL)}=${mockBackend.intakeUrl}" as String
+    ],
+    [:])
+    assert exitCode == 1
 
     def additionalDynamicTags = ["content.meta.['_dd.debug.error.6.snapshot_id']", "content.meta.['_dd.debug.error.exception_id']"]
     verifyEventsAndCoverages(projectName, "junit-console", "headless", mockBackend.waitForEvents(5), mockBackend.waitForCoverages(0), additionalDynamicTags)
@@ -73,20 +76,20 @@ class JUnitConsoleSmokeTest extends CiVisibilitySmokeTest {
 
   private void copyFolder(Path src, Path dest) throws IOException {
     Files.walkFileTree(src, new SimpleFileVisitor<Path>() {
-      @Override
-      FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
+        @Override
+        FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
         throws IOException {
-        Files.createDirectories(dest.resolve(src.relativize(dir)))
-        return FileVisitResult.CONTINUE
-      }
+          Files.createDirectories(dest.resolve(src.relativize(dir)))
+          return FileVisitResult.CONTINUE
+        }
 
-      @Override
-      FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+        @Override
+        FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
         throws IOException {
-        Files.copy(file, dest.resolve(src.relativize(file)))
-        return FileVisitResult.CONTINUE
-      }
-    })
+          Files.copy(file, dest.resolve(src.relativize(file)))
+          return FileVisitResult.CONTINUE
+        }
+      })
 
     // creating empty .git directory so that the tracer could detect projectFolder as repo root
     Files.createDirectory(projectHome.resolve(".git"))
@@ -153,14 +156,14 @@ class JUnitConsoleSmokeTest extends CiVisibilitySmokeTest {
 
     List<String> javaFiles = []
     Files.walkFileTree(directory, new SimpleFileVisitor<Path>() {
-      @Override
-      FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-        if (file.toString().endsWith(".java")) {
-          javaFiles.add(file.toString())
+        @Override
+        FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+          if (file.toString().endsWith(".java")) {
+            javaFiles.add(file.toString())
+          }
+          return FileVisitResult.CONTINUE
         }
-        return FileVisitResult.CONTINUE
-      }
-    })
+      })
 
     return javaFiles
   }
@@ -173,15 +176,15 @@ class JUnitConsoleSmokeTest extends CiVisibilitySmokeTest {
     return runProcess(processBuilder.start())
   }
 
-  private static runProcess(Process p, int timeout_secs = PROCESS_TIMEOUT_SECS) {
+  private static runProcess(Process p, int timeoutSecs = PROCESS_TIMEOUT_SECS) {
     StreamConsumer errorGobbler = new StreamConsumer(p.getErrorStream(), "ERROR")
     StreamConsumer outputGobbler = new StreamConsumer(p.getInputStream(), "OUTPUT")
     outputGobbler.start()
     errorGobbler.start()
 
-    if (!p.waitFor(timeout_secs, TimeUnit.SECONDS)) {
+    if (!p.waitFor(timeoutSecs , TimeUnit.SECONDS)) {
       p.destroyForcibly()
-      throw new TimeoutException("Instrumented process failed to exit within $timeout_secs seconds")
+      throw new TimeoutException("Instrumented process failed to exit within $timeoutSecs  seconds")
     }
 
     return p.exitValue()
@@ -194,7 +197,10 @@ class JUnitConsoleSmokeTest extends CiVisibilitySmokeTest {
     command.add(javaPath())
     command.addAll((String[]) ["-jar", JUNIT_CONSOLE_JAR_PATH])
     command.addAll(consoleCommand)
-    command.addAll(["--class-path", [projectHome.resolve("target/classes").toString(), projectHome.resolve("target/test-classes")].join(":")])
+    command.addAll([
+      "--class-path",
+      [projectHome.resolve("target/classes").toString(), projectHome.resolve("target/test-classes")].join(":")
+    ])
     command.add("--scan-class-path")
 
     ProcessBuilder processBuilder = new ProcessBuilder(command)
@@ -255,9 +261,8 @@ class JUnitConsoleSmokeTest extends CiVisibilitySmokeTest {
   private static String buildJavaHome() {
     if (Jvm.current.isJava8()) {
       return System.getenv("JAVA_8_HOME")
-    } else {
-      return System.getenv("JAVA_" + Jvm.current.getJavaSpecificationVersion() + "_HOME")
     }
+    return System.getenv("JAVA_" + Jvm.current.getJavaSpecificationVersion() + "_HOME")
   }
 
   private static class StreamConsumer extends Thread {

dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy

@@ -242,9 +242,10 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
 
     def exitCode = whenRunningMavenBuild([
       "${Strings.propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_COUNT)}=2" as String,
-      "${Strings.propertyNameToSystemPropertyName(GeneralConfig.AGENTLESS_LOG_SUBMISSION_URL)}=${mockBackend.intakeUrl}" as String],
-      [],
-      [:])
+      "${Strings.propertyNameToSystemPropertyName(GeneralConfig.AGENTLESS_LOG_SUBMISSION_URL)}=${mockBackend.intakeUrl}" as String
+    ],
+    [],
+    [:])
     assert exitCode == 1
 
     def additionalDynamicTags = ["content.meta.['_dd.debug.error.3.snapshot_id']", "content.meta.['_dd.debug.error.exception_id']"]
@@ -493,10 +494,10 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
   private static String getLatestMavenSurefireVersion() {
     OkHttpClient client = new OkHttpClient()
     Request request =
-      new Request.Builder()
-        .url(
-          "https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/maven-metadata.xml")
-        .build()
+    new Request.Builder()
+    .url(
+    "https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/maven-metadata.xml")
+    .build()
     try (Response response = client.newCall(request).execute()) {
       if (response.isSuccessful()) {
         DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance()
@@ -514,10 +515,10 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
         }
       } else {
         LOGGER.warn(
-          "Could not get latest Maven Surefire version, response from repo.maven.apache.org is "
-            + response.code()
-            + ":"
-            + response.body().string())
+        "Could not get latest Maven Surefire version, response from repo.maven.apache.org is "
+        + response.code()
+        + ":"
+        + response.body().string())
       }
     } catch (Exception e) {
       LOGGER.warn("Could not get latest Maven Surefire version", e)

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -3717,16 +3717,12 @@ public boolean isCiVisibilityCodeCoverageEnabled() {
     return ciVisibilityCodeCoverageEnabled;
   }
 
-  /**
-   * @return {@code true} if code coverage line-granularity is explicitly enabled
-   */
+  /** @return {@code true} if code coverage line-granularity is explicitly enabled */
   public boolean isCiVisibilityCoverageLinesEnabled() {
     return ciVisibilityCoverageLinesEnabled != null && ciVisibilityCoverageLinesEnabled;
   }
 
-  /**
-   * @return {@code true} if code coverage line-granularity is explicitly disabled
-   */
+  /** @return {@code true} if code coverage line-granularity is explicitly disabled */
   public boolean isCiVisibilityCoverageLinesDisabled() {
     return ciVisibilityCoverageLinesEnabled != null && !ciVisibilityCoverageLinesEnabled;
   }
@@ -4453,9 +4449,7 @@ public int getStackTraceLengthLimit() {
     return stackTraceLengthLimit;
   }
 
-  /**
-   * @return A map of tags to be applied only to the local application root span.
-   */
+  /** @return A map of tags to be applied only to the local application root span. */
   public TagMap getLocalRootSpanTags() {
     final Map<String, String> runtimeTags = getRuntimeTags();