Implement running jobs metric + update metrics code#407
Merged
Conversation
nikita-tkachenko-datadog
added
changelog/Added
nikita-tkachenko-datadog
force-pushed
the
nikita-tkachenko/metrics-update
branch
from
April 3, 2024 09:28
a03b079 to
e9bdcc4
Compare
nikita-tkachenko-datadog
marked this pull request as ready for review
April 3, 2024 09:50
drodriguezhdez
left a comment
drodriguezhdez
left a comment
Collaborator
There was a problem hiding this comment.
Dropped some comments
| metrics.gauge("jenkins.job.build_duration", buildDuration / 1000, hostname, tags); | ||
| metrics.gauge("jenkins.job.pause_duration", TimeUnit.MILLISECONDS.toSeconds(pauseDurationMillis), hostname, tags); | ||
| logger.fine(String.format("[%s]: Pause Duration: %s", buildData.getJobName(), toTimeString(pauseDurationMillis))); | ||
| long buildDuration = run.getDuration() - pauseDurationMillis; |
Collaborator
There was a problem hiding this comment.
Suggested change
| long buildDuration = run.getDuration() - pauseDurationMillis; | |
| long buildDurationMillis = run.getDuration() - pauseDurationMillis; |
At some point, probably we want to start using java.time.Duration and java.time.Instant to get rid of these xxxMillis suffixes everywhere, now that JDK 1.8 is a requirement for the plugin. (Not blocker for this PR, tho)
Collaborator
Author
There was a problem hiding this comment.
Agree about the java.time usage. Added the suffix for now :)
| return; | ||
| } | ||
| logger.fine("increment counter with dogStatD client"); | ||
| statsd.count(name, value, TagsUtil.convertTagsToArray(tags)); |
Collaborator
There was a problem hiding this comment.
Suggested change
| statsd.count(name, value, TagsUtil.convertTagsToArray(tags)); | |
| String[] tagsArr = (tags != null) ? TagsUtil.convertTagsToArray(tags) : EMPTY_ARRAY; | |
| statsd.count(name, value, TagsUtil.convertTagsToArray(tagsArr)); |
Or even better, modify the TagsUtil.convertTagsToArray method to be resilient for null tags.
In the DatadogApiClient class, we're checking this.
Collaborator
Author
There was a problem hiding this comment.
Added a null-check in TagsUtil.convertTagsToArray
| metrics.gauge("jenkins.node.count", nodeCount, hostname, globalTags); | ||
| metrics.gauge("jenkins.node.offline", nodeOffline, hostname, globalTags); | ||
| metrics.gauge("jenkins.node.online", nodeOnline, hostname, globalTags); | ||
| metrics.gauge("jenkins.job.currently_building", getCurrentRunCount(computers), hostname, globalTags); |
Collaborator
There was a problem hiding this comment.
Is it possible to add a test for this new metric?
Collaborator
Author
There was a problem hiding this comment.
Added an integration test
drodriguezhdez
previously approved these changes
Apr 4, 2024
nikita-tkachenko-datadog
force-pushed
the
nikita-tkachenko/metrics-update
branch
from
April 8, 2024 09:39
114903e to
e3c5e9a
Compare
drodriguezhdez
approved these changes
Apr 8, 2024
nikita-tkachenko-datadog
added a commit
that referenced
this pull request
May 3, 2024
This reverts commit 2074828.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Adds new
jenkins.job.currently_buildingmetric which is a gauge of how many jobs are currently executing (the difference compared to existing "busy executors count" is that multiple executors can run parallel task from the same job).Also some of the code that accumulates global counter metrics is refactored.
Description of the Change
Alternate Designs
Possible Drawbacks
Verification Process
Additional Notes
Release Notes
Review checklist (to be filled by reviewers)
changelog/label attached. If applicable it should have thebackward-incompatiblelabel attached.do-not-merge/label attached.kind/andseverity/labels attached at least.