Refactor to introduce Result class

Introducing Result class to replace just returning exitCode
In subsequent change, Result class will also provide the forwarded JSON telemetry information

Author: dougqh

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

@@ -11,33 +11,33 @@ class InitializationTelemetryTest extends Specification {
     // In this case, the SecurityManager blocks loading of the Premain Class,
     // so the JVM is expected to terminate with an error
     expect:
-    InitializationTelemetryCheck.runTestJvm(InitializationTelemetryCheck.BlockAgentLoading) != 0
+    InitializationTelemetryCheck.runTestJvm(InitializationTelemetryCheck.BlockAgentLoading).exitCode != 0
   }
 
   def "normal start-up"() {
     expect:
-    InitializationTelemetryCheck.runTestJvm(null) == 0
+    InitializationTelemetryCheck.runTestJvm(null).exitCode == 0
   }
 
   def "incomplete agent start-up"() {
     // In this case, the SecurityManager blocks a custom permission that is checked by bytebuddy causing
     // agent initialization to fail.  However, we should catch the exception allowing the application
     // to run normally.
     expect:
-    InitializationTelemetryCheck.runTestJvm(InitializationTelemetryCheck.BlockByteBuddy) == 0
+    InitializationTelemetryCheck.runTestJvm(InitializationTelemetryCheck.BlockByteBuddy).exitCode == 0
   }
 
   def "block forwarder env var"() {
     // In this case, the SecurityManager blocks access to the forwarder environment variable,
     // so the tracer is unable to report initialization telemetry
     expect:
-    InitializationTelemetryCheck.runTestJvm(InitializationTelemetryCheck.BlockForwarderEnvVar, true) == 0
+    InitializationTelemetryCheck.runTestJvm(InitializationTelemetryCheck.BlockForwarderEnvVar, true).exitCode == 0
   }
 
   def "block forwarder execution"() {
     // In this case, the SecurityManager blocks access to process execution, so the tracer is
     // unable to invoke the forwarder executable
     expect:
-    InitializationTelemetryCheck.runTestJvm(InitializationTelemetryCheck.BlockForwarderExecution, true) == 0
+    InitializationTelemetryCheck.runTestJvm(InitializationTelemetryCheck.BlockForwarderExecution, true).exitCode == 0
   }
 }

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

@@ -61,24 +61,26 @@ protected boolean checkFileExecutePermission(FilePermission perm, Object ctx, St
     }
   }
 
-  public static final int runTestJvm(Class<? extends TestSecurityManager> securityManagerClass)
+  public static final Result runTestJvm(Class<? extends TestSecurityManager> securityManagerClass)
       throws Exception {
     return runTestJvm(securityManagerClass, false);
   }
 
-  public static final int runTestJvm(
+  public static final Result runTestJvm(
       Class<? extends TestSecurityManager> securityManagerClass, boolean printStreams)
       throws Exception {
     File jarFile =
         IntegrationTestUtils.createJarFileWithClasses(requiredClasses(securityManagerClass));
     try {
-      return IntegrationTestUtils.runOnSeparateJvm(
+      int exitCode = IntegrationTestUtils.runOnSeparateJvm(
           InitializationTelemetryCheck.class.getName(),
           InitializationTelemetryCheck.jvmArgs(securityManagerClass),
           InitializationTelemetryCheck.mainArgs(),
           InitializationTelemetryCheck.envVars(),
           jarFile,
           printStreams);
+      
+      return new Result(exitCode);
     } finally {
       jarFile.delete();
     }
@@ -88,10 +90,13 @@ public static final Class<?>[] requiredClasses(
       Class<? extends TestSecurityManager> securityManagerClass) {
 
     if (securityManagerClass == null) {
-      return new Class<?>[] {InitializationTelemetryCheck.class};
+      return new Class<?>[] {
+    	InitializationTelemetryCheck.class,
+    	InitializationTelemetryCheck.Result.class};
     } else {
       return new Class<?>[] {
         InitializationTelemetryCheck.class,
+        InitializationTelemetryCheck.Result.class,
         securityManagerClass,
         TestSecurityManager.class,
         CustomSecurityManager.class
@@ -116,4 +121,12 @@ public static final Map<String, String> envVars() {
     envVars.put("DD_TELEMETRY_FORWARDER_PATH", "/dummy/path");
     return envVars;
   }
+  
+  public static final class Result {
+	public final int exitCode;
+	
+	public Result(int exitCode) {
+	  this.exitCode = exitCode;
+	}
+  }
 }