Skip to content

Commit 39c42b2

Browse files
juan-fernandezdevflow.devflow-routing-intake
andauthored
Propagate Jenkins custom parent ID (#11348)
Propagate Jenkins custom parent ID Merge branch 'master' into juan-fernandez-custom-parent-id-jenkins Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>
1 parent dab8a45 commit 39c42b2

3 files changed

Lines changed: 82 additions & 37 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class JenkinsInfo implements CIProviderInfo {
3434
public static final String JENKINS_GIT_COMMIT = "GIT_COMMIT";
3535
public static final String JENKINS_GIT_BRANCH = "GIT_BRANCH";
3636
public static final String JENKINS_DD_CUSTOM_TRACE_ID = "DD_CUSTOM_TRACE_ID";
37+
public static final String JENKINS_DD_CUSTOM_PARENT_ID = "DD_CUSTOM_PARENT_ID";
3738
public static final String JENKINS_NODE_NAME = "NODE_NAME";
3839
public static final String JENKINS_NODE_LABELS = "NODE_LABELS";
3940
public static final String JENKINS_PR_NUMBER = "CHANGE_ID";
@@ -67,7 +68,7 @@ public CIInfo buildCIInfo() {
6768
.ciWorkspace(expandTilde(environment.get(JENKINS_WORKSPACE_PATH)))
6869
.ciNodeName(environment.get(JENKINS_NODE_NAME))
6970
.ciNodeLabels(buildCiNodeLabels())
70-
.ciEnvVars(JENKINS_DD_CUSTOM_TRACE_ID)
71+
.ciEnvVars(JENKINS_DD_CUSTOM_TRACE_ID, JENKINS_DD_CUSTOM_PARENT_ID)
7172
.build();
7273
}
7374

0 commit comments

Comments
 (0)