pr review

Author: zeitlinger

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

@@ -21,7 +21,7 @@
 import jdk.jfr.consumer.RecordingStream;
 
 /** The entry point class for runtime metrics support using JFR and JMX. */
-public final class RuntimeMetrics implements Closeable {
+public final class RuntimeMetrics implements AutoCloseable {
 
   private static final Logger logger = Logger.getLogger(RuntimeMetrics.class.getName());
 

instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/RuntimeMetrics.java

@@ -7,15 +7,14 @@
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.runtimemetrics.java8.internal.JmxRuntimeMetricsUtil;
-import java.io.Closeable;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /** The entry point class for runtime metrics support using JMX. */
-public final class RuntimeMetrics implements Closeable {
+public final class RuntimeMetrics implements AutoCloseable {
 
   private static final Logger logger = Logger.getLogger(RuntimeMetrics.class.getName());
 

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/Java17RuntimeMetricsProvider.java

@@ -9,7 +9,6 @@
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import io.opentelemetry.instrumentation.runtimemetrics.java17.RuntimeMetrics;
 import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.RuntimeMetricsConfigUtil;
-import java.util.function.Consumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,13 +27,8 @@ public int minJavaVersion() {
   }
 
   @Override
-  public void start(
-      OpenTelemetry openTelemetry, Consumer<Runnable> shutdownHook, InstrumentationConfig config) {
+  public AutoCloseable start(OpenTelemetry openTelemetry, InstrumentationConfig config) {
     logger.debug("Use runtime metrics instrumentation for Java 17+");
-    RuntimeMetrics runtimeMetrics =
-        RuntimeMetricsConfigUtil.configure(RuntimeMetrics.builder(openTelemetry), config);
-    if (runtimeMetrics != null) {
-      shutdownHook.accept(runtimeMetrics::close);
-    }
+    return RuntimeMetricsConfigUtil.configure(RuntimeMetrics.builder(openTelemetry), config);
   }
 }

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/Java8RuntimeMetricsProvider.java

@@ -9,7 +9,6 @@
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import io.opentelemetry.instrumentation.runtimemetrics.java8.RuntimeMetrics;
 import io.opentelemetry.instrumentation.runtimemetrics.java8.internal.RuntimeMetricsConfigUtil;
-import java.util.function.Consumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,17 +23,12 @@ public class Java8RuntimeMetricsProvider implements RuntimeMetricsProvider {
 
   @Override
   public int minJavaVersion() {
-    return 1;
+    return 8;
   }
 
   @Override
-  public void start(
-      OpenTelemetry openTelemetry, Consumer<Runnable> shutdownHook, InstrumentationConfig config) {
+  public AutoCloseable start(OpenTelemetry openTelemetry, InstrumentationConfig config) {
     logger.debug("Use runtime metrics instrumentation for Java 8");
-    RuntimeMetrics runtimeMetrics =
-        RuntimeMetricsConfigUtil.configure(RuntimeMetrics.builder(openTelemetry), config);
-    if (runtimeMetrics != null) {
-      shutdownHook.accept(runtimeMetrics::close);
-    }
+    return RuntimeMetricsConfigUtil.configure(RuntimeMetrics.builder(openTelemetry), config);
   }
 }

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/RuntimeMetricsAutoConfiguration.java

@@ -32,12 +32,12 @@ public class RuntimeMetricsAutoConfiguration {
   private static final Logger logger =
       LoggerFactory.getLogger(RuntimeMetricsAutoConfiguration.class);
 
-  private Runnable shutdownHook;
+  private AutoCloseable closeable;
 
   @PreDestroy
-  public void stopMetrics() {
-    if (shutdownHook != null) {
-      shutdownHook.run();
+  public void stopMetrics() throws Exception {
+    if (closeable != null) {
+      closeable.close();
     }
   }
 
@@ -48,15 +48,16 @@ public void handleApplicationReadyEvent(ApplicationReadyEvent event) {
     ConfigPropertiesBridge config =
         new ConfigPropertiesBridge(applicationContext.getBean(ConfigProperties.class));
 
-    double version = Double.parseDouble(System.getProperty("java.specification.version"));
+    double version =
+        Math.max(8, Double.parseDouble(System.getProperty("java.specification.version")));
     Optional<RuntimeMetricsProvider> metricsProvider =
         applicationContext.getBeanProvider(RuntimeMetricsProvider.class).stream()
             .sorted(Comparator.comparing(RuntimeMetricsProvider::minJavaVersion).reversed())
             .filter(provider -> provider.minJavaVersion() <= version)
             .findFirst();
 
     if (metricsProvider.isPresent()) {
-      metricsProvider.get().start(openTelemetry, runnable -> shutdownHook = runnable, config);
+      this.closeable = metricsProvider.get().start(openTelemetry, config);
     } else {
       logger.debug("No runtime metrics instrumentation available for Java {}", version);
     }

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/RuntimeMetricsProvider.java

@@ -7,7 +7,7 @@
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
-import java.util.function.Consumer;
+import javax.annotation.Nullable;
 
 /**
  * Configures runtime metrics collection.
@@ -18,6 +18,6 @@
 public interface RuntimeMetricsProvider {
   int minJavaVersion();
 
-  void start(
-      OpenTelemetry openTelemetry, Consumer<Runnable> shutdownHook, InstrumentationConfig config);
+  @Nullable
+  AutoCloseable start(OpenTelemetry openTelemetry, InstrumentationConfig config);
 }