Skip to content

Fix invalid metric unit strings per OTel UCUM spec #1274

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

Open
esosaoh wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −16
Open

Fix invalid metric unit strings per OTel UCUM spec #1274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions ...main/java/io/jenkins/plugins/opentelemetry/init/JenkinsExecutorMonitoringInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,22 @@ public void postConstruct() {
Meter meter = Objects.requireNonNull(jenkinsControllerOpenTelemetry).getDefaultMeter();

final ObservableLongMeasurement queueLength = meter.gaugeBuilder(JENKINS_EXECUTOR_QUEUE)
.setUnit("${items}")
.setUnit("{items}")
.setDescription("Executors queue items")
.ofLongs()
.buildObserver();
final ObservableLongMeasurement totalExecutors = meter.gaugeBuilder(JENKINS_EXECUTOR_TOTAL)
.setUnit("${executors}")
.setUnit("{executors}")
.setDescription("Total executors")
.ofLongs()
.buildObserver();
final ObservableLongMeasurement nodes = meter.gaugeBuilder(JENKINS_NODE)
.setUnit("${nodes}")
.setUnit("{nodes}")
.setDescription("Nodes")
.ofLongs()
.buildObserver();
final ObservableLongMeasurement executors = meter.gaugeBuilder(JENKINS_EXECUTOR_COUNT)
.setUnit("${executors}")
.setUnit("{executors}")
.setDescription("Count of executors per label")
.ofLongs()
.buildObserver();
Expand All @@ -73,32 +73,32 @@ public void postConstruct() {
// * `jenkins.node` metric with the `status` attribute
// * `jenkins.executor.total` metric with the `status` attribute
final ObservableLongMeasurement availableExecutors = meter.gaugeBuilder(JENKINS_EXECUTOR_AVAILABLE)
.setUnit("${executors}")
.setUnit("{executors}")
.setDescription("Available executors")
.ofLongs()
.buildObserver();
final ObservableLongMeasurement busyExecutors = meter.gaugeBuilder(JENKINS_EXECUTOR_BUSY)
.setUnit("${executors}")
.setUnit("{executors}")
.setDescription("Busy executors")
.ofLongs()
.buildObserver();
final ObservableLongMeasurement idleExecutors = meter.gaugeBuilder(JENKINS_EXECUTOR_IDLE)
.setUnit("${executors}")
.setUnit("{executors}")
.setDescription("Idle executors")
.ofLongs()
.buildObserver();
final ObservableLongMeasurement onlineExecutors = meter.gaugeBuilder(JENKINS_EXECUTOR_ONLINE)
.setUnit("${executors}")
.setUnit("{executors}")
.setDescription("Online executors")
.ofLongs()
.buildObserver();
final ObservableLongMeasurement connectingExecutors = meter.gaugeBuilder(JENKINS_EXECUTOR_CONNECTING)
.setUnit("${executors}")
.setUnit("{executors}")
.setDescription("Connecting executors")
.ofLongs()
.buildObserver();
final ObservableLongMeasurement definedExecutors = meter.gaugeBuilder(JENKINS_EXECUTOR_DEFINED)
.setUnit("${executors}")
.setUnit("{executors}")
.setDescription("Defined executors")
.ofLongs()
.buildObserver();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/jenkins/plugins/opentelemetry/init/PluginMonitoringInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ public void postConstruct() {
Meter meter = Objects.requireNonNull(jenkinsControllerOpenTelemetry).getDefaultMeter();

final ObservableLongMeasurement plugins = meter.gaugeBuilder(JENKINS_PLUGINS_COUNT)
.setUnit("${plugins}")
.setUnit("{plugins}")
.setDescription("Jenkins plugins")
.ofLongs()
.buildObserver();
final ObservableLongMeasurement pluginUpdates = meter.gaugeBuilder(JENKINS_PLUGINS_UPDATES)
.setUnit("${plugins}")
.setUnit("{plugins}")
.setDescription("Jenkins plugin updates")
.ofLongs()
.buildObserver();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/jenkins/plugins/opentelemetry/queue/MonitoringQueueListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void postConstruct() {
final ObservableLongMeasurement queueItems = meter.gaugeBuilder(JENKINS_QUEUE_COUNT)
.ofLongs()
.setDescription("Number of tasks in the queue")
.setUnit("${tasks}")
.setUnit("{tasks}")
.buildObserver();
// should be deprecated in favor of "jenkins.queue" metric with status attribute
final ObservableLongMeasurement queueWaitingItems = meter.gaugeBuilder(JENKINS_QUEUE_WAITING)
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/jenkins/plugins/opentelemetry/security/AuditingSecurityListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ public void postConstruct() {

loginSuccessCounter = meter.counterBuilder(JenkinsMetrics.LOGIN_SUCCESS)
.setDescription("Successful logins")
.setUnit("${logins}")
.setUnit("{logins}")
.build();
loginFailureCounter = meter.counterBuilder(JenkinsMetrics.LOGIN_FAILURE)
.setDescription("Failing logins")
.setUnit("${logins}")
.setUnit("{logins}")
.build();

loginCounter = meter.counterBuilder(JenkinsMetrics.LOGIN)
.setDescription("Logins")
.setUnit("${logins}")
.setUnit("{logins}")
.build();
}

Expand Down