update PRInfo building to use partial information from CI vendors

DataDog · daniel-mohedano · Jun 3, 2025 · May 20, 2025 · May 23, 2025 · Jun 2, 2025
commit 8747ab6d9f68c1075f9599760d836e18e68b3c11
@@ -65,7 +65,8 @@ public class CiVisibilityRepoServices {
     ciProvider = ciProviderInfo.getProvider();
 
     CIInfo ciInfo = ciProviderInfo.buildCIInfo();
-    PullRequestInfo pullRequestInfo = buildPullRequestInfo(services.environment, ciProviderInfo);
+    PullRequestInfo pullRequestInfo =
+        buildPullRequestInfo(services.config, services.environment, ciProviderInfo);
 
     if (pullRequestInfo.isNotEmpty()) {
       LOGGER.info("PR detected: {}", pullRequestInfo);
@@ -110,18 +111,38 @@ public class CiVisibilityRepoServices {
 
   @Nonnull
   private static PullRequestInfo buildPullRequestInfo(
-      CiEnvironment environment, CIProviderInfo ciProviderInfo) {
-    PullRequestInfo ciProviderPrInfo = ciProviderInfo.buildPullRequestInfo();
-    if (ciProviderPrInfo.isNotEmpty()) {
-      return ciProviderPrInfo;
+      Config config, CiEnvironment environment, CIProviderInfo ciProviderInfo) {
+    PullRequestInfo info = buildUserPullRequestInfo(config, environment);
+
+    if (info.isComplete()) {
+      return info;
+    }
+
+    // complete with CI vars if user didn't provide all information
+    return PullRequestInfo.merge(info, ciProviderInfo.buildPullRequestInfo());
+  }
+
+  @Nonnull
+  private static PullRequestInfo buildUserPullRequestInfo(
+      Config config, CiEnvironment environment) {
+    PullRequestInfo userInfo =
+        new PullRequestInfo(
+            config.getGitPullRequestBaseBranch(),
+            config.getGitPullRequestBaseBranchSha(),
+            config.getGitCommitHeadSha());
+
+    if (userInfo.isComplete()) {
+      return userInfo;
     }
 
-    // could not get PR info from CI provider,
-    // check if it was set manually
-    return new PullRequestInfo(
-        null,
-        environment.get(Constants.DDCI_PULL_REQUEST_TARGET_SHA),
-        environment.get(Constants.DDCI_PULL_REQUEST_SOURCE_SHA));
+    // logs-backend specific vars
+    PullRequestInfo ddCiInfo =
+        new PullRequestInfo(
+            null,
+            environment.get(Constants.DDCI_PULL_REQUEST_TARGET_SHA),
+            environment.get(Constants.DDCI_PULL_REQUEST_SOURCE_SHA));
+
+    return PullRequestInfo.merge(userInfo, ddCiInfo);
   }
 
   private static String getRepoRoot(CIInfo ciInfo, GitClient.Factory gitClientFactory) {

@@ -83,7 +83,7 @@ public CIInfo buildCIInfo() {
   @Nonnull
   @Override
   public PullRequestInfo buildPullRequestInfo() {
-    return PullRequestI
8000
nfo.EMPTY;
+    return new PullRequestInfo(environment.get(APPVEYOR_REPO_BRANCH), null, null);
   }
 
   private String buildGitBranch(final String repoProvider) {

@@ -26,6 +26,7 @@ class BitBucketInfo implements CIProviderInfo {
   public static final String BITBUCKET_GIT_COMMIT = "BITBUCKET_COMMIT";
   public static final String BITBUCKET_GIT_BRANCH = "BITBUCKET_BRANCH";
   public static final String BITBUCKET_GIT_TAG = "BITBUCKET_TAG";
+  public static final String BITBUCKET_PR_DESTINATION_BRANCH = "BITBUCKET_PR_DESTINATION_BRANCH";
 
   private final CiEnvironment environment;
 
@@ -74,7 +75,7 @@ public CIInfo buildCIInfo() {
   @Nonnull
   @Override
   public PullRequestInfo buildPullRequestInfo() {
    return PullRequestInfo.EMPTY;
+    return new PullRequestInfo(environment.get(BITBUCKET_PR_DESTINATION_BRANCH), null, null);
   }
 
   private String buildPipelineUrl(final String repo, final String number) {

@@ -27,6 +27,7 @@ class BuddyInfo implements CIProviderInfo {
   public static final String BUDDY_GIT_COMMIT_MESSAGE = "BUDDY_EXECUTION_REVISION_MESSAGE";
   public static final String BUDDY_GIT_COMMIT_AUTHOR = "BUDDY_EXECUTION_REVISION_COMMITTER_NAME";
   public static final String BUDDY_GIT_COMMIT_EMAIL = "BUDDY_EXECUTION_REVISION_COMMITTER_EMAIL";
+  public static final String BUDDY_RUN_PR_BASE_BRANCH = "BUDDY_RUN_PR_BASE_BRANCH";
 
   private final CiEnvironment environment;
 
@@ -62,7 +63,7 @@ public CIInfo buildCIInfo() {
   @Nonnull
   @Override
   public PullRequestInfo buildPullRequestInfo() {
-        return PullRequestInfo.EMPTY;
+    return new PullRequestInfo(BUDDY_RUN_PR_BASE_BRANCH, null, null);
   }
 
   private String getPipelineId(String pipelineNumber) {

@@ -36,6 +36,32 @@ public boolean isNotEmpty() {
         || Strings.isNotBlank(gitCommitHeadSha);
   }
 
+  public boolean isComplete() {
+    return Strings.isNotBlank(pullRequestBaseBranch)
+        && Strings.isNotBlank(pullRequestBaseBranchSha)
+        && Strings.isNotBlank(gitCommitHeadSha);
+  }
+
+  /**
+   * Merges info by completing the empty information fields with the fallback's
+   *
+   * @param info Base PR info
+   * @param fallback Fallback PR info
+   * @return Completed PR info
+   */
+  public static PullRequestInfo merge(PullRequestInfo info, PullRequestInfo fallback) {
+    return new PullRequestInfo(
+        Strings.isNotBlank(info.pullRequestBaseBranch)
+            ? info.pullRequestBaseBranch
+            : fallback.pullRequestBaseBranch,
+        Strings.isNotBlank(info.pullRequestBaseBranchSha)
+            ? info.pullRequestBaseBranchSha
+            : fallback.pullRequestBaseBranchSha,
+        Strings.isNotBlank(info.gitCommitHeadSha)
+            ? info.gitCommitHeadSha
+            : fallback.gitCommitHeadSha);
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

@@ -85,6 +85,11 @@ public final class CiVisibilityConfig {
   public static final String TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES =
       "test.management.attempt.to.fix.retries";
 
+  /* Git PR info */
+  public static final String GIT_PULL_REQUEST_BASE_BRANCH = "git.pull.request.base.branch";
+  public static final String GIT_PULL_REQUEST_BASE_BRANCH_SHA = "git.pull.request.base.branch.sha";
+  public static final String GIT_COMMIT_HEAD_SHA = "git.commit.head.sha";
+
   /* COVERAGE SETTINGS */
   public static final String CIVISIBILITY_CODE_COVERAGE_ENABLED =
       "civisibility.code.coverage.enabled";

@@ -389,6 +389,9 @@ public static String getHostName() {
   private final boolean ciVisibilityTestManagementEnabled;
   private final Integer ciVisibilityTestManagementAttemptToFixRetries;
   private final boolean ciVisibilityScalatestForkMonitorEnabled;
+  private final String gitPullRequestBaseBranch;
+  private final String gitPullRequestBaseBranchSha;
+  private final String gitCommitHeadSha;
 
   private final boolean remoteConfigEnabled;
   private final boolean remoteConfigIntegrityCheckEnabled;
@@ -1631,6 +1634,9 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
         configProvider.getInteger(TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES);
     ciVisibilityScalatestForkMonitorEnabled =
         configProvider.getBoolean(CIVISIBILITY_SCALATEST_FORK_MONITOR_ENABLED, false);
+    gitPullRequestBaseBranch = configProvider.getString(GIT_PULL_REQUEST_BASE_BRANCH);
+    gitPullRequestBaseBranchSha = configProvider.getString(GIT_PULL_REQUEST_BASE_BRANCH_SHA);
+    gitCommitHeadSha = configProvider.getString(GIT_COMMIT_HEAD_SHA);
 
     remoteConfigEnabled =
         configProvider.getBoolean(
@@ -3196,6 +3202,18 @@ public Integer getCiVisibilityTestManagementAttemptToFixRetries() {
     return ciVisibilityTestManagementAttemptToFixRetries;
   }
 
+  public String getGitPullRequestBaseBranch() {
+    return gitPullRequestBaseBranch;
+  }
+
+  public String getGitPullRequestBaseBranchSha() {
+    return gitPullRequestBaseBranchSha;
+  }
+
+  public String getGitCommitHeadSha() {
+    return gitCommitHeadSha;
+  }
+
   public String getAppSecRulesFile() {
     return appSecRulesFile;
   }