Separate OTLP Runtime Metrics Tests into 2 Tests (#6955)

Author: mhlidd

manifests/java.yml

@@ -4242,7 +4242,8 @@ manifest:
         akka-http: irrelevant (integration injects Date header after bytecode injection occurs)
         play: irrelevant (integration injects Date header after bytecode injection occurs)
   tests/test_library_logs.py::Test_NoExceptions::test_dotnet: irrelevant (only for .NET)
-  tests/test_otlp_runtime_metrics.py::Test_OtlpRuntimeMetrics: missing_feature
+  tests/test_otlp_runtime_metrics.py::Test_OtlpRuntimeMetrics::test_dd_metrics_are_absent: bug (APMAPI-1952)
+  tests/test_otlp_runtime_metrics.py::Test_OtlpRuntimeMetrics::test_otel_metrics_are_present: missing_feature
   tests/test_profiling.py::Test_Profile:
     - weblog_declaration:
         akka-http: v1.22.0

tests/test_otlp_runtime_metrics.py

@@ -68,14 +68,11 @@
         "jvm.cpu.count",
         "jvm.cpu.recent_utilization",
         "jvm.cpu.time",
-        "jvm.file_descriptor.count",
-        "jvm.file_descriptor.limit",
         "jvm.memory.committed",
         "jvm.memory.init",
         "jvm.memory.limit",
         "jvm.memory.used",
         "jvm.memory.used_after_last_gc",
-        "jvm.system.cpu.utilization",
         "jvm.thread.count",
     ],
 }
@@ -106,10 +103,10 @@ def get_runtime_metric_names():
 class Test_OtlpRuntimeMetrics:
     """Verify runtime metrics are sent via OTLP with OTel names, not DD-proprietary names."""
 
-    def setup_main(self):
+    def setup_otel_metrics_are_present(self):
         self.req = weblog.get("/")
 
-    def test_main(self):
+    def test_otel_metrics_are_present(self):
         assert self.req.status_code == 200
 
         library = context.library.name
@@ -118,18 +115,27 @@ def test_main(self):
 
         metric_names = get_runtime_metric_names()
 
-        # All expected OTel-named metrics must be present
         expected = EXPECTED_METRICS[library]
         for expected_name in expected:
             assert expected_name in metric_names, (
                 f"Expected OTel runtime metric '{expected_name}' not found for {library}. "
                 f"Got metrics: {sorted(metric_names)}"
             )
 
-        # DD-proprietary names must NOT be present
+    def setup_dd_metrics_are_absent(self):
+        self.req = weblog.get("/")
+
+    def test_dd_metrics_are_absent(self):
+        assert self.req.status_code == 200
+
+        library = context.library.name
         dd_prefix = DD_PROPRIETARY_PREFIXES.get(library)
-        if dd_prefix:
-            dd_named_metrics = [n for n in metric_names if n.startswith(dd_prefix)]
-            assert len(dd_named_metrics) == 0, (
-                f"Found DD-proprietary metric names for {library}: {dd_named_metrics}. Expected OTel-native names only."
-            )
+        if not dd_prefix:
+            return
+
+        metric_names = get_runtime_metric_names()
+
+        dd_named_metrics = [n for n in metric_names if n.startswith(dd_prefix)]
+        assert len(dd_named_metrics) == 0, (
+            f"Found DD-proprietary metric names for {library}: {dd_named_metrics}. Expected OTel-native names only."
+        )