Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add _dd.origin tag to Jenkins traces #218

Merged
merged 1 commit into from
Jun 15, 2021
Merged

Add _dd.origin tag to Jenkins traces #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/java/org/datadog/jenkins/plugins/datadog/traces/CITags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class CITags {
@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 _DD_ORIGIN = "_dd.origin";

public static final String _ID = ".id";
public static final String _NAME = ".name";
Expand Down Expand Up @@ -46,4 +47,8 @@ public class CITags {
public static final String JENKINS_RESULT = "jenkins.result";

public static final String ERROR = "error";

public static class Values {
public static final String ORIGIN_CIAPP_PIPELINE = "ciapp-pipeline";
}
}
2 changes: 2 additions & 0 deletions src/main/java/org/datadog/jenkins/plugins/datadog/traces/DatadogTraceBuildLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static org.datadog.jenkins.plugins.datadog.DatadogUtilities.getNormalizedResultForTraces;
import static org.datadog.jenkins.plugins.datadog.DatadogUtilities.toJson;
import static org.datadog.jenkins.plugins.datadog.traces.CITags.Values.ORIGIN_CIAPP_PIPELINE;
import static org.datadog.jenkins.plugins.datadog.traces.GitInfoUtils.normalizeBranch;
import static org.datadog.jenkins.plugins.datadog.traces.GitInfoUtils.normalizeTag;
import static org.datadog.jenkins.plugins.datadog.util.git.GitUtils.isValidCommit;
Expand Down Expand Up @@ -122,6 +123,7 @@ public void finishBuildTrace(final BuildData buildData, final Run<?,?> run) {
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._DD_ORIGIN, ORIGIN_CIAPP_PIPELINE);
buildSpan.setTag(CITags.USER_NAME, buildData.getUserId());
buildSpan.setTag(prefix + CITags._ID, buildData.getBuildTag(""));
buildSpan.setTag(prefix + CITags._NUMBER, buildData.getBuildNumber(""));
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/datadog/jenkins/plugins/datadog/traces/DatadogTracePipelineLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static org.datadog.jenkins.plugins.datadog.DatadogUtilities.getNormalizedResultForTraces;
import static org.datadog.jenkins.plugins.datadog.DatadogUtilities.toJson;
import static org.datadog.jenkins.plugins.datadog.model.BuildPipelineNode.NodeType.PIPELINE;
import static org.datadog.jenkins.plugins.datadog.traces.CITags.Values.ORIGIN_CIAPP_PIPELINE;
import static org.datadog.jenkins.plugins.datadog.traces.GitInfoUtils.normalizeBranch;
import static org.datadog.jenkins.plugins.datadog.traces.GitInfoUtils.normalizeTag;
import static org.datadog.jenkins.plugins.datadog.util.git.GitUtils.isValidCommit;
Expand Down Expand Up @@ -279,6 +280,7 @@ private Map<String, Object> buildTraceTags(final Run run, final BuildPipelineNod

final Map<String, Object> tags = new HashMap<>();
tags.put(CITags.CI_PROVIDER_NAME, CI_PROVIDER);
tags.put(CITags._DD_ORIGIN, ORIGIN_CIAPP_PIPELINE);
tags.put(prefix + CITags._NAME, current.getName());
tags.put(prefix + CITags._NUMBER, current.getId());
final String status = getNormalizedResultForTraces(getResult(current));
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/org/datadog/jenkins/plugins/datadog/listeners/DatadogBuildListenerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.datadog.jenkins.plugins.datadog.listeners;

import static org.datadog.jenkins.plugins.datadog.traces.CITags.Values.ORIGIN_CIAPP_PIPELINE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
Expand Down Expand Up @@ -112,6 +113,7 @@ public void testTraces() throws Exception {
assertGitVariables(buildSpan, "master");
assertEquals(BuildPipelineNode.NodeType.PIPELINE.getBuildLevel(), buildSpan.getTag(CITags._DD_CI_BUILD_LEVEL));
assertEquals(BuildPipelineNode.NodeType.PIPELINE.getBuildLevel(), buildSpan.getTag(CITags._DD_CI_LEVEL));
assertEquals(ORIGIN_CIAPP_PIPELINE, buildSpan.getTag(CITags._DD_ORIGIN));
assertEquals("jenkins.build", buildSpan.getOperationName());
assertEquals(SAMPLE_SERVICE_NAME, buildSpan.getServiceName());
assertEquals("buildIntegrationSuccess", buildSpan.getResourceName());
Expand Down
4 changes: 4 additions & 0 deletions src/test/java/org/datadog/jenkins/plugins/datadog/listeners/DatadogGraphListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.datadog.jenkins.plugins.datadog.listeners;

import static org.datadog.jenkins.plugins.datadog.traces.CITags.Values.ORIGIN_CIAPP_PIPELINE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
Expand Down Expand Up @@ -503,6 +504,7 @@ public void testIntegrationNoFailureTag() throws Exception {
final DDSpan buildSpan = buildTrace.get(0);
assertEquals("jenkins.build", buildSpan.getOperationName());
assertEquals(SAMPLE_SERVICE_NAME, buildSpan.getServiceName());
assertEquals(ORIGIN_CIAPP_PIPELINE, buildSpan.getTag(CITags._DD_ORIGIN));
assertEquals("pipelineIntegrationSuccess", buildSpan.getResourceName());
assertEquals("ci", buildSpan.getType());
assertEquals("anonymous", buildSpan.getTag(CITags.USER_NAME));
Expand Down Expand Up @@ -531,6 +533,7 @@ public void testIntegrationNoFailureTag() throws Exception {
final DDSpan stageSpan = pipelineTrace.get(0);
assertEquals("jenkins.stage", stageSpan.getOperationName());
assertEquals(SAMPLE_SERVICE_NAME, stageSpan.getServiceName());
assertEquals(ORIGIN_CIAPP_PIPELINE, stageSpan.getTag(CITags._DD_ORIGIN));
assertEquals("test", stageSpan.getResourceName());
assertEquals("ci", stageSpan.getType());
assertEquals("test", stageSpan.getTag(stagePrefix + CITags._NAME));
Expand All @@ -552,6 +555,7 @@ public void testIntegrationNoFailureTag() throws Exception {
final DDSpan stepAtomSpan = pipelineTrace.get(1);
assertEquals("jenkins.step", stepAtomSpan.getOperationName());
assertEquals(SAMPLE_SERVICE_NAME, stepAtomSpan.getServiceName());
assertEquals(ORIGIN_CIAPP_PIPELINE, stepAtomSpan.getTag(CITags._DD_ORIGIN));
assertEquals("Print Message", stepAtomSpan.getResourceName());
assertEquals("ci", stepAtomSpan.getType());
assertEquals("Print Message", stepAtomSpan.getTag(stepPrefix + CITags._NAME));
Expand Down