minor log fix (#485)

* iterate version
* minor fix to log

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)

metricsaggregator/src/main/java/io/dockstore/metricsaggregator/client/cli/TerraMetricsSubmitter.java

@@ -199,7 +199,6 @@ private void executionMetricsPost(List<RunExecution> 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<RunExecution> 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(workflowExecutionsToSubmit.size());
     }
 
     /**

pom.xml

@@ -33,7 +33,7 @@
     -->
     <properties>
         <!-- the following properties set sane defaults when no revision properties are set from the command-line -->
-        <revision>1.15</revision>
+        <revision>1.16</revision>
         <changelist>.0-SNAPSHOT</changelist>
 
         <github.url>scm:git:git@github.com:dockstore/dockstore-support.git</github.url>