Collect only the bare essentials in the GATKRunReport
Now looks like: <GATK-run-report> <id>D7D31ULwTSxlAwnEOSmW6Z4PawXwMxEz</id> <start-time>2012/03/10 20.21.19</start-time> <end-time>2012/03/10 20.21.19</end-time> <run-time>0</run-time> <walker-name>CountReads</walker-name> <svn-version>1.4-483-g63ecdb2</svn-version> <total-memory>85000192</total-memory> <max-memory>129957888</max-memory> <user-name>depristo</user-name> <host-name>10.0.1.10</host-name> <java>Apple Inc.-1.6.0_26</java> <machine>Mac OS X-x86_64</machine> <iterations>105</iterations> </GATK-run-report> No longer capturing command line or directory information, to minimize people's concerns with phone home and privacy
This commit is contained in:
parent
bd883031a4
commit
1ee46e5c06
|
|
@ -90,19 +90,12 @@ public class GATKRunReport {
|
||||||
protected static Logger logger = Logger.getLogger(GATKRunReport.class);
|
protected static Logger logger = Logger.getLogger(GATKRunReport.class);
|
||||||
|
|
||||||
|
|
||||||
// the listing of the fields is somewhat important; this is the order that the simple XML will output them
|
|
||||||
@ElementList(required = true, name = "gatk_header_Information")
|
|
||||||
private List<String> mGATKHeader;
|
|
||||||
|
|
||||||
@Element(required = false, name = "id")
|
@Element(required = false, name = "id")
|
||||||
private final String id;
|
private final String id;
|
||||||
|
|
||||||
@Element(required = false, name = "exception")
|
@Element(required = false, name = "exception")
|
||||||
private final ExceptionToXML mException;
|
private final ExceptionToXML mException;
|
||||||
|
|
||||||
@Element(required = true, name = "working_directory")
|
|
||||||
private String currentPath;
|
|
||||||
|
|
||||||
@Element(required = true, name = "start_time")
|
@Element(required = true, name = "start_time")
|
||||||
private String startTime = "ND";
|
private String startTime = "ND";
|
||||||
|
|
||||||
|
|
@ -112,9 +105,6 @@ public class GATKRunReport {
|
||||||
@Element(required = true, name = "run_time")
|
@Element(required = true, name = "run_time")
|
||||||
private long runTime = 0;
|
private long runTime = 0;
|
||||||
|
|
||||||
@Element(required = true, name = "command_line")
|
|
||||||
private String cmdLine = "COULD NOT BE DETERMINED";
|
|
||||||
|
|
||||||
@Element(required = true, name = "walker_name")
|
@Element(required = true, name = "walker_name")
|
||||||
private String walkerName;
|
private String walkerName;
|
||||||
|
|
||||||
|
|
@ -127,9 +117,6 @@ public class GATKRunReport {
|
||||||
@Element(required = true, name = "max_memory")
|
@Element(required = true, name = "max_memory")
|
||||||
private long maxMemory;
|
private long maxMemory;
|
||||||
|
|
||||||
@Element(required = true, name = "java_tmp_directory")
|
|
||||||
private String tmpDir;
|
|
||||||
|
|
||||||
@Element(required = true, name = "user_name")
|
@Element(required = true, name = "user_name")
|
||||||
private String userName;
|
private String userName;
|
||||||
|
|
||||||
|
|
@ -145,9 +132,6 @@ public class GATKRunReport {
|
||||||
@Element(required = true, name = "iterations")
|
@Element(required = true, name = "iterations")
|
||||||
private long nIterations;
|
private long nIterations;
|
||||||
|
|
||||||
@Element(required = true, name = "reads")
|
|
||||||
private long nReads;
|
|
||||||
|
|
||||||
public enum PhoneHomeOption {
|
public enum PhoneHomeOption {
|
||||||
/** Disable phone home */
|
/** Disable phone home */
|
||||||
NO_ET,
|
NO_ET,
|
||||||
|
|
@ -172,15 +156,8 @@ public class GATKRunReport {
|
||||||
|
|
||||||
logger.debug("Aggregating data for run report");
|
logger.debug("Aggregating data for run report");
|
||||||
|
|
||||||
mGATKHeader = CommandLineGATK.createApplicationHeader();
|
|
||||||
currentPath = System.getProperty("user.dir");
|
|
||||||
|
|
||||||
// what did we run?
|
// what did we run?
|
||||||
id = org.apache.commons.lang.RandomStringUtils.randomAlphanumeric(32);
|
id = org.apache.commons.lang.RandomStringUtils.randomAlphanumeric(32);
|
||||||
try {
|
|
||||||
cmdLine = engine.createApproximateCommandLineArgumentString(engine, walker);
|
|
||||||
} catch (Exception ignore) { }
|
|
||||||
|
|
||||||
walkerName = engine.getWalkerName(walker.getClass());
|
walkerName = engine.getWalkerName(walker.getClass());
|
||||||
svnVersion = CommandLineGATK.getVersionNumber();
|
svnVersion = CommandLineGATK.getVersionNumber();
|
||||||
|
|
||||||
|
|
@ -191,7 +168,6 @@ public class GATKRunReport {
|
||||||
startTime = dateFormat.format(engine.getStartTime());
|
startTime = dateFormat.format(engine.getStartTime());
|
||||||
runTime = (end.getTime() - engine.getStartTime().getTime()) / 1000L; // difference in seconds
|
runTime = (end.getTime() - engine.getStartTime().getTime()) / 1000L; // difference in seconds
|
||||||
}
|
}
|
||||||
tmpDir = System.getProperty("java.io.tmpdir");
|
|
||||||
|
|
||||||
// deal with memory usage
|
// deal with memory usage
|
||||||
Runtime.getRuntime().gc(); // call GC so totalMemory is ~ used memory
|
Runtime.getRuntime().gc(); // call GC so totalMemory is ~ used memory
|
||||||
|
|
@ -202,12 +178,11 @@ public class GATKRunReport {
|
||||||
if ( engine.getCumulativeMetrics() != null ) {
|
if ( engine.getCumulativeMetrics() != null ) {
|
||||||
// it's possible we aborted so early that these data structures arent initialized
|
// it's possible we aborted so early that these data structures arent initialized
|
||||||
nIterations = engine.getCumulativeMetrics().getNumIterations();
|
nIterations = engine.getCumulativeMetrics().getNumIterations();
|
||||||
nReads = engine.getCumulativeMetrics().getNumReadsSeen();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// user and hostname -- information about the runner of the GATK
|
// user and hostname -- information about the runner of the GATK
|
||||||
userName = System.getProperty("user.name");
|
userName = System.getProperty("user.name");
|
||||||
hostName = "unknown"; // resolveHostname();
|
hostName = Utils.resolveHostname();
|
||||||
|
|
||||||
// basic java information
|
// basic java information
|
||||||
java = Utils.join("-", Arrays.asList(System.getProperty("java.vendor"), System.getProperty("java.version")));
|
java = Utils.join("-", Arrays.asList(System.getProperty("java.vendor"), System.getProperty("java.version")));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue