From be6816489ada52321031387d299a9ac87b41c9a3 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Tue, 1 Jun 2021 22:56:49 -0700
Subject: [PATCH] Small cleanup (#3163)

* Small cleanup

* Ooops
---
 .../javaagent/bootstrap/AgentInitializer.java         | 11 +++++------
 .../io/opentelemetry/javaagent/tooling/Utils.java     |  2 +-
 .../opentelemetry/javaagent/IntegrationTestUtils.java |  2 +-
 .../testing/common/AgentClassLoaderAccess.java        |  6 +++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/AgentInitializer.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/AgentInitializer.java
index 39d74559f7..468ae0db57 100644
--- a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/AgentInitializer.java
+++ b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/AgentInitializer.java
@@ -24,7 +24,7 @@ public final class AgentInitializer {
 
   // Accessed via reflection from tests.
   // fields must be managed under class lock
-  @Nullable private static ClassLoader agentClassloader = null;
+  @Nullable private static ClassLoader agentClassLoader = null;
 
   // called via reflection in the OpenTelemetryAgent class
   public static void initialize(Instrumentation inst, URL bootstrapUrl) throws Exception {
@@ -33,9 +33,8 @@ public final class AgentInitializer {
 
   private static synchronized void startAgent(Instrumentation inst, URL bootstrapUrl)
       throws Exception {
-    if (agentClassloader == null) {
-      ClassLoader agentClassLoader = createAgentClassLoader("inst", bootstrapUrl);
-      agentClassloader = agentClassLoader;
+    if (agentClassLoader == null) {
+      agentClassLoader = createAgentClassLoader("inst", bootstrapUrl);
 
       Class<?> agentInstallerClass =
           agentClassLoader.loadClass("io.opentelemetry.javaagent.tooling.AgentInstaller");
@@ -52,8 +51,8 @@ public final class AgentInitializer {
   }
 
   // TODO misleading name
-  public static synchronized ClassLoader getAgentClassloader() {
-    return agentClassloader;
+  public static synchronized ClassLoader getAgentClassLoader() {
+    return agentClassLoader;
   }
 
   /**
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/Utils.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/Utils.java
index 4b072c3680..4e3d5745e5 100644
--- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/Utils.java
+++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/Utils.java
@@ -24,7 +24,7 @@ public class Utils {
   }
 
   public static ClassLoader getExtensionsClassLoader() {
-    return AgentInitializer.getAgentClassloader();
+    return AgentInitializer.getAgentClassLoader();
   }
 
   /** Return a classloader which can be used to look up bootstrap resources. */
diff --git a/javaagent/src/test/java/io/opentelemetry/javaagent/IntegrationTestUtils.java b/javaagent/src/test/java/io/opentelemetry/javaagent/IntegrationTestUtils.java
index e58f0317cc..dc1a74c57c 100644
--- a/javaagent/src/test/java/io/opentelemetry/javaagent/IntegrationTestUtils.java
+++ b/javaagent/src/test/java/io/opentelemetry/javaagent/IntegrationTestUtils.java
@@ -37,7 +37,7 @@ public class IntegrationTestUtils {
 
   /** Returns the classloader the core agent is running on. */
   public static ClassLoader getAgentClassLoader() {
-    return getAgentFieldClassloader("agentClassloader");
+    return getAgentFieldClassloader("agentClassLoader");
   }
 
   private static ClassLoader getAgentFieldClassloader(String fieldName) {
diff --git a/testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentClassLoaderAccess.java b/testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentClassLoaderAccess.java
index 6fa6e34c85..0177e5ef4a 100644
--- a/testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentClassLoaderAccess.java
+++ b/testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentClassLoaderAccess.java
@@ -16,9 +16,9 @@ public final class AgentClassLoaderAccess {
       Class<?> agentInitializerClass =
           ClassLoader.getSystemClassLoader()
               .loadClass("io.opentelemetry.javaagent.bootstrap.AgentInitializer");
-      Field agentClassloader = agentInitializerClass.getDeclaredField("agentClassloader");
-      agentClassloader.setAccessible(true);
-      agentClassLoader = (ClassLoader) agentClassloader.get(null);
+      Field agentClassLoaderField = agentInitializerClass.getDeclaredField("agentClassLoader");
+      agentClassLoaderField.setAccessible(true);
+      agentClassLoader = (ClassLoader) agentClassLoaderField.get(null);
     } catch (Throwable t) {
       throw new AssertionError("Could not access agent classLoader", t);
     }