From fcb64dfc0f4b1b6232872483df49f1d747316260 Mon Sep 17 00:00:00 2001
From: Dev Catalin <20538711+devcatalin@users.noreply.github.com>
Date: Mon, 30 Sep 2024 12:47:35 +0300
Subject: [PATCH 01/14] fix: JUnit processing for large files

---
 .../artifacts/junit_post_processor.go                  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
index d7cdc837d8a..da00ea57740 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
@@ -106,10 +106,16 @@ func isXMLFile(stat fs.FileInfo) bool {
 
 // isJUnitReport checks if the file starts with a JUnit XML tag
 func isJUnitReport(xmlData []byte) (bool, error) {
+	const BYTE_SIZE_8KB = 8 * 1024
+
+	// Limit check to first 8KB
+	if len(xmlData) > BYTE_SIZE_8KB {
+		xmlData = xmlData[:BYTE_SIZE_8KB]
+	}
+
 	scanner := bufio.NewScanner(bytes.NewReader(xmlData))
-	// Read only the first few lines of the file
 	for scanner.Scan() {
-		line := scanner.Text()
+		line := strings.TrimSpace(scanner.Text())
 		line = strings.TrimSpace(line) // Remove leading and trailing whitespace
 
 		// Skip comments and declarations

From d304e01c352ac208a4e83cd7360a241f5cf9148d Mon Sep 17 00:00:00 2001
From: Dev Catalin <20538711+devcatalin@users.noreply.github.com>
Date: Mon, 30 Sep 2024 17:09:04 +0300
Subject: [PATCH 02/14] fix: parsing one-line JUnit reports

---
 .../artifacts/junit_post_processor.go         | 37 +++++++------------
 .../artifacts/junit_post_processor_test.go    | 10 +++--
 .../common/testdata/junit.go                  |  2 +
 3 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
index da00ea57740..f8b1294f996 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
@@ -1,8 +1,6 @@
 package artifacts
 
 import (
-	"bufio"
-	"bytes"
 	"context"
 	"fmt"
 	"io"
@@ -63,10 +61,7 @@ func (p *JUnitPostProcessor) Add(path string) error {
 	if err != nil {
 		return errors.Wrapf(err, "failed to read %s", path)
 	}
-	ok, err := isJUnitReport(xmlData)
-	if err != nil {
-		return errors.Wrapf(err, "failed to check if %s is a JUnit report", path)
-	}
+	ok := isJUnitReport(xmlData)
 	if !ok {
 		return nil
 	}
@@ -104,33 +99,29 @@ func isXMLFile(stat fs.FileInfo) bool {
 	return strings.HasSuffix(stat.Name(), ".xml")
 }
 
-// isJUnitReport checks if the file starts with a JUnit XML tag
-func isJUnitReport(xmlData []byte) (bool, error) {
+// isJUnitReport checks if the XML data is a JUnit report.
+func isJUnitReport(xmlData []byte) bool {
 	const BYTE_SIZE_8KB = 8 * 1024
 
-	// Limit check to first 8KB
+	tags := []string{
+		"<?xml",
+		"<testsuite",
+		"<testsuites",
+	}
+
 	if len(xmlData) > BYTE_SIZE_8KB {
 		xmlData = xmlData[:BYTE_SIZE_8KB]
 	}
 
-	scanner := bufio.NewScanner(bytes.NewReader(xmlData))
-	for scanner.Scan() {
-		line := strings.TrimSpace(scanner.Text())
-		line = strings.TrimSpace(line) // Remove leading and trailing whitespace
+	content := string(xmlData)
 
-		// Skip comments and declarations
-		if strings.HasPrefix(line, "<!--") || strings.HasPrefix(line, "<?xml") {
-			continue
-		}
-		if strings.Contains(line, "<testsuite") || strings.Contains(line, "<testsuites") {
-			return true, nil
-		}
-		if strings.Contains(line, "<") { // Stop if any non-JUnit tag is found
-			break
+	for _, tag := range tags {
+		if !strings.Contains(content, tag) {
+			return false
 		}
 	}
 
-	return false, scanner.Err()
+	return true
 }
 
 func (p *JUnitPostProcessor) End() error {
diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor_test.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor_test.go
index 6ac04777efe..def94fdfbe5 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor_test.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor_test.go
@@ -146,6 +146,11 @@ func TestIsJUnitReport(t *testing.T) {
 			file: filesystem.NewMockFile("invalid.xml", []byte(testdata.InvalidJUnit)),
 			want: false,
 		},
+		{
+			name: "one-line junit",
+			file: filesystem.NewMockFile("pytest.xml", []byte(testdata.OneLineJUnit)),
+			want: true,
+		},
 	}
 
 	for _, tc := range tests {
@@ -154,10 +159,7 @@ func TestIsJUnitReport(t *testing.T) {
 			if err != nil {
 				t.Fatalf("unexpected error: %v", err)
 			}
-			ok, err := isJUnitReport(data)
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
+			ok := isJUnitReport(data)
 			assert.Equal(t, tc.want, ok)
 		})
 	}
diff --git a/cmd/testworkflow-toolkit/common/testdata/junit.go b/cmd/testworkflow-toolkit/common/testdata/junit.go
index 6369f859371..e3667109e92 100644
--- a/cmd/testworkflow-toolkit/common/testdata/junit.go
+++ b/cmd/testworkflow-toolkit/common/testdata/junit.go
@@ -176,3 +176,5 @@ var InvalidJUnit = `<?xml version="1.0" encoding="UTF-8"?>
 <foo>
 	<bar>
 </foo>`
+
+var OneLineJUnit = `<?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="TestSuite" tests="2" errors="0" failures="1" skipped="0"><testcase name="Test1" classname="TestClass"><failure message="Test failed">Failure details</failure></testcase><testcase name="Test2" classname="TestClass"/></testsuite></testsuites>`

From 82c3d5a10ec2cdacd1c3f10e8a6c6bd55afbe22c Mon Sep 17 00:00:00 2001
From: Dev Catalin <20538711+devcatalin@users.noreply.github.com>
Date: Tue, 1 Oct 2024 13:04:15 +0300
Subject: [PATCH 03/14] chore: add more junit logging

---
 cmd/testworkflow-toolkit/artifacts/junit_post_processor.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
index f8b1294f996..2a9559cf020 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
@@ -63,6 +63,7 @@ func (p *JUnitPostProcessor) Add(path string) error {
 	}
 	ok := isJUnitReport(xmlData)
 	if !ok {
+		fmt.Printf("Skipping non-JUnit report: %s\n", ui.LightCyan(path))
 		return nil
 	}
 	fmt.Printf("Processing JUnit report: %s\n", ui.LightCyan(path))
@@ -80,6 +81,7 @@ func (p *JUnitPostProcessor) sendJUnitReport(path string, report []byte) error {
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
 	defer cancel()
+	fmt.Printf("Sending JUnit report to the cloud: %s\n", ui.LightCyan(path))
 	_, err := p.client.Execute(ctx, testworkflow.CmdTestWorkflowExecutionAddReport, &testworkflow.ExecutionsAddReportRequest{
 		ID:           env.ExecutionId(),
 		WorkflowName: env.WorkflowName(),

From 0f8a3f2f91d877531306fff2dd44d22fd6902724 Mon Sep 17 00:00:00 2001
From: Dev Catalin <20538711+devcatalin@users.noreply.github.com>
Date: Tue, 1 Oct 2024 13:05:16 +0300
Subject: [PATCH 04/14] chore: log xml data

---
 cmd/testworkflow-toolkit/artifacts/junit_post_processor.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
index 2a9559cf020..f91b267bb50 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
@@ -61,6 +61,7 @@ func (p *JUnitPostProcessor) Add(path string) error {
 	if err != nil {
 		return errors.Wrapf(err, "failed to read %s", path)
 	}
+	fmt.Printf("================ XML Data Start ================\n%s\n================ XML Data End ================\n", xmlData)
 	ok := isJUnitReport(xmlData)
 	if !ok {
 		fmt.Printf("Skipping non-JUnit report: %s\n", ui.LightCyan(path))

From e5feda627ab5e141a031034a9ed9c21278c07cd5 Mon Sep 17 00:00:00 2001
From: Dev Catalin <20538711+devcatalin@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:21:03 +0300
Subject: [PATCH 05/14] fix: reports without xml tag

---
 cmd/testworkflow-toolkit/artifacts/junit_post_processor.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
index f91b267bb50..884b7ae9f92 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
@@ -107,7 +107,6 @@ func isJUnitReport(xmlData []byte) bool {
 	const BYTE_SIZE_8KB = 8 * 1024
 
 	tags := []string{
-		"<?xml",
 		"<testsuite",
 		"<testsuites",
 	}

From 9ab1d7b33e8a2ebc60cbde44ec5880bbe7b566fe Mon Sep 17 00:00:00 2001
From: Dev Catalin <20538711+devcatalin@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:25:59 +0300
Subject: [PATCH 06/14] fix: junit post processor edge cases

---
 .../artifacts/junit_post_processor.go                |  6 +++---
 .../artifacts/junit_post_processor_test.go           | 12 +++++++++++-
 cmd/testworkflow-toolkit/common/testdata/junit.go    | 11 +++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
index 884b7ae9f92..1d47f69f922 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
@@ -118,12 +118,12 @@ func isJUnitReport(xmlData []byte) bool {
 	content := string(xmlData)
 
 	for _, tag := range tags {
-		if !strings.Contains(content, tag) {
-			return false
+		if strings.Contains(content, tag) {
+			return true
 		}
 	}
 
-	return true
+	return false
 }
 
 func (p *JUnitPostProcessor) End() error {
diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor_test.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor_test.go
index def94fdfbe5..4882a04e2be 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor_test.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor_test.go
@@ -148,7 +148,17 @@ func TestIsJUnitReport(t *testing.T) {
 		},
 		{
 			name: "one-line junit",
-			file: filesystem.NewMockFile("pytest.xml", []byte(testdata.OneLineJUnit)),
+			file: filesystem.NewMockFile("oneline.xml", []byte(testdata.OneLineJUnit)),
+			want: true,
+		},
+		{
+			name: "testsuites only junit",
+			file: filesystem.NewMockFile("testsuites.xml", []byte(testdata.TestsuitesOnlyJUnit)),
+			want: true,
+		},
+		{
+			name: "testsuite only junit",
+			file: filesystem.NewMockFile("testsuite.xml", []byte(testdata.TestsuiteOnlyJUnit)),
 			want: true,
 		},
 	}
diff --git a/cmd/testworkflow-toolkit/common/testdata/junit.go b/cmd/testworkflow-toolkit/common/testdata/junit.go
index e3667109e92..f516d99c94b 100644
--- a/cmd/testworkflow-toolkit/common/testdata/junit.go
+++ b/cmd/testworkflow-toolkit/common/testdata/junit.go
@@ -178,3 +178,14 @@ var InvalidJUnit = `<?xml version="1.0" encoding="UTF-8"?>
 </foo>`
 
 var OneLineJUnit = `<?xml version="1.0" encoding="UTF-8"?><testsuites><testsuite name="TestSuite" tests="2" errors="0" failures="1" skipped="0"><testcase name="Test1" classname="TestClass"><failure message="Test failed">Failure details</failure></testcase><testcase name="Test2" classname="TestClass"/></testsuite></testsuites>`
+
+var TestsuitesOnlyJUnit = `<testsuites id="" name="" tests="2" failures="0" skipped="0" errors="0" time="14.511833">
+    <testsuite name="smoke.spec.js" timestamp="2024-10-01T12:48:47.332Z" hostname="chromium" tests="1" failures="0" skipped="0" time="6.259" errors="0">
+        <testcase name="Smoke 1 - has title" classname="smoke.spec.js" time="6.259"></testcase>
+    </testsuite>
+    <testsuite name="smoke2.spec.js" timestamp="2024-10-01T12:48:47.332Z" hostname="chromium" tests="1" failures="0" skipped="0" time="6.657" errors="0">
+        <testcase name="Smoke 2 - has title" classname="smoke2.spec.js" time="6.657"></testcase>
+    </testsuite>
+</testsuites>`
+
+var TestsuiteOnlyJUnit = `<testsuite name="smoke.spec.js" timestamp="2024-10-01T12:48:47.332Z" hostname="chromium" tests="1" failures="0" skipped="0" time="6.259" errors="0"><testcase name="Smoke 1 - has title" classname="smoke.spec.js" time="6.259"></testcase></testsuite>`

From cfc61986c80c0797336f6d808ef49a3b818a3c6b Mon Sep 17 00:00:00 2001
From: Dev Catalin <20538711+devcatalin@users.noreply.github.com>
Date: Wed, 2 Oct 2024 11:26:47 +0300
Subject: [PATCH 07/14] chore: remove unnecessary logs

---
 cmd/testworkflow-toolkit/artifacts/junit_post_processor.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
index 1d47f69f922..260538c4d5d 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
@@ -61,10 +61,8 @@ func (p *JUnitPostProcessor) Add(path string) error {
 	if err != nil {
 		return errors.Wrapf(err, "failed to read %s", path)
 	}
-	fmt.Printf("================ XML Data Start ================\n%s\n================ XML Data End ================\n", xmlData)
 	ok := isJUnitReport(xmlData)
 	if !ok {
-		fmt.Printf("Skipping non-JUnit report: %s\n", ui.LightCyan(path))
 		return nil
 	}
 	fmt.Printf("Processing JUnit report: %s\n", ui.LightCyan(path))

From 22b065fee53dc64ce5497ba5cba8884ba166772d Mon Sep 17 00:00:00 2001
From: Dev Catalin <20538711+devcatalin@users.noreply.github.com>
Date: Wed, 2 Oct 2024 12:29:09 +0300
Subject: [PATCH 08/14] chore: add logs for paths

---
 cmd/testworkflow-toolkit/artifacts/junit_post_processor.go | 1 +
 cmd/testworkflow-toolkit/artifacts/walker.go               | 3 +++
 cmd/testworkflow-toolkit/commands/artifacts.go             | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
index 260538c4d5d..75064166f9d 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
@@ -37,6 +37,7 @@ func (p *JUnitPostProcessor) Start() error {
 
 // Add checks if the file is a JUnit report and sends it to the cloud.
 func (p *JUnitPostProcessor) Add(path string) error {
+	fmt.Printf("Checking file: %s\n", ui.LightCyan(path))
 	uploadPath := path
 	if p.pathPrefix != "" {
 		uploadPath = filepath.Join(p.pathPrefix, uploadPath)
diff --git a/cmd/testworkflow-toolkit/artifacts/walker.go b/cmd/testworkflow-toolkit/artifacts/walker.go
index b9499903ba4..e9f79e83bce 100644
--- a/cmd/testworkflow-toolkit/artifacts/walker.go
+++ b/cmd/testworkflow-toolkit/artifacts/walker.go
@@ -197,6 +197,8 @@ func (w *walker) walk(fsys fs.FS, path string, walker WalkerFn) error {
 		sanitizedPath = "."
 	}
 
+	fmt.Printf("Walking: %s\n", sanitizedPath)
+
 	return fs.WalkDir(fsys, sanitizedPath, func(filePath string, d fs.DirEntry, err error) error {
 		resolvedPath := "/" + filepath.ToSlash(filePath)
 		if !w.matches(resolvedPath) {
@@ -219,6 +221,7 @@ func (w *walker) walk(fsys fs.FS, path string, walker WalkerFn) error {
 
 		// Pass the data to final walker
 		relativeFilePath := strings.TrimLeft(resolvedPath[len(w.root):], "/")
+		fmt.Printf("Relative path: %s\n", relativeFilePath)
 		file, err := fsys.Open(filePath)
 		return walker(relativeFilePath, file, stat, err)
 	})
diff --git a/cmd/testworkflow-toolkit/commands/artifacts.go b/cmd/testworkflow-toolkit/commands/artifacts.go
index 615cd6daf8f..ff4a059f04a 100644
--- a/cmd/testworkflow-toolkit/commands/artifacts.go
+++ b/cmd/testworkflow-toolkit/commands/artifacts.go
@@ -180,6 +180,8 @@ func run(handler artifacts.Handler, walker artifacts.Walker, dirFS fs.FS) {
 
 	started := time.Now()
 	err = walker.Walk(dirFS, func(path string, file fs.File, _ fs.FileInfo, err error) error {
+		fmt.Printf("Processing: %s\n", ui.LightCyan(path))
+
 		if err != nil {
 			fmt.Printf("Warning: '%s' has been ignored, as there was a problem reading it: %s\n", path, err.Error())
 			return nil

From 05dd832ce5df5b48c04d5f877cc0cfe3c12ea1a5 Mon Sep 17 00:00:00 2001
From: Dev Catalin <20538711+devcatalin@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:09:40 +0300
Subject: [PATCH 09/14] refactor: read only first 8KB of the xml

---
 .../artifacts/junit_post_processor.go             | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
index 75064166f9d..f4b216ef238 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
@@ -58,10 +58,15 @@ func (p *JUnitPostProcessor) Add(path string) error {
 	if ok := isXMLFile(stat); !ok {
 		return nil
 	}
-	xmlData, err := io.ReadAll(file)
-	if err != nil {
+	// Read only the first 8KB of data
+	const BYTE_SIZE_8KB = 8 * 1024
+	xmlData := make([]byte, BYTE_SIZE_8KB)
+	n, err := file.Read(xmlData)
+	if err != nil && err != io.EOF {
 		return errors.Wrapf(err, "failed to read %s", path)
 	}
+	// Trim the slice to the actual number of bytes read
+	xmlData = xmlData[:n]
 	ok := isJUnitReport(xmlData)
 	if !ok {
 		return nil
@@ -103,17 +108,11 @@ func isXMLFile(stat fs.FileInfo) bool {
 
 // isJUnitReport checks if the XML data is a JUnit report.
 func isJUnitReport(xmlData []byte) bool {
-	const BYTE_SIZE_8KB = 8 * 1024
-
 	tags := []string{
 		"<testsuite",
 		"<testsuites",
 	}
 
-	if len(xmlData) > BYTE_SIZE_8KB {
-		xmlData = xmlData[:BYTE_SIZE_8KB]
-	}
-
 	content := string(xmlData)
 
 	for _, tag := range tags {

From 4a2ad572e18bfc837bdabe2432d6f4a8fe9c2fcd Mon Sep 17 00:00:00 2001
From: Dev Catalin <20538711+devcatalin@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:19:26 +0300
Subject: [PATCH 10/14] chore: more debug logs for sandbox

---
 cmd/testworkflow-toolkit/artifacts/handler.go              | 1 +
 cmd/testworkflow-toolkit/artifacts/junit_post_processor.go | 1 +
 cmd/testworkflow-toolkit/commands/artifacts.go             | 1 +
 3 files changed, 3 insertions(+)

diff --git a/cmd/testworkflow-toolkit/artifacts/handler.go b/cmd/testworkflow-toolkit/artifacts/handler.go
index b1e17980539..4262b91b742 100644
--- a/cmd/testworkflow-toolkit/artifacts/handler.go
+++ b/cmd/testworkflow-toolkit/artifacts/handler.go
@@ -116,6 +116,7 @@ func (h *handler) Add(path string, file fs.File, stat fs.FileInfo) (err error) {
 		fmt.Printf(ui.Red("%s: failed: %s"), uploadPath, err.Error())
 	}
 	if h.postProcessor != nil {
+		fmt.Printf("Path sent to post processor: %s\n", ui.LightCyan(path))
 		err = h.postProcessor.Add(path)
 		if err != nil {
 			h.errors.Add(1)
diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
index f4b216ef238..d288a937f49 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
@@ -38,6 +38,7 @@ func (p *JUnitPostProcessor) Start() error {
 // Add checks if the file is a JUnit report and sends it to the cloud.
 func (p *JUnitPostProcessor) Add(path string) error {
 	fmt.Printf("Checking file: %s\n", ui.LightCyan(path))
+	fmt.Printf("Path prefix: %s\n", ui.LightCyan(p.pathPrefix))
 	uploadPath := path
 	if p.pathPrefix != "" {
 		uploadPath = filepath.Join(p.pathPrefix, uploadPath)
diff --git a/cmd/testworkflow-toolkit/commands/artifacts.go b/cmd/testworkflow-toolkit/commands/artifacts.go
index ff4a059f04a..17c72529e6b 100644
--- a/cmd/testworkflow-toolkit/commands/artifacts.go
+++ b/cmd/testworkflow-toolkit/commands/artifacts.go
@@ -114,6 +114,7 @@ func NewArtifactsCmd() *cobra.Command {
 				defer executor.Close()
 
 				if env.JUnitParserEnabled() || capabilities.Enabled(supported, capabilities.CapabilityJUnitReports) {
+					fmt.Printf("FSPrefix: %s\n", env.Config().Execution.FSPrefix)
 					junitProcessor := artifacts.NewJUnitPostProcessor(filesystem.NewOSFileSystem(), executor, walker.Root(), env.Config().Execution.FSPrefix)
 					handlerOpts = append(handlerOpts, artifacts.WithPostProcessor(junitProcessor))
 				}

From a48a2c94736fb76457da9cb95e7040b11a2ebbce Mon Sep 17 00:00:00 2001
From: Dev Catalin <20538711+devcatalin@users.noreply.github.com>
Date: Wed, 2 Oct 2024 16:04:39 +0300
Subject: [PATCH 11/14] fix: remove duplicated path prefixing

---
 cmd/testworkflow-toolkit/artifacts/junit_post_processor.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
index d288a937f49..887a10732cc 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
@@ -81,10 +81,6 @@ func (p *JUnitPostProcessor) Add(path string) error {
 
 // sendJUnitReport sends the JUnit report to the Agent gRPC API.
 func (p *JUnitPostProcessor) sendJUnitReport(path string, report []byte) error {
-	// Apply path prefix correctly
-	if p.pathPrefix != "" {
-		path = filepath.Join(p.pathPrefix, path)
-	}
 	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
 	defer cancel()
 	fmt.Printf("Sending JUnit report to the cloud: %s\n", ui.LightCyan(path))

From da3c9f82ecc3f142ea1e6552a9c777ed7d2e271b Mon Sep 17 00:00:00 2001
From: Dev Catalin <20538711+devcatalin@users.noreply.github.com>
Date: Wed, 2 Oct 2024 16:06:26 +0300
Subject: [PATCH 12/14] chore: remove debug logs

---
 cmd/testworkflow-toolkit/artifacts/handler.go              | 1 -
 cmd/testworkflow-toolkit/artifacts/junit_post_processor.go | 3 ---
 cmd/testworkflow-toolkit/artifacts/walker.go               | 4 ----
 cmd/testworkflow-toolkit/commands/artifacts.go             | 2 --
 4 files changed, 10 deletions(-)

diff --git a/cmd/testworkflow-toolkit/artifacts/handler.go b/cmd/testworkflow-toolkit/artifacts/handler.go
index 4262b91b742..b1e17980539 100644
--- a/cmd/testworkflow-toolkit/artifacts/handler.go
+++ b/cmd/testworkflow-toolkit/artifacts/handler.go
@@ -116,7 +116,6 @@ func (h *handler) Add(path string, file fs.File, stat fs.FileInfo) (err error) {
 		fmt.Printf(ui.Red("%s: failed: %s"), uploadPath, err.Error())
 	}
 	if h.postProcessor != nil {
-		fmt.Printf("Path sent to post processor: %s\n", ui.LightCyan(path))
 		err = h.postProcessor.Add(path)
 		if err != nil {
 			h.errors.Add(1)
diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
index 887a10732cc..10ceb6787b8 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor.go
@@ -37,8 +37,6 @@ func (p *JUnitPostProcessor) Start() error {
 
 // Add checks if the file is a JUnit report and sends it to the cloud.
 func (p *JUnitPostProcessor) Add(path string) error {
-	fmt.Printf("Checking file: %s\n", ui.LightCyan(path))
-	fmt.Printf("Path prefix: %s\n", ui.LightCyan(p.pathPrefix))
 	uploadPath := path
 	if p.pathPrefix != "" {
 		uploadPath = filepath.Join(p.pathPrefix, uploadPath)
@@ -83,7 +81,6 @@ func (p *JUnitPostProcessor) Add(path string) error {
 func (p *JUnitPostProcessor) sendJUnitReport(path string, report []byte) error {
 	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
 	defer cancel()
-	fmt.Printf("Sending JUnit report to the cloud: %s\n", ui.LightCyan(path))
 	_, err := p.client.Execute(ctx, testworkflow.CmdTestWorkflowExecutionAddReport, &testworkflow.ExecutionsAddReportRequest{
 		ID:           env.ExecutionId(),
 		WorkflowName: env.WorkflowName(),
diff --git a/cmd/testworkflow-toolkit/artifacts/walker.go b/cmd/testworkflow-toolkit/artifacts/walker.go
index e9f79e83bce..f20c8c4e338 100644
--- a/cmd/testworkflow-toolkit/artifacts/walker.go
+++ b/cmd/testworkflow-toolkit/artifacts/walker.go
@@ -196,9 +196,6 @@ func (w *walker) walk(fsys fs.FS, path string, walker WalkerFn) error {
 	if sanitizedPath == "" {
 		sanitizedPath = "."
 	}
-
-	fmt.Printf("Walking: %s\n", sanitizedPath)
-
 	return fs.WalkDir(fsys, sanitizedPath, func(filePath string, d fs.DirEntry, err error) error {
 		resolvedPath := "/" + filepath.ToSlash(filePath)
 		if !w.matches(resolvedPath) {
@@ -221,7 +218,6 @@ func (w *walker) walk(fsys fs.FS, path string, walker WalkerFn) error {
 
 		// Pass the data to final walker
 		relativeFilePath := strings.TrimLeft(resolvedPath[len(w.root):], "/")
-		fmt.Printf("Relative path: %s\n", relativeFilePath)
 		file, err := fsys.Open(filePath)
 		return walker(relativeFilePath, file, stat, err)
 	})
diff --git a/cmd/testworkflow-toolkit/commands/artifacts.go b/cmd/testworkflow-toolkit/commands/artifacts.go
index 17c72529e6b..04718afb5e2 100644
--- a/cmd/testworkflow-toolkit/commands/artifacts.go
+++ b/cmd/testworkflow-toolkit/commands/artifacts.go
@@ -181,8 +181,6 @@ func run(handler artifacts.Handler, walker artifacts.Walker, dirFS fs.FS) {
 
 	started := time.Now()
 	err = walker.Walk(dirFS, func(path string, file fs.File, _ fs.FileInfo, err error) error {
-		fmt.Printf("Processing: %s\n", ui.LightCyan(path))
-
 		if err != nil {
 			fmt.Printf("Warning: '%s' has been ignored, as there was a problem reading it: %s\n", path, err.Error())
 			return nil

From 0010ed7d5e80f237e8978fdad2103aab5b38462f Mon Sep 17 00:00:00 2001
From: Dev Catalin <20538711+devcatalin@users.noreply.github.com>
Date: Wed, 2 Oct 2024 16:09:27 +0300
Subject: [PATCH 13/14] chore: remove log

---
 cmd/testworkflow-toolkit/commands/artifacts.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmd/testworkflow-toolkit/commands/artifacts.go b/cmd/testworkflow-toolkit/commands/artifacts.go
index 04718afb5e2..615cd6daf8f 100644
--- a/cmd/testworkflow-toolkit/commands/artifacts.go
+++ b/cmd/testworkflow-toolkit/commands/artifacts.go
@@ -114,7 +114,6 @@ func NewArtifactsCmd() *cobra.Command {
 				defer executor.Close()
 
 				if env.JUnitParserEnabled() || capabilities.Enabled(supported, capabilities.CapabilityJUnitReports) {
-					fmt.Printf("FSPrefix: %s\n", env.Config().Execution.FSPrefix)
 					junitProcessor := artifacts.NewJUnitPostProcessor(filesystem.NewOSFileSystem(), executor, walker.Root(), env.Config().Execution.FSPrefix)
 					handlerOpts = append(handlerOpts, artifacts.WithPostProcessor(junitProcessor))
 				}

From ac23cbd9e3d8ec2f1df3217b1d063f982f2e7fe4 Mon Sep 17 00:00:00 2001
From: Dev Catalin <20538711+devcatalin@users.noreply.github.com>
Date: Thu, 3 Oct 2024 11:00:01 +0300
Subject: [PATCH 14/14] test: junit postprocessor with path prefix

---
 .../artifacts/junit_post_processor_test.go    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/cmd/testworkflow-toolkit/artifacts/junit_post_processor_test.go b/cmd/testworkflow-toolkit/artifacts/junit_post_processor_test.go
index 4882a04e2be..3195fd6688a 100644
--- a/cmd/testworkflow-toolkit/artifacts/junit_post_processor_test.go
+++ b/cmd/testworkflow-toolkit/artifacts/junit_post_processor_test.go
@@ -3,6 +3,7 @@ package artifacts
 import (
 	"io"
 	"io/fs"
+	"path/filepath"
 	"testing"
 
 	"github.com/golang/mock/gomock"
@@ -71,6 +72,33 @@ func TestJUnitPostProcessor_Add(t *testing.T) {
 
 }
 
+func TestJUnitPostProcessor_Add_WithPathPrefix(t *testing.T) {
+	mockCtrl := gomock.NewController(t)
+	defer mockCtrl.Finish()
+
+	mockFS := filesystem.NewMockFileSystem(mockCtrl)
+	mockClient := executor.NewMockExecutor(mockCtrl)
+
+	pathPrefix := "prefixed/junit/report/"
+	filePath := "junit.xml"
+	junitContent := []byte(testdata.BasicJUnit)
+
+	mockFS.EXPECT().OpenFileRO(gomock.Any()).Return(filesystem.NewMockFile("junit.xml", junitContent), nil)
+
+	pp := NewJUnitPostProcessor(mockFS, mockClient, "/test_root", pathPrefix)
+
+	expectedPayload := testworkflow.ExecutionsAddReportRequest{
+		Filepath: filepath.Join(pathPrefix, filePath),
+		Report:   junitContent,
+	}
+
+	mockClient.EXPECT().Execute(gomock.Any(), testworkflow.CmdTestWorkflowExecutionAddReport, gomock.Eq(&expectedPayload)).Return(nil, nil)
+
+	err := pp.Add(filePath)
+
+	assert.NoError(t, err)
+}
+
 func TestIsXMLFile(t *testing.T) {
 	t.Parallel()