Add ability to post task metadata to a task

SingularityBase/src/main/java/com/hubspot/singularity/MetadataLevel.java

@@ -0,0 +1,8 @@
+package com.hubspot.singularity;
+
+
+public enum MetadataLevel {
+
+    INFO, WARN, ERROR
+
+}

SingularityBase/src/main/java/com/hubspot/singularity/SingularityTaskHealthcheckResult.java

@@ -38,25 +38,26 @@ public int compareTo(SingularityTaskHealthcheckResult o) {
 
   @Override
   public int hashCode() {
-      return Objects.hashCode(statusCode, durationMillis, responseBody, errorMessage, timestamp);
+    return Objects.hashCode(getTaskId(), statusCode, durationMillis, responseBody, errorMessage, timestamp);
   }
 
   @Override
   public boolean equals(Object other) {
-      if (this == other) {
-          return true;
-      }
-      if (other == null || other.getClass() != this.getClass()) {
-          return false;
-      }
-
-      SingularityTaskHealthcheckResult that = (SingularityTaskHealthcheckResult) other;
-
-      return Objects.equal(this.statusCode, that.statusCode)
-              && Objects.equal(this.durationMillis, that.durationMillis)
-              && Objects.equal(this.responseBody, that.responseBody)
-              && Objects.equal(this.errorMessage, that.errorMessage)
-              && Objects.equal(this.timestamp, that.timestamp);
+    if (this == other) {
+        return true;
+    }
+    if (other == null || other.getClass() != this.getClass()) {
+        return false;
+    }
+
+    SingularityTaskHealthcheckResult that = (SingularityTaskHealthcheckResult) other;
+
+    return Objects.equal(this.statusCode, that.statusCode)
+            && Objects.equal(this.getTaskId(), that.getTaskId())
+            && Objects.equal(this.durationMillis, that.durationMillis)
+            && Objects.equal(this.responseBody, that.responseBody)
+            && Objects.equal(this.errorMessage, that.errorMessage)
+            && Objects.equal(this.timestamp, that.timestamp);
   }
 
   public Optional<Integer> getStatusCode() {
@@ -86,7 +87,8 @@ public boolean isFailed() {
 
   @Override
   public String toString() {
-    return "SingularityTaskHealthcheckResult [statusCode=" + statusCode + ", durationMillis=" + durationMillis + ", timestamp=" + timestamp + ", responseBody=" + responseBody + ", errorMessage=" + errorMessage + ", taskId=" + getTaskId() + "]";
+    return "SingularityTaskHealthcheckResult [statusCode=" + statusCode + ", durationMillis=" + durationMillis + ", timestamp=" + timestamp + ", responseBody="
+        + responseBody + ", errorMessage=" + errorMessage + ", taskId=" + getTaskId() + "]";
   }
 
 }

SingularityBase/src/main/java/com/hubspot/singularity/SingularityTaskHistory.java

@@ -3,8 +3,10 @@
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Optional;
+import com.hubspot.mesos.JavaUtils;
 
 public class SingularityTaskHistory {
 
@@ -14,16 +16,21 @@ public class SingularityTaskHistory {
   private final List<SingularityTaskHealthcheckResult> healthcheckResults;
   private final List<SingularityLoadBalancerUpdate> loadBalancerUpdates;
   private final List<SingularityTaskShellCommandHistory> shellCommandHistory;
+  private final List<SingularityTaskMetadata> taskMetadata;
 
   @JsonCreator
-  public SingularityTaskHistory(@JsonProperty("taskUpdates") List<SingularityTaskHistoryUpdate> taskUpdates, @JsonProperty("directory") Optional<String> directory, @JsonProperty("healthcheckResults") List<SingularityTaskHealthcheckResult> healthcheckResults,
-      @JsonProperty("task") SingularityTask task, @JsonProperty("loadBalancerUpdates") List<SingularityLoadBalancerUpdate> loadBalancerUpdates, @JsonProperty("shellCommandHistory") List<SingularityTaskShellCommandHistory> shellCommandHistory) {
-    this.taskUpdates = taskUpdates;
-    this.healthcheckResults = healthcheckResults;
+  public SingularityTaskHistory(@JsonProperty("taskUpdates") List<SingularityTaskHistoryUpdate> taskUpdates, @JsonProperty("directory") Optional<String> directory,
+      @JsonProperty("healthcheckResults") List<SingularityTaskHealthcheckResult> healthcheckResults, @JsonProperty("task") SingularityTask task,
+      @JsonProperty("loadBalancerUpdates") List<SingularityLoadBalancerUpdate> loadBalancerUpdates,
+      @JsonProperty("shellCommandHistory") List<SingularityTaskShellCommandHistory> shellCommandHistory,
+      @JsonProperty("taskMetadata") List<SingularityTaskMetadata> taskMetadata) {
     this.directory = directory;
     this.task = task;
-    this.loadBalancerUpdates = loadBalancerUpdates;
-    this.shellCommandHistory = shellCommandHistory;
+    this.taskUpdates = JavaUtils.nonNullImmutable(taskUpdates);
+    this.healthcheckResults = JavaUtils.nonNullImmutable(healthcheckResults);
+    this.loadBalancerUpdates = JavaUtils.nonNullImmutable(loadBalancerUpdates);
+    this.shellCommandHistory = JavaUtils.nonNullImmutable(shellCommandHistory);
+    this.taskMetadata = JavaUtils.nonNullImmutable(taskMetadata);
   }
 
   public List<SingularityTaskHistoryUpdate> getTaskUpdates() {
@@ -38,6 +45,10 @@ public SingularityTask getTask() {
     return task;
   }
 
+  public List<SingularityTaskMetadata> getTaskMetadata() {
+    return taskMetadata;
+  }
+
   public List<SingularityTaskHealthcheckResult> getHealthcheckResults() {
     return healthcheckResults;
   }
@@ -50,10 +61,15 @@ public List<SingularityTaskShellCommandHistory> getShellCommandHistory() {
     return shellCommandHistory;
   }
 
+  @JsonIgnore
+  public Optional<SingularityTaskHistoryUpdate> getLastTaskUpdate() {
+    return JavaUtils.getLast(getTaskUpdates());
+  }
+
   @Override
   public String toString() {
     return "SingularityTaskHistory [taskUpdates=" + taskUpdates + ", directory=" + directory + ", task=" + task + ", healthcheckResults=" + healthcheckResults + ", loadBalancerUpdates="
-        + loadBalancerUpdates + ", shellCommandHistory=" + shellCommandHistory + "]";
+        + loadBalancerUpdates + ", shellCommandHistory=" + shellCommandHistory + ", taskMetadata=" + taskMetadata + "]";
   }
 
 }

SingularityBase/src/main/java/com/hubspot/singularity/SingularityTaskMetadata.java

@@ -0,0 +1,96 @@
+package com.hubspot.singularity;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Objects;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ComparisonChain;
+
+public class SingularityTaskMetadata extends SingularityTaskIdHolder implements Comparable<SingularityTaskMetadata> {
+
+  private static final MetadataLevel DEFAULT_METADATA_LEVEL = MetadataLevel.INFO;
+  private final long timestamp;
+  private final String type;
+  private final String title;
+  private final MetadataLevel level;
+  private final Optional<String> message;
+  private final Optional<String> user;
+
+  @JsonCreator
+  public SingularityTaskMetadata(@JsonProperty("taskId") SingularityTaskId taskId, @JsonProperty("timestamp") long timestamp, @JsonProperty("type") String type, @JsonProperty("title") String title,
+      @JsonProperty("message") Optional<String> message, @JsonProperty("user") Optional<String> user, @JsonProperty("level") Optional<MetadataLevel> level) {
+    super(taskId);
+    Preconditions.checkNotNull(type);
+    Preconditions.checkState(!type.contains("/"));
+    this.timestamp = timestamp;
+    this.type = type;
+    this.title = title;
+    this.message = message;
+    this.user = user;
+    this.level = level.or(DEFAULT_METADATA_LEVEL);
+  }
+
+  public long getTimestamp() {
+    return timestamp;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public Optional<String> getMessage() {
+    return message;
+  }
+
+  public Optional<String> getUser() {
+    return user;
+  }
+
+  public MetadataLevel getLevel() { return level; }
+
+  @Override
+  public int compareTo(SingularityTaskMetadata o) {
+    return ComparisonChain.start()
+        .compare(timestamp, o.getTimestamp())
+        .compare(type, o.getType())
+        .compare(level, o.getLevel())
+        .compare(getTaskId().getId(), o.getTaskId().getId())
+        .result();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(user, type, title, message, timestamp, getTaskId());
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    if (this == other) {
+        return true;
+    }
+    if (other == null || other.getClass() != this.getClass()) {
+        return false;
+    }
+
+    SingularityTaskMetadata that = (SingularityTaskMetadata) other;
+
+    return Objects.equal(this.user, that.user)
+            && Objects.equal(this.type, that.type)
+            && Objects.equal(this.title, that.title)
+            && Objects.equal(this.message, that.message)
+            && Objects.equal(this.timestamp, that.timestamp)
+            && Objects.equal(this.getTaskId(), that.getTaskId())
+            && Objects.equal(this.level, that.level);
+  }
+
+  @Override
+  public String toString() {
+    return "SingularityTaskMetadata [timestamp=" + timestamp + ", type=" + type + ", title=" + title + ", message=" + message + ", user=" + user + ", taskId=" + getTaskId() + ", level=" + getLevel() + "]";
+  }
+
+}

SingularityBase/src/main/java/com/hubspot/singularity/SingularityTaskShellCommandHistory.java

@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.hubspot.mesos.JavaUtils;
 
 public class SingularityTaskShellCommandHistory {
 
@@ -14,7 +15,7 @@ public class SingularityTaskShellCommandHistory {
   public SingularityTaskShellCommandHistory(@JsonProperty("shellRequest") SingularityTaskShellCommandRequest shellRequest,
       @JsonProperty("shellUpdates") List<SingularityTaskShellCommandUpdate> shellUpdates) {
     this.shellRequest = shellRequest;
-    this.shellUpdates = shellUpdates;
+    this.shellUpdates = JavaUtils.nonNullImmutable(shellUpdates);
   }
 
   public SingularityTaskShellCommandRequest getShellRequest() {

SingularityBase/src/main/java/com/hubspot/singularity/api/SingularityTaskMetadataRequest.java

@@ -0,0 +1,45 @@
+package com.hubspot.singularity.api;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.hubspot.singularity.MetadataLevel;
+
+public class SingularityTaskMetadataRequest {
+
+  private final String type;
+  private final String title;
+  private final Optional<String> message;
+  private final Optional<MetadataLevel> level;
+
+  @JsonCreator
+  public SingularityTaskMetadataRequest(@JsonProperty("type") String type, @JsonProperty("title") String title, @JsonProperty("message") Optional<String> message, @JsonProperty("level") Optional<MetadataLevel> level) {
+    Preconditions.checkNotNull(type);
+    Preconditions.checkState(!type.contains("/"));
+    this.type = type;
+    this.title = title;
+    this.message = message;
+    this.level = level;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public Optional<String> getMessage() {
+    return message;
+  }
+
+  public Optional<MetadataLevel> getLevel() { return level; }
+
+  @Override
+  public String toString() {
+    return "SingularityTaskMetadataRequest [type=" + type + ", title=" + title + ", message=" + message + ", level=" + level + "]";
+  }
+
+}

SingularityService/src/main/java/com/hubspot/singularity/SingularityMainModule.java

@@ -47,6 +47,7 @@
 import com.hubspot.singularity.config.SMTPConfiguration;
 import com.hubspot.singularity.config.SentryConfiguration;
 import com.hubspot.singularity.config.SingularityConfiguration;
+import com.hubspot.singularity.config.SingularityTaskMetadataConfiguration;
 import com.hubspot.singularity.config.UIConfiguration;
 import com.hubspot.singularity.config.ZooKeeperConfiguration;
 import com.hubspot.singularity.guice.DropwizardMetricRegistryProvider;
@@ -213,6 +214,12 @@ public Optional<SentryConfiguration> sentryConfiguration(final SingularityConfig
     return config.getSentryConfiguration();
   }
 
+  @Provides
+  @Singleton
+  public SingularityTaskMetadataConfiguration taskMetadataConfiguration(SingularityConfiguration config) {
+    return config.getTaskMetadataConfiguration();
+  }
+
   @Provides
   @Singleton
   public Optional<S3Service> s3Service(Optional<S3Configuration> config) throws S3ServiceException {

SingularityService/src/main/java/com/hubspot/singularity/config/SingularityConfiguration.java

@@ -55,6 +55,8 @@ public class SingularityConfiguration extends Configuration {
 
   private long cleanupEverySeconds = 5;
 
+  private long checkQueuedMailsEveryMillis = TimeUnit.SECONDS.toMillis(15);
+
   private long closeWaitSeconds = 5;
 
   private String commonHostnameSuffixToOmit;
@@ -186,6 +188,10 @@ public class SingularityConfiguration extends Configuration {
   @Valid
   private SentryConfiguration sentryConfiguration;
 
+  @JsonProperty("taskMetadata")
+  @Valid
+  private SingularityTaskMetadataConfiguration taskMetadataConfiguration = new SingularityTaskMetadataConfiguration();
+
   @JsonProperty("smtp")
   @Valid
   private SMTPConfiguration smtpConfiguration;
@@ -228,7 +234,7 @@ public class SingularityConfiguration extends Configuration {
 
   @JsonProperty("ldap")
   @Valid
-  private LDAPConfiguration ldapConfiguration = null;
+  private LDAPConfiguration ldapConfiguration;
 
   @JsonProperty("auth")
   @NotNull
@@ -561,6 +567,14 @@ public UIConfiguration getUiConfiguration() {
     return uiConfiguration;
   }
 
+  public long getCheckQueuedMailsEveryMillis() {
+    return checkQueuedMailsEveryMillis;
+  }
+
+  public void setCheckQueuedMailsEveryMillis(long checkQueuedMailsEveryMillis) {
+    this.checkQueuedMailsEveryMillis = checkQueuedMailsEveryMillis;
+  }
+
   public long getWarnIfScheduledJobIsRunningForAtLeastMillis() {
     return warnIfScheduledJobIsRunningForAtLeastMillis;
   }
@@ -949,6 +963,14 @@ public void setReserveSlavesWithAttributes(Map<String, List<String>> reserveSlav
     this.reserveSlavesWithAttributes = reserveSlavesWithAttributes;
   }
 
+  public SingularityTaskMetadataConfiguration getTaskMetadataConfiguration() {
+    return taskMetadataConfiguration;
+  }
+
+  public void setTaskMetadataConfiguration(SingularityTaskMetadataConfiguration taskMetadataConfiguration) {
+    this.taskMetadataConfiguration = taskMetadataConfiguration;
+  }
+
   public GraphiteConfiguration getGraphiteConfiguration() {
     return graphiteConfiguration;
   }