Skip to content

Commit 1719f9d

Browse files
PayBasBas van Erp
and
Bas van Erp
authored
[JENKINS-73788] Reduce metrics bloat relating to provisioning requests (#1604)
Co-authored-by: Bas van Erp <[email protected]>
1 parent 7345138 commit 1719f9d

File tree

4 files changed

+0
-29
lines changed

4 files changed

+0
-29
lines changed

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import static java.nio.charset.StandardCharsets.UTF_8;
44
import static org.apache.commons.lang.StringUtils.isEmpty;
5-
import static org.csanchez.jenkins.plugins.kubernetes.MetricNames.metricNameForLabel;
65

76
import com.cloudbees.plugins.credentials.CredentialsMatchers;
87
import com.cloudbees.plugins.credentials.common.StandardCredentials;
@@ -599,7 +598,6 @@ public Collection<NodeProvisioner.PlannedNode> provision(
599598
@NonNull final Cloud.CloudState state, final int excessWorkload) {
600599
var limitRegistrationResults = new LimitRegistrationResults(this);
601600
try {
602-
Metrics.metricRegistry().meter(metricNameForLabel(state.getLabel())).mark(excessWorkload);
603601
Label label = state.getLabel();
604602
// Planned nodes, will be launched on the next round of NodeProvisioner
605603
int plannedCapacity = state.getAdditionalPlannedCapacity();

src/main/java/org/csanchez/jenkins/plugins/kubernetes/MetricNames.java

-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.csanchez.jenkins.plugins.kubernetes;
22

3-
import hudson.model.Label;
43
import java.util.Locale;
54

65
public class MetricNames {
@@ -21,9 +20,4 @@ public static String metricNameForPodStatus(String status) {
2120
String formattedStatus = status == null ? "null" : status.toLowerCase(Locale.getDefault());
2221
return PREFIX + ".pods.launch.status." + formattedStatus;
2322
}
24-
25-
public static String metricNameForLabel(Label label) {
26-
String labelText = (label == null) ? "nolabel" : label.getDisplayName();
27-
return String.format("%s.%s.provision.request", PREFIX, labelText);
28-
}
2923
}

src/test/java/org/csanchez/jenkins/plugins/kubernetes/MetricNamesTest.java

-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.csanchez.jenkins.plugins.kubernetes;
22

3-
import hudson.model.labels.LabelAtom;
43
import org.junit.Assert;
54
import org.junit.Test;
65

@@ -29,20 +28,4 @@ public void metricNameForPodStatusChangeStatusToLowercase() {
2928

3029
Assert.assertEquals(expected, actual);
3130
}
32-
33-
@Test
34-
public void metricNameForLabelAddsNoLabelIfLabelIsNull() {
35-
String expected = "kubernetes.cloud.nolabel.provision.request";
36-
String actual = MetricNames.metricNameForLabel(null);
37-
38-
Assert.assertEquals(expected, actual);
39-
}
40-
41-
@Test
42-
public void metricNameForLabelAddsLabelValue() {
43-
String expected = "kubernetes.cloud.java.provision.request";
44-
String actual = MetricNames.metricNameForLabel(new LabelAtom("java"));
45-
46-
Assert.assertEquals(expected, actual);
47-
}
4831
}

src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java

-4
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,6 @@ public void runInPod() throws Exception {
252252
emptyIterable());
253253

254254
assertTrue(Metrics.metricRegistry().counter(MetricNames.PODS_LAUNCHED).getCount() > 0);
255-
assertTrue(Metrics.metricRegistry()
256-
.meter(MetricNames.metricNameForLabel(Label.parseExpression("runInPod")))
257-
.getCount()
258-
> 0);
259255
}
260256

261257
@Test

0 commit comments

Comments
 (0)