Merge pull request #176 from DataDog/gzu/all_env_vars

DataDog · Dec 2, 2019 · 57c1cf6 · 57c1cf6
2 parents 0d67c3e + 860960b
commit 57c1cf6
Show file tree

Hide file tree

Showing 10 changed files with 267 additions and 100 deletions.
diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogBuildListener.java b/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogBuildListener.java
@@ -153,7 +153,7 @@ public final void onCompleted(final Run run, @Nonnull final TaskListener listene
 
             // Send a metric
             JSONArray tags = buildData.getAssembledTags(extraTags);
-            client.gauge("jenkins.job.duration", buildData.getDuration(0L), hostname, tags);
+            client.gauge("jenkins.job.duration", buildData.getDuration(0L) / 1000, hostname, tags);
 
             // Submit counter
             client.incrementCounter("jenkins.job.completed", hostname, tags);

diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogUtilities.java b/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogUtilities.java
@@ -3,7 +3,6 @@
 import hudson.EnvVars;
 import hudson.model.Run;
 import hudson.model.TaskListener;
-import hudson.util.Secret;
 import jenkins.model.Jenkins;
 import org.datadog.jenkins.plugins.datadog.clients.DatadogHttpClient;
 import java.io.BufferedReader;

diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/events/AbstractDatadogEvent.java b/src/main/java/org/datadog/jenkins/plugins/datadog/events/AbstractDatadogEvent.java
@@ -23,20 +23,20 @@ public AbstractDatadogEvent(BuildData buildData, Map<String, Set<String>> buildT
     public JSONObject createPayload() {
         JSONObject payload = new JSONObject();
         payload.put("host", builddata.getHostname(null));
-        payload.put("aggregation_key", builddata.getJob(null));
-        payload.put("date_happened", builddata.getTimestamp(System.currentTimeMillis() / 1000));
+        payload.put("aggregation_key", builddata.getJobName(null));
+        payload.put("date_happened", builddata.getEndTime(System.currentTimeMillis()) / 1000);
         payload.put("tags", builddata.getAssembledTags(tags));
         payload.put("source_type_name", "jenkins");
 
         return payload;
     }
 
-    protected String getDuration() {
+    protected String getFormattedDuration() {
         Long duration = builddata.getDuration(null);
         if (duration != null) {
             String output = "(";
             String format = "%.2f";
-            double d = duration.doubleValue();
+            double d = duration.doubleValue() / 1000;
             if (d < MINUTE) {
                 output = output + String.format(format, d) + " secs)";
             } else if (MINUTE <= d && d < HOUR) {

diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/events/BuildFinishedEventImpl.java b/src/main/java/org/datadog/jenkins/plugins/datadog/events/BuildFinishedEventImpl.java
@@ -21,26 +21,25 @@ public BuildFinishedEventImpl(BuildData buildData, Map<String, Set<String>> buil
     @Override
     public JSONObject createPayload() {
         JSONObject payload = super.createPayload();
-        String number = builddata.getNumber(null) == null ?
-                "unknown" : builddata.getNumber(null).toString();
+        String buildNumber = builddata.getBuildNumber("unknown");
         String buildResult = builddata.getResult("UNKNOWN");
 
         // Build title
-        String title = builddata.getJob("unknown") +
+        String title = builddata.getJobName("unknown") +
                 " build #" +
-                number +
+                buildNumber +
                 " " +
                 buildResult.toLowerCase() +
                 " on " +
                 builddata.getHostname("unknown");
         payload.put("title", title);
 
         String message = "%%% \n [See results for build #" +
-                number +
+                buildNumber +
                 "](" +
                 builddata.getBuildUrl("unknown") +
                 ") " +
-                getDuration() +
+                getFormattedDuration() +
                 " \n %%%";
         payload.put("text", message);
 

diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/events/BuildStartedEventImpl.java b/src/main/java/org/datadog/jenkins/plugins/datadog/events/BuildStartedEventImpl.java
@@ -23,11 +23,10 @@ public BuildStartedEventImpl(BuildData buildData, Map<String, Set<String>> build
     @Override
     public JSONObject createPayload() {
         JSONObject payload = super.createPayload();
-        String number = builddata.getNumber(null) == null ?
-                "unknown" : builddata.getNumber(null).toString();
+        String number = builddata.getBuildNumber("unknown");
 
         // Build title
-        String title = builddata.getJob("unknown") +
+        String title = builddata.getJobName("unknown") +
                 " build #" +
                 number +
                 " started" +
@@ -41,7 +40,7 @@ public JSONObject createPayload() {
                 " progress](" +
                 builddata.getBuildUrl("unknown") +
                 ") " +
-                getDuration() +
+                getFormattedDuration() +
                 " \n %%%";
         payload.put("text", message);
 

diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/events/CheckoutCompletedEventImpl.java b/src/main/java/org/datadog/jenkins/plugins/datadog/events/CheckoutCompletedEventImpl.java
@@ -23,11 +23,10 @@ public CheckoutCompletedEventImpl(BuildData buildData, Map<String, Set<String>>
     @Override
     public JSONObject createPayload() {
         JSONObject payload = super.createPayload();
-        String number = builddata.getNumber(null) == null ?
-                "unknown" : builddata.getNumber(null).toString();
+        String number = builddata.getBuildNumber("unknown");
 
         // Build title
-        String title = builddata.getJob("unknown") +
+        String title = builddata.getJobName("unknown") +
                 " build #" +
                 number +
                 " checkout finished" +
@@ -41,7 +40,7 @@ public JSONObject createPayload() {
                 " progress](" +
                 builddata.getBuildUrl("unknown") +
                 ") " +
-                getDuration() +
+                getFormattedDuration() +
                 " \n %%%";
         payload.put("text", message);