diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/init/JenkinsExecutorMonitoringInitializer.java b/src/main/java/io/jenkins/plugins/opentelemetry/init/JenkinsExecutorMonitoringInitializer.java index da713ba8b..d492b272b 100644 --- a/src/main/java/io/jenkins/plugins/opentelemetry/init/JenkinsExecutorMonitoringInitializer.java +++ b/src/main/java/io/jenkins/plugins/opentelemetry/init/JenkinsExecutorMonitoringInitializer.java @@ -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(); @@ -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(); diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/init/PluginMonitoringInitializer.java b/src/main/java/io/jenkins/plugins/opentelemetry/init/PluginMonitoringInitializer.java index 77fad0efc..dddac057b 100644 --- a/src/main/java/io/jenkins/plugins/opentelemetry/init/PluginMonitoringInitializer.java +++ b/src/main/java/io/jenkins/plugins/opentelemetry/init/PluginMonitoringInitializer.java @@ -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(); diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/queue/MonitoringQueueListener.java b/src/main/java/io/jenkins/plugins/opentelemetry/queue/MonitoringQueueListener.java index aaf517cd3..7fc389531 100644 --- a/src/main/java/io/jenkins/plugins/opentelemetry/queue/MonitoringQueueListener.java +++ b/src/main/java/io/jenkins/plugins/opentelemetry/queue/MonitoringQueueListener.java @@ -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) diff --git a/src/main/java/io/jenkins/plugins/opentelemetry/security/AuditingSecurityListener.java b/src/main/java/io/jenkins/plugins/opentelemetry/security/AuditingSecurityListener.java index 737abfee2..02f5ea0dd 100644 --- a/src/main/java/io/jenkins/plugins/opentelemetry/security/AuditingSecurityListener.java +++ b/src/main/java/io/jenkins/plugins/opentelemetry/security/AuditingSecurityListener.java @@ -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(); }