extract metrics providers

Author: zeitlinger

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

@@ -0,0 +1,32 @@
+package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics;
+
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
+import io.opentelemetry.instrumentation.runtimemetrics.java17.RuntimeMetrics;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.util.function.Consumer;
+
+/**
+ * Configures runtime metrics collection for Java 17+.
+ *
+ * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+public class Java17RuntimeMetricsProvider implements RuntimeMetricsProvider {
+  private static final Logger logger = LoggerFactory.getLogger(Java17RuntimeMetricsProvider.class);
+
+  @Override
+  public int minJavaVersion() {
+    return 17;
+  }
+
+  @Override
+  public void start(
+      OpenTelemetry openTelemetry, Consumer<Runnable> shutdownHook, InstrumentationConfig config) {
+    logger.debug("Use runtime metrics instrumentation for Java 17+");
+    RuntimeMetrics.builder(openTelemetry)
+        .setShutdownHook(shutdownHook)
+        .startFromInstrumentationConfig(config);
+  }
+}

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

@@ -0,0 +1,32 @@
+package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics;
+
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.RuntimeMetrics;
+import java.util.function.Consumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Configures runtime metrics collection for Java 8.
+ *
+ * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+public class Java8RuntimeMetricsProvider implements RuntimeMetricsProvider {
+  private static final Logger logger = LoggerFactory.getLogger(Java8RuntimeMetricsProvider.class);
+
+  @Override
+  public int minJavaVersion() {
+    return 1;
+  }
+
+  @Override
+  public void start(
+      OpenTelemetry openTelemetry, Consumer<Runnable> shutdownHook, InstrumentationConfig config) {
+    logger.debug("Use runtime metrics instrumentation for Java 8");
+    RuntimeMetrics.builder(openTelemetry)
+        .setShutdownHook(shutdownHook)
+        .startFromInstrumentationConfig(config);
+  }
+}

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

@@ -9,6 +9,8 @@
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.ConfigPropertiesBridge;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import java.util.Comparator;
+import java.util.Optional;
 import javax.annotation.PreDestroy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,16 +48,17 @@ public void handleApplicationReadyEvent(ApplicationReadyEvent event) {
     ConfigPropertiesBridge config =
         new ConfigPropertiesBridge(applicationContext.getBean(ConfigProperties.class));
 
-    if (Double.parseDouble(System.getProperty("java.specification.version")) >= 17) {
-      logger.debug("Use runtime metrics instrumentation for Java 17+");
-      io.opentelemetry.instrumentation.runtimemetrics.java17.RuntimeMetrics.builder(openTelemetry)
-          .setShutdownHook(runnable -> shutdownHook = runnable)
-          .startFromInstrumentationConfig(config);
+    double version = 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);
     } else {
-      logger.debug("Use runtime metrics instrumentation for Java 8");
-      io.opentelemetry.instrumentation.runtimemetrics.java8.RuntimeMetrics.builder(openTelemetry)
-          .setShutdownHook(runnable -> shutdownHook = runnable)
-          .startFromInstrumentationConfig(config);
+      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

@@ -0,0 +1,17 @@
+package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics;
+
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
+import java.util.function.Consumer;
+
+/**
+ * Configures runtime metrics collection.
+ *
+ * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+public interface RuntimeMetricsProvider {
+  int minJavaVersion();
+
+  void start(OpenTelemetry openTelemetry, Consumer<Runnable> shutdownHook, InstrumentationConfig config);
+}

instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -11,7 +11,9 @@ io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.w
 io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.webflux.SpringWebfluxInstrumentationAutoConfiguration,\
 io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.webmvc.SpringWebMvc5InstrumentationAutoConfiguration,\
 io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.scheduling.SpringSchedulingInstrumentationAutoConfiguration,\
-io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.RuntimeMetricsAutoConfiguration
+io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.RuntimeMetricsAutoConfiguration,\
+io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.Java8RuntimeMetricsProvider,\
+io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.Java17RuntimeMetricsProvider
 
 org.springframework.context.ApplicationListener=\
 io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.logging.LogbackAppenderApplicationListener

instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -12,3 +12,5 @@ io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.w
 io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.webmvc.SpringWebMvc6InstrumentationAutoConfiguration
 io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.scheduling.SpringSchedulingInstrumentationAutoConfiguration
 io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.RuntimeMetricsAutoConfiguration
+io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.Java8RuntimeMetricsProvider
+io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.runtimemetrics.Java17RuntimeMetricsProvider