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 queue_time metric in APM traces as tag #127

Merged
merged 2 commits into from
Sep 11, 2020
Merged

Add queue_time metric in APM traces as tag #127

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a784ef
Include queue_time in APM traces
drodriguezhdez Sep 11, 2020
e964d10
Test queue_time tag
drodriguezhdez Sep 11, 2020
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
2 changes: 2 additions & 0 deletions src/main/java/org/datadog/jenkins/plugins/datadog/listeners/DatadogBuildListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ of this software and associated documentation files (the "Software"), to deal
import org.datadog.jenkins.plugins.datadog.events.BuildFinishedEventImpl;
import org.datadog.jenkins.plugins.datadog.events.BuildStartedEventImpl;
import org.datadog.jenkins.plugins.datadog.model.BuildData;
import org.datadog.jenkins.plugins.datadog.model.TimeInQueueAction;
import org.jenkinsci.plugins.workflow.job.WorkflowRun;

import javax.annotation.Nonnull;
Expand Down Expand Up @@ -107,6 +108,7 @@ public void onStarted(Run run, TaskListener listener) {
try {
long waiting = (DatadogUtilities.currentTimeMillis() - item.getInQueueSince()) / 1000;
client.gauge("jenkins.job.waiting", waiting, hostname, tags);
run.addAction(new TimeInQueueAction(waiting));
} catch (NullPointerException e) {
logger.warning("Unable to compute 'waiting' metric. " +
"item.getInQueueSince() unavailable, possibly due to worker instance provisioning");
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/org/datadog/jenkins/plugins/datadog/model/TimeInQueueAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package org.datadog.jenkins.plugins.datadog.model;

import hudson.model.InvisibleAction;

public class TimeInQueueAction extends InvisibleAction {

private final long secondsInQueue;

public TimeInQueueAction(final long secondsInQueue) {
this.secondsInQueue = secondsInQueue;
}

public long getSecondsInQueue() {
return secondsInQueue;
}
}
1 change: 1 addition & 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 {
public static final String _URL = ".url";
public static final String _RESULT = ".result";
public static final String _CONFIGURATION = ".configuration";
public static final String _QUEUE_TIME = ".queue_time";

public static final String CI_PROVIDER_NAME = "ci.provider.name";
public static final String USER_NAME = "user.name";
Expand Down
6 changes: 6 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 @@ -14,6 +14,7 @@
import org.datadog.jenkins.plugins.datadog.model.BuildData;
import org.datadog.jenkins.plugins.datadog.model.BuildPipelineNode;
import org.datadog.jenkins.plugins.datadog.model.StepData;
import org.datadog.jenkins.plugins.datadog.model.TimeInQueueAction;

import java.util.Map;
import java.util.logging.Logger;
Expand Down Expand Up @@ -99,6 +100,11 @@ public void finishBuildTrace(final BuildData buildData, final Run<?,?> run) {
buildSpan.setTag(prefix + CITags._NUMBER, buildData.getBuildNumber(""));
buildSpan.setTag(prefix + CITags._URL, buildData.getBuildUrl(""));

final TimeInQueueAction timeInQueueAction = run.getAction(TimeInQueueAction.class);
if(timeInQueueAction != null) {
buildSpan.setTag(prefix + CITags._QUEUE_TIME, timeInQueueAction.getSecondsInQueue());
FlorianVeaux marked this conversation as resolved.
Show resolved Hide resolved
}

final String workspace = buildData.getWorkspace("").isEmpty() ? pipelineData.getWorkspace("") : buildData.getWorkspace("");
buildSpan.setTag(CITags.WORKSPACE_PATH, workspace);

Expand Down