Skip to content

Commit cff7170

Browse files
fix: use base SHA value in GHA as base branch head sha
1 parent 7d20566 commit cff7170

File tree

22 files changed

+104
-61
lines changed

22 files changed

+104
-61
lines changed

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityRepoServices.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ static PullRequestInfo buildPullRequestInfo(
131131
// if head sha present try to populate author, committer and message info through git client
132132
try {
133133
CommitInfo commitInfo = gitClient.getCommitInfo(headSha, true);
134-
return PullRequestInfo.merge(ciInfo, new PullRequestInfo(null, null, commitInfo, null));
134+
return PullRequestInfo.merge(
135+
ciInfo, new PullRequestInfo(null, null, null, commitInfo, null));
135136
} catch (Exception ignored) {
136137
}
137138
}
@@ -145,6 +146,7 @@ private static PullRequestInfo buildUserPullRequestInfo(
145146
new PullRequestInfo(
146147
config.getGitPullRequestBaseBranch(),
147148
config.getGitPullRequestBaseBranchSha(),
149+
null,
148150
new CommitInfo(config.getGitCommitHeadSha()),
149151
null);
150152

@@ -164,6 +166,7 @@ private static PullRequestInfo buildUserPullRequestInfo(
164166
new PullRequestInfo(
165167
null,
166168
mergeBase,
169+
null,
167170
new CommitInfo(environment.get(Constants.DDCI_PULL_REQUEST_SOURCE_SHA)),
168171
null);
169172

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AppVeyorInfo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ public PullRequestInfo buildPullRequestInfo() {
9191
return new PullRequestInfo(
9292
normalizeBranch(environment.get(APPVEYOR_REPO_BRANCH)),
9393
null,
94+
null,
9495
new CommitInfo(environment.get(APPVEYOR_PR_HEAD_COMMIT)),
9596
environment.get(APPVEYOR_PR_NUMBER));
9697
} else {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AzurePipelinesInfo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ public PullRequestInfo buildPullRequestInfo() {
9090
return new PullRequestInfo(
9191
normalizeBranch(environment.get(AZURE_PR_TARGET_BRANCH)),
9292
null,
93+
null,
9394
CommitInfo.NOOP,
9495
environment.get(AZURE_PR_NUMBER));
9596
}

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitBucketInfo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public PullRequestInfo buildPullRequestInfo() {
7979
return new PullRequestInfo(
8080
normalizeBranch(environment.get(BITBUCKET_PR_DESTINATION_BRANCH)),
8181
null,
82+
null,
8283
CommitInfo.NOOP,
8384
environment.get(BITBUCKET_PR_NUMBER));
8485
}

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitriseInfo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public PullRequestInfo buildPullRequestInfo() {
7676
return new PullRequestInfo(
7777
normalizeBranch(environment.get(BITRISE_GIT_BRANCH_DEST)),
7878
null,
79+
null,
7980
CommitInfo.NOOP,
8081
environment.get(BITRISE_PR_NUMBER));
8182
}

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuddyInfo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public PullRequestInfo buildPullRequestInfo() {
6767
return new PullRequestInfo(
6868
normalizeBranch(environment.get(BUDDY_RUN_PR_BASE_BRANCH)),
6969
null,
70+
null,
7071
CommitInfo.NOOP,
7172
environment.get(BUDDY_RUN_PR_NUMBER));
7273
}

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BuildkiteInfo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public PullRequestInfo buildPullRequestInfo() {
8585
return new PullRequestInfo(
8686
normalizeBranch(environment.get(BUILDKITE_PULL_REQUEST_BASE_BRANCH)),
8787
null,
88+
null,
8889
CommitInfo.NOOP,
8990
environment.get(BUILDKITE_PULL_REQUEST_NUMBER));
9091
}

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CITagsProvider.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public Map<String, String> getCiTags(CIInfo ciInfo, PullRequestInfo pullRequestI
4141
.withAdditionalTags(ciInfo.getAdditionalTags())
4242
.withPullRequestBaseBranch(pullRequestInfo)
4343
.withPullRequestBaseBranchSha(pullRequestInfo)
44+
.withPullRequestBaseBranchHeadSha(pullRequestInfo)
4445
.withGitCommitHeadSha(pullRequestInfo)
4546
.withGitCommitHeadAuthorName(pullRequestInfo)
4647
.withGitCommitHeadAuthorEmail(pullRequestInfo)
@@ -130,13 +131,16 @@ public CITagsBuilder withAdditionalTags(final Map<String, String> additionalTags
130131
}
131132

132133
public CITagsBuilder withPullRequestBaseBranch(final PullRequestInfo pullRequestInfo) {
133-
return putTagValue(
134-
Tags.GIT_PULL_REQUEST_BASE_BRANCH, pullRequestInfo.getPullRequestBaseBranch());
134+
return putTagValue(Tags.GIT_PULL_REQUEST_BASE_BRANCH, pullRequestInfo.getBaseBranch());
135135
}
136136

137137
public CITagsBuilder withPullRequestBaseBranchSha(final PullRequestInfo pullRequestInfo) {
138+
return putTagValue(Tags.GIT_PULL_REQUEST_BASE_BRANCH_SHA, pullRequestInfo.getBaseBranchSha());
139+
}
140+
141+
public CITagsBuilder withPullRequestBaseBranchHeadSha(final PullRequestInfo pullRequestInfo) {
138142
return putTagValue(
139-
Tags.GIT_PULL_REQUEST_BASE_BRANCH_SHA, pullRequestInfo.getPullRequestBaseBranchSha());
143+
Tags.GIT_PULL_REQUEST_BASE_BRANCH_HEAD_SHA, pullRequestInfo.getBaseBranchHeadSha());
140144
}
141145

142146
public CITagsBuilder withGitCommitHeadSha(final PullRequestInfo pullRequestInfo) {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CircleCIInfo.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ public CIInfo buildCIInfo() {
6161
@Nonnull
6262
@Override
6363
public PullRequestInfo buildPullRequestInfo() {
64-
return new PullRequestInfo(null, null, CommitInfo.NOOP, environment.get(CIRCLECI_PR_NUMBER));
64+
return new PullRequestInfo(
65+
null, null, null, CommitInfo.NOOP, environment.get(CIRCLECI_PR_NUMBER));
6566
}
6667

6768
private String buildPipelineUrl(final String pipelineId) {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/CodefreshInfo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public PullRequestInfo buildPullRequestInfo() {
5151
return new PullRequestInfo(
5252
normalizeBranch(environment.get(CF_PULL_REQUEST_TARGET_BRANCH)),
5353
null,
54+
null,
5455
CommitInfo.NOOP,
5556
environment.get(CF_PULL_REQUEST_NUMBER));
5657
}

0 commit comments

Comments
 (0)