Skip to content

Commit 50f0421

Browse files
feat: add pr number parsing for github actions file
1 parent d4526f8 commit 50f0421

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ public PullRequestInfo buildPullRequestInfo() {
109109

110110
String baseSha = null;
111111
String headSha = null;
112+
String prNumber = null;
112113

113114
Map<String, Object> pullRequest = (Map<String, Object>) eventJson.get("pull_request");
114115
if (pullRequest != null) {
@@ -121,9 +122,17 @@ public PullRequestInfo buildPullRequestInfo() {
121122
if (base != null) {
122123
baseSha = (String) base.get("sha");
123124
}
125+
126+
Object number = pullRequest.get("number");
127+
if (number != null) {
128+
prNumber =
129+
number instanceof Double
130+
? String.valueOf(((Double) number).intValue())
131+
: String.valueOf(number);
132+
}
124133
}
125134

126-
return new PullRequestInfo(baseRef, baseSha, new CommitInfo(headSha), null);
135+
return new PullRequestInfo(baseRef, baseSha, new CommitInfo(headSha), prNumber);
127136

128137
} catch (Exception e) {
129138
LOGGER.warn("Error while parsing GitHub event", e);

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/GithubActionsInfoTest.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class GithubActionsInfoTest extends CITagsProviderTest {
4242
then:
4343
pullRequestInfo.getPullRequestBaseBranch() == "base-ref"
4444
pullRequestInfo.getPullRequestBaseBranchSha() == "52e0974c74d41160a03d59ddc73bb9f5adab054b"
45-
pullRequestInfo.getGitCommitHead().getSha() == "df289512a51123083a8e6931dd6f57bb3883d4c4"
45+
pullRequestInfo.getHeadCommit().getSha() == "df289512a51123083a8e6931dd6f57bb3883d4c4"
46+
pullRequestInfo.getPullRequestNumber() == "1"
4647
}
4748
}

0 commit comments

Comments
 (0)