removed some more stuff

signalfx · Dec 1, 2022 · a7b287c · a7b287c
1 parent d5cbb17
commit a7b287c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 327 deletions.
diff --git a/...rc/main/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/JvmMetricsInstaller.java b/...rc/main/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/JvmMetricsInstaller.java
@@ -25,8 +25,6 @@
 import com.splunk.opentelemetry.instrumentation.jvmmetrics.micrometer.MicrometerGcMemoryMetrics;
 import com.splunk.opentelemetry.instrumentation.jvmmetrics.otel.OtelAllocatedMemoryMetrics;
 import com.splunk.opentelemetry.instrumentation.jvmmetrics.otel.OtelGcMemoryMetrics;
-import com.splunk.opentelemetry.instrumentation.jvmmetrics.otel.OtelJvmGcMetrics;
-import com.splunk.opentelemetry.instrumentation.jvmmetrics.otel.OtelJvmHeapPressureMetrics;
 import com.splunk.opentelemetry.instrumentation.jvmmetrics.otel.OtelJvmThreadMetrics;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
@@ -59,8 +57,25 @@ public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetr
       new JvmThreadMetrics().bindTo(Metrics.globalRegistry);
     }
     if (useOtelMetrics(metricsImplementation)) {
-      new OtelJvmGcMetrics().install();
-      new OtelJvmHeapPressureMetrics().install();
+      // gc metrics were removed:
+      //   runtime.jvm.gc.concurrent.phase.time is replaced by OTel
+      //     process.runtime.jvm.gc.duration{gc=<concurrent gcs>}
+      //   runtime.jvm.gc.pause is replaced by OTel
+      //     process.runtime.jvm.gc.duration{gc!=<concurrent gcs>}
+      //   runtime.jvm.gc.max.data.size is replaced by OTel
+      //     process.runtime.jvm.memory.limit{pool=<long lived pools>}
+      //   runtime.jvm.gc.live.data.size is replaced by OTel
+      //     process.runtime.jvm.memory.usage_after_last_gc{pool=<long lived pools>}
+      //   runtime.jvm.gc.memory.allocated is replaced by memory profiling metric
+      //     process.runtime.jvm.memory.allocated
+      //   runtime.jvm.gc.memory.promoted is removed with no direct replacement
+
+      // heap pressure metrics were removed:
+      //   runtime.jvm.memory.usage.after.gc is replaced by OTel
+      //     process.runtime.jvm.memory.usage_after_last_gc{pool=<long lived pools>,type=heap} /
+      //     process.runtime.jvm.memory.limit{pool=<long lived pools>,type=heap}
+      //   runtime.jvm.gc.overhead is something that should to done in a dashboard, not here
+
       new OtelJvmThreadMetrics().install();
     }
 

diff --git a/.../main/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/otel/OtelJvmGcMetrics.java b/.../main/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/otel/OtelJvmGcMetrics.java
diff --git a/.../com/splunk/opentelemetry/instrumentation/jvmmetrics/otel/OtelJvmHeapPressureMetrics.java b/.../com/splunk/opentelemetry/instrumentation/jvmmetrics/otel/OtelJvmHeapPressureMetrics.java
diff --git a/...src/test/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/OtelJvmMetricsTest.java b/...src/test/java/com/splunk/opentelemetry/instrumentation/jvmmetrics/OtelJvmMetricsTest.java
@@ -44,10 +44,6 @@ void shouldRegisterOtelJvmMeters() {
     }
     System.gc();
 
-    // GC metrics
-    assertOtelMetricPresent("runtime.jvm.gc.memory.allocated");
-    // GC pressure metrics
-    assertOtelMetricPresent("runtime.jvm.gc.overhead");
     // thread metrics
     assertOtelMetricPresent("runtime.jvm.threads.states");
     // allocated memory metrics