RuntimeMetrics - move creation logic out of constructor (#8653)

open-telemetry · Jun 6, 2023 · a0cfb06 · a0cfb06
1 parent c8bcdee
commit a0cfb06
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 34 deletions.
diff --git a/.../src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/RuntimeMetrics.java b/.../src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/RuntimeMetrics.java
@@ -7,21 +7,15 @@
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.RecordedEventHandler;
-import io.opentelemetry.instrumentation.runtimemetrics.java8.BufferPools;
-import io.opentelemetry.instrumentation.runtimemetrics.java8.Classes;
-import io.opentelemetry.instrumentation.runtimemetrics.java8.Cpu;
-import io.opentelemetry.instrumentation.runtimemetrics.java8.GarbageCollector;
-import io.opentelemetry.instrumentation.runtimemetrics.java8.MemoryPools;
-import io.opentelemetry.instrumentation.runtimemetrics.java8.Threads;
 import io.opentelemetry.instrumentation.runtimemetrics.java8.internal.JmxRuntimeMetricsUtil;
 import java.io.Closeable;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.annotation.Nullable;
 import jdk.jfr.EventSettings;
 import jdk.jfr.consumer.RecordingStream;
 
@@ -32,33 +26,17 @@ public final class RuntimeMetrics implements Closeable {
 
  private final AtomicBoolean isClosed = new AtomicBoolean();
  private final OpenTelemetry openTelemetry;
- private final List<AutoCloseable> observables = new ArrayList<>();
- private final JfrRuntimeMetrics jfrRuntimeMetrics;
+ private final List<AutoCloseable> observables;
+
+ @Nullable private final JfrRuntimeMetrics jfrRuntimeMetrics;
 
- @SuppressWarnings("CatchingUnchecked")
  RuntimeMetrics(
  OpenTelemetry openTelemetry,
- Predicate<JfrFeature> featurePredicate,
- boolean disableJmx,
- boolean disableJfr) {
+ List<AutoCloseable> observables,
+ @Nullable JfrRuntimeMetrics jfrRuntimeMetrics) {
  this.openTelemetry = openTelemetry;
- try {
- jfrRuntimeMetrics =
- disableJfr ? null : JfrRuntimeMetrics.build(openTelemetry, featurePredicate);
-
- // Set up metrics gathered by JMX
- if (!disableJmx) {
- observables.addAll(BufferPools.registerObservers(openTelemetry));
- observables.addAll(Classes.registerObservers(openTelemetry));
- observables.addAll(Cpu.registerObservers(openTelemetry));
- observables.addAll(MemoryPools.registerObservers(openTelemetry));
- observables.addAll(Threads.registerObservers(openTelemetry));
- observables.addAll(GarbageCollector.registerObservers(openTelemetry));
- }
- } catch (Exception e) {
- close();
- throw new IllegalStateException("Error starting RuntimeMetrics", e);
- }
+ this.observables = List.copyOf(observables);
+ this.jfrRuntimeMetrics = jfrRuntimeMetrics;
  }
 
  /**

diff --git a/...in/java/io/opentelemetry/instrumentation/runtimemetrics/java17/RuntimeMetricsBuilder.java b/...in/java/io/opentelemetry/instrumentation/runtimemetrics/java17/RuntimeMetricsBuilder.java
@@ -7,9 +7,18 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.BufferPools;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.Classes;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.Cpu;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.GarbageCollector;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.MemoryPools;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.Threads;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.EnumMap;
-import java.util.function.Predicate;
+import java.util.List;
+import javax.annotation.Nullable;
 
 /** Builder for {@link RuntimeMetrics}. */
 public final class RuntimeMetricsBuilder {
@@ -73,8 +82,36 @@ public RuntimeMetricsBuilder disableAllJmx() {
 
  /** Build and start an {@link RuntimeMetrics} with the config from this builder. */
  public RuntimeMetrics build() {
- Predicate<JfrFeature> featurePredicate = jfrFeature -> enabledFeatureMap.get(jfrFeature);
- boolean disableJfr = !enabledFeatureMap.keySet().stream().anyMatch(featurePredicate);
- return new RuntimeMetrics(openTelemetry, featurePredicate, disableJmx, disableJfr);
+ List<AutoCloseable> observables = buildObservables();
+ RuntimeMetrics.JfrRuntimeMetrics jfrRuntimeMetrics = buildJfrMetrics();
+ return new RuntimeMetrics(openTelemetry, observables, jfrRuntimeMetrics);
+ }
+
+ @SuppressWarnings("CatchingUnchecked")
+ private List<AutoCloseable> buildObservables() {
+ if (disableJmx) {
+ return Collections.emptyList();
+ }
+ try {
+ // Set up metrics gathered by JMX
+ List<AutoCloseable> observables = new ArrayList<>();
+ observables.addAll(BufferPools.registerObservers(openTelemetry));
+ observables.addAll(Classes.registerObservers(openTelemetry));
+ observables.addAll(Cpu.registerObservers(openTelemetry));
+ observables.addAll(MemoryPools.registerObservers(openTelemetry));
+ observables.addAll(Threads.registerObservers(openTelemetry));
+ observables.addAll(GarbageCollector.registerObservers(openTelemetry));
+ return observables;
+ } catch (Exception e) {
+ throw new IllegalStateException("Error building RuntimeMetrics", e);
+ }
+ }
+
+ @Nullable
+ private RuntimeMetrics.JfrRuntimeMetrics buildJfrMetrics() {
+ if (enabledFeatureMap.values().stream().noneMatch(isEnabled -> isEnabled)) {
+ return null;
+ }
+ return RuntimeMetrics.JfrRuntimeMetrics.build(openTelemetry, enabledFeatureMap::get);
  }
 }