Time consumer detection

build.gradle

@@ -38,10 +38,11 @@ subprojects {
 }
 
 allprojects {
+    apply plugin: 'java'
+    sourceCompatibility = '1.8'
+    targetCompatibility = '1.8'
 
     ext {
-        sourceCompatibility = '1.8'
-        targetCompatibility = '1.8'
 
         jettyVer = '9.4.12.v20180830'
 
@@ -58,13 +59,19 @@ allprojects {
         slf4jVer = '1.7.25'
 
         gsonVer = '2.8.2'
+
+        junitVer = '4.12'
+        mockitoVer = '2.22.0'
     }
 
     repositories {
         //uncomment for RC testing
-        maven {
-            url "https://repository.apache.org/content/repositories/orgapacheignite-1463/"
-        }
+        // maven {
+        //     url "https://repository.apache.org/content/repositories/orgapacheignite-1463/"
+        // }
+
+        mavenCentral()
+        mavenLocal()
     }
 }
 

ignite-tc-helper-web/build.gradle

@@ -18,14 +18,6 @@
 apply plugin: 'java'
 apply plugin: 'war'
 
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
-
-repositories {
-    mavenCentral()
-    mavenLocal()
-}
-
 // https://www.apache.org/legal/resolved.html#category-a
 dependencies {
     compile (project(":tcbot-common"));
@@ -72,12 +64,8 @@ dependencies {
 }
 
 processResources {
-
-    // Minify json resources
     from(sourceSets.test.resources.srcDirs) {
         include "**/*.json"
-
-        // Minify every file here
     }
 }
 

ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/db/TcHelperDb.java

@@ -111,15 +111,6 @@ public static <K, V> CacheConfiguration<K, V> getCacheV2TxConfig(String name) {
 
     }
 
-    @NotNull
-    public static <K, V> CacheConfiguration<K, V> getCache8PartsConfig(String name) {
-        CacheConfiguration<K, V> ccfg = new CacheConfiguration<>(name);
-
-        ccfg.setAffinity(new RendezvousAffinityFunction(false, 8));
-
-        return ccfg;
-    }
-
     public static class LocalOnlyTcpDiscoveryIpFinder implements TcpDiscoveryIpFinder {
         /** Port. */
         private int port;

ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/IgniteTcBotModule.java

@@ -28,9 +28,9 @@
 import org.apache.ignite.Ignite;
 import org.apache.ignite.ci.db.Ignite1Init;
 import org.apache.ignite.ci.di.cache.GuavaCachedModule;
-import org.apache.ignite.ci.di.scheduler.SchedulerModule;
-import org.apache.ignite.ci.github.ignited.GitHubIgnitedModule;
-import org.apache.ignite.ci.jira.ignited.JiraIgnitedModule;
+import org.apache.ignite.tcbot.persistence.scheduler.SchedulerModule;
+import org.apache.ignite.githubignited.GitHubIgnitedModule;
+import org.apache.ignite.jiraignited.JiraIgnitedModule;
 import org.apache.ignite.ci.observer.BuildObserver;
 import org.apache.ignite.ci.observer.ObserverTask;
 import org.apache.ignite.ci.tcbot.TcBotBusinessServicesModule;

ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/ChangeUi.java

@@ -17,6 +17,8 @@
 
 package org.apache.ignite.ci.issue;
 
+import com.google.common.base.MoreObjects;
+
 public class ChangeUi {
     public final String username;
     public final String webUrl;
@@ -41,4 +43,12 @@ public String toSlackMarkup() {
     public String toPlainText() {
         return username + " " + webUrl;
     }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return MoreObjects.toStringHelper(this)
+            .add("username", username)
+            .add("webUrl", webUrl)
+            .toString();
+    }
 }

ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Issue.java

@@ -20,24 +20,27 @@
 import com.google.common.base.MoreObjects;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
+import java.util.Map;
 import java.util.TreeSet;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.apache.ignite.tcbot.persistence.Persisted;
 import org.apache.ignite.tcbot.common.util.TimeUtil;
-import org.jetbrains.annotations.Nullable;
 
 /**
- *
+ * Issue used both for saving into DB and in UI (in issue history).
  */
-@SuppressWarnings("WeakerAccess")
+@SuppressWarnings({"WeakerAccess", "PublicField"})
 @Persisted
 public class Issue {
     /** Type code. Null of older versions of issue */
     @Nullable
-    private String type;
+    public String type;
 
     /** Display type. for issue. Kept for backward compatibilty with older records without type code. */
     private String displayType;
@@ -57,7 +60,7 @@ public class Issue {
     @Nullable
     public String displayName;
 
-    /** Build start timestamp. */
+    /** Build start timestamp. Builds which is older that 10 days not notified. */
     @Nullable public Long buildStartTs;
 
     /** Detected timestamp. */
@@ -66,11 +69,21 @@ public class Issue {
     /** Set of build tags detected. */
     public Set<String> buildTags = new TreeSet<>();
 
-    public Issue(IssueKey issueKey, IssueType type) {
+    /** Statistics of subscribers for this issue. Filled accordignly recent update. */
+    public Map<String, Object> stat = new HashMap<>();
+
+    /** Notification failed: Map from address to exception text */
+    @Nullable public Map<String, String> notificationFailed = new HashMap<>();
+
+    public int notificationRetry = 0;
+
+    public Issue(IssueKey issueKey, IssueType type,
+        @Nullable Long buildStartTs) {
         this.issueKey = issueKey;
         this.detectedTs = System.currentTimeMillis();
         this.type = type.code();
         this.displayType = type.displayName();
+        this.buildStartTs = buildStartTs;
     }
 
     public void addChange(String username, String webUrl) {
@@ -230,4 +243,32 @@ public String toPlainText(boolean includeChangesInfo) {
     public String type() {
         return type;
     }
+
+    /** {@inheritDoc} */
+    @Override public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        Issue issue = (Issue)o;
+        return notificationRetry == issue.notificationRetry &&
+            Objects.equals(type, issue.type) &&
+            Objects.equals(displayType, issue.displayType) &&
+            Objects.equals(trackedBranchName, issue.trackedBranchName) &&
+            Objects.equals(issueKey, issue.issueKey) &&
+            Objects.equals(changes, issue.changes) &&
+            Objects.equals(addressNotified, issue.addressNotified) &&
+            Objects.equals(webUrl, issue.webUrl) &&
+            Objects.equals(displayName, issue.displayName) &&
+            Objects.equals(buildStartTs, issue.buildStartTs) &&
+            Objects.equals(detectedTs, issue.detectedTs) &&
+            Objects.equals(buildTags, issue.buildTags) &&
+            Objects.equals(stat, issue.stat) &&
+            Objects.equals(notificationFailed, issue.notificationFailed);
+    }
+
+    /** {@inheritDoc} */
+    @Override public int hashCode() {
+        return Objects.hash(type, displayType, trackedBranchName, issueKey, changes, addressNotified, webUrl, displayName, buildStartTs, detectedTs, buildTags, stat, notificationFailed, notificationRetry);
+    }
 }

ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssuesStorage.java

@@ -17,8 +17,10 @@
 
 package org.apache.ignite.ci.issue;
 
+import java.util.HashMap;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
+import javax.annotation.Nullable;
 import javax.cache.Cache;
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -52,17 +54,60 @@ public static IgniteCache<IssueKey, Issue> botDetectedIssuesCache(Ignite ignite)
     }
 
     /** {@inheritDoc} */
-    @Override public boolean setNotified(IssueKey issueKey, String to) {
+    @Override public boolean getIsNewAndSetNotified(IssueKey issueKey, String to,
+        @Nullable Exception e) {
         Issue issue = cache().get(issueKey);
         if (issue == null)
             return false;
 
-        boolean add = issue.addressNotified.add(to);
+        boolean update;
+        if (e == null) {
+            if (issue.notificationRetry >= 2 && issue.notificationFailed.containsKey(to))
+                return false; // no more tries;
 
-        if (add)
+            update = issue.addressNotified.add(to);
+
+            if (update && issue.notificationFailed != null)
+                issue.notificationFailed.remove(to);
+        }
+        else {
+            if (issue.notificationRetry < 2)
+                issue.addressNotified.remove(to);
+
+            issue.notificationRetry++;
+
+            if (issue.notificationFailed == null)
+                issue.notificationFailed = new HashMap<>();
+
+            issue.notificationFailed.put(to, e.getClass().getSimpleName() + ": " + e.getMessage());
+
+            update = true;
+        }
+
+        if (update)
             cache().put(issueKey, issue);
 
-        return add;
+        return update;
+    }
+
+    @Override
+    public void saveIssueSubscribersStat(IssueKey issueKey, int cntSrvAllowed, int cntSubscribed,
+        int cntTagsFilterPassed) {
+        Issue issue = cache().get(issueKey);
+        if (issue == null)
+            return;
+
+        int hashCode = issue.hashCode();
+
+        if (issue.stat == null)
+            issue.stat = new HashMap<>();
+
+        issue.stat.put("cntSrvAllowed", cntSrvAllowed);
+        issue.stat.put("cntSubscribed", cntSubscribed);
+        issue.stat.put("cntTagsFilterPassed", cntTagsFilterPassed);
+
+        if (issue.hashCode() != hashCode)
+            cache().put(issueKey, issue); // protect from odd writes
     }
 
     /** {@inheritDoc} */

ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/mail/EmailSender.java

@@ -35,8 +35,8 @@
  * Class for sending email with configured credentials.
  */
 public class EmailSender {
-    public static boolean sendEmail(String to, String subject, String html, String plainText,
-        NotificationsConfig notifications) {
+    public static void sendEmail(String to, String subject, String html, String plainText,
+        NotificationsConfig notifications) throws MessagingException {
 
         String user = notifications.emailUsernameMandatory();
 
@@ -58,42 +58,34 @@ public static boolean sendEmail(String to, String subject, String html, String p
                 }
             });
 
-        try {
-            // Create a default MimeMessage object.
-            MimeMessage msg = new MimeMessage(ses);
+        // Create a default MimeMessage object.
+        MimeMessage msg = new MimeMessage(ses);
 
-            // Set From: header field of the header.
-            msg.setFrom(new InternetAddress(from));
+        // Set From: header field of the header.
+        msg.setFrom(new InternetAddress(from));
 
-            // Set To: header field of the header.
-            msg.addRecipient(Message.RecipientType.TO, new InternetAddress(to));
+        // Set To: header field of the header.
+        msg.addRecipient(Message.RecipientType.TO, new InternetAddress(to));
 
-            // Set Subject: header field
-            msg.setSubject(subject);
+        // Set Subject: header field
+        msg.setSubject(subject);
 
-            final MimeBodyPart textPart = new MimeBodyPart();
-            textPart.setContent(plainText, "text/plain");
-            // HTML version
-            final MimeBodyPart htmlPart = new MimeBodyPart();
-            htmlPart.setContent(html, "text/html");
+        final MimeBodyPart textPart = new MimeBodyPart();
+        textPart.setContent(plainText, "text/plain");
+        // HTML version
+        final MimeBodyPart htmlPart = new MimeBodyPart();
+        htmlPart.setContent(html, "text/html");
 
-            // Create the Multipart.  Add BodyParts to it.
-            final Multipart mp = new MimeMultipart("alternative");
-            mp.addBodyPart(textPart);
-            mp.addBodyPart(htmlPart);
-            // Set Multipart as the message's content
-            msg.setContent(mp);
+        // Create the Multipart.  Add BodyParts to it.
+        final Multipart mp = new MimeMultipart("alternative");
+        mp.addBodyPart(textPart);
+        mp.addBodyPart(htmlPart);
+        // Set Multipart as the message's content
+        msg.setContent(mp);
 
-            // Send message
-            Transport.send(msg);
+        // Send message
+        Transport.send(msg);
 
-            System.out.println("Sent message successfully to [" + to + "]...");
-
-            return true;
-        }
-        catch (MessagingException mex) {
-            mex.printStackTrace();
-        }
-        return false;
+        System.out.println("Sent message successfully to [" + to + "]...");
     }
 }