Skip to content

Commit bdeec9f

Browse files
mateuszrzeszutekMateusz Rzeszutek
and
Mateusz Rzeszutek
authored
Enable stable JVM semconv by default (#9963)
Co-authored-by: Mateusz Rzeszutek <[email protected]>
1 parent 5522a23 commit bdeec9f

File tree

33 files changed

+206
-1471
lines changed

33 files changed

+206
-1471
lines changed

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/SemconvStability.java

-52
This file was deleted.

instrumentation/runtime-telemetry/runtime-telemetry-java17/javaagent/src/test/java/io/opentelemetry/instrumentation/javaagent/runtimemetrics/java17/JmxRuntimeMetricsTest.java

+12-16
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,17 @@ void runtimeMetricsAreEnabled() {
2222

2323
testing.waitAndAssertMetrics(
2424
"io.opentelemetry.runtime-telemetry-java8",
25-
metric -> metric.hasName("process.runtime.jvm.classes.loaded"),
26-
metric -> metric.hasName("process.runtime.jvm.classes.unloaded"),
27-
metric -> metric.hasName("process.runtime.jvm.classes.current_loaded"),
28-
metric -> metric.hasName("process.runtime.jvm.system.cpu.load_1m"),
29-
metric -> metric.hasName("process.runtime.jvm.system.cpu.utilization"),
30-
metric -> metric.hasName("process.runtime.jvm.cpu.utilization"),
31-
metric -> metric.hasName("process.runtime.jvm.gc.duration"),
32-
metric -> metric.hasName("process.runtime.jvm.memory.init"),
33-
metric -> metric.hasName("process.runtime.jvm.memory.usage"),
34-
metric -> metric.hasName("process.runtime.jvm.memory.committed"),
35-
metric -> metric.hasName("process.runtime.jvm.memory.limit"),
36-
metric -> metric.hasName("process.runtime.jvm.memory.usage_after_last_gc"),
37-
metric -> metric.hasName("process.runtime.jvm.threads.count"),
38-
metric -> metric.hasName("process.runtime.jvm.buffer.limit"),
39-
metric -> metric.hasName("process.runtime.jvm.buffer.count"),
40-
metric -> metric.hasName("process.runtime.jvm.buffer.usage"));
25+
metric -> metric.hasName("jvm.class.loaded"),
26+
metric -> metric.hasName("jvm.class.unloaded"),
27+
metric -> metric.hasName("jvm.class.count"),
28+
metric -> metric.hasName("jvm.cpu.time"),
29+
metric -> metric.hasName("jvm.cpu.count"),
30+
metric -> metric.hasName("jvm.cpu.recent_utilization"),
31+
metric -> metric.hasName("jvm.gc.duration"),
32+
metric -> metric.hasName("jvm.memory.used"),
33+
metric -> metric.hasName("jvm.memory.committed"),
34+
metric -> metric.hasName("jvm.memory.limit"),
35+
metric -> metric.hasName("jvm.memory.used_after_last_gc"),
36+
metric -> metric.hasName("jvm.thread.count"));
4137
}
4238
}

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/RuntimeMetricsBuilder.java

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

88
import com.google.errorprone.annotations.CanIgnoreReturnValue;
99
import io.opentelemetry.api.OpenTelemetry;
10-
import io.opentelemetry.instrumentation.runtimemetrics.java8.BufferPools;
1110
import io.opentelemetry.instrumentation.runtimemetrics.java8.Classes;
1211
import io.opentelemetry.instrumentation.runtimemetrics.java8.Cpu;
1312
import io.opentelemetry.instrumentation.runtimemetrics.java8.GarbageCollector;
@@ -106,7 +105,6 @@ private List<AutoCloseable> buildObservables() {
106105
try {
107106
// Set up metrics gathered by JMX
108107
List<AutoCloseable> observables = new ArrayList<>();
109-
observables.addAll(BufferPools.registerObservers(openTelemetry));
110108
observables.addAll(Classes.registerObservers(openTelemetry));
111109
observables.addAll(Cpu.registerObservers(openTelemetry));
112110
observables.addAll(GarbageCollector.registerObservers(openTelemetry));

instrumentation/runtime-telemetry/runtime-telemetry-java8/javaagent/src/main/java/io/opentelemetry/instrumentation/javaagent/runtimemetrics/java8/Java8RuntimeMetricsInstaller.java

-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.google.auto.service.AutoService;
99
import io.opentelemetry.api.GlobalOpenTelemetry;
1010
import io.opentelemetry.api.OpenTelemetry;
11-
import io.opentelemetry.instrumentation.runtimemetrics.java8.BufferPools;
1211
import io.opentelemetry.instrumentation.runtimemetrics.java8.Classes;
1312
import io.opentelemetry.instrumentation.runtimemetrics.java8.Cpu;
1413
import io.opentelemetry.instrumentation.runtimemetrics.java8.GarbageCollector;
@@ -41,7 +40,6 @@ public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredSdk) {
4140

4241
OpenTelemetry openTelemetry = GlobalOpenTelemetry.get();
4342
List<AutoCloseable> observables = new ArrayList<>();
44-
observables.addAll(BufferPools.registerObservers(openTelemetry));
4543
observables.addAll(Classes.registerObservers(openTelemetry));
4644
observables.addAll(Cpu.registerObservers(openTelemetry));
4745
observables.addAll(GarbageCollector.registerObservers(openTelemetry));

0 commit comments

Comments
 (0)