Add more logging

dockstore · Jan 19, 2024 · 125f9d7 · 125f9d7
1 parent c66bb0d
commit 125f9d7
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/...icsaggregator/src/main/java/io/dockstore/metricsaggregator/MetricsAggregatorS3Client.java b/...icsaggregator/src/main/java/io/dockstore/metricsaggregator/MetricsAggregatorS3Client.java
@@ -39,6 +39,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.slf4j.Logger;
@@ -110,12 +111,16 @@ private void aggregateMetricsForDirectory(S3DirectoryInfo directoryInfo, Extende
             }
 
             try {
-                getAggregatedMetrics(allSubmissions).ifPresent(metrics -> {
-                    extendedGa4GhApi.aggregatedMetricsPut(metrics, platform, toolId, versionName);
-                    LOG.info("Aggregated metrics for tool ID {}, version {}, platform {} from directory {}", toolId, versionName, platform, versionS3KeyPrefix);
-                    allMetrics.add(metrics);
+                Optional<Metrics> aggregatedPlatformMetric = getAggregatedMetrics(allSubmissions);
+                if (aggregatedPlatformMetric.isPresent()) {
+                    extendedGa4GhApi.aggregatedMetricsPut(aggregatedPlatformMetric.get(), platform, toolId, versionName);
+                    LOG.info("Aggregated metrics for tool ID {}, version {}, platform {} from directory {}", toolId, versionName, platform,
+                            versionS3KeyPrefix);
+                    allMetrics.add(aggregatedPlatformMetric.get());
                     numberOfMetricsSubmitted.incrementAndGet();
-                });
+                } else {
+                    LOG.error("Error aggregating metrics for tool ID {}, version {}, platform {} from directory {}", toolId, versionName, platform, versionS3KeyPrefix);
+                }
             } catch (Exception e) {
                 LOG.error("Error aggregating metrics: Could not put all executions from directory {}", versionS3KeyPrefix, e);
                 numberOfMetricsSkipped.incrementAndGet();
@@ -139,6 +144,7 @@ private void aggregateMetricsForDirectory(S3DirectoryInfo directoryInfo, Extende
                 // Continue aggregating metrics for other directories
             }
         } else {
+            LOG.error("Error aggregating metrics for directory {}: no platform metrics aggregated", versionS3KeyPrefix);
             numberOfMetricsSkipped.incrementAndGet();
         }
         numberOfDirectoriesProcessed.incrementAndGet();
@@ -170,7 +176,7 @@ private ExecutionsRequestBody getExecutions(String toolId, String versionName, S
             try {
                 executionsFromOneSubmission = GSON.fromJson(fileContent, ExecutionsRequestBody.class);
             } catch (JsonSyntaxException e) {
-                LOG.error("Could not read execution(s) from S3 key {}, ignoring file", metricsData.s3Key());
+                LOG.error("Could not read execution(s) from S3 key {}, ignoring file", metricsData.s3Key(), e);
                 continue;
             }