Fix AWS Cloudwatch access when using custom log group name

Signed-off-by: Paolo Di Tommaso <[email protected]>
nextflow-io · Jul 16, 2024 · 3019583 · 3019583
1 parent 61b2205
commit 3019583
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/plugins/nf-amazon/src/main/nextflow/cloud/aws/batch/AwsBatchExecutor.groovy b/plugins/nf-amazon/src/main/nextflow/cloud/aws/batch/AwsBatchExecutor.groovy
@@ -299,7 +299,7 @@ class AwsBatchExecutor extends Executor implements ExtensionPoint, TaskArrayExec
 
     String getJobOutputStream(String jobId) {
         try {
-            return helper.getTaskLogStream(jobId)
+            return helper.getTaskLogStream(jobId, awsOptions.getLogsGroup())
         }
         catch (ResourceNotFoundException e) {
             log.debug "Unable to find AWS Cloudwatch logs for Batch Job id=$jobId - ${e.message}"

diff --git a/plugins/nf-amazon/src/main/nextflow/cloud/aws/batch/AwsBatchHelper.groovy b/plugins/nf-amazon/src/main/nextflow/cloud/aws/batch/AwsBatchHelper.groovy
@@ -198,15 +198,15 @@ class AwsBatchHelper {
      *      The Batch jobs as a string value or {@code null} if no logs is available. Note, if the log
      *      is made of multiple *page* this method returns only the first one
      */
-    String getTaskLogStream(String jobId) {
+    String getTaskLogStream(String jobId, String groupName) {
         final streamId = getLogStreamId(jobId)
         if( !streamId ) {
             log.debug "Unable to find CloudWatch log stream for batch job id=$jobId"
             return null
         }
 
         final logRequest = new GetLogEventsRequest()
-                .withLogGroupName("/aws/batch/job")
+                .withLogGroupName(groupName ?: "/aws/batch/job")
                 .withLogStreamName(streamId)
 
         final result = new StringBuilder()