diff --git a/.gitignore b/.gitignore index 4c5df42ba..356ffe7d4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ target/* nb-configuration.xml /datadog.iml /.idea/* +.idea/ diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogBuildListener.java b/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogBuildListener.java index f147260ba..ec3d1ff05 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogBuildListener.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogBuildListener.java @@ -217,7 +217,7 @@ private JSONObject gatherBuildMetadata(final Run run, @Nonnull final TaskListene builddata.put("timestamp", endtime); // long builddata.put("result", run.getResult().toString()); // string builddata.put("number", run.number); // int - builddata.put("job", run.getParent().getDisplayName()); // string + builddata.put("job", run.getParent().getFullDisplayName()); // string // Grab environment variables try { diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogSCMListener.java b/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogSCMListener.java index e8dbd4e12..63c24e917 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogSCMListener.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogSCMListener.java @@ -44,7 +44,7 @@ public void onCheckout(Run build, SCM scm, FilePath workspace, TaskListene HashMap tags = new HashMap(); DatadogJobProperty prop = DatadogUtilities.retrieveProperty(build); // Process only if job is NOT in blacklist - if ( DatadogUtilities.isJobTracked(build.getParent().getName()) + if ( DatadogUtilities.isJobTracked(build.getParent().getFullDisplayName()) && prop != null && prop.isEmitOnCheckout() ) { logger.fine("Checkout! in onCheckout()");