JFG-1047: store all Dates as timestamps in DB; add timezone to date format in report and webUI

chassis/configuration/configuration/reporting/session-summary-reporting.jrxml

@@ -32,8 +32,8 @@
     <field name="sessionId" class="java.lang.String"/>
     <field name="sessionName" class="java.lang.String"/>
     <field name="comment" class="java.lang.String"/>
-    <field name="startTime" class="java.util.Date"/>
-    <field name="endTime" class="java.util.Date"/>
+    <field name="startTime" class="java.lang.Long"/>
+    <field name="endTime" class="java.lang.Long"/>
     <field name="taskExecuted" class="java.lang.Integer"/>
     <field name="taskFailed" class="java.lang.Integer"/>
     <field name="activeKernels" class="java.lang.Integer"/>
@@ -84,21 +84,21 @@
                 <textElement textAlignment="Left" verticalAlignment="Middle"/>
                 <text><![CDATA[Session start time]]></text>
             </staticText>
-            <textField pattern="HH:mm:ss.SSS, dd MMMMM yyyy (EEEEE)">
+            <textField pattern="HH:mm:ss.SSS z, dd MMMMM yyyy (EEEEE)">
                 <reportElement style="Header_Bold" positionType="Float" x="300" y="20" width="200" height="10"/>
                 <textElement textAlignment="Left"/>
-                <textFieldExpression class="java.util.Date"><![CDATA[$F{startTime}]]></textFieldExpression>
+                <textFieldExpression class="java.util.Date"><![CDATA[new java.util.Date($F{startTime})]]></textFieldExpression>
             </textField>
             <staticText>
                 <reportElement style="Header_Bold" positionType="Float" x="0" y="30" width="300" height="10"
                                forecolor="#AAAAAA"/>
                 <textElement textAlignment="Left" verticalAlignment="Middle"/>
                 <text><![CDATA[Session end time]]></text>
             </staticText>
-            <textField pattern="HH:mm:ss.SSS, dd MMMMM yyyy (EEEEE)">
+            <textField pattern="HH:mm:ss.SSS z, dd MMMMM yyyy (EEEEE)">
                 <reportElement style="Header_Bold" positionType="Float" x="300" y="30" width="200" height="10"/>
                 <textElement textAlignment="Left"/>
-                <textFieldExpression class="java.util.Date"><![CDATA[$F{endTime}]]></textFieldExpression>
+                <textFieldExpression class="java.util.Date"><![CDATA[new java.util.Date($F{endTime})]]></textFieldExpression>
             </textField>
             <staticText>
                 <reportElement style="Header_Bold" positionType="Float" x="0" y="40" width="300" height="10"
@@ -110,7 +110,7 @@
                 <reportElement style="Header_Bold" positionType="Float" x="300" y="40" width="200" height="10"/>
                 <textElement textAlignment="Left"/>
                 <textFieldExpression>
-                    <![CDATA[com.griddynamics.jagger.util.TimeUtils.formatDuration( $F{endTime}.getTime() - $F{startTime}.getTime() )]]></textFieldExpression>
+                    <![CDATA[com.griddynamics.jagger.util.TimeUtils.formatDuration( $F{endTime} - $F{startTime} )]]></textFieldExpression>
             </textField>
             <staticText>
                 <reportElement style="Header_Bold" positionType="Float" x="0" y="50" width="300" height="10"

chassis/core/src/main/java/com/griddynamics/jagger/engine/e1/aggregator/session/BasicAggregator.java

@@ -20,14 +20,7 @@
 
 package com.griddynamics.jagger.engine.e1.aggregator.session;
 
-import static com.griddynamics.jagger.engine.e1.collector.CollectorConstants.END_TIME;
-import static com.griddynamics.jagger.engine.e1.collector.CollectorConstants.ERROR_MESSAGE;
-import static com.griddynamics.jagger.engine.e1.collector.CollectorConstants.FAILED;
-import static com.griddynamics.jagger.engine.e1.collector.CollectorConstants.KERNELS_COUNT;
-import static com.griddynamics.jagger.engine.e1.collector.CollectorConstants.SESSION;
-import static com.griddynamics.jagger.engine.e1.collector.CollectorConstants.START_TIME;
-import static com.griddynamics.jagger.engine.e1.collector.CollectorConstants.TASK_EXECUTED;
-
+import com.google.common.collect.Multimap;
 import com.griddynamics.jagger.coordinator.NodeId;
 import com.griddynamics.jagger.coordinator.NodeType;
 import com.griddynamics.jagger.dbapi.entity.SessionData;
@@ -48,15 +41,20 @@
 import org.springframework.orm.hibernate3.HibernateTemplate;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
-import com.google.common.collect.Multimap;
-
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import static com.griddynamics.jagger.engine.e1.collector.CollectorConstants.END_TIME;
+import static com.griddynamics.jagger.engine.e1.collector.CollectorConstants.ERROR_MESSAGE;
+import static com.griddynamics.jagger.engine.e1.collector.CollectorConstants.FAILED;
+import static com.griddynamics.jagger.engine.e1.collector.CollectorConstants.KERNELS_COUNT;
+import static com.griddynamics.jagger.engine.e1.collector.CollectorConstants.SESSION;
+import static com.griddynamics.jagger.engine.e1.collector.CollectorConstants.START_TIME;
+import static com.griddynamics.jagger.engine.e1.collector.CollectorConstants.TASK_EXECUTED;
+
 /**
  * Aggregates generic session/task data from key-value storage and stores to
  * relation structure. See {@link com.griddynamics.jagger.dbapi.entity.SessionData},
@@ -99,10 +97,10 @@ public void onSessionExecuted(String sessionId, String sessionComment, SessionEx
         sessionData.setComment(sessionComment);
 
         Long startTime = (Long) getFirst(all, START_TIME);
-        sessionData.setStartTime(new Date(startTime));
+        sessionData.setStartTime(startTime);
 
         Long endTime = (Long) getFirst(all, END_TIME);
-        sessionData.setEndTime(new Date(endTime));
+        sessionData.setEndTime(endTime);
 
         Integer taskExecuted = (Integer) getFirst(all, TASK_EXECUTED);
         sessionData.setTaskExecuted(taskExecuted);

chassis/core/src/main/java/com/griddynamics/jagger/engine/e1/aggregator/workload/WorkloadAggregator.java

@@ -40,7 +40,6 @@
 import org.springframework.beans.factory.annotation.Required;
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -144,8 +143,8 @@ private void persistValues(String sessionId, String taskId, WorkloadTask workloa
         testData.setParentId(parentId);
         testData.setNumber(workloadTask.getNumber());
         testData.setScenario(workloadDetails);
-        testData.setStartTime(new Date(startTime));
-        testData.setEndTime(new Date(endTime));
+        testData.setStartTime(startTime);
+        testData.setEndTime(endTime);
 
         getHibernateTemplate().persist(testData);
 

chassis/util/src/main/java/com/griddynamics/jagger/util/FormatCalculator.java

@@ -22,7 +22,7 @@
 
 public class FormatCalculator {
 
-    public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
+    public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss z";
 
     public static String getNumberFormat(double value) {
         value = Math.abs(value);

dbapi/src/main/java/com/griddynamics/jagger/dbapi/entity/SessionData.java

@@ -20,10 +20,6 @@
 
 package com.griddynamics.jagger.dbapi.entity;
 
-import java.util.Date;
-import java.util.Set;
-import java.util.Collections;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -33,6 +29,8 @@
 import javax.persistence.Id;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
+import java.util.Collections;
+import java.util.Set;
 
 @Entity
 public class SessionData {
@@ -41,8 +39,8 @@ public class SessionData {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private String sessionId;
-    private Date startTime;
-    private Date endTime;
+    private Long startTime;
+    private Long endTime;
     private Integer taskExecuted;
     private Integer taskFailed;
     private Integer activeKernels;
@@ -73,19 +71,19 @@ public void setSessionId(String sessionId) {
         this.sessionId = sessionId;
     }
 
-    public Date getStartTime() {
+    public Long getStartTime() {
         return startTime;
     }
 
-    public void setStartTime(Date startTime) {
+    public void setStartTime(Long startTime) {
         this.startTime = startTime;
     }
 
-    public Date getEndTime() {
+    public Long getEndTime() {
         return endTime;
     }
 
-    public void setEndTime(Date endTime) {
+    public void setEndTime(Long endTime) {
         this.endTime = endTime;
     }
 

dbapi/src/main/java/com/griddynamics/jagger/dbapi/entity/WorkloadData.java

@@ -25,7 +25,6 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
-import java.util.Date;
 
 @Entity
 public class WorkloadData {
@@ -35,8 +34,8 @@ public class WorkloadData {
     private String parentId;
     private Integer number;
     private WorkloadDetails scenario;
-    private Date startTime;
-    private Date endTime;
+    private Long startTime;
+    private Long endTime;
 
     @Id
     // Identity strategy is not supported by Oracle DB from the box
@@ -82,19 +81,19 @@ public void setScenario(WorkloadDetails scenario) {
         this.scenario = scenario;
     }
 
-    public Date getStartTime() {
+    public Long getStartTime() {
         return startTime;
     }
 
-    public void setStartTime(Date startTime) {
+    public void setStartTime(Long startTime) {
         this.startTime = startTime;
     }
 
-    public Date getEndTime() {
+    public Long getEndTime() {
         return endTime;
     }
 
-    public void setEndTime(Date endTime) {
+    public void setEndTime(Long endTime) {
         this.endTime = endTime;
     }
 

dbapi/src/main/java/com/griddynamics/jagger/dbapi/provider/SessionInfoProviderImpl.java

@@ -104,8 +104,8 @@ public Long getTotalSize() {
 
     public Long getTotalSizeByDate(Date from, Date to) {
         return (Long) entityManager.createQuery("select count(sd.id) from SessionData as sd where sd.startTime between :from and :to")
-                .setParameter("from", from)
-                .setParameter("to", to)
+                .setParameter("from", from.getTime())
+                .setParameter("to", to.getTime())
                 .getSingleResult();
     }
 
@@ -131,7 +131,7 @@ public Long getFirstPosition(Set<String> selectedIds) throws RuntimeException {
             return 0L;
         }
 
-        List<Date> startTimeList = (List<Date>) entityManager.createQuery("select ses.startTime from SessionData ses where ses.sessionId in " +
+        List<Long> startTimeList = (List<Long>) entityManager.createQuery("select ses.startTime from SessionData ses where ses.sessionId in " +
                 "(:sessionIds) order by ses.startTime asc")
                 .setMaxResults(1)
                 .setParameter("sessionIds", selectedIds).getResultList();
@@ -140,7 +140,7 @@ public Long getFirstPosition(Set<String> selectedIds) throws RuntimeException {
             return 0L;
         }
 
-        Date startTime = startTimeList.iterator().next();
+        Date startTime = new Date(startTimeList.iterator().next());
 
         Long lastPosition = (Long) entityManager.createQuery("select count(ses.id) from SessionData ses where startTime<=:startTime")
                 .setParameter("startTime", startTime).getSingleResult();
@@ -239,8 +239,8 @@ public List<SessionDataDto> getByDatePeriod(int start, int length, Date from, Da
         try {
             List<SessionData> sessionDataList = (List<SessionData>)
                     entityManager.createQuery("select sd from SessionData as sd where sd.startTime between :from and :to order by sd.startTime asc")
-                            .setParameter("from", from)
-                            .setParameter("to", to)
+                            .setParameter("from", from.getTime())
+                            .setParameter("to", to.getTime())
                             .setFirstResult(start)
                             .setMaxResults(length)
                             .getResultList();
@@ -467,8 +467,8 @@ private SessionDataDto createSessionDataDto(SessionData sessionData, String user
         return new SessionDataDto(
                 sessionData.getId(),
                 sessionData.getSessionId(),
-                sessionData.getStartTime(),
-                sessionData.getEndTime(),
+                new Date(sessionData.getStartTime()),
+                new Date(sessionData.getEndTime()),
                 sessionData.getActiveKernels(),
                 sessionData.getTaskExecuted(),
                 sessionData.getTaskFailed(),

dbapi/src/main/java/com/griddynamics/jagger/dbapi/util/FetchUtil.java

@@ -128,8 +128,8 @@ public Map<Long, Map<String, TestInfoDto>> getTestInfoByTaskIds(Set<Long> taskId
             String termination = (String) objects[3];
             String sessionId = (String) objects[0];
 
-            Date startTime = (Date) objects[5];
-            Date endTime = (Date) objects[6];
+            Date startTime = new Date(((BigInteger) objects[5]).longValue());
+            Date endTime = new Date(((BigInteger) objects[6]).longValue());
 
 
             Integer number = (Integer) objects[7];

docker/compose/src/main/files/my.cnf

@@ -1,4 +1,4 @@
 [mysqld]
 
-#default_time_zone = "Europe/Moscow"
+#default_time_zone = "UTC"
 sql_mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY"

docker/compose/src/main/resources/docker-compose-with-existing-results-db.yml

@@ -22,7 +22,7 @@ services:
     ports:
       - 8087:80
     environment:
-      TZ: Europe/Moscow
+      TZ: UTC
       JWC_HTTP_PORT: 80
       JWC_JDBC_DRIVER: com.mysql.jdbc.Driver
       # Specify here the existing results database

docker/compose/src/main/resources/docker-compose.yml

@@ -43,7 +43,7 @@ services:
     depends_on:
       - jagger-mysql
     environment:
-      TZ: Europe/Moscow
+      TZ: UTC
       JWC_HTTP_PORT: 80
       JWC_JDBC_DRIVER: com.mysql.jdbc.Driver
       JWC_JDBC_URL: jdbc:mysql://jagger-mysql:3306/jaggerdb

docker/jagger/webclient/Dockerfile

@@ -12,7 +12,7 @@ ENV MYSQL_HOST mysql
 ENV MYSQL_PORT 3306
 
 # Set default timezone
-ENV TZ=Europe/Moscow
+ENV TZ=UTC
 
 # Get latest jagger-webclient
 ADD ["http://nexus.vm.griddynamics.net:8081/nexus/service/local/artifact/maven/content?r=jagger-snapshots&g=com.griddynamics.jagger&a=webclient&c=war-exec&v=${project.version}", "/com/griddynamics/jagger/jagger-webclient.jar"]