Encapsulate shared static helpers

Author: trask

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsHttpClientInstrumentation.java

@@ -53,7 +53,8 @@ public static void methodExit(
         @Advice.Return Response<?> response,
         @Advice.Thrown Throwable throwable) {
       if (throwable instanceof Exception) {
-        TracingRequestHandler.tracingHandler.afterError(request, response, (Exception) throwable);
+        TracingRequestHandler.tracingHandler().afterError(
+            request, response, (Exception) throwable);
       }
       Scope scope = request.getHandlerContext(TracingRequestHandler.SCOPE);
       if (scope != null) {

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/RequestExecutorInstrumentation.java

@@ -46,7 +46,8 @@ public static void methodExit(
         @Advice.Return Response<?> response,
         @Advice.Thrown Throwable throwable) {
       if (throwable instanceof Exception) {
-        TracingRequestHandler.tracingHandler.afterError(request, response, (Exception) throwable);
+        TracingRequestHandler.tracingHandler().afterError(
+            request, response, (Exception) throwable);
       }
       Scope scope = request.getHandlerContext(TracingRequestHandler.SCOPE);
       if (scope != null) {

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/TracingRequestHandler.java

@@ -33,7 +33,7 @@ public class TracingRequestHandler extends RequestHandler2 {
   public static final HandlerContextKey<Scope> SCOPE =
       new HandlerContextKey<>(Scope.class.getName());
 
-  public static final RequestHandler2 tracingHandler =
+  private static final RequestHandler2 tracingHandler =
       AwsSdkTelemetry.builder(GlobalOpenTelemetry.get())
           .setCaptureExperimentalSpanAttributes(
               DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "aws_sdk")
@@ -44,6 +44,10 @@ public class TracingRequestHandler extends RequestHandler2 {
           .build()
           .createRequestHandler();
 
+  public static RequestHandler2 tracingHandler() {
+    return tracingHandler;
+  }
+
   @Override
   public void beforeRequest(Request<?> request) {
     tracingHandler.beforeRequest(request);

instrumentation/cassandra/cassandra-4.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_4/CassandraSingletons.java

@@ -11,11 +11,15 @@
 
 final class CassandraSingletons {
 
-  static final CassandraTelemetry telemetry =
+  private static final CassandraTelemetry telemetry =
       CassandraTelemetry.builder(GlobalOpenTelemetry.get())
           .setQuerySanitizationEnabled(
               DbConfig.isQuerySanitizationEnabled(GlobalOpenTelemetry.get(), "cassandra"))
           .build();
 
+  static CassandraTelemetry telemetry() {
+    return telemetry;
+  }
+
   private CassandraSingletons() {}
 }

instrumentation/cassandra/cassandra-4.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_4/CompletionStageFunction.java

@@ -19,6 +19,6 @@ public Object apply(Object session) {
     if (session.getClass().getName().endsWith("cassandra4.TracingCqlSession")) {
       return session;
     }
-    return CassandraSingletons.telemetry.wrap((CqlSession) session);
+    return CassandraSingletons.telemetry().wrap((CqlSession) session);
   }
 }

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

@@ -8,6 +8,7 @@
 import java.util.IdentityHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.function.Supplier;
 
 /**
  * Undertow's {@code io.undertow.server.HttpServerExchange} uses {@code
@@ -30,7 +31,15 @@
  * the same instance of the key.
  */
 public final class KeyHolder {
-  public static final ConcurrentMap<Class<?>, Object> contextKeys = new ConcurrentHashMap<>();
+  private static final ConcurrentMap<Class<?>, Object> contextKeys = new ConcurrentHashMap<>();
+
+  public static Object getContextKey(Class<?> keyType) {
+    return contextKeys.get(keyType);
+  }
+
+  public static Object computeContextKeyIfAbsent(Class<?> keyType, Supplier<Object> supplier) {
+    return contextKeys.computeIfAbsent(keyType, unused -> supplier.get());
+  }
 
   private KeyHolder() {}
 }

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.contextKeys.get(AttachmentKey.class);
+        (AttachmentKey<Context>) KeyHolder.getContextKey(AttachmentKey.class);
     if (contextKey == null) {
       return null;
     }
@@ -81,8 +81,8 @@ public Context getServerContext(HttpServerExchange exchange) {
   private static void attachServerContext(Context context, HttpServerExchange exchange) {
     AttachmentKey<Context> contextKey =
         (AttachmentKey<Context>)
-            KeyHolder.contextKeys.computeIfAbsent(
-                AttachmentKey.class, key -> AttachmentKey.create(Context.class));
+            KeyHolder.computeContextKeyIfAbsent(
+                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.fieldInjectionEnabled()) {
       return null;
     }
 

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

@@ -8,7 +8,11 @@
 import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig;
 
 public final class FieldBackedImplementationConfiguration {
-  static boolean fieldInjectionEnabled = true;
+  private static boolean fieldInjectionEnabled = true;
+
+  static boolean fieldInjectionEnabled() {
+    return fieldInjectionEnabled;
+  }
 
   public static void configure() {
     fieldInjectionEnabled = EarlyInitAgentConfig.get().isExperimentalFieldInjectionEnabled();

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

@@ -176,7 +176,7 @@ context class is used by multiple instrumentations.
   public AgentBuilder.Identified.Extendable injectFields(
       AgentBuilder.Identified.Extendable builder) {
 
-    if (fieldInjectionEnabled) {
+    if (fieldInjectionEnabled()) {
       for (Map.Entry<String, String> entry : virtualFieldMappings.entrySet()) {
         /*
          * For each virtual field defined in a current instrumentation we create an agent builder