Fix warning about setting VirtualField supplier twice (#12584)

open-telemetry · Nov 8, 2024 · 51b4051 · 51b4051
1 parent 0c2d504
commit 51b4051
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java
@@ -224,7 +224,7 @@ private static void installEarlyInstrumentation(
                 (builder, typeDescription, classLoader, module, protectionDomain) -> builder);
 
     VirtualFieldImplementationInstallerFactory virtualFieldInstallerFactory =
-        new VirtualFieldImplementationInstallerFactory();
+        VirtualFieldImplementationInstallerFactory.getInstance();
     for (EarlyInstrumentationModule earlyInstrumentationModule :
         loadOrdered(EarlyInstrumentationModule.class, Utils.getExtensionsClassLoader())) {
 

diff --git a/.../io/opentelemetry/javaagent/tooling/field/VirtualFieldImplementationInstallerFactory.java b/.../io/opentelemetry/javaagent/tooling/field/VirtualFieldImplementationInstallerFactory.java
@@ -18,11 +18,17 @@ public final class VirtualFieldImplementationInstallerFactory {
 
   private static final TransformSafeLogger logger =
       TransformSafeLogger.getLogger(VirtualFieldImplementationInstallerFactory.class);
+  private static final VirtualFieldImplementationInstallerFactory INSTANCE =
+      new VirtualFieldImplementationInstallerFactory();
 
-  public VirtualFieldImplementationInstallerFactory() {
+  private VirtualFieldImplementationInstallerFactory() {
     RuntimeVirtualFieldSupplier.set(new RuntimeFieldBasedImplementationSupplier());
   }
 
+  public static VirtualFieldImplementationInstallerFactory getInstance() {
+    return INSTANCE;
+  }
+
   public VirtualFieldImplementationInstaller create(InstrumentationModule instrumentationModule) {
     VirtualFieldMappingsBuilderImpl builder = new VirtualFieldMappingsBuilderImpl();
     if (instrumentationModule instanceof InstrumentationModuleMuzzle) {

diff --git a/...va/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java b/...va/io/opentelemetry/javaagent/tooling/instrumentation/InstrumentationModuleInstaller.java
@@ -54,7 +54,7 @@ public final class InstrumentationModuleInstaller {
 
   private final Instrumentation instrumentation;
   private final VirtualFieldImplementationInstallerFactory virtualFieldInstallerFactory =
-      new VirtualFieldImplementationInstallerFactory();
+      VirtualFieldImplementationInstallerFactory.getInstance();
 
   public InstrumentationModuleInstaller(Instrumentation instrumentation) {
     this.instrumentation = instrumentation;