From 41efd1ffc938d2e5dfcd2be900a25cce6ea32d9d Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Mon, 13 Jan 2025 17:26:53 +0530
Subject: [PATCH 01/15] [maven-release-plugin] prepare release bstack

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index dc482a3..384e2a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.16-SNAPSHOT</version>
+  <version>1.2.17</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>
@@ -34,7 +34,7 @@
     <connection>scm:git:ssh://github.com/jenkinsci/browserstack-integration-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/browserstack-integration-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/browserstack-integration-plugin</url>
-    <tag>HEAD</tag>
+    <tag>bstack</tag>
   </scm>
 
   <!-- Adding a distribution management section here to override the now

From 9df77f88f27b3188ff741cac526b59ff4a0ec9f7 Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Mon, 13 Jan 2025 17:26:54 +0530
Subject: [PATCH 02/15] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 384e2a8..7d5449f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.17</version>
+  <version>1.2.19-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>
@@ -34,7 +34,7 @@
     <connection>scm:git:ssh://github.com/jenkinsci/browserstack-integration-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/browserstack-integration-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/browserstack-integration-plugin</url>
-    <tag>bstack</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <!-- Adding a distribution management section here to override the now

From cc13d948ecf3c67f3f0b9e13ad6325e0a03669b4 Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Mon, 26 May 2025 13:30:24 +0530
Subject: [PATCH 03/15] [maven-release-plugin] prepare release
 browserstack-integration-1.2.19

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8b94685..2268686 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.19-SNAPSHOT</version>
+  <version>1.2.19</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>
@@ -34,7 +34,7 @@
     <connection>scm:git:ssh://github.com/jenkinsci/browserstack-integration-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/browserstack-integration-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/browserstack-integration-plugin</url>
-    <tag>HEAD</tag>
+    <tag>browserstack-integration-1.2.19</tag>
   </scm>
 
   <!-- Adding a distribution management section here to override the now

From 691cdaa09dd0294bf39dc4dff7e79edd70cfa02d Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Mon, 26 May 2025 13:30:24 +0530
Subject: [PATCH 04/15] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2268686..9b766aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.19</version>
+  <version>1.2.20-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>
@@ -34,7 +34,7 @@
     <connection>scm:git:ssh://github.com/jenkinsci/browserstack-integration-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/browserstack-integration-plugin.git</developerConnection>
     <url>https://github.com/jenkinsci/browserstack-integration-plugin</url>
-    <tag>browserstack-integration-1.2.19</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <!-- Adding a distribution management section here to override the now

From cd1fb7c26853d67c06f30e03a78d159519d99641 Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Tue, 3 Jun 2025 10:09:56 +0530
Subject: [PATCH 05/15] Parent child relationship

---
 .../QualityDashboardInit.java                 |  21 +-
 .../QualityDashboardPipelineTracker.java      |  37 +--
 .../UpstreamPipelineResolver.java             | 280 ++++++++++++++++++
 3 files changed, 318 insertions(+), 20 deletions(-)
 create mode 100644 src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/UpstreamPipelineResolver.java

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
index 48499af..ddd4ad2 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
@@ -201,7 +201,13 @@ private static List<PipelineDetails> getAllBuilds(BrowserStackCredentials browse
                                     long endTimeInMillis = build.getTimeInMillis();
                                     Timestamp endTime = new Timestamp(endTimeInMillis);
                                     String result = overallResult != null ? overallResult.toString() : null;
-                                    PipelineDetails pipelineDetail = new PipelineDetails(pipelineName, buildNumber, duration, result, endTime);
+                                    
+                                    // Get root upstream project information for QEI with build number (returns in format "project#build")
+                                    String rootUpstreamProject = UpstreamPipelineResolver.resolveRootUpstreamProject(build, browserStackCredentials);
+                                    // Get immediate parent project information for QEI (returns in format "project#build")
+                                    String immediateParentProject = UpstreamPipelineResolver.resolveImmediateUpstreamProjectForQEI(build, browserStackCredentials);
+                                    PipelineDetails pipelineDetail = new PipelineDetails(pipelineName, buildNumber, duration, result, 
+                                                                                        endTime, rootUpstreamProject, immediateParentProject);
                                     allBuildResults.add(pipelineDetail);
                                 }
                         );
@@ -307,13 +313,22 @@ class PipelineDetails {
 
     @JsonProperty("endTime")
     private Timestamp endTime;
-
-    public PipelineDetails(String pipelineName, Integer buildNumber, Long buildDuration, String buildStatus, Timestamp endTime) {
+    
+    @JsonProperty("rootProject")
+    private String rootProject;
+    
+    @JsonProperty("immediateParentProject")
+    private String immediateParentProject;
+
+    public PipelineDetails(String pipelineName, Integer buildNumber, Long buildDuration, String buildStatus, 
+                          Timestamp endTime, String rootProject, String immediateParentProject) {
         this.pipelineName = pipelineName;
         this.buildNumber = buildNumber;
         this.buildDuration = buildDuration;
         this.buildStatus = buildStatus;
         this.endTime = endTime;
+        this.rootProject = rootProject;
+        this.immediateParentProject = immediateParentProject;
     }
 }
 
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
index ae8c90f..63e5a24 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
@@ -24,7 +24,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.sql.Timestamp;
-import java.util.List;
 
 @Extension
 public class QualityDashboardPipelineTracker extends RunListener<Run> {
@@ -102,8 +101,14 @@ private void sendBuildDataToQD(Run run, Result overallResult, String finalZipPat
                 jobUrl = rootUrl + run.getUrl();
             }
 
+            // Get root upstream project information for QEI with build number (returns in format "project#build")
+            String rootUpstreamProject = UpstreamPipelineResolver.resolveRootUpstreamProject(run, browserStackCredentials);
+            // Get immediate parent project information for QEI (returns in format "project#build")
+            String immediateParentProject = UpstreamPipelineResolver.resolveImmediateUpstreamProjectForQEI(run, browserStackCredentials);
+
             Timestamp endTime = new Timestamp(endTimeInMillis);
-            PipelineResults pipelineResultsReqObj = new PipelineResults(buildNumber, pipelineDuration, overallResult.toString(), finalZipPath, jobName, endTime, jobUrl);
+            PipelineResults pipelineResultsReqObj = new PipelineResults(buildNumber, pipelineDuration, overallResult.toString(), 
+                    finalZipPath, jobName, endTime, jobUrl, rootUpstreamProject, immediateParentProject);
             ObjectMapper objectMapper = new ObjectMapper();
             String jsonBody = objectMapper.writeValueAsString(pipelineResultsReqObj);
 
@@ -243,7 +248,7 @@ private String uploadZipToQd(String pathToZip, BrowserStackCredentials browserSt
 
     private void copyDirectoryToParentIfRequired(Run run, String finalParentPathFrom, BrowserStackCredentials browserStackCredentials) throws IOException {
         String finalParentPathTo = null;
-        String upStreamProj = upStreamPipelineUrl(run);
+        String upStreamProj = UpstreamPipelineResolver.resolveImmediateUpstreamProject(run, browserStackCredentials);
         if(StringUtils.isNotEmpty(upStreamProj)) {
             String parentResultDir = getResultDirForPipeline(upStreamProj, browserStackCredentials, run.getNumber());
             if(StringUtils.isNotEmpty(parentResultDir) && checkIfPathIsFound(parentResultDir)) {
@@ -268,18 +273,6 @@ private void copyDirectoryToParentIfRequired(Run run, String finalParentPathFrom
             }
         }
     }
-
-    private String upStreamPipelineUrl(Run run) {
-        String upstreamProjectName = null;
-        List<Cause> causes = run.getCauses();
-        for (Cause cause : causes) {
-            if (cause instanceof Cause.UpstreamCause) {
-                Cause.UpstreamCause upstreamCause = (Cause.UpstreamCause) cause;
-                upstreamProjectName = upstreamCause.getUpstreamProject();
-            }
-        }
-        return upstreamProjectName;
-    }
 }
 
 class QualityDashboardGetDetailsForPipeline implements Serializable {
@@ -310,8 +303,16 @@ class PipelineResults implements Serializable {
 
     @JsonProperty("zipFile")
     private String zipFile;
-
-    public PipelineResults(Integer buildNumber, Long buildDuration, String buildStatus, String zipFile, String pipelineName, Timestamp endTime, String jobUrl) {
+    
+    @JsonProperty("rootProject")
+    private String rootProject;
+    
+    @JsonProperty("immediateParentProject")
+    private String immediateParentProject;
+
+    public PipelineResults(Integer buildNumber, Long buildDuration, String buildStatus, String zipFile, 
+                          String pipelineName, Timestamp endTime, String jobUrl, String rootProject, 
+                          String immediateParentProject) {
         this.buildNumber = buildNumber;
         this.buildDuration = buildDuration;
         this.buildStatus = buildStatus;
@@ -319,5 +320,7 @@ public PipelineResults(Integer buildNumber, Long buildDuration, String buildStat
         this.pipelineName = pipelineName;
         this.endTime = endTime;
         this.jobUrl = jobUrl;
+        this.rootProject = rootProject;
+        this.immediateParentProject = immediateParentProject;
     }
 }
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/UpstreamPipelineResolver.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/UpstreamPipelineResolver.java
new file mode 100644
index 0000000..00d0b1a
--- /dev/null
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/UpstreamPipelineResolver.java
@@ -0,0 +1,280 @@
+package com.browserstack.automate.ci.jenkins.qualityDashboard;
+
+import com.browserstack.automate.ci.jenkins.BrowserStackCredentials;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import hudson.model.*;
+import jenkins.model.Jenkins;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+
+public class UpstreamPipelineResolver {
+    
+    private static final QualityDashboardAPIUtil apiUtil = new QualityDashboardAPIUtil();
+
+    /**
+     * Centralized method to handle JsonProcessingException logging.
+     * This reduces duplication of exception handling code throughout the class.
+     * 
+     * @param browserStackCredentials The credentials required for logging
+     * @param message The error message to log
+     */
+    private static void logError(BrowserStackCredentials browserStackCredentials, String message) {
+        try {
+            apiUtil.logToQD(browserStackCredentials, message);
+        } catch (JsonProcessingException ex) {
+            throw new RuntimeException("Failed to log error: " + ex.getMessage(), ex);
+        }
+    }
+    
+    /**
+     * Resolves the root upstream project with its build number in the format "project#build".
+     * This method returns both the project name and build number, which is useful for
+     * identifying the root project in the pipeline chain.
+     * 
+     * @param run The current build run
+     * @param browserStackCredentials The BrowserStack credentials for API access
+     * @return The root upstream project with build number in format "project#build", or null if none found
+     */
+    public static String resolveRootUpstreamProject(Run<?, ?> run, BrowserStackCredentials browserStackCredentials) {
+        try {
+            Set<String> visitedProjects = new HashSet<>();
+            return findRootUpstreamProject(run, browserStackCredentials, visitedProjects);
+        } catch (Exception e) {
+            logError(browserStackCredentials, "Error resolving root upstream project for " + 
+                     getProjectName(run) + "#" + run.getNumber() + ": " + e.getMessage());
+            return null;
+        }
+    }
+    
+    private static String findRootUpstreamProject(Run<?, ?> run, BrowserStackCredentials browserStackCredentials, 
+                                                 Set<String> visitedProjects) {
+        if (run == null) {
+            return null;
+        }
+        
+        String currentProject = getProjectName(run);
+        
+        // Cycle detection - prevent infinite recursion
+        if (visitedProjects.contains(currentProject)) {
+            logError(browserStackCredentials, "Circular dependency detected in project: " + currentProject);
+            return null;
+        }
+        
+        visitedProjects.add(currentProject);
+        
+        List<Cause> causes = run.getCauses();
+        if (causes == null || causes.isEmpty()) {
+            // No causes found - this is likely a root project
+            return null;
+        }
+        
+        String rootProject = null;
+        
+        for (Cause cause : causes) {
+            String upstreamProject = processUpstreamCause(cause, run, browserStackCredentials, visitedProjects);
+            if (upstreamProject != null) {
+                // If we found an upstream project, that becomes our root candidate
+                rootProject = upstreamProject;
+                break; // Use first valid upstream cause
+            }
+        }
+        
+        return rootProject;
+    }
+    
+    private static String processUpstreamCause(Cause cause, Run<?, ?> run, 
+                                             BrowserStackCredentials browserStackCredentials, 
+                                             Set<String> visitedProjects) {
+        try {
+            if (cause instanceof Cause.UpstreamCause) {
+                return handleUpstreamCause((Cause.UpstreamCause) cause, browserStackCredentials, visitedProjects);
+            } else if (cause instanceof hudson.triggers.TimerTrigger.TimerTriggerCause) {
+                apiUtil.logToQD(browserStackCredentials, "Build triggered by timer/schedule");
+                return null;
+            } else if (cause instanceof hudson.triggers.SCMTrigger.SCMTriggerCause) {
+                apiUtil.logToQD(browserStackCredentials, "Build triggered by SCM change");
+                return null;
+            } else if (cause instanceof Cause.UserIdCause) {
+                Cause.UserIdCause userCause = (Cause.UserIdCause) cause;
+                apiUtil.logToQD(browserStackCredentials, "Build triggered manually by user: " + 
+                         getUserDisplayName(userCause));
+                return null;
+            } else if (cause instanceof Cause.RemoteCause) {
+                Cause.RemoteCause remoteCause = (Cause.RemoteCause) cause;
+                apiUtil.logToQD(browserStackCredentials, "Build triggered remotely from: " + 
+                         remoteCause.getAddr());
+                return null;
+            } else {
+                // Handle unknown cause types
+                apiUtil.logToQD(browserStackCredentials, "Unknown build cause type: " + 
+                         cause.getClass().getSimpleName());
+                return null;
+            }
+        } catch (JsonProcessingException e) {
+            logError(browserStackCredentials, "Error processing cause: " + e.getMessage());
+            return null;
+        }
+    }
+    
+    /**
+     * Handles upstream cause by recursively finding the root upstream project and its build number.
+     * This method always returns the project name and build number in the format "project#build".
+     * 
+     * @param upstreamCause The upstream cause to process
+     * @param browserStackCredentials The BrowserStack credentials for API access
+     * @param visitedProjects Set of already visited projects to detect cycles
+     * @return The root upstream project with build number in format "project#build", or null if none found
+     */
+    private static String handleUpstreamCause(Cause.UpstreamCause upstreamCause, 
+                                            BrowserStackCredentials browserStackCredentials, 
+                                            Set<String> visitedProjects) {
+        try {
+            String upstreamProjectName = upstreamCause.getUpstreamProject();
+            int upstreamBuildNumber = upstreamCause.getUpstreamBuild();
+            
+            if (upstreamProjectName == null || upstreamProjectName.trim().isEmpty()) {
+                apiUtil.logToQD(browserStackCredentials, "Invalid upstream project name");
+                return null;
+            }
+            
+            apiUtil.logToQD(browserStackCredentials, "Found upstream: " + upstreamProjectName + 
+                     "#" + upstreamBuildNumber);
+        
+        // Try to get the upstream run for recursive traversal
+        Run<?, ?> upstreamRun = getUpstreamRun(upstreamProjectName, upstreamBuildNumber);
+        if (upstreamRun != null) {
+            // Recursively check if this upstream has its own upstream
+            String rootProject = findRootUpstreamProject(upstreamRun, browserStackCredentials, visitedProjects);
+            if (rootProject != null) {
+                // Found a higher-level upstream, return that
+                return rootProject;
+            }
+        }
+        // Return in format projectName#buildNumber
+        String formattedResult = upstreamProjectName + "#" + upstreamBuildNumber;
+        apiUtil.logToQD(browserStackCredentials, "Resolved root upstream project: " + formattedResult);
+        return formattedResult;
+        } catch (JsonProcessingException e) {
+            logError(browserStackCredentials, "Error processing upstream cause: " + e.getMessage());
+            return null;
+        } catch (Exception e) {
+            logError(browserStackCredentials, "Unexpected error while handling upstream cause: " + e.getMessage());
+            return null;
+        }
+    }
+    
+    private static Run<?, ?> getUpstreamRun(String projectName, int buildNumber) {
+        try {
+            Jenkins jenkins = Jenkins.getInstanceOrNull();
+            if (jenkins == null) {
+                return null;
+            }
+            
+            Job<?, ?> job = jenkins.getItemByFullName(projectName, Job.class);
+            if (job == null) {
+                return null;
+            }
+            
+            return job.getBuildByNumber(buildNumber);
+        } catch (Exception e) {
+            // upstream build might not exist anymore
+            return null;
+        }
+    }
+    
+    private static String getProjectName(Run<?, ?> run) {
+        try {
+            return run.getParent().getFullName();
+        } catch (Exception e) {
+            return "unknown";
+        }
+    }
+    
+    private static String getUserDisplayName(Cause.UserIdCause userCause) {
+        try {
+            String userName = userCause.getUserName();
+            String userId = userCause.getUserId();
+            return userName != null ? userName : userId;
+        } catch (Exception e) {
+            return "unknown user";
+        }
+    }
+    
+    public static String resolveImmediateUpstreamProject(Run<?, ?> run, BrowserStackCredentials browserStackCredentials) {
+        try {
+            return findImmediateUpstreamProject(run, browserStackCredentials);
+        } catch (Exception e) {
+            logError(browserStackCredentials, "Error resolving immediate upstream project for " + 
+                     getProjectName(run) + "#" + run.getNumber() + ": " + e.getMessage());
+            return null;
+        }
+    }
+    
+    public static String resolveImmediateUpstreamProjectForQEI(Run<?, ?> run, BrowserStackCredentials browserStackCredentials) {
+        try {
+            return findImmediateUpstreamProjectForQEI(run, browserStackCredentials);
+        } catch (Exception e) {
+            logError(browserStackCredentials, "Error resolving immediate upstream project for QEI for " + 
+                     getProjectName(run) + "#" + run.getNumber() + ": " + e.getMessage());
+            return null;
+        }
+    }
+    
+    private static String findImmediateUpstreamProject(Run<?, ?> run, BrowserStackCredentials browserStackCredentials) throws JsonProcessingException {
+        if (run == null) {
+            return null;
+        }
+        
+        List<Cause> causes = run.getCauses();
+        if (causes == null || causes.isEmpty()) {
+            return null;
+        }
+        
+        for (Cause cause : causes) {
+            if (cause instanceof Cause.UpstreamCause) {
+                Cause.UpstreamCause upstreamCause = (Cause.UpstreamCause) cause;
+                String upstreamProjectName = upstreamCause.getUpstreamProject();
+                
+                if (upstreamProjectName != null && !upstreamProjectName.trim().isEmpty()) {
+                    apiUtil.logToQD(browserStackCredentials, "Found immediate upstream: " + upstreamProjectName);
+                    return upstreamProjectName;
+                }
+            }
+        }
+        
+        apiUtil.logToQD(browserStackCredentials, "No immediate upstream found for: " + getProjectName(run));
+        return null;
+    }
+    
+    private static String findImmediateUpstreamProjectForQEI(Run<?, ?> run, BrowserStackCredentials browserStackCredentials) throws JsonProcessingException {
+        if (run == null) {
+            return null;
+        }
+        
+        List<Cause> causes = run.getCauses();
+        if (causes == null || causes.isEmpty()) {
+            return null;
+        }
+        
+        for (Cause cause : causes) {
+            if (cause instanceof Cause.UpstreamCause) {
+                Cause.UpstreamCause upstreamCause = (Cause.UpstreamCause) cause;
+                String upstreamProjectName = upstreamCause.getUpstreamProject();
+                int upstreamBuildNumber = upstreamCause.getUpstreamBuild();
+                
+                if (upstreamProjectName != null && !upstreamProjectName.trim().isEmpty()) {
+                    String formattedResult = upstreamProjectName + "#" + upstreamBuildNumber;
+                    apiUtil.logToQD(browserStackCredentials, "Found immediate upstream for QEI: " + formattedResult);
+                    return formattedResult;
+                }
+            }
+        }
+        
+        apiUtil.logToQD(browserStackCredentials, "No immediate upstream found with BuildNumber: " + getProjectName(run));
+        return null;
+    }
+    
+}

From c1f4865e81e3ad32e4bcbbf68b76776624508fe3 Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Wed, 4 Jun 2025 12:36:18 +0530
Subject: [PATCH 06/15] Reverting the pom.xml file changes

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9b766aa..b331561 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.20-SNAPSHOT</version>
+  <version>1.2.17-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>

From a8fcb9fb564c8416be1c90f5b79a3d30ddc98ca4 Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Wed, 4 Jun 2025 12:53:47 +0530
Subject: [PATCH 07/15] Adding a try-catch while resolving parent-child
 relationship.

---
 .../QualityDashboardInit.java                 | 20 ++++++++++++++-----
 .../QualityDashboardPipelineTracker.java      | 18 ++++++++++++-----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
index ddd4ad2..30eb0a3 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
@@ -203,11 +203,21 @@ private static List<PipelineDetails> getAllBuilds(BrowserStackCredentials browse
                                     String result = overallResult != null ? overallResult.toString() : null;
                                     
                                     // Get root upstream project information for QEI with build number (returns in format "project#build")
-                                    String rootUpstreamProject = UpstreamPipelineResolver.resolveRootUpstreamProject(build, browserStackCredentials);
-                                    // Get immediate parent project information for QEI (returns in format "project#build")
-                                    String immediateParentProject = UpstreamPipelineResolver.resolveImmediateUpstreamProjectForQEI(build, browserStackCredentials);
-                                    PipelineDetails pipelineDetail = new PipelineDetails(pipelineName, buildNumber, duration, result, 
-                                                                                        endTime, rootUpstreamProject, immediateParentProject);
+                                    String rootUpstreamProject = "";
+                                    String immediateParentProject = "";
+                                    try {
+                                        rootUpstreamProject = UpstreamPipelineResolver.resolveRootUpstreamProject(build, browserStackCredentials);
+                                        immediateParentProject = UpstreamPipelineResolver.resolveImmediateUpstreamProjectForQEI(build, browserStackCredentials);
+                                    } catch (Exception e) {          
+                                        try {
+                                            apiUtil.logToQD(browserStackCredentials, "Failed to resolve root upstream project for build " + buildNumber + ": " + e.getMessage());
+                                        } catch (JsonProcessingException ex) {
+                                            System.err.println("Error logging upstream project resolution failure for build " + buildNumber + ": " + ex.getMessage());
+                                            ex.printStackTrace();
+                                        }
+                                    }
+                                    PipelineDetails pipelineDetail = new PipelineDetails(pipelineName, buildNumber, duration, result,
+                                            endTime, rootUpstreamProject, immediateParentProject);
                                     allBuildResults.add(pipelineDetail);
                                 }
                         );
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
index 63e5a24..75b135b 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
@@ -100,12 +100,20 @@ private void sendBuildDataToQD(Run run, Result overallResult, String finalZipPat
             if(rootUrl != null) {
                 jobUrl = rootUrl + run.getUrl();
             }
-
             // Get root upstream project information for QEI with build number (returns in format "project#build")
-            String rootUpstreamProject = UpstreamPipelineResolver.resolveRootUpstreamProject(run, browserStackCredentials);
-            // Get immediate parent project information for QEI (returns in format "project#build")
-            String immediateParentProject = UpstreamPipelineResolver.resolveImmediateUpstreamProjectForQEI(run, browserStackCredentials);
-
+            String rootUpstreamProject = "";
+            String immediateParentProject = "";
+            try {
+                rootUpstreamProject = UpstreamPipelineResolver.resolveRootUpstreamProject(run, browserStackCredentials);
+                immediateParentProject = UpstreamPipelineResolver.resolveImmediateUpstreamProjectForQEI(run, browserStackCredentials);
+            } catch (Exception e) {          
+                try {
+                    apiUtil.logToQD(browserStackCredentials, "Failed to resolve root upstream project for build " + buildNumber + ": " + e.getMessage());
+                } catch (JsonProcessingException ex) {
+                    System.err.println("Error logging upstream project resolution failure for build " + buildNumber + ": " + ex.getMessage());
+                    ex.printStackTrace();
+                }
+            }
             Timestamp endTime = new Timestamp(endTimeInMillis);
             PipelineResults pipelineResultsReqObj = new PipelineResults(buildNumber, pipelineDuration, overallResult.toString(), 
                     finalZipPath, jobName, endTime, jobUrl, rootUpstreamProject, immediateParentProject);

From b1d7a8042d395272fd594127a40fe3eb38fdc8b6 Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Sat, 7 Jun 2025 00:57:46 +0530
Subject: [PATCH 08/15] Added Support for Multi-Configuration/Matrix Job and
 artifacts handling

---
 .../QualityDashboardInit.java                 | 40 ++++----
 .../QualityDashboardPipelineTracker.java      | 98 +++++++++++++------
 2 files changed, 93 insertions(+), 45 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
index 30eb0a3..0457b02 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
@@ -9,13 +9,14 @@
 import hudson.Extension;
 import hudson.init.InitMilestone;
 import hudson.init.Initializer;
+import hudson.model.Job;
 import hudson.model.Result;
+import hudson.model.Run;
 import java.sql.Timestamp;
 import java.time.Instant;
 import jenkins.model.Jenkins;
 import okhttp3.*;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
-import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import java.time.temporal.ChronoUnit;
 import java.io.IOException;
 import java.net.HttpURLConnection;
@@ -114,26 +115,32 @@ private static List<String> getAllPipelines(BrowserStackCredentials browserStack
             totalPipelines = jenkins.getAllItems().size();
             jenkins.getAllItems().forEach(job -> {
                 try {
+                    String jobType = job.getClass().getSimpleName();
+                    boolean isWorkflowJob = job instanceof WorkflowJob;
+                    
                     // Logging job details
                     apiUtil.logToQD(
                         browserStackCredentials,
                         String.format(
                             "Job name: %s, instance type: %s, and is_workflow_job: %s",
                             job.getName(),
-                            job.getClass().getSimpleName(),
-                            (job instanceof WorkflowJob) ? "yes" : "no"
+                            jobType,
+                            isWorkflowJob ? "yes" : "no"
                         )
                     );
+                    if ( job instanceof Job) {
+                        String pipelineName = job.getFullName();
+                        allPipelines.add(pipelineName);
+                    }
+                    else{
+                        apiUtil.logToQD(browserStackCredentials, "Skipping job: " + job.getName() + " as it is not a Job instance");
+                    }
+                    
                 } catch (JsonProcessingException e) {
                     // Handling the exception and logging an error
                     System.err.println("Error processing JSON for job: " + job.getName());
                     e.printStackTrace();
                 }
-
-                if (job instanceof WorkflowJob) {
-                    String pipelineName = job.getFullName(); // Getting pipeline name
-                    allPipelines.add(pipelineName);
-                }
             });
         } else {
             try {
@@ -188,10 +195,12 @@ private static List<PipelineDetails> getAllBuilds(BrowserStackCredentials browse
         Jenkins jenkins = Jenkins.getInstanceOrNull();
         Instant thresholdInstant = Instant.now().minus(getHistoryForDays(browserStackCredentials), ChronoUnit.DAYS);
         if (jenkins != null) {
-            jenkins.getAllItems().forEach(job -> {
-                if (job instanceof WorkflowJob) {
+            jenkins.getAllItems().forEach(item -> {
+                // Support both WorkflowJob and Matrix projects (and potentially other job types)
+                if (item instanceof Job) {
+                    Job<?, ?> job = (Job<?, ?>) item;
                     String pipelineName = job.getFullName();
-                    List<WorkflowRun> allBuilds = ((WorkflowJob) job).getBuilds();
+                    List<? extends Run<?, ?>> allBuilds = job.getBuilds();
                     if(!allBuilds.isEmpty()) {
                         allBuilds.stream().filter(build -> Instant.ofEpochMilli(build.getTimeInMillis()).isAfter(thresholdInstant)).forEach(
                                 build -> {
@@ -265,9 +274,8 @@ private static int getHistoryForDays(BrowserStackCredentials browserStackCredent
             }
         } catch(IOException e) {
             e.printStackTrace();
-        } finally {
-            return no_of_days;
         }
+        return no_of_days;
     }
 
     private static int getProjectPageSize(BrowserStackCredentials browserStackCredentials) {
@@ -284,9 +292,8 @@ private static int getProjectPageSize(BrowserStackCredentials browserStackCreden
             }
         } catch(IOException e) {
             e.printStackTrace();
-        } finally {
-            return projectPageSize;
         }
+        return projectPageSize;
     }
 
     private static int getResultPageSize(BrowserStackCredentials browserStackCredentials) {
@@ -303,9 +310,8 @@ private static int getResultPageSize(BrowserStackCredentials browserStackCredent
             }
         } catch(IOException e) {
             e.printStackTrace();
-        } finally {
-            return resultPageSize;
         }
+        return resultPageSize;
     }
 }
 
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
index 75b135b..67daad6 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
@@ -12,8 +12,6 @@
 import jenkins.model.Jenkins;
 import okhttp3.*;
 import org.apache.commons.io.FileUtils;
-import org.jenkinsci.plugins.workflow.job.WorkflowJob;
-import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.zeroturnaround.zip.ZipUtil;
 
 import java.io.File;
@@ -26,39 +24,22 @@
 import java.sql.Timestamp;
 
 @Extension
-public class QualityDashboardPipelineTracker extends RunListener<Run> {
+public class QualityDashboardPipelineTracker extends RunListener<Run<?, ?>> {
 
     QualityDashboardAPIUtil apiUtil = new QualityDashboardAPIUtil();
 
     @Override
-    public void onCompleted(Run run, TaskListener listener) {
+    public void onCompleted(Run<?, ?> run, TaskListener listener) {
         super.onCompleted(run, listener);
         BrowserStackCredentials browserStackCredentials = QualityDashboardUtil.getBrowserStackCreds();
         if(browserStackCredentials!=null) {
-            WorkflowRun workflowRun = (WorkflowRun) run;
-            WorkflowJob workflowJob = workflowRun.getParent();
-            String jobName = workflowJob.getFullName();
+            String jobName = getJobNameFromRun(run);
             int buildNumber = run.getNumber();
             try {
                 if(isQDEnabled(browserStackCredentials) && isPipelineEnabledForQD(browserStackCredentials, jobName)) {
                     Result overallResult = run.getResult();
                     if(overallResult != null) {
-                        String qdS3Url = null;
-                        String finalPathToZip = getFinalZipPath(run, browserStackCredentials);
-                        apiUtil.logToQD(browserStackCredentials, "Final Computed Zip Path for jobName: " + jobName + " and buildNumber: " + buildNumber + " is: " + finalPathToZip);
-                        if(StringUtils.isNotEmpty(finalPathToZip)) {
-                            apiUtil.logToQD(browserStackCredentials, "Found artifacts in configured path for jobName: " + jobName + " and buildNumber: " + buildNumber);
-                            copyDirectoryToParentIfRequired(run, finalPathToZip, browserStackCredentials);
-                            qdS3Url = zipArtifactsAndUploadToQD(finalPathToZip, browserStackCredentials, jobName, buildNumber);
-                        } else if(run.getHasArtifacts()) {
-                            apiUtil.logToQD(browserStackCredentials, "No artifacts in configured path but found archive artifacts for jobName: " + jobName + " and buildNumber: " + buildNumber);
-                            finalPathToZip = run.getArtifactsDir().getAbsolutePath();
-                            apiUtil.logToQD(browserStackCredentials, "Got artifact path for jobName: " + jobName + " and buildNumber: " + buildNumber + " as: " + finalPathToZip);
-                            qdS3Url = zipArtifactsAndUploadToQD(finalPathToZip, browserStackCredentials, jobName, buildNumber);
-                        } else {
-                            apiUtil.logToQD(browserStackCredentials, "Finally no artifacts found for jobName: " + jobName + " and buildNumber: " + buildNumber);
-                        }
-                        sendBuildDataToQD(run, overallResult, qdS3Url, browserStackCredentials);
+                        processArtifactsAndSendData(run, overallResult, browserStackCredentials, jobName, buildNumber);
                     } else {
                         apiUtil.logToQD(browserStackCredentials, "Null Result Captured for jobName: " + jobName + " and buildNumber: " + buildNumber);
                     }
@@ -74,6 +55,45 @@ public void onCompleted(Run run, TaskListener listener) {
         }
     }
 
+
+    private void processArtifactsAndSendData(Run<?, ?> run, Result overallResult, BrowserStackCredentials browserStackCredentials, 
+                                           String jobName, int buildNumber) throws IOException {
+        String qdS3Url = null;
+        String finalPathToZip = getFinalZipPath(run, browserStackCredentials);
+        
+        apiUtil.logToQD(browserStackCredentials, "Final Computed Zip Path for jobName: " + jobName + " and buildNumber: " + buildNumber + " is: " + finalPathToZip);
+        
+        if(StringUtils.isNotEmpty(finalPathToZip)) {
+            apiUtil.logToQD(browserStackCredentials, "Found artifacts in configured path for jobName: " + jobName + " and buildNumber: " + buildNumber);
+            copyDirectoryToParentIfRequired(run, finalPathToZip, browserStackCredentials);
+            qdS3Url = zipArtifactsAndUploadToQD(finalPathToZip, browserStackCredentials, jobName, buildNumber);
+        } else if(run.getHasArtifacts()) {
+            File artifactsDir = new File(run.getRootDir(), "archive");
+            if (artifactsDir.exists() && artifactsDir.isDirectory()) {
+                finalPathToZip = artifactsDir.getAbsolutePath();
+            }
+            if (finalPathToZip == null || !Files.exists(Paths.get(finalPathToZip))) {
+                Jenkins jenkins = Jenkins.getInstanceOrNull();
+                if (jenkins != null) {
+                    finalPathToZip = jenkins.getRootDir().getAbsolutePath() + "/archive/" + jobName + "/" + buildNumber;
+                } else {
+                    apiUtil.logToQD(browserStackCredentials, "Jenkins instance is null, cannot access archived artifacts for jobName: " + jobName + " and buildNumber: " + buildNumber);    
+                    finalPathToZip = null;
+                }
+            }
+            if (StringUtils.isNotEmpty(finalPathToZip) && Files.exists(Paths.get(finalPathToZip))) {
+                apiUtil.logToQD(browserStackCredentials, "Got artifact path for jobName: " + jobName + " and buildNumber: " + buildNumber + " as: " + finalPathToZip);
+                qdS3Url = zipArtifactsAndUploadToQD(finalPathToZip, browserStackCredentials, jobName, buildNumber);
+            } else {
+                apiUtil.logToQD(browserStackCredentials, "Archive artifacts not found at expected path for jobName: " + jobName + " and buildNumber: " + buildNumber);
+                finalPathToZip = null;
+            }
+        } else {
+            apiUtil.logToQD(browserStackCredentials, "Finally no artifacts found for jobName: " + jobName + " and buildNumber: " + buildNumber);
+        }
+        sendBuildDataToQD(run, overallResult, qdS3Url, browserStackCredentials);
+    }
+
     private String zipArtifactsAndUploadToQD (String finalPathToZip, BrowserStackCredentials browserStackCredentials, String jobName, int buildNumber) throws IOException {
         String finalZipFilePath = packZip(finalPathToZip, jobName, browserStackCredentials);
         apiUtil.logToQD(browserStackCredentials, "Final zip file's path for jobName: " + jobName + " and buildNumber: " + buildNumber + " is:" + finalZipFilePath);
@@ -87,7 +107,7 @@ private String zipArtifactsAndUploadToQD (String finalPathToZip, BrowserStackCre
         return qdS3Url;
     }
 
-    private void sendBuildDataToQD(Run run, Result overallResult, String finalZipPath, BrowserStackCredentials browserStackCredentials) {
+    private void sendBuildDataToQD(Run<?, ?> run, Result overallResult, String finalZipPath, BrowserStackCredentials browserStackCredentials) {
         Long pipelineDuration = getPipelineDuration(run);
         try {
             String jobName = run.getParent().getFullName();
@@ -128,7 +148,7 @@ private void sendBuildDataToQD(Run run, Result overallResult, String finalZipPat
         }
     }
 
-    private Long getPipelineDuration(Run build) {
+    private Long getPipelineDuration(Run<?, ?> build) {
         long startTime = build.getStartTimeInMillis();
         long endTime = System.currentTimeMillis();
         long duration = (endTime - startTime) / 1000;
@@ -139,7 +159,7 @@ private boolean checkIfPathIsFound(String filePath) {
         Path path = Paths.get(filePath);
         return Files.exists(path) ? true : false;
     }
-    private String getFinalZipPath(Run run, BrowserStackCredentials browserStackCredentials) throws JsonProcessingException {
+    private String getFinalZipPath(Run<?, ?> run, BrowserStackCredentials browserStackCredentials) throws JsonProcessingException {
         String finalZipPath = null;
         String currentResultDir = getResultDirForPipeline(getUrlForPipeline(run), browserStackCredentials, run.getNumber());
         if(StringUtils.isNotEmpty(currentResultDir) && checkIfPathIsFound(currentResultDir)) {
@@ -155,7 +175,7 @@ private String getFinalZipPath(Run run, BrowserStackCredentials browserStackCred
         return finalZipPath;
     }
 
-    private String getDefaultWorkspaceDirectory(Run run) {
+    private String getDefaultWorkspaceDirectory(Run<?, ?> run) {
         Jenkins jenkins = Jenkins.getInstanceOrNull();
         String workspacePath = jenkins != null && jenkins.getRootDir() != null ? jenkins.getRootDir().getAbsolutePath() : null;
         return StringUtils.isNotEmpty(workspacePath) ? workspacePath : null;
@@ -254,7 +274,7 @@ private String uploadZipToQd(String pathToZip, BrowserStackCredentials browserSt
         return qdS3Url;
     }
 
-    private void copyDirectoryToParentIfRequired(Run run, String finalParentPathFrom, BrowserStackCredentials browserStackCredentials) throws IOException {
+    private void copyDirectoryToParentIfRequired(Run<?, ?> run, String finalParentPathFrom, BrowserStackCredentials browserStackCredentials) throws IOException {
         String finalParentPathTo = null;
         String upStreamProj = UpstreamPipelineResolver.resolveImmediateUpstreamProject(run, browserStackCredentials);
         if(StringUtils.isNotEmpty(upStreamProj)) {
@@ -281,6 +301,28 @@ private void copyDirectoryToParentIfRequired(Run run, String finalParentPathFrom
             }
         }
     }
+
+    private String getJobNameFromRun(Run<?, ?> run){
+        try {
+            // Check if parent is a Job (covers all job types)
+            if (run.getParent() instanceof Job) {
+                Job<?, ?> job = (Job<?, ?>) run.getParent();
+                String jobName = job.getFullName();
+                return jobName;
+            } else {
+                // Fallback for any other parent types
+                String fallbackName = run.getParent().getFullName();
+                return fallbackName;
+            }
+        } catch (Exception e) {
+            try {
+                apiUtil.logToQD(QualityDashboardUtil.getBrowserStackCreds(), "Error getting job name from run: " + e.getMessage());
+            } catch (JsonProcessingException jsonEx) {
+                jsonEx.printStackTrace();
+            }
+        }
+        return null;
+    }
 }
 
 class QualityDashboardGetDetailsForPipeline implements Serializable {

From 5056c1aa2e0b21d876e3beeafbd0c01f54b31c16 Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Tue, 10 Jun 2025 14:48:30 +0530
Subject: [PATCH 09/15] Adding Caching for QD Enabled and check for Creds

---
 .../ci/common/constants/Constants.java        |  2 +
 .../QualityDashboardInit.java                 |  8 ++-
 .../QualityDashboardInitItemListener.java     | 21 +++++--
 .../QualityDashboardPipelineTracker.java      | 58 ++++++++++++++++---
 4 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
index a9f6d90..1eca695 100644
--- a/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
+++ b/src/main/java/com/browserstack/automate/ci/common/constants/Constants.java
@@ -65,6 +65,8 @@ public static final class SessionStatus {
     public static final class QualityDashboardAPI {
         public static final String QEI_DEFAULT_URL = "https://quality-engineering-insights.browserstack.com";
         public static String host = QEI_DEFAULT_URL;
+        // Cache configuration
+        public static final long CACHE_DURATION_MS = 60 * 60 * 1000L; // 1 hour in milliseconds
 
         public static String getHost() {
             return host;
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
index 0457b02..0c7ff4f 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
@@ -22,13 +22,15 @@
 import java.net.HttpURLConnection;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
 
 @Extension
 public class QualityDashboardInit {
 
+    private static final Logger LOGGER = Logger.getLogger(QualityDashboardInit.class.getName());
     static QualityDashboardAPIUtil apiUtil = new QualityDashboardAPIUtil();
 
-    @Initializer(after = InitMilestone.PLUGINS_PREPARED)
+    @Initializer(after = InitMilestone.JOB_LOADED)
     public static void postInstall() {
         try {
             initQDSetupIfRequired();
@@ -52,9 +54,11 @@ private static String exceptionToString(Throwable throwable) {
     private static void initQDSetupIfRequired() throws JsonProcessingException {
         BrowserStackCredentials browserStackCredentials = QualityDashboardUtil.getBrowserStackCreds();
         try {
-            if(browserStackCredentials!=null) {
+            if(browserStackCredentials != null) {
                 apiUtil.logToQD(browserStackCredentials,"Starting plugin data export to QD");
                 checkQDIntegrationAndDumpMetaData(browserStackCredentials);
+            } else {
+                LOGGER.info("BrowserStack credentials not found. Skipping Quality Dashboard initialization.");
             }
         } catch (Exception e) {
             try {
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java
index fd4259f..d2397a4 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java
@@ -12,16 +12,22 @@
 import okhttp3.RequestBody;
 import okhttp3.Response;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
-import java.io.IOException;
 import java.io.Serializable;
+import java.util.logging.Logger;
 
 @Extension
 public class QualityDashboardInitItemListener extends ItemListener {
 
+    private static final Logger LOGGER = Logger.getLogger(QualityDashboardInitItemListener.class.getName());
+
     @Override
     public void onCreated(Item job) {
         try {
             BrowserStackCredentials browserStackCredentials = QualityDashboardUtil.getBrowserStackCreds();
+            if(browserStackCredentials == null) {
+                LOGGER.info("BrowserStackCredentials not found. Please ensure they are configured correctly.");
+                return;
+            }
             QualityDashboardAPIUtil apiUtil = new QualityDashboardAPIUtil();
             apiUtil.logToQD(browserStackCredentials, "Item Created : " + job.getClass().getName()) ;
 
@@ -35,7 +41,8 @@ public void onCreated(Item job) {
                     String jsonBody = getJsonReqBody(new ItemUpdate(itemName, itemType));
                     syncItemListToQD(jsonBody, Constants.QualityDashboardAPI.getItemCrudEndpoint(), "POST");
 
-                } catch(IOException e) {
+                } catch(Exception e) {
+                    LOGGER.info("Error syncing item creation to Quality Dashboard: " + e.getMessage());
                     e.printStackTrace();
                 }
             }
@@ -52,7 +59,8 @@ public void onDeleted(Item job) {
             try {
                 String jsonBody = getJsonReqBody(new ItemUpdate(itemName, itemType));
                 syncItemListToQD(jsonBody, Constants.QualityDashboardAPI.getItemCrudEndpoint(), "DELETE");
-            } catch(IOException e) {
+            } catch(Exception e) {
+                LOGGER.info("Error syncing item deletion to Quality Dashboard: " + e.getMessage());
                 e.printStackTrace();
             }
         }
@@ -67,7 +75,8 @@ public void onRenamed(Item job, String oldName, String newName) {
                 newName = job.getParent().getFullName() + "/" + newName;
                 String jsonBody = getJsonReqBody(new ItemRename(oldName, newName, itemType));
                 syncItemListToQD(jsonBody, Constants.QualityDashboardAPI.getItemCrudEndpoint(), "PUT");
-            } catch(IOException e) {
+            } catch(Exception e) {
+            LOGGER.info("Error syncing item rename to Quality Dashboard: " + e.getMessage());
                 e.printStackTrace();
             }
         }
@@ -93,6 +102,10 @@ private Response syncItemListToQD(String jsonBody, String url, String typeOfRequ
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonBody);
         QualityDashboardAPIUtil apiUtil = new QualityDashboardAPIUtil();
         BrowserStackCredentials browserStackCredentials = QualityDashboardUtil.getBrowserStackCreds();
+        if(browserStackCredentials == null) {
+            LOGGER.info("BrowserStack credentials not found. Please ensure they are configured correctly.");
+            return null;
+        }  
         if(typeOfRequest.equals("PUT")) {
             apiUtil.logToQD(browserStackCredentials, "Syncing Item Update - PUT");
             return apiUtil.makePutRequestToQd(url, browserStackCredentials, requestBody);
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
index 67daad6..7740939 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
@@ -22,18 +22,20 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.sql.Timestamp;
+import java.util.logging.Logger;
 
 @Extension
 public class QualityDashboardPipelineTracker extends RunListener<Run<?, ?>> {
 
+    private static final Logger LOGGER = Logger.getLogger(QualityDashboardPipelineTracker.class.getName());
     QualityDashboardAPIUtil apiUtil = new QualityDashboardAPIUtil();
 
     @Override
     public void onCompleted(Run<?, ?> run, TaskListener listener) {
         super.onCompleted(run, listener);
         BrowserStackCredentials browserStackCredentials = QualityDashboardUtil.getBrowserStackCreds();
-        if(browserStackCredentials!=null) {
-            String jobName = getJobNameFromRun(run);
+        if(browserStackCredentials != null) {
+            String jobName = getJobNameFromRun(run, browserStackCredentials);
             int buildNumber = run.getNumber();
             try {
                 if(isQDEnabled(browserStackCredentials) && isPipelineEnabledForQD(browserStackCredentials, jobName)) {
@@ -53,6 +55,9 @@ public void onCompleted(Run<?, ?> run, TaskListener listener) {
                 throw new RuntimeException(e);
             }
         }
+        else {
+            LOGGER.info("BrowserStack credentials not found. Please ensure they are configured correctly.");
+        }
     }
 
 
@@ -186,16 +191,35 @@ private String getUrlForPipeline(Run<?, ?> build) {
     }
 
     private boolean isQDEnabled(BrowserStackCredentials browserStackCredentials) throws IOException {
+        // Check if we have a valid cached value
+        Boolean cachedResult = QDEnabledCache.getCachedValue();
+        if (cachedResult != null) {
+            LOGGER.info("Using cached QD enabled status: " + cachedResult);
+            return cachedResult;
+        }
+        
+        // Cache expired or not set, make API call
+        LOGGER.info("QD enabled status cache expired or not set, making API call");
         Response response = apiUtil.makeGetRequestToQd(Constants.QualityDashboardAPI.getIsQdEnabledEndpoint(), browserStackCredentials);
-        if (response != null &&  response.code() == HttpURLConnection.HTTP_OK) {
+        boolean isEnabled = false;
+        
+        if (response != null && response.code() == HttpURLConnection.HTTP_OK) {
             ResponseBody responseBody = response.body();
-            if(responseBody != null && Boolean.parseBoolean(response.body().string())) {
+            if (responseBody != null && Boolean.parseBoolean(response.body().string())) {
+                isEnabled = true;
                 apiUtil.logToQD(browserStackCredentials, "QD enabled check passed");
-                return true;
             }
         }
-        apiUtil.logToQD(browserStackCredentials, "QD enabled check failed");
-        return false;
+        
+        if (!isEnabled) {
+            apiUtil.logToQD(browserStackCredentials, "QD enabled check failed");
+        }
+        
+        // Cache the result for 1 hour
+        QDEnabledCache.setCachedValue(isEnabled);
+        LOGGER.info("Cached QD enabled status: " + isEnabled + " for 1 hour");
+        
+        return isEnabled;
     }
 
     private boolean isPipelineEnabledForQD(BrowserStackCredentials browserStackCredentials, String pipelineName) throws IOException {
@@ -302,7 +326,7 @@ private void copyDirectoryToParentIfRequired(Run<?, ?> run, String finalParentPa
         }
     }
 
-    private String getJobNameFromRun(Run<?, ?> run){
+    private String getJobNameFromRun(Run<?, ?> run, BrowserStackCredentials browserStackCredentials) {
         try {
             // Check if parent is a Job (covers all job types)
             if (run.getParent() instanceof Job) {
@@ -316,13 +340,29 @@ private String getJobNameFromRun(Run<?, ?> run){
             }
         } catch (Exception e) {
             try {
-                apiUtil.logToQD(QualityDashboardUtil.getBrowserStackCreds(), "Error getting job name from run: " + e.getMessage());
+                apiUtil.logToQD(browserStackCredentials, "Error getting job name from run: " + e.getMessage());
             } catch (JsonProcessingException jsonEx) {
                 jsonEx.printStackTrace();
             }
         }
         return null;
     }
+    private static class QDEnabledCache {
+        private static volatile Boolean qdEnabled = null;
+        private static volatile long expiryTime = 0L;
+        
+        public static Boolean getCachedValue() {
+            if (qdEnabled != null && System.currentTimeMillis() < expiryTime) {
+                return qdEnabled;
+            }
+            return null; // Cache expired or not set
+        }
+        
+        public static void setCachedValue(boolean value) {
+            qdEnabled = value;
+            expiryTime = System.currentTimeMillis() + Constants.QualityDashboardAPI.CACHE_DURATION_MS;
+        }
+    } 
 }
 
 class QualityDashboardGetDetailsForPipeline implements Serializable {

From bddc072cfa21004beef14eff1aa569f63812b49f Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Thu, 12 Jun 2025 14:16:27 +0530
Subject: [PATCH 10/15] Using Instant time module for cache expiry.

---
 .../QualityDashboardPipelineTracker.java               | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
index 7740939..3de116b 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
@@ -22,6 +22,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.sql.Timestamp;
+import java.time.Instant;
 import java.util.logging.Logger;
 
 @Extension
@@ -349,18 +350,17 @@ private String getJobNameFromRun(Run<?, ?> run, BrowserStackCredentials browserS
     }
     private static class QDEnabledCache {
         private static volatile Boolean qdEnabled = null;
-        private static volatile long expiryTime = 0L;
-        
+        private static volatile Instant expiryTime = Instant.EPOCH;
+
         public static Boolean getCachedValue() {
-            if (qdEnabled != null && System.currentTimeMillis() < expiryTime) {
+            if (qdEnabled != null && Instant.now().isBefore(expiryTime)) {
                 return qdEnabled;
             }
             return null; // Cache expired or not set
         }
-        
         public static void setCachedValue(boolean value) {
             qdEnabled = value;
-            expiryTime = System.currentTimeMillis() + Constants.QualityDashboardAPI.CACHE_DURATION_MS;
+            expiryTime = Instant.now().plusMillis(Constants.QualityDashboardAPI.CACHE_DURATION_MS);
         }
     } 
 }

From 5df30d47eb737646f1ffe62227a65c7739735a02 Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Fri, 13 Jun 2025 10:33:42 +0530
Subject: [PATCH 11/15] Replacing System.print to Logger.info

---
 .../qualityDashboard/QualityDashboardInit.java     | 14 +++++---------
 .../QualityDashboardPipelineTracker.java           | 10 +++-------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
index 0c7ff4f..6ec838f 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
@@ -142,7 +142,7 @@ private static List<String> getAllPipelines(BrowserStackCredentials browserStack
                     
                 } catch (JsonProcessingException e) {
                     // Handling the exception and logging an error
-                    System.err.println("Error processing JSON for job: " + job.getName());
+                    LOGGER.info("Error processing JSON for job: " + job.getName() + " - " + e.getMessage());
                     e.printStackTrace();
                 }
             });
@@ -150,7 +150,7 @@ private static List<String> getAllPipelines(BrowserStackCredentials browserStack
             try {
                 apiUtil.logToQD(browserStackCredentials, "Issue getting Jenkins Instance");
             } catch (JsonProcessingException e) {
-                System.err.println("Error logging issue with Jenkins instance.");
+                LOGGER.info("Error logging issue with Jenkins instance.");
                 e.printStackTrace();
             }
         }
@@ -160,7 +160,7 @@ private static List<String> getAllPipelines(BrowserStackCredentials browserStack
             apiUtil.logToQD(browserStackCredentials,"Total Pipelines detected : " + allPipelines.size());
         } catch (JsonProcessingException e) {
             // Handling the exception and logging an error
-            System.err.println("Error processing JSON for total pipelines: ");
+            LOGGER.info("Error processing JSON for total pipelines: " + e.getMessage());
             e.printStackTrace();
         }
         // Returning the list of filtered pipelines
@@ -222,12 +222,8 @@ private static List<PipelineDetails> getAllBuilds(BrowserStackCredentials browse
                                         rootUpstreamProject = UpstreamPipelineResolver.resolveRootUpstreamProject(build, browserStackCredentials);
                                         immediateParentProject = UpstreamPipelineResolver.resolveImmediateUpstreamProjectForQEI(build, browserStackCredentials);
                                     } catch (Exception e) {          
-                                        try {
-                                            apiUtil.logToQD(browserStackCredentials, "Failed to resolve root upstream project for build " + buildNumber + ": " + e.getMessage());
-                                        } catch (JsonProcessingException ex) {
-                                            System.err.println("Error logging upstream project resolution failure for build " + buildNumber + ": " + ex.getMessage());
-                                            ex.printStackTrace();
-                                        }
+                                        LOGGER.info("Error resolving upstream project for " + pipelineName + " build number " + buildNumber + ": " + e.getMessage());
+                                        e.printStackTrace();
                                     }
                                     PipelineDetails pipelineDetail = new PipelineDetails(pipelineName, buildNumber, duration, result,
                                             endTime, rootUpstreamProject, immediateParentProject);
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
index 3de116b..e76d0ee 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
@@ -132,13 +132,9 @@ private void sendBuildDataToQD(Run<?, ?> run, Result overallResult, String final
             try {
                 rootUpstreamProject = UpstreamPipelineResolver.resolveRootUpstreamProject(run, browserStackCredentials);
                 immediateParentProject = UpstreamPipelineResolver.resolveImmediateUpstreamProjectForQEI(run, browserStackCredentials);
-            } catch (Exception e) {          
-                try {
-                    apiUtil.logToQD(browserStackCredentials, "Failed to resolve root upstream project for build " + buildNumber + ": " + e.getMessage());
-                } catch (JsonProcessingException ex) {
-                    System.err.println("Error logging upstream project resolution failure for build " + buildNumber + ": " + ex.getMessage());
-                    ex.printStackTrace();
-                }
+            } catch (Exception e) {
+                LOGGER.info("Error resolving upstream project for jobName: " + jobName + " and buildNumber: " + buildNumber + ". Exception: " + e.getMessage());
+                e.printStackTrace();
             }
             Timestamp endTime = new Timestamp(endTimeInMillis);
             PipelineResults pipelineResultsReqObj = new PipelineResults(buildNumber, pipelineDuration, overallResult.toString(), 

From 25cc14b9ed87587f73b4e74d4cfea54905af0944 Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Thu, 19 Jun 2025 01:36:37 +0530
Subject: [PATCH 12/15] Sending the job type to QEI.

---
 .../QualityDashboardInit.java                 | 42 ++++++++++++-------
 .../QualityDashboardInitItemListener.java     | 23 +++-------
 .../QualityDashboardUtil.java                 | 14 +++++++
 3 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
index 6ec838f..4fbaf9e 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
@@ -14,6 +14,7 @@
 import hudson.model.Run;
 import java.sql.Timestamp;
 import java.time.Instant;
+import java.io.Serializable;
 import jenkins.model.Jenkins;
 import okhttp3.*;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
@@ -62,7 +63,7 @@ private static void initQDSetupIfRequired() throws JsonProcessingException {
             }
         } catch (Exception e) {
             try {
-                apiUtil.logToQD(browserStackCredentials, "Global exception in data export is:");
+                apiUtil.logToQD(browserStackCredentials, "Global exception in data export is:" + exceptionToString(e));
             } catch (Exception ex) {
                 String exceptionString = exceptionToString(ex);
                 apiUtil.logToQD(browserStackCredentials, "Global exception in exception data export is:" + exceptionString);
@@ -74,7 +75,7 @@ private static void initQDSetupIfRequired() throws JsonProcessingException {
 
     private static void checkQDIntegrationAndDumpMetaData(BrowserStackCredentials browserStackCredentials) throws JsonProcessingException {
         if(initialQDSetupRequired(browserStackCredentials)) {
-            List<String> allPipelines = getAllPipelines(browserStackCredentials);
+            List<PipelineInfo> allPipelines = getAllPipelines(browserStackCredentials);
             if(!allPipelines.isEmpty()){
                 boolean projectsSavedSuccessfully = sendPipelinesPaginated(browserStackCredentials, allPipelines);
                 if(projectsSavedSuccessfully) {
@@ -110,8 +111,8 @@ private static boolean initialQDSetupRequired(BrowserStackCredentials browserSta
         return false;
     }
 
-    private static List<String> getAllPipelines(BrowserStackCredentials browserStackCredentials) {
-        List<String> allPipelines = new ArrayList<>();
+    private static List<PipelineInfo> getAllPipelines(BrowserStackCredentials browserStackCredentials) {
+        List<PipelineInfo> allPipelines = new ArrayList<>();
         Jenkins jenkins = Jenkins.getInstanceOrNull();
         Integer totalPipelines = 0;
 
@@ -119,7 +120,7 @@ private static List<String> getAllPipelines(BrowserStackCredentials browserStack
             totalPipelines = jenkins.getAllItems().size();
             jenkins.getAllItems().forEach(job -> {
                 try {
-                    String jobType = job.getClass().getSimpleName();
+                    String itemType = QualityDashboardUtil.getItemTypeModified(job);
                     boolean isWorkflowJob = job instanceof WorkflowJob;
                     
                     // Logging job details
@@ -128,16 +129,16 @@ private static List<String> getAllPipelines(BrowserStackCredentials browserStack
                         String.format(
                             "Job name: %s, instance type: %s, and is_workflow_job: %s",
                             job.getName(),
-                            jobType,
+                            itemType,
                             isWorkflowJob ? "yes" : "no"
                         )
                     );
-                    if ( job instanceof Job) {
+                    if (itemType != null) {
                         String pipelineName = job.getFullName();
-                        allPipelines.add(pipelineName);
+                        allPipelines.add(new PipelineInfo(pipelineName, itemType));
                     }
                     else{
-                        apiUtil.logToQD(browserStackCredentials, "Skipping job: " + job.getName() + " as it is not a Job instance");
+                        apiUtil.logToQD(browserStackCredentials, "Skipping job: " + job.getName() + " as it is not a Job or Folder instance");
                     }
                     
                 } catch (JsonProcessingException e) {
@@ -167,13 +168,13 @@ private static List<String> getAllPipelines(BrowserStackCredentials browserStack
         return allPipelines;
     }
 
-    private static boolean sendPipelinesPaginated(BrowserStackCredentials browserStackCredentials, List<String> allPipelines) {
+    private static boolean sendPipelinesPaginated(BrowserStackCredentials browserStackCredentials, List<PipelineInfo> allPipelines) {
         boolean isSuccess = true;
         int pageSize = getProjectPageSize(browserStackCredentials);
-        List<List<String>> pipelinesInSmallerBatches = Lists.partition(allPipelines, pageSize);
+        List<List<PipelineInfo>> pipelinesInSmallerBatches = Lists.partition(allPipelines, pageSize);
         int totalPages = !pipelinesInSmallerBatches.isEmpty() ? pipelinesInSmallerBatches.size() : 0;
         int page = 0;
-        for(List<String> singlePagePipelineList : pipelinesInSmallerBatches) {
+        for(List<PipelineInfo> singlePagePipelineList : pipelinesInSmallerBatches) {
             try {
                 page++;
                 ObjectMapper objectMapper = new ObjectMapper();
@@ -348,6 +349,19 @@ public PipelineDetails(String pipelineName, Integer buildNumber, Long buildDurat
     }
 }
 
+class PipelineInfo implements Serializable {
+    @JsonProperty("pipelineName")
+    private String pipelineName;
+
+    @JsonProperty("jobType")
+    private String jobType;
+
+    public PipelineInfo(String pipelineName, String jobType) {
+        this.pipelineName = pipelineName;
+        this.jobType = jobType;
+    }
+}
+
 class PipelinesPaginated {
     @JsonProperty("page")
     private int page;
@@ -356,9 +370,9 @@ class PipelinesPaginated {
     private int totalPages;
 
     @JsonProperty("pipelines")
-    private List<String> pipelines;
+    private List<PipelineInfo> pipelines;
 
-    public PipelinesPaginated(int page, int totalPages, List<String> pipelines) {
+    public PipelinesPaginated(int page, int totalPages, List<PipelineInfo> pipelines) {
         this.page = page;
         this.totalPages = totalPages;
         this.pipelines = pipelines;
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java
index d2397a4..b3001e1 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java
@@ -11,7 +11,6 @@
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import java.io.Serializable;
 import java.util.logging.Logger;
 
@@ -29,15 +28,13 @@ public void onCreated(Item job) {
                 return;
             }
             QualityDashboardAPIUtil apiUtil = new QualityDashboardAPIUtil();
-            apiUtil.logToQD(browserStackCredentials, "Item Created : " + job.getClass().getName()) ;
 
             String itemName = job.getFullName();
-            String itemType = getItemTypeModified(job);
+            String itemType = QualityDashboardUtil.getItemTypeModified(job);
 
-            apiUtil.logToQD(browserStackCredentials, "Item Type  : " + itemType + " : " + itemName + " : " + itemType.equals("PIPELINE"));
-            if(itemType != null && itemType.equals("PIPELINE")) {
+            apiUtil.logToQD(browserStackCredentials, "Item Created : " + itemName + " - " + "Item Type : " + itemType);
+            if(itemType != null) {
                 try {
-                    apiUtil.logToQD(browserStackCredentials, "Item Type inside the Folder  : " + itemType + " : " + itemName + " : " + itemType.equals("PIPELINE"));
                     String jsonBody = getJsonReqBody(new ItemUpdate(itemName, itemType));
                     syncItemListToQD(jsonBody, Constants.QualityDashboardAPI.getItemCrudEndpoint(), "POST");
 
@@ -54,7 +51,7 @@ public void onCreated(Item job) {
     @Override
     public void onDeleted(Item job) {
         String itemName = job.getFullName();
-        String itemType = getItemTypeModified(job);
+        String itemType = QualityDashboardUtil.getItemTypeModified(job);
         if(itemType != null) {
             try {
                 String jsonBody = getJsonReqBody(new ItemUpdate(itemName, itemType));
@@ -68,7 +65,7 @@ public void onDeleted(Item job) {
 
     @Override
     public void onRenamed(Item job, String oldName, String newName) {
-        String itemType = getItemTypeModified(job);
+        String itemType = QualityDashboardUtil.getItemTypeModified(job);
         if(itemType != null) {
             try {
                 oldName = job.getParent().getFullName() + "/" + oldName;
@@ -82,16 +79,6 @@ public void onRenamed(Item job, String oldName, String newName) {
         }
     }
 
-    private String getItemTypeModified(Item job) {
-        String itemType = null;
-        boolean isFolderRenamed = job.getClass().getName().contains("Folder");
-        boolean isPipelineRenamed = job instanceof WorkflowJob;
-        if(isFolderRenamed || isPipelineRenamed) {
-            itemType = isPipelineRenamed ? "PIPELINE" : "FOLDER";
-        }
-        return itemType;
-    }
-
     private <T> String getJsonReqBody( T item) throws JsonProcessingException {
         ObjectMapper objectMapper = new ObjectMapper();
         String jsonBody = objectMapper.writeValueAsString(item);
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardUtil.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardUtil.java
index e2dff06..3ad2e95 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardUtil.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardUtil.java
@@ -3,6 +3,8 @@
 import com.browserstack.automate.ci.jenkins.BrowserStackCredentials;
 import com.cloudbees.plugins.credentials.CredentialsProvider;
 import com.cloudbees.plugins.credentials.common.StandardCredentials;
+import hudson.model.Item;
+import hudson.model.Job;
 import jenkins.model.Jenkins;
 
 import java.util.ArrayList;
@@ -15,4 +17,16 @@ public static BrowserStackCredentials getBrowserStackCreds() {
         BrowserStackCredentials browserStackCredentials = (BrowserStackCredentials) creds.stream().filter(c -> c instanceof BrowserStackCredentials).findFirst().orElse(null);
         return browserStackCredentials;
     }
+
+    public static String getItemTypeModified(Item job) {
+        if (job instanceof Job) {
+            return job.getClass().getSimpleName().toUpperCase();
+        }
+        else if (job.getClass().getName().contains("Folder")) {
+            return "FOLDER";
+        } 
+        else {
+            return null;
+        }
+    }
 }

From bea898d43334e54174d36c53f74b8a8ac8945960 Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Thu, 19 Jun 2025 11:55:38 +0530
Subject: [PATCH 13/15] Adding try-catch around the getItemType

---
 .../QualityDashboardUtil.java                 | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardUtil.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardUtil.java
index 3ad2e95..0e08874 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardUtil.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardUtil.java
@@ -19,13 +19,18 @@ public static BrowserStackCredentials getBrowserStackCreds() {
     }
 
     public static String getItemTypeModified(Item job) {
-        if (job instanceof Job) {
-            return job.getClass().getSimpleName().toUpperCase();
-        }
-        else if (job.getClass().getName().contains("Folder")) {
-            return "FOLDER";
-        } 
-        else {
+        try {
+            if (job instanceof Job) {
+                return job.getClass().getSimpleName().toUpperCase();
+            }
+            else if (job.getClass().getName().contains("Folder")) {
+                return "FOLDER";
+            } 
+            else {
+                return null;
+            }
+        } catch (Exception e) {
+            // Return null in case of any error during job type determination
             return null;
         }
     }

From e2cad42bf743e3b04705e100486c53db62bc21e3 Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Thu, 19 Jun 2025 13:51:53 +0530
Subject: [PATCH 14/15] Sending job type at the initials set-up and item
 creation steps, and supporting job and folder item type handling on rename
 and deletion.

---
 .../ci/jenkins/qualityDashboard/QualityDashboardInit.java     | 4 ++--
 .../qualityDashboard/QualityDashboardInitItemListener.java    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
index 4fbaf9e..07f17be 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
@@ -133,12 +133,12 @@ private static List<PipelineInfo> getAllPipelines(BrowserStackCredentials browse
                             isWorkflowJob ? "yes" : "no"
                         )
                     );
-                    if (itemType != null) {
+                    if (itemType != null && !itemType.equals("FOLDER")) {
                         String pipelineName = job.getFullName();
                         allPipelines.add(new PipelineInfo(pipelineName, itemType));
                     }
                     else{
-                        apiUtil.logToQD(browserStackCredentials, "Skipping job: " + job.getName() + " as it is not a Job or Folder instance");
+                        apiUtil.logToQD(browserStackCredentials, "Skipping job or Folder: " + job.getName() + " as it is not a Job or Folder instance");
                     }
                     
                 } catch (JsonProcessingException e) {
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java
index b3001e1..20f8c14 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java
@@ -33,7 +33,7 @@ public void onCreated(Item job) {
             String itemType = QualityDashboardUtil.getItemTypeModified(job);
 
             apiUtil.logToQD(browserStackCredentials, "Item Created : " + itemName + " - " + "Item Type : " + itemType);
-            if(itemType != null) {
+            if(itemType != null && !itemType.equals("FOLDER")) {
                 try {
                     String jsonBody = getJsonReqBody(new ItemUpdate(itemName, itemType));
                     syncItemListToQD(jsonBody, Constants.QualityDashboardAPI.getItemCrudEndpoint(), "POST");
@@ -42,6 +42,8 @@ public void onCreated(Item job) {
                     LOGGER.info("Error syncing item creation to Quality Dashboard: " + e.getMessage());
                     e.printStackTrace();
                 }
+            } else {
+                apiUtil.logToQD(browserStackCredentials, "Skipping item creation sync: " + itemName);
             }
         } catch(Exception e) {
             e.printStackTrace();

From 631cf696b601fda0e37792cee571d08e986611b8 Mon Sep 17 00:00:00 2001
From: Sanjay Shukla <sanjay.s@browserstack.com>
Date: Thu, 19 Jun 2025 15:46:30 +0530
Subject: [PATCH 15/15] changing logger method from info to warning.

---
 .../jenkins/qualityDashboard/QualityDashboardInit.java | 10 +++++-----
 .../QualityDashboardInitItemListener.java              | 10 +++++-----
 .../QualityDashboardPipelineTracker.java               |  8 ++------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
index 07f17be..cb18f33 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInit.java
@@ -59,7 +59,7 @@ private static void initQDSetupIfRequired() throws JsonProcessingException {
                 apiUtil.logToQD(browserStackCredentials,"Starting plugin data export to QD");
                 checkQDIntegrationAndDumpMetaData(browserStackCredentials);
             } else {
-                LOGGER.info("BrowserStack credentials not found. Skipping Quality Dashboard initialization.");
+                LOGGER.warning("BrowserStack credentials not found. Skipping Quality Dashboard initialization.");
             }
         } catch (Exception e) {
             try {
@@ -143,7 +143,7 @@ private static List<PipelineInfo> getAllPipelines(BrowserStackCredentials browse
                     
                 } catch (JsonProcessingException e) {
                     // Handling the exception and logging an error
-                    LOGGER.info("Error processing JSON for job: " + job.getName() + " - " + e.getMessage());
+                    LOGGER.warning("Error processing JSON for job: " + job.getName() + " - " + e.getMessage());
                     e.printStackTrace();
                 }
             });
@@ -151,7 +151,7 @@ private static List<PipelineInfo> getAllPipelines(BrowserStackCredentials browse
             try {
                 apiUtil.logToQD(browserStackCredentials, "Issue getting Jenkins Instance");
             } catch (JsonProcessingException e) {
-                LOGGER.info("Error logging issue with Jenkins instance.");
+                LOGGER.warning("Error logging issue with Jenkins instance.");
                 e.printStackTrace();
             }
         }
@@ -161,7 +161,7 @@ private static List<PipelineInfo> getAllPipelines(BrowserStackCredentials browse
             apiUtil.logToQD(browserStackCredentials,"Total Pipelines detected : " + allPipelines.size());
         } catch (JsonProcessingException e) {
             // Handling the exception and logging an error
-            LOGGER.info("Error processing JSON for total pipelines: " + e.getMessage());
+            LOGGER.warning("Error processing JSON for total pipelines: " + e.getMessage());
             e.printStackTrace();
         }
         // Returning the list of filtered pipelines
@@ -223,7 +223,7 @@ private static List<PipelineDetails> getAllBuilds(BrowserStackCredentials browse
                                         rootUpstreamProject = UpstreamPipelineResolver.resolveRootUpstreamProject(build, browserStackCredentials);
                                         immediateParentProject = UpstreamPipelineResolver.resolveImmediateUpstreamProjectForQEI(build, browserStackCredentials);
                                     } catch (Exception e) {          
-                                        LOGGER.info("Error resolving upstream project for " + pipelineName + " build number " + buildNumber + ": " + e.getMessage());
+                                        LOGGER.warning("Error resolving upstream project for " + pipelineName + " build number " + buildNumber + ": " + e.getMessage());
                                         e.printStackTrace();
                                     }
                                     PipelineDetails pipelineDetail = new PipelineDetails(pipelineName, buildNumber, duration, result,
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java
index 20f8c14..e00adba 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardInitItemListener.java
@@ -24,7 +24,7 @@ public void onCreated(Item job) {
         try {
             BrowserStackCredentials browserStackCredentials = QualityDashboardUtil.getBrowserStackCreds();
             if(browserStackCredentials == null) {
-                LOGGER.info("BrowserStackCredentials not found. Please ensure they are configured correctly.");
+                LOGGER.warning("BrowserStackCredentials not found. Please ensure they are configured correctly.");
                 return;
             }
             QualityDashboardAPIUtil apiUtil = new QualityDashboardAPIUtil();
@@ -39,7 +39,7 @@ public void onCreated(Item job) {
                     syncItemListToQD(jsonBody, Constants.QualityDashboardAPI.getItemCrudEndpoint(), "POST");
 
                 } catch(Exception e) {
-                    LOGGER.info("Error syncing item creation to Quality Dashboard: " + e.getMessage());
+                    LOGGER.warning("Error syncing item creation to Quality Dashboard: " + e.getMessage());
                     e.printStackTrace();
                 }
             } else {
@@ -59,7 +59,7 @@ public void onDeleted(Item job) {
                 String jsonBody = getJsonReqBody(new ItemUpdate(itemName, itemType));
                 syncItemListToQD(jsonBody, Constants.QualityDashboardAPI.getItemCrudEndpoint(), "DELETE");
             } catch(Exception e) {
-                LOGGER.info("Error syncing item deletion to Quality Dashboard: " + e.getMessage());
+                LOGGER.warning("Error syncing item deletion to Quality Dashboard: " + e.getMessage());
                 e.printStackTrace();
             }
         }
@@ -75,7 +75,7 @@ public void onRenamed(Item job, String oldName, String newName) {
                 String jsonBody = getJsonReqBody(new ItemRename(oldName, newName, itemType));
                 syncItemListToQD(jsonBody, Constants.QualityDashboardAPI.getItemCrudEndpoint(), "PUT");
             } catch(Exception e) {
-            LOGGER.info("Error syncing item rename to Quality Dashboard: " + e.getMessage());
+            LOGGER.warning("Error syncing item rename to Quality Dashboard: " + e.getMessage());
                 e.printStackTrace();
             }
         }
@@ -92,7 +92,7 @@ private Response syncItemListToQD(String jsonBody, String url, String typeOfRequ
         QualityDashboardAPIUtil apiUtil = new QualityDashboardAPIUtil();
         BrowserStackCredentials browserStackCredentials = QualityDashboardUtil.getBrowserStackCreds();
         if(browserStackCredentials == null) {
-            LOGGER.info("BrowserStack credentials not found. Please ensure they are configured correctly.");
+            LOGGER.warning("BrowserStack credentials not found. Please ensure they are configured correctly.");
             return null;
         }  
         if(typeOfRequest.equals("PUT")) {
diff --git a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
index e76d0ee..ca77738 100644
--- a/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
+++ b/src/main/java/com/browserstack/automate/ci/jenkins/qualityDashboard/QualityDashboardPipelineTracker.java
@@ -57,7 +57,7 @@ public void onCompleted(Run<?, ?> run, TaskListener listener) {
             }
         }
         else {
-            LOGGER.info("BrowserStack credentials not found. Please ensure they are configured correctly.");
+            LOGGER.warning("BrowserStack credentials not found. Please ensure they are configured correctly.");
         }
     }
 
@@ -133,7 +133,7 @@ private void sendBuildDataToQD(Run<?, ?> run, Result overallResult, String final
                 rootUpstreamProject = UpstreamPipelineResolver.resolveRootUpstreamProject(run, browserStackCredentials);
                 immediateParentProject = UpstreamPipelineResolver.resolveImmediateUpstreamProjectForQEI(run, browserStackCredentials);
             } catch (Exception e) {
-                LOGGER.info("Error resolving upstream project for jobName: " + jobName + " and buildNumber: " + buildNumber + ". Exception: " + e.getMessage());
+                LOGGER.warning("Error resolving upstream project for jobName: " + jobName + " and buildNumber: " + buildNumber + ". Exception: " + e.getMessage());
                 e.printStackTrace();
             }
             Timestamp endTime = new Timestamp(endTimeInMillis);
@@ -191,12 +191,8 @@ private boolean isQDEnabled(BrowserStackCredentials browserStackCredentials) thr
         // Check if we have a valid cached value
         Boolean cachedResult = QDEnabledCache.getCachedValue();
         if (cachedResult != null) {
-            LOGGER.info("Using cached QD enabled status: " + cachedResult);
             return cachedResult;
         }
-        
-        // Cache expired or not set, make API call
-        LOGGER.info("QD enabled status cache expired or not set, making API call");
         Response response = apiUtil.makeGetRequestToQd(Constants.QualityDashboardAPI.getIsQdEnabledEndpoint(), browserStackCredentials);
         boolean isEnabled = false;