Skip to content

Avoid computing merge base for PR info in DDCI legacy mode #10624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daniel-mohedano wants to merge 2 commits into
base: master
Choose a base branch
from
+18 −3
Open

Avoid computing merge base for PR info in DDCI legacy mode #10624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c32c221
feat: check for DDCI legacy mode before running merge base
daniel-mohedano Feb 18, 2026
fde088b
Merge branch 'master' into daniel.mohedano/ddci-legacy
daniel-mohedano Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ...gent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityRepoServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,15 @@ private static PullRequestInfo buildUserPullRequestInfo(
String targetSha = environment.get(Constants.DDCI_PULL_REQUEST_TARGET_SHA);
String sourceSha = environment.get(Constants.DDCI_PULL_REQUEST_SOURCE_SHA);
String mergeBase = null;
try {
mergeBase = gitClient.getMergeBase(targetSha, sourceSha);
} catch (Exception ignored) {

if (!Constants.DDCI_LEGACY_KIND.equals(environment.get(Constants.DDCI_REQUEST_KIND))) {
// legacy mode doesn't set a valid target sha to compute the merge base
try {
mergeBase = gitClient.getMergeBase(targetSha, sourceSha);
} catch (Exception ignored) {
}
}

PullRequestInfo ddCiInfo =
new PullRequestInfo(
null,
Expand Down
10 changes: 10 additions & 0 deletions dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,14 @@ public interface Constants {
* the necessary data is not exposed by the CI provider
*/
String DDCI_PULL_REQUEST_TARGET_SHA = "DDCI_PULL_REQUEST_TARGET_SHA";

/**
* Env var containing the DDCI mode used. When the legacy mode is used,
* DDCI_PULL_REQUEST_TARGET_SHA won't contain the expected value, but the previous base on the
* push event.
*/
String DDCI_REQUEST_KIND = "DDCI_REQUEST_KIND";

// Legacy mode identifier
String DDCI_LEGACY_KIND = "REQUEST_KIND_LEGACY_REQUEST";
}