more

Author: trask

instrumentation/undertow-1.4/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/undertow/KeyHolder.java

@@ -33,11 +33,11 @@
 public final class KeyHolder {
   private static final ConcurrentMap<Class<?>, Object> contextKeys = new ConcurrentHashMap<>();
 
-  public static Object getContextKey(Class<?> keyType) {
+  public static Object get(Class<?> keyType) {
     return contextKeys.get(keyType);
   }
 
-  public static Object computeContextKeyIfAbsent(Class<?> keyType, Supplier<Object> supplier) {
+  public static Object computeIfAbsent(Class<?> keyType, Supplier<Object> supplier) {
     return contextKeys.computeIfAbsent(keyType, unused -> supplier.get());
   }
 

instrumentation/undertow-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowHelper.java

@@ -70,7 +70,7 @@ public void exchangeCompleted(Context context, HttpServerExchange exchange) {
   @Nullable
   public Context getServerContext(HttpServerExchange exchange) {
     AttachmentKey<Context> contextKey =
-        (AttachmentKey<Context>) KeyHolder.getContextKey(AttachmentKey.class);
+        (AttachmentKey<Context>) KeyHolder.get(AttachmentKey.class);
     if (contextKey == null) {
       return null;
     }
@@ -81,7 +81,7 @@ public Context getServerContext(HttpServerExchange exchange) {
   private static void attachServerContext(Context context, HttpServerExchange exchange) {
     AttachmentKey<Context> contextKey =
         (AttachmentKey<Context>)
-            KeyHolder.computeContextKeyIfAbsent(
+            KeyHolder.computeIfAbsent(
                 AttachmentKey.class, () -> AttachmentKey.create(Context.class));
     exchange.putAttachment(contextKey, context);
   }

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/FieldBackedImplementationClassFileLocatorProvider.java

@@ -21,7 +21,7 @@ public final class FieldBackedImplementationClassFileLocatorProvider
   @Nullable
   @Override
   public ClassFileLocator getClassFileLocator() {
-    if (!FieldBackedImplementationConfiguration.fieldInjectionEnabled()) {
+    if (!FieldBackedImplementationConfiguration.isFieldInjectionEnabled()) {
       return null;
     }
 

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/FieldBackedImplementationConfiguration.java

@@ -10,7 +10,7 @@
 public final class FieldBackedImplementationConfiguration {
   private static boolean fieldInjectionEnabled = true;
 
-  static boolean fieldInjectionEnabled() {
+  static boolean isFieldInjectionEnabled() {
     return fieldInjectionEnabled;
   }
 

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/field/FieldBackedImplementationInstaller.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.javaagent.tooling.field;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
-import static io.opentelemetry.javaagent.tooling.field.FieldBackedImplementationConfiguration.fieldInjectionEnabled;
 import static io.opentelemetry.javaagent.tooling.field.GeneratedVirtualFieldNames.getFieldAccessorInterfaceName;
 import static java.util.logging.Level.FINEST;
 import static net.bytebuddy.matcher.ElementMatchers.isAbstract;
@@ -176,7 +175,7 @@ context class is used by multiple instrumentations.
   public AgentBuilder.Identified.Extendable injectFields(
       AgentBuilder.Identified.Extendable builder) {
 
-    if (fieldInjectionEnabled()) {
+    if (FieldBackedImplementationConfiguration.isFieldInjectionEnabled()) {
       for (Map.Entry<String, String> entry : virtualFieldMappings.entrySet()) {
         /*
          * For each virtual field defined in a current instrumentation we create an agent builder