make detection explicit

open-telemetry · Mar 12, 2024 · 4eb9368 · 4eb9368
1 parent 8fb6b11
commit 4eb9368
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/...urces/library/src/main/java/io/opentelemetry/instrumentation/resources/JarPathFinder.java b/...urces/library/src/main/java/io/opentelemetry/instrumentation/resources/JarPathFinder.java
@@ -20,7 +20,15 @@ class JarPathFinder {
   private final Function<String, String> getSystemProperty;
   private final Predicate<Path> fileExists;
 
-  private static Optional<Optional<Path>> jarPath = Optional.empty();
+  private static class DetectionResult {
+    private final Optional<Path> jarPath;
+
+    private DetectionResult(Optional<Path> jarPath) {
+      this.jarPath = jarPath;
+    }
+  }
+
+  private static Optional<DetectionResult> detectionResult = Optional.empty();
 
   public JarPathFinder() {
     this(ProcessArguments::getProcessArguments, System::getProperty, Files::isRegularFile);
@@ -38,18 +46,17 @@ public JarPathFinder() {
 
   // visible for testing
   static void resetForTest() {
-    jarPath = Optional.empty();
+    detectionResult = Optional.empty();
   }
 
   Optional<Path> getJarPath() {
-    if (jarPath.isPresent()) {
-      return jarPath.get();
+    if (!detectionResult.isPresent()) {
+      detectionResult = Optional.of(new DetectionResult(Optional.ofNullable(detectJarPath())));
     }
-    jarPath = Optional.of(Optional.ofNullable(readJarPath()));
-    return jarPath.get();
+    return detectionResult.get().jarPath;
   }
 
-  private Path readJarPath() {
+  private Path detectJarPath() {
     Path jarPath = getJarPathFromProcessHandle();
     if (jarPath != null) {
       return jarPath;