spotless

Author: dougqh

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

@@ -205,10 +205,10 @@ public void send(JsonBuffer buffer) throws IOException {
       ProcessBuilder builder = new ProcessBuilder(forwarderPath);
 
       Process process = builder.start();
-      try ( OutputStream out = process.getOutputStream() ) {
-    	out.write(buffer.toByteArray());
+      try (OutputStream out = process.getOutputStream()) {
+        out.write(buffer.toByteArray());
       }
-      
+
       try {
         process.waitFor(1, TimeUnit.SECONDS);
       } catch (InterruptedException e) {

dd-java-agent/src/test/groovy/datadog/trace/agent/InitializationTelemetryTest.groovy

@@ -12,7 +12,7 @@ class InitializationTelemetryTest extends Specification {
     // so the JVM is expected to terminate with an error
     when:
     def result = InitializationTelemetryCheck.runTestJvm(InitializationTelemetryCheck.BlockAgentLoading)
-    
+
     then:
     result.exitCode != 0
     // JVM fails before premain, so no telemetry output
@@ -22,7 +22,7 @@ class InitializationTelemetryTest extends Specification {
   def "normal start-up"() {
     when:
     def result = InitializationTelemetryCheck.runTestJvm(null)
-    
+
     then:
     result.exitCode == 0
     result.telemetryJson.contains('library_entrypoint.complete')
@@ -34,7 +34,7 @@ class InitializationTelemetryTest extends Specification {
     // to run normally.
     when:
     def result = InitializationTelemetryCheck.runTestJvm(InitializationTelemetryCheck.BlockByteBuddy)
-    
+
     then:
     result.exitCode == 0
     !result.telemetryJson.contains('library_entrypoint.complete')
@@ -46,7 +46,7 @@ class InitializationTelemetryTest extends Specification {
     // so the tracer is unable to report initialization telemetry
     when:
     def result = InitializationTelemetryCheck.runTestJvm(InitializationTelemetryCheck.BlockForwarderEnvVar, true)
-    
+
     then:
     result.exitCode == 0
     // forwarder env var unreadable, so no telemetry output
@@ -58,7 +58,7 @@ class InitializationTelemetryTest extends Specification {
     // unable to invoke the forwarder executable
     when:
     def result = InitializationTelemetryCheck.runTestJvm(InitializationTelemetryCheck.BlockForwarderExecution, true)
-    
+
     then:
     result.exitCode == 0
     // forwarder execution is blocked, so no telemetry output

dd-java-agent/src/test/java/jvmbootstraptest/InitializationTelemetryCheck.java

@@ -1,5 +1,6 @@
 package jvmbootstraptest;
 
+import datadog.trace.agent.test.IntegrationTestUtils;
 import java.io.File;
 import java.io.FilePermission;
 import java.io.IOException;
@@ -13,8 +14,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import datadog.trace.agent.test.IntegrationTestUtils;
-
 /**
  * Basic sanity check that InitializationTelemetry is functioning
  *
@@ -78,64 +77,72 @@ public static final Result runTestJvm(Class<? extends TestSecurityManager> secur
   public static final Result runTestJvm(
       Class<? extends TestSecurityManager> securityManagerClass, boolean printStreams)
       throws Exception {
-    
-	File jarFile =
+
+    File jarFile =
         IntegrationTestUtils.createJarFileWithClasses(requiredClasses(securityManagerClass));
-    
-	File forwarderFile = createTempFile("forwarder", "sh", PosixFilePermissions.fromString("rwxr--r--"));
-	File outputFile = new File(forwarderFile.getAbsoluteFile() + ".out");
-	
-    write(forwarderFile,
-      "#!/usr/bin/env bash\n",
-      "echo \"$1	$(cat -)\" >> " + outputFile.getAbsolutePath() + "\n");
-    
+
+    File forwarderFile =
+        createTempFile("forwarder", "sh", PosixFilePermissions.fromString("rwxr--r--"));
+    File outputFile = new File(forwarderFile.getAbsoluteFile() + ".out");
+
+    write(
+        forwarderFile,
+        "#!/usr/bin/env bash\n",
+        "echo \"$1	$(cat -)\" >> " + outputFile.getAbsolutePath() + "\n");
+
     try {
-      int exitCode = IntegrationTestUtils.runOnSeparateJvm(
-          InitializationTelemetryCheck.class.getName(),
-          InitializationTelemetryCheck.jvmArgs(securityManagerClass),
-          InitializationTelemetryCheck.mainArgs(),
-          InitializationTelemetryCheck.envVars(forwarderFile),
-          jarFile,
-          printStreams);
-      
+      int exitCode =
+          IntegrationTestUtils.runOnSeparateJvm(
+              InitializationTelemetryCheck.class.getName(),
+              InitializationTelemetryCheck.jvmArgs(securityManagerClass),
+              InitializationTelemetryCheck.mainArgs(),
+              InitializationTelemetryCheck.envVars(forwarderFile),
+              jarFile,
+              printStreams);
+
       return new Result(exitCode, read(outputFile));
     } finally {
       delete(jarFile, forwarderFile, outputFile);
     }
   }
-  
-  static final File createTempFile(String baseName, String extension, Set<PosixFilePermission> perms) throws IOException {
-    Path path = Files.createTempFile(baseName + "-integration-telemetry-check", "." + extension, PosixFilePermissions.asFileAttribute(perms));
+
+  static final File createTempFile(
+      String baseName, String extension, Set<PosixFilePermission> perms) throws IOException {
+    Path path =
+        Files.createTempFile(
+            baseName + "-integration-telemetry-check",
+            "." + extension,
+            PosixFilePermissions.asFileAttribute(perms));
     File file = path.toFile();
     file.deleteOnExit();
     return file;
   }
-  
+
   static final void write(File file, String... lines) throws IOException {
-	Files.write(file.toPath(), Arrays.asList(lines));
+    Files.write(file.toPath(), Arrays.asList(lines));
   }
-  
+
   static final String read(File file) throws IOException {
-	try {
-	  return new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
-	} catch ( IOException e ) {
-	  return null;
-	}
+    try {
+      return new String(Files.readAllBytes(file.toPath()), StandardCharsets.UTF_8);
+    } catch (IOException e) {
+      return null;
+    }
   }
-  
+
   static final void delete(File... tempFiles) {
-	for ( File file: tempFiles ) {
-	  file.delete();
-	}
+    for (File file : tempFiles) {
+      file.delete();
+    }
   }
 
   public static final Class<?>[] requiredClasses(
       Class<? extends TestSecurityManager> securityManagerClass) {
 
     if (securityManagerClass == null) {
       return new Class<?>[] {
-    	InitializationTelemetryCheck.class,
-    	InitializationTelemetryCheck.Result.class};
+        InitializationTelemetryCheck.class, InitializationTelemetryCheck.Result.class
+      };
     } else {
       return new Class<?>[] {
         InitializationTelemetryCheck.class,
@@ -164,14 +171,14 @@ public static final Map<String, String> envVars(File forwarderFile) {
     envVars.put("DD_TELEMETRY_FORWARDER_PATH", forwarderFile.getAbsolutePath());
     return envVars;
   }
-  
+
   public static final class Result {
-	public final int exitCode;
-	public final String telemetryJson;
-	
-	public Result(int exitCode, String telemetryJson) {
-	  this.exitCode = exitCode;
-	  this.telemetryJson = telemetryJson;
-	}
+    public final int exitCode;
+    public final String telemetryJson;
+
+    public Result(int exitCode, String telemetryJson) {
+      this.exitCode = exitCode;
+      this.telemetryJson = telemetryJson;
+    }
   }
 }