Quick fix to allow continuous monitoring

samples/config/monitoring-config.xml

@@ -11,7 +11,7 @@
         <datasource id="datasource-git" type="messagebroker"
                     monitor="de.atb.context.monitoring.monitors.GitMonitor"
                     uri=""
-                    options="server=rabbitmq&amp;port=5672&amp;exchange=smartclide-monitoring&amp;topic=monitoring.git.*&amp;dle-topic=dle.git.commits"
+                    options="server=rabbitmq&amp;port=5672&amp;exchange=smartclide-monitoring&amp;outgoing-topic=monitoring.git.*"
                     class="de.atb.context.monitoring.config.models.datasources.MessageBrokerDataSource"/>
     </datasources>
 

samples/docker-compose.yml

@@ -10,31 +10,31 @@ services:
     networks:
       - smartclide-monitoring
   # smartclide-monitoring
-  smartclide-monitoring:
-    image: ghcr.io/eclipse-researchlabs/smartclide/smartclide-monitoring:latest
-    depends_on:
-      - rabbitmq
-    volumes:
+#  smartclide-monitoring:
+#    image: ghcr.io/eclipse-researchlabs/smartclide/smartclide-monitoring:latest
+#    depends_on:
+#      - rabbitmq
+#    volumes:
       # configuration files are mounted to '/opt/smartclide/config'
       # see eu.smartclide.contexthandling.ServiceMain for other options
-      - ./config:/opt/smartclide/config
+#      - ./config:/opt/smartclide/config
     # waits for rabbitmq datasource to be available before starting smartclide-monitoring
-    entrypoint:
-      [
-        "/entrypoint.d/wait-for-it.sh",
-        "rabbitmq:5672",
-        "--strict",
-        "-t",
-        "30",
-        "--",
-        "java",
-        "-Djava.security.egd=file:/dev/./urandom",
-        "-cp",
-        "app/libs/*:app/resources:app/classes",
-        "eu.smartclide.contexthandling.ServiceMain",
-      ]
-    networks:
-      - smartclide-monitoring
+#    entrypoint:
+#      [
+#        "/entrypoint.d/wait-for-it.sh",
+#        "rabbitmq:5672",
+#        "--strict",
+#        "-t",
+#        "30",
+#        "--",
+#        "java",
+#        "-Djava.security.egd=file:/dev/./urandom",
+#        "-cp",
+#        "app/libs/*:app/resources:app/classes",
+#        "eu.smartclide.contexthandling.ServiceMain",
+#      ]
+#    networks:
+#      - smartclide-monitoring
 
 networks:
   smartclide-monitoring:

smartclide-monitoring/src/main/java/eu/smartclide/contexthandling/services/GitlabApiClient.java

@@ -118,7 +118,8 @@ private int calculateTimeSinceLastCommit(String projectId, JsonObject commit) {
         int difference = 0;
         // check if parent id exists for given commit
         if (commit.get("parent_ids").getAsJsonArray().size() > 0) {
-            String parentCommitId = commit.get("parent_ids").getAsString();
+            String parentCommitId;
+            parentCommitId = commit.get("parent_ids").getAsJsonArray().get(0).getAsString();
             String commitCreationDateStr = commit.get("created_at").getAsString();
             JsonObject parentCommit = getCommitById(projectId, parentCommitId);
             if (parentCommit.getAsJsonObject().has("created_at")) {
@@ -128,7 +129,7 @@ private int calculateTimeSinceLastCommit(String projectId, JsonObject commit) {
                     ZonedDateTime commitCreationDate = ZonedDateTime.parse(commitCreationDateStr, formatter);
                     ZonedDateTime parentCommitCreationDate = ZonedDateTime.parse(parentCommitCreationDateStr, formatter);
                     long longDifference = commitCreationDate.toInstant().getEpochSecond() -
-                            parentCommitCreationDate.toInstant().getEpochSecond();
+                        parentCommitCreationDate.toInstant().getEpochSecond();
                     if (longDifference <= (long) Integer.MAX_VALUE) {
                         difference = (int) longDifference;
                     }