Replaced set by list

Author: fmeheust

ojdbc-provider-observability/src/main/java/oracle/jdbc/provider/observability/ObservabilityTraceEventListener.java

@@ -1,7 +1,5 @@
 package oracle.jdbc.provider.observability;
 
-import java.util.EnumMap;
-
 import oracle.jdbc.TraceEventListener;
 import oracle.jdbc.provider.observability.configuration.ObservabilityConfiguration;
 import oracle.jdbc.provider.observability.tracers.JFRTracer;
@@ -28,21 +26,21 @@ public ObservabilityTracer getTracer() {
 
   @Override
   public Object roundTrip(Sequence sequence, TraceContext traceContext, Object userContext) {
-    EnumMap<Tracers, Object> currentUserContext = getCurrentUserContext(userContext);
+    Object[] currentUserContext = getCurrentUserContext(userContext);
     for (Tracers tracer : ObservabilityConfiguration.getInstance().getEnabledTracersSet()) {
-      Object newUserContext = tracer.getTracer().traceRoundtrip(sequence, traceContext, currentUserContext.get(tracer));
-      currentUserContext.put(tracer, newUserContext);
+      Object newUserContext = tracer.getTracer().traceRoundtrip(sequence, traceContext, currentUserContext[tracer.ordinal()]);
+      currentUserContext[tracer.ordinal()] = newUserContext;
     }
     return currentUserContext;
   }
 
 
   @Override
   public Object onExecutionEventReceived(JdbcExecutionEvent event, Object userContext, Object... params) {
-    EnumMap<Tracers, Object> currentUserContext = getCurrentUserContext(userContext);
+    Object[] currentUserContext = getCurrentUserContext(userContext);
     for (Tracers tracer : ObservabilityConfiguration.getInstance().getEnabledTracersSet()) {
-      Object newUserContext = tracer.getTracer().traceExecutionEvent(event, currentUserContext.get(tracer), params);
-      currentUserContext.put(tracer, newUserContext);
+      Object newUserContext = tracer.getTracer().traceExecutionEvent(event, currentUserContext[tracer.ordinal()], params);
+      currentUserContext[tracer.ordinal()] = newUserContext;
     }
     return currentUserContext;
   }
@@ -54,12 +52,12 @@ public boolean isDesiredEvent(JdbcExecutionEvent event) {
   }
 
   @SuppressWarnings("unchecked")
-  private EnumMap<Tracers, Object> getCurrentUserContext(Object userContext) {
-    EnumMap<Tracers, Object> currentUserContext;
-    if (userContext != null && (userContext instanceof EnumMap<?,?>)) {
-      currentUserContext = (EnumMap<Tracers, Object>) userContext;
+  private Object[] getCurrentUserContext(Object userContext) {
+    Object[] currentUserContext;
+    if (userContext != null && (userContext instanceof Object[])) {
+      currentUserContext = (Object[]) userContext;
     } else {
-      currentUserContext = new EnumMap<Tracers, Object>(Tracers.class);
+      currentUserContext = new Object[Tracers.values().length];
     }
     return currentUserContext;
   }

ojdbc-provider-observability/src/main/java/oracle/jdbc/provider/observability/configuration/ObservabilityConfiguration.java

@@ -1,6 +1,7 @@
 package oracle.jdbc.provider.observability.configuration;
 
-import java.util.EnumSet;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 
@@ -23,7 +24,7 @@ private ObservabilityConfiguration() {  }
   private boolean sensitiveDataEnabled;
   private String tracers;
 
-  private EnumSet<ObservabilityTraceEventListener.Tracers> enabledTracers = EnumSet.noneOf(ObservabilityTraceEventListener.Tracers.class);
+  private List<ObservabilityTraceEventListener.Tracers> enabledTracers = new ArrayList<>();
 
   @Override
   public String getEnabledTracers() {
@@ -67,12 +68,8 @@ public static ObservabilityConfiguration getInstance() {
     return INSTANCE;
   }
 
-  public EnumSet<ObservabilityTraceEventListener.Tracers> getEnabledTracersSet() {
-    if (enabledTracers != null) {
-      return enabledTracers.clone();
-    } else {
-      return null;
-    }
+  public List<ObservabilityTraceEventListener.Tracers> getEnabledTracersSet() {
+    return enabledTracers;
   }
 
 }

ojdbc-provider-observability/src/test/java/oracle/jdbc/provider/observability/ObservabilityTraceEventListenerTest.java

@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.atLeastOnce;
 
 import java.nio.file.Path;
@@ -12,8 +13,6 @@
 import java.sql.ResultSet;
 import java.sql.Statement;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mockito;
@@ -61,6 +60,7 @@ public class ObservabilityTraceEventListenerTest {
 
   static {
     GlobalOpenTelemetry.set(openTelemetry);
+    configureOTEL();
   }
 
   @ParameterizedTest
@@ -137,7 +137,7 @@ public void JFRTraceTest(boolean sensitiveDataEnabled) throws Exception {
   @ParameterizedTest
   @ValueSource(booleans = {true, false})
   public void OTELTraceTest(boolean sensitiveDataEnabled) throws Exception {
-    configureOTEL();
+    Mockito.clearInvocations(tracer, spanBuilder);
     ObservabilityConfiguration.getInstance().setEnabledTracers("OTEL");
     ObservabilityConfiguration.getInstance().setSensitiveDataEnabled(sensitiveDataEnabled);
     try (Connection connection = DriverManager.getConnection(url, userName, password);
@@ -165,12 +165,12 @@ public void OTELTraceTest(boolean sensitiveDataEnabled) throws Exception {
       Mockito.verify(spanBuilder, Mockito.times(1)).setAttribute("Original SQL Text", "SELECT 'OK' FROM DUAL");
       Mockito.verify(spanBuilder, Mockito.times(1)).setAttribute("Actual SQL Text", "SELECT 'OK' FROM DUAL");
     }
+    Mockito.verify(span, atLeast(4)).end(Mockito.any());
 
 
   }
 
   private static void configureOTEL() {
-    Mockito.reset(spanBuilder, tracer);
     Mockito.when(openTelemetry.getTracerProvider()).thenReturn(tracerProvider);
     Mockito.when(tracerProvider.get(Mockito.anyString())).thenReturn(tracer);
     Mockito.when(openTelemetry.meterBuilder(Mockito.anyString())).thenReturn(meterBuilder);