From cd4150fbce1d4f075a44e702b93007811ada32d6 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Wed, 21 Feb 2024 16:31:06 -0500 Subject: [PATCH 1/3] iterate version --- THIRD-PARTY-LICENSES.txt | 8 ++++---- pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/THIRD-PARTY-LICENSES.txt b/THIRD-PARTY-LICENSES.txt index ff28ecc4..51e53cd5 100644 --- a/THIRD-PARTY-LICENSES.txt +++ b/THIRD-PARTY-LICENSES.txt @@ -327,7 +327,7 @@ Lists of 417 third-party dependencies. (Apache License 2.0) Metrics Utility Jakarta Servlets (io.dropwizard.metrics:metrics-jakarta-servlets:4.2.19 - https://metrics.dropwizard.io/metrics-jakarta-servlets) (The Apache Software License, Version 2.0) metrics3-statsd (com.readytalk:metrics3-statsd:4.2.0 - no url defined) (Apache 2) metrics4-scala (nl.grons:metrics4-scala_2.13:4.2.8 - https://github.com/erikvanoosten/metrics-scala) - (GNU General Public License (GPLv3)) metricsaggregator (io.dockstore:metricsaggregator:1.15.0 - https://github.com/dockstore/dockstore-support) + (GNU General Public License (GPLv3)) metricsaggregator (io.dockstore:metricsaggregator:1.16.0-SNAPSHOT - https://github.com/dockstore/dockstore-support) (Eclipse Distribution License - v 1.0) MIME streaming extension (org.jvnet.mimepull:mimepull:1.9.15 - https://github.com/eclipse-ee4j/metro-mimepull) (The MIT License) mockito-core (org.mockito:mockito-core:3.12.4 - https://github.com/mockito/mockito) (The MIT License) mockito-inline (org.mockito:mockito-inline:3.12.4 - https://github.com/mockito/mockito) @@ -410,10 +410,10 @@ Lists of 417 third-party dependencies. (Apache License 2.0) Throttling Appender (io.dropwizard.logback:logback-throttling-appender:1.4.0 - https://github.com/dropwizard/logback-throttling-appender/) (Apache License, Version 2.0) tomcat-jdbc (org.apache.tomcat:tomcat-jdbc:10.1.13 - https://tomcat.apache.org/) (Apache License, Version 2.0) tomcat-juli (org.apache.tomcat:tomcat-juli:10.1.13 - https://tomcat.apache.org/) - (GNU General Public License (GPLv3)) toolbackup (io.dockstore:toolbackup:1.15.0 - https://github.com/dockstore/dockstore-support) - (GNU General Public License (GPLv3)) tooltester (io.dockstore:tooltester:1.15.0 - https://github.com/dockstore/dockstore-support) + (GNU General Public License (GPLv3)) toolbackup (io.dockstore:toolbackup:1.16.0-SNAPSHOT - https://github.com/dockstore/dockstore-support) + (GNU General Public License (GPLv3)) tooltester (io.dockstore:tooltester:1.16.0-SNAPSHOT - https://github.com/dockstore/dockstore-support) (Eclipse Distribution License - v 1.0) TXW2 Runtime (org.glassfish.jaxb:txw2:3.0.2 - https://eclipse-ee4j.github.io/jaxb-ri/) - (GNU General Public License (GPLv3)) utils (io.dockstore:utils:1.15.0 - https://github.com/dockstore/dockstore-support) + (GNU General Public License (GPLv3)) utils (io.dockstore:utils:1.16.0-SNAPSHOT - https://github.com/dockstore/dockstore-support) (WDL License https://github.com/openwdl/wdl/blob/master/LICENSE) wdl-biscayne (org.broadinstitute:wdl-biscayne_2.13:85 - no url defined) (WDL License https://github.com/openwdl/wdl/blob/master/LICENSE) wdl-draft2 (org.broadinstitute:wdl-draft2_2.13:85 - no url defined) (WDL License https://github.com/openwdl/wdl/blob/master/LICENSE) wdl-draft3 (org.broadinstitute:wdl-draft3_2.13:85 - no url defined) diff --git a/pom.xml b/pom.xml index ff6581a8..08698d18 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ --> - 1.15 + 1.16 .0-SNAPSHOT scm:git:git@github.com:dockstore/dockstore-support.git From 471f5ad4f03033ef8cac6739b0687c0b6ec5a5d4 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Wed, 21 Feb 2024 16:31:21 -0500 Subject: [PATCH 2/3] minor fix to log --- .../metricsaggregator/client/cli/TerraMetricsSubmitter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/client/cli/TerraMetricsSubmitter.java b/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/client/cli/TerraMetricsSubmitter.java index 24cabbc3..6db31ee6 100644 --- a/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/client/cli/TerraMetricsSubmitter.java +++ b/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/client/cli/TerraMetricsSubmitter.java @@ -199,7 +199,6 @@ private void executionMetricsPost(List workflowExecutionsToSubmit, try { extendedGa4GhApi.executionMetricsPost(new ExecutionsRequestBody().runExecutions(workflowExecutionsToSubmit), Partner.TERRA.toString(), sourceUrlTrsInfo.trsId(), sourceUrlTrsInfo.version(), description); - numberOfExecutionsSubmitted.addAndGet(workflowMetricRecords.size()); } catch (ApiException e) { if (e.getCode() == HttpStatus.SC_REQUEST_TOO_LONG) { // One execution is too large, not much that can be done, so log and skip it @@ -225,7 +224,10 @@ private void executionMetricsPost(List workflowExecutionsToSubmit, String.format("Could not submit execution metrics to Dockstore for workflow %s: %s", sourceUrlTrsInfo, e.getMessage()), skippedExecutionsCsvPrinter, false); } + return; } + // only count if there was no exception + numberOfExecutionsSubmitted.addAndGet(workflowMetricRecords.size()); } /** From abc108f061d561471d7947cf826bdee2e87a5334 Mon Sep 17 00:00:00 2001 From: Denis Yuen Date: Mon, 26 Feb 2024 15:35:33 -0500 Subject: [PATCH 3/3] change --- .../metricsaggregator/client/cli/TerraMetricsSubmitter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/client/cli/TerraMetricsSubmitter.java b/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/client/cli/TerraMetricsSubmitter.java index 6db31ee6..121bae91 100644 --- a/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/client/cli/TerraMetricsSubmitter.java +++ b/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/client/cli/TerraMetricsSubmitter.java @@ -227,7 +227,7 @@ private void executionMetricsPost(List workflowExecutionsToSubmit, return; } // only count if there was no exception - numberOfExecutionsSubmitted.addAndGet(workflowMetricRecords.size()); + numberOfExecutionsSubmitted.addAndGet(workflowExecutionsToSubmit.size()); } /**