Add ci.job.id tag

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

@@ -29,6 +29,7 @@ public CIInfo buildCIInfo() {
     return CIInfo.builder(environment)
         .ciProviderName(AWS_CODEPIPELINE_PROVIDER_NAME)
         .ciPipelineId(environment.get(AWS_CODEPIPELINE_EXECUTION_ID))
+        .ciJobId(environment.get(AWS_CODEPIPELINE_ACTION_EXECUTION_ID))
         .ciEnvVars(
             AWS_CODEPIPELINE_EXECUTION_ID,
             AWS_CODEPIPELINE_ACTION_EXECUTION_ID,

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

@@ -77,6 +77,7 @@ public CIInfo buildCIInfo() {
         .ciPipelineNumber(buildId)
         .ciPipelineUrl(buildCiPipelineUrl(uri, project, buildId))
         .ciStageName(environment.get(AZURE_SYSTEM_STAGEDISPLAYNAME))
+        .ciJobId(jobId)
         .ciJobName(environment.get(AZURE_SYSTEM_JOBDISPLAYNAME))
         .ciJobUrl(buildCiJobUrl(uri, project, buildId, jobId, taskId))
         .ciWorkspace(expandTilde(environment.get(AZURE_WORKSPACE_PATH)))

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

@@ -70,6 +70,7 @@ public CIInfo buildCIInfo() {
         .ciPipelineName(environment.get(BUILDKITE_PIPELINE_NAME))
         .ciPipelineNumber(environment.get(BUILDKITE_PIPELINE_NUMBER))
         .ciPipelineUrl(ciPipelineUrl)
+        .ciJobId(environment.get(BUILDKITE_JOB_ID))
         .ciJobUrl(String.format("%s#%s", ciPipelineUrl, environment.get(BUILDKITE_JOB_ID)))
         .ciWorkspace(expandTilde(environment.get(BUILDKITE_WORKSPACE_PATH)))
         .ciNodeName(environment.get(BUILDKITE_AGENT_ID))

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

@@ -23,6 +23,7 @@ public static final class Builder {
     private String ciPipelineId;
     private String ciPipelineName;
     private String ciStageName;
+    private String ciJobId;
     private String ciJobName;
     private String ciPipelineNumber;
     private String ciPipelineUrl;
@@ -72,6 +73,11 @@ public Builder ciPipelineUrl(String ciPipelineUrl) {
       return this;
     }
 
+    public Builder ciJobId(String ciJobId) {
+      this.ciJobId = ciJobId;
+      return this;
+    }
+
     public Builder ciJobUrl(String ciJobUrl) {
       this.ciJobUrl = ciJobUrl;
       return this;
@@ -118,6 +124,7 @@ public CIInfo build() {
           ciPipelineId,
           ciPipelineName,
           ciStageName,
+          ciJobId,
           ciJobName,
           ciPipelineNumber,
           ciPipelineUrl,
@@ -134,6 +141,7 @@ public CIInfo build() {
   private final String ciPipelineId;
   private final String ciPipelineName;
   private final String ciStageName;
+  private final String ciJobId;
   private final String ciJobName;
   private final String ciPipelineNumber;
   private final String ciPipelineUrl;
@@ -145,14 +153,15 @@ public CIInfo build() {
   private final Map<String, String> additionalTags;
 
   public CIInfo() {
-    this(null, null, null, null, null, null, null, null, null, null, null, null, null);
+    this(null, null, null, null, null, null, null, null, null, null, null, null, null, null);
   }
 
   public CIInfo(
       String ciProviderName,
       String ciPipelineId,
       String ciPipelineName,
       String ciStageName,
+      String ciJobId,
       String ciJobName,
       String ciPipelineNumber,
       String ciPipelineUrl,
@@ -166,6 +175,7 @@ public CIInfo(
     this.ciPipelineId = ciPipelineId;
     this.ciPipelineName = ciPipelineName;
     this.ciStageName = ciStageName;
+    this.ciJobId = ciJobId;
     this.ciJobName = ciJobName;
     this.ciPipelineNumber = ciPipelineNumber;
     this.ciPipelineUrl = ciPipelineUrl;
@@ -193,6 +203,10 @@ public String getCiStageName() {
     return ciStageName;
   }
 
+  public String getCiJobId() {
+    return ciJobId;
+  }
+
   public String getCiJobName() {
     return ciJobName;
   }
@@ -252,6 +266,7 @@ public boolean equals(Object o) {
         && Objects.equals(ciPipelineId, ciInfo.ciPipelineId)
         && Objects.equals(ciPipelineName, ciInfo.ciPipelineName)
         && Objects.equals(ciStageName, ciInfo.ciStageName)
+        && Objects.equals(ciJobId, ciInfo.ciJobId)
         && Objects.equals(ciJobName, ciInfo.ciJobName)
         && Objects.equals(ciPipelineNumber, ciInfo.ciPipelineNumber)
         && Objects.equals(ciPipelineUrl, ciInfo.ciPipelineUrl)
@@ -270,6 +285,7 @@ public int hashCode() {
     hash = 31 * hash + (ciPipelineId == null ? 0 : ciPipelineId.hashCode());
     hash = 31 * hash + (ciPipelineName == null ? 0 : ciPipelineName.hashCode());
     hash = 31 * hash + (ciStageName == null ? 0 : ciStageName.hashCode());
+    hash = 31 * hash + (ciJobId == null ? 0 : ciJobId.hashCode());
     hash = 31 * hash + (ciJobName == null ? 0 : ciJobName.hashCode());
     hash = 31 * hash + (ciPipelineNumber == null ? 0 : ciPipelineNumber.hashCode());
     hash = 31 * hash + (ciPipelineUrl == null ? 0 : ciPipelineUrl.hashCode());
@@ -297,6 +313,9 @@ public String toString() {
         + ", ciStageName='"
         + ciStageName
         + '\''
+        + ", ciJobId='"
+        + ciJobId
+        + '\''
         + ", ciJobName='"
         + ciJobName
         + '\''

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

@@ -31,6 +31,7 @@ public Map<String, String> getCiTags(CIInfo ciInfo, PullRequestInfo pullRequestI
         .withCiPipelineName(ciInfo.getCiPipelineName())
         .withCiStageName(ciInfo.getCiStageName())
         .withCiJobName(ciInfo.getCiJobName())
+        .withCiJobId(ciInfo.getCiJobId())
         .withCiPipelineNumber(ciInfo.getCiPipelineNumber())
         .withCiPipelineUrl(ciInfo.getCiPipelineUrl())
         .withCiJorUrl(ciInfo.getCiJobUrl())
@@ -92,6 +93,10 @@ public CITagsBuilder withCiStageName(final String ciStageName) {
       return putTagValue(Tags.CI_STAGE_NAME, ciStageName);
     }
 
+    public CITagsBuilder withCiJobId(final String ciJobId) {
+      return putTagValue(Tags.CI_JOB_ID, ciJobId);
+    }
+
     public CITagsBuilder withCiJobName(final String ciJobName) {
       return putTagValue(Tags.CI_JOB_NAME, ciJobName);
     }

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

@@ -51,6 +51,7 @@ public CIInfo buildCIInfo() {
         .ciPipelineId(pipelineId)
         .ciPipelineName(environment.get(CIRCLECI_PIPELINE_NAME))
         .ciPipelineUrl(buildPipelineUrl(pipelineId))
+        .ciJobId(environment.get(CIRCLECI_BUILD_NUM))
         .ciJobName(environment.get(CIRCLECI_JOB_NAME))
         .ciJobUrl(environment.get(CIRCLECI_BUILD_URL))
         .ciWorkspace(expandTilde(environment.get(CIRCLECI_WORKSPACE_PATH)))

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

@@ -73,6 +73,7 @@ public CIInfo buildCIInfo() {
         .ciPipelineNumber(environment.get(GITLAB_PIPELINE_NUMBER))
         .ciPipelineUrl(environment.get(GITLAB_PIPELINE_URL))
         .ciStageName(environment.get(GITLAB_STAGE_NAME))
+        .ciJobId(environment.get(GITLAB_JOB_ID))
         .ciJobName(environment.get(GITLAB_JOB_NAME))
         .ciJobUrl(environment.get(GITLAB_JOB_URL))
         .ciWorkspace(expandTilde(environment.get(GITLAB_WORKSPACE_PATH)))

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

@@ -82,6 +82,7 @@ public CIInfo buildCIInfo() {
         .ciPipelineName(environment.get(GHACTIONS_PIPELINE_NAME))
         .ciPipelineNumber(environment.get(GHACTIONS_PIPELINE_NUMBER))
         .ciPipelineUrl(pipelineUrl)
+        .ciJobId(environment.get(GHACTIONS_JOB))
         .ciJobName(environment.get(GHACTIONS_JOB))
         .ciJobUrl(jobUrl)
         .ciWorkspace(expandTilde(environment.get(GHACTIONS_WORKSPACE_PATH)))

dd-java-agent/agent-ci-visibility/src/test/resources/ci/awscodepipeline.json

@@ -18,6 +18,7 @@
     },
     {
       "_dd.ci.env_vars": "{\"CODEBUILD_BUILD_ARN\":\"arn:aws:codebuild:eu-north-1:12345678:build/codebuild-demo-project:b1e6661e-e4f2-4156-9ab9-82a19\",\"DD_PIPELINE_EXECUTION_ID\":\"bb1f15ed-fde2-494d-8e13-88785bca9cc0\",\"DD_ACTION_EXECUTION_ID\":\"35519dc3-7c45-493c-9ba6-cd78ea11f69d\"}",
+      "ci.job.id": "35519dc3-7c45-493c-9ba6-cd78ea11f69d",
       "ci.pipeline.id": "bb1f15ed-fde2-494d-8e13-88785bca9cc0",
       "ci.provider.name": "awscodepipeline",
       "git.branch": "user-supplied-branch",