Remove deprecated runtime-telemetry-java8 and runtime-telemetry-java17 javaagent modules (#18207)

Author: trask

.fossa.yml

@@ -904,12 +904,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:rocketmq:rocketmq-client-5.0:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:runtime-telemetry:runtime-telemetry-java17:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:runtime-telemetry:runtime-telemetry-java8:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:rxjava:rxjava-1.0:library'

instrumentation/runtime-telemetry/javaagent/build.gradle.kts

@@ -7,6 +7,9 @@ dependencies {
 
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   compileOnly("io.opentelemetry:opentelemetry-api-incubator")
+
+  // used to verify jar analyzer package events
+  testImplementation("commons-io:commons-io")
 }
 
 tasks {

…rics/java8/JarAnalyzerInstallerTest.java …etelemetry/JarAnalyzerInstallerTest.javainstrumentation/runtime-telemetry/runtime-telemetry-java8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java8/JarAnalyzerInstallerTest.java renamed to instrumentation/runtime-telemetry/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimetelemetry/JarAnalyzerInstallerTest.java instrumentation/runtime-telemetry/runtime-telemetry-java8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java8/JarAnalyzerInstallerTest.java renamed to instrumentation/runtime-telemetry/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimetelemetry/JarAnalyzerInstallerTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.runtimemetrics.java8;
+package io.opentelemetry.javaagent.instrumentation.runtimetelemetry;
 
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;

…etrics/java17/JmxRuntimeMetricsTest.java …timetelemetry/JmxRuntimeMetricsTest.javainstrumentation/runtime-telemetry/runtime-telemetry-java17/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java17/JmxRuntimeMetricsTest.java renamed to instrumentation/runtime-telemetry/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimetelemetry/JmxRuntimeMetricsTest.java instrumentation/runtime-telemetry/runtime-telemetry-java17/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java17/JmxRuntimeMetricsTest.java renamed to instrumentation/runtime-telemetry/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimetelemetry/JmxRuntimeMetricsTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.runtimemetrics.java17;
+package io.opentelemetry.javaagent.instrumentation.runtimetelemetry;
 
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;

instrumentation/runtime-telemetry/jfr-testing/build.gradle.kts

@@ -0,0 +1,35 @@
+plugins {
+  id("otel.javaagent-testing")
+}
+
+dependencies {
+  testInstrumentation(project(":instrumentation:runtime-telemetry:javaagent"))
+}
+
+otelJava {
+  minJavaVersionSupported.set(JavaVersion.VERSION_17)
+}
+
+tasks {
+  test {
+    jvmArgs("-Dotel.instrumentation.runtime-telemetry.emit-experimental-jfr-metrics=true")
+    filter {
+      excludeTestsMatching("*JfrRuntimeMetricsBackcompatTest")
+    }
+  }
+
+  val testBackcompat by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    // Verify backward compatibility of the deprecated runtime-telemetry-java17.enabled flag
+    jvmArgs("-Dotel.instrumentation.runtime-telemetry-java17.enabled=true")
+    filter {
+      includeTestsMatching("*JfrRuntimeMetricsBackcompatTest")
+    }
+  }
+
+  check {
+    dependsOn(testBackcompat)
+  }
+}

instrumentation/runtime-telemetry/jfr-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimetelemetry/JfrRuntimeMetricsBackcompatTest.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.runtimetelemetry;
+
+import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import jdk.jfr.FlightRecorder;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+class JfrRuntimeMetricsBackcompatTest {
+
+  @RegisterExtension
+  static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
+
+  @BeforeAll
+  static void setUp() {
+    try {
+      Class.forName("jdk.jfr.FlightRecorder");
+    } catch (ClassNotFoundException ignored) {
+      Assumptions.abort("JFR not present");
+    }
+    Assumptions.assumeTrue(FlightRecorder.isAvailable(), "JFR not available");
+  }
+
+  @Test
+  void shouldHaveDefaultMetrics() {
+    // This should generate some events
+    System.gc();
+
+    testing.waitAndAssertMetrics(
+        "io.opentelemetry.runtime-telemetry-java17",
+        metric -> metric.hasName("jvm.cpu.limit"),
+        metric -> metric.hasName("jvm.cpu.context_switch"));
+  }
+}

…etrics/java17/JfrRuntimeMetricsTest.java …timetelemetry/JfrRuntimeMetricsTest.javainstrumentation/runtime-telemetry/runtime-telemetry-java17/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java17/JfrRuntimeMetricsTest.java renamed to instrumentation/runtime-telemetry/jfr-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimetelemetry/JfrRuntimeMetricsTest.java instrumentation/runtime-telemetry/runtime-telemetry-java17/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java17/JfrRuntimeMetricsTest.java renamed to instrumentation/runtime-telemetry/jfr-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/runtimetelemetry/JfrRuntimeMetricsTest.java

@@ -3,7 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.runtimemetrics.java17;
+package io.opentelemetry.javaagent.instrumentation.runtimetelemetry;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@@ -34,8 +36,7 @@ void shouldHaveDefaultMetrics() {
     System.gc();
 
     testing.waitAndAssertMetrics(
-        "io.opentelemetry.runtime-telemetry-java17",
-        metric -> metric.hasName("jvm.cpu.limit"),
-        metric -> metric.hasName("jvm.cpu.context_switch"));
+        "io.opentelemetry.runtime-telemetry", metric -> metric.hasName("jvm.cpu.context_switch"));
+    assertThat(testing.metrics()).noneMatch(m -> m.getName().equals("jvm.cpu.limit"));
   }
 }