Add _dd.ci.level (#165)

jenkinsci · Dec 15, 2020 · 520d982 · 520d982
1 parent bf8eb41
commit 520d982
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/traces/CITags.java b/src/main/java/org/datadog/jenkins/plugins/datadog/traces/CITags.java
@@ -8,7 +8,9 @@ public class CITags {
     public static final String QUEUE_TIME = "ci.queue_time";
     public static final String _DD_HOSTNAME = "_dd.hostname";
     public static final String _DD_CI_INTERNAL = "_dd.ci.internal";
-    public static final String _DD_CI_BUILD_LEVEL = "_dd.ci.build_level";
+    public static final String _DD_CI_LEVEL = "_dd.ci.level";
+    @Deprecated
+    public static final String _DD_CI_BUILD_LEVEL = "_dd.ci.build_level"; //Maintain retrocompatibility
     public static final String _DD_CI_STAGES = "_dd.ci.stages";
 
     public static final String _ID = ".id";

diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/traces/DatadogTraceBuildLogic.java b/src/main/java/org/datadog/jenkins/plugins/datadog/traces/DatadogTraceBuildLogic.java
@@ -111,6 +111,7 @@ public void finishBuildTrace(final BuildData buildData, final Run<?,?> run) {
         buildSpan.setTag(DDTags.LANGUAGE_TAG_KEY, "");
         buildSpan.setTag(CITags._DD_CI_INTERNAL, false);
         buildSpan.setTag(CITags._DD_CI_BUILD_LEVEL, buildLevel);
+        buildSpan.setTag(CITags._DD_CI_LEVEL, buildLevel);
         buildSpan.setTag(CITags.USER_NAME, buildData.getUserId());
         buildSpan.setTag(prefix + CITags._ID, buildData.getBuildTag(""));
         buildSpan.setTag(prefix + CITags._NUMBER, buildData.getBuildNumber(""));

diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/traces/DatadogTracePipelineLogic.java b/src/main/java/org/datadog/jenkins/plugins/datadog/traces/DatadogTracePipelineLogic.java
@@ -291,6 +291,7 @@ private Map<String, Object> buildTraceTags(final BuildPipelineNode current, fina
         tags.put(CITags._DD_CI_INTERNAL, current.isInternal());
         if(!current.isInternal()) {
             tags.put(CITags._DD_CI_BUILD_LEVEL, buildLevel);
+            tags.put(CITags._DD_CI_LEVEL, buildLevel);
         }
         tags.put(CITags.JENKINS_RESULT, current.getResult().toLowerCase());
         tags.put(CITags.ERROR, String.valueOf(current.isError()));

diff --git a/src/test/java/org/datadog/jenkins/plugins/datadog/listeners/DatadogBuildListenerIT.java b/src/test/java/org/datadog/jenkins/plugins/datadog/listeners/DatadogBuildListenerIT.java
@@ -104,6 +104,7 @@ public void testTraces() throws Exception {
         final DDSpan buildSpan = buildTrace.get(0);
         assertGitVariables(buildSpan);
         assertEquals(BuildPipelineNode.NodeType.PIPELINE.getBuildLevel(), buildSpan.getTag(CITags._DD_CI_BUILD_LEVEL));
+        assertEquals(BuildPipelineNode.NodeType.PIPELINE.getBuildLevel(), buildSpan.getTag(CITags._DD_CI_LEVEL));
         assertEquals("jenkins.build", buildSpan.getOperationName());
         assertEquals(SAMPLE_SERVICE_NAME, buildSpan.getServiceName());
         assertEquals("buildIntegrationSuccess", buildSpan.getResourceName());

diff --git a/src/test/java/org/datadog/jenkins/plugins/datadog/listeners/DatadogGraphListenerTest.java b/src/test/java/org/datadog/jenkins/plugins/datadog/listeners/DatadogGraphListenerTest.java
@@ -442,6 +442,7 @@ public void testIntegrationNoFailureTag() throws Exception {
         assertEquals("jenkins-pipelineIntegrationSuccess-1", buildSpan.getTag(CITags.JENKINS_TAG));
         assertEquals(false, buildSpan.getTag(CITags._DD_CI_INTERNAL));
         assertEquals(BuildPipelineNode.NodeType.PIPELINE.getBuildLevel(), buildSpan.getTag(CITags._DD_CI_BUILD_LEVEL));
+        assertEquals(BuildPipelineNode.NodeType.PIPELINE.getBuildLevel(), buildSpan.getTag(CITags._DD_CI_LEVEL));
         assertNotNull(buildSpan.getTag(CITags._DD_CI_STAGES));
         assertTrue(((String) buildSpan.getTag(CITags._DD_CI_STAGES)).contains("{\"name\":\"test\",\"duration\""));
 
@@ -463,6 +464,7 @@ public void testIntegrationNoFailureTag() throws Exception {
         assertNotNull(pipelineSpan.getTag(CITags._DD_HOSTNAME));
         assertEquals(true, pipelineSpan.getTag(CITags._DD_CI_INTERNAL));
         assertNull(pipelineSpan.getTag(CITags._DD_CI_BUILD_LEVEL));
+        assertNull(pipelineSpan.getTag(CITags._DD_CI_LEVEL));
         assertEquals("jenkins-pipelineIntegrationSuccess-1", pipelineSpan.getTag(BuildPipelineNode.NodeType.PIPELINE.getTagName() + CITags._ID));
         assertEquals("pipelineIntegrationSuccess", pipelineSpan.getTag(BuildPipelineNode.NodeType.PIPELINE.getTagName() + CITags._NAME));
         assertNotNull(pipelineSpan.getTag(CITags.QUEUE_TIME));
@@ -484,6 +486,7 @@ public void testIntegrationNoFailureTag() throws Exception {
         assertEquals(true, stepInternalSpan.getTag(CITags._DD_CI_INTERNAL));
         assertEquals("3", stepInternalSpan.getTag(stepPrefix + CITags._NUMBER));
         assertNull(stepInternalSpan.getTag(CITags._DD_CI_BUILD_LEVEL));
+        assertNull(stepInternalSpan.getTag(CITags._DD_CI_LEVEL));
         assertEquals("jenkins-pipelineIntegrationSuccess-1", stepInternalSpan.getTag(BuildPipelineNode.NodeType.PIPELINE.getTagName() + CITags._ID));
         assertEquals("pipelineIntegrationSuccess", stepInternalSpan.getTag(BuildPipelineNode.NodeType.PIPELINE.getTagName() + CITags._NAME));
         assertNotNull(stepInternalSpan.getTag(CITags.QUEUE_TIME));
@@ -504,6 +507,7 @@ public void testIntegrationNoFailureTag() throws Exception {
         assertEquals(false, stageSpan.getTag(CITags._DD_CI_INTERNAL));
         assertEquals("4", stageSpan.getTag(stagePrefix + CITags._NUMBER));
         assertEquals(BuildPipelineNode.NodeType.STAGE.getBuildLevel(), stageSpan.getTag(CITags._DD_CI_BUILD_LEVEL));
+        assertEquals(BuildPipelineNode.NodeType.STAGE.getBuildLevel(), stageSpan.getTag(CITags._DD_CI_LEVEL));
         assertEquals("jenkins-pipelineIntegrationSuccess-1", stageSpan.getTag(BuildPipelineNode.NodeType.PIPELINE.getTagName() + CITags._ID));
         assertEquals("pipelineIntegrationSuccess", stageSpan.getTag(BuildPipelineNode.NodeType.PIPELINE.getTagName() + CITags._NAME));
         assertNotNull(stageSpan.getTag(CITags.QUEUE_TIME));
@@ -525,6 +529,7 @@ public void testIntegrationNoFailureTag() throws Exception {
         assertEquals(false, stepAtomSpan.getTag(CITags._DD_CI_INTERNAL));
         assertEquals("5", stepAtomSpan.getTag(stepPrefix + CITags._NUMBER));
         assertEquals(BuildPipelineNode.NodeType.STEP.getBuildLevel(), stepAtomSpan.getTag(CITags._DD_CI_BUILD_LEVEL));
+        assertEquals(BuildPipelineNode.NodeType.STEP.getBuildLevel(), stepAtomSpan.getTag(CITags._DD_CI_LEVEL));
         assertEquals("jenkins-pipelineIntegrationSuccess-1", stepAtomSpan.getTag(BuildPipelineNode.NodeType.PIPELINE.getTagName() + CITags._ID));
         assertEquals("pipelineIntegrationSuccess", stepAtomSpan.getTag(BuildPipelineNode.NodeType.PIPELINE.getTagName() + CITags._NAME));
         assertEquals("test", stepAtomSpan.getTag(BuildPipelineNode.NodeType.STAGE.getTagName() + CITags._NAME));