From 21e3fe5178bd72465aa3eeeae04488749f8f78c9 Mon Sep 17 00:00:00 2001
From: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Date: Mon, 24 Jul 2023 20:10:38 +0200
Subject: [PATCH] set cpu load unit to "{run_queue_item}" (#8777)

---
 .../opentelemetry/instrumentation/runtimemetrics/java8/Cpu.java | 2 +-
 .../instrumentation/runtimemetrics/java8/CpuTest.java           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/Cpu.java b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/Cpu.java
index edfd443fd6f7..555f66fb40cf 100644
--- a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/Cpu.java
+++ b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/Cpu.java
@@ -89,7 +89,7 @@ List<AutoCloseable> registerObservers(
         meter
             .gaugeBuilder("process.runtime.jvm.system.cpu.load_1m")
             .setDescription("Average CPU load of the whole system for the last minute")
-            .setUnit("1")
+            .setUnit("{run_queue_item}")
             .buildWithCallback(
                 observableMeasurement -> {
                   double loadAverage = osBean.getSystemLoadAverage();
diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/CpuTest.java b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/CpuTest.java
index 38f53768c0fb..17e88913ea4c 100644
--- a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/CpuTest.java
+++ b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/CpuTest.java
@@ -45,7 +45,7 @@ void registerObservers() {
                     assertThat(metricData)
                         .hasInstrumentationScope(EXPECTED_SCOPE)
                         .hasDescription("Average CPU load of the whole system for the last minute")
-                        .hasUnit("1")
+                        .hasUnit("{run_queue_item}")
                         .hasDoubleGaugeSatisfying(
                             gauge -> gauge.hasPointsSatisfying(point -> point.hasValue(2.2)))));
     testing.waitAndAssertMetrics(