Cleaned up the code and applied coding standards

Author: elaaissaouiabdessamad

ojdbc-provider-observability/pom.xml

@@ -50,12 +50,6 @@
       <artifactId>junit-jupiter-params</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk</artifactId>
@@ -65,7 +59,7 @@
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk-testing</artifactId>
-      <version>1.32.0</version>
+      <version>${opentelemetry.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

ojdbc-provider-observability/src/main/java/oracle/ucp/provider/observability/jfr/core/JFRUCPEventListenerProvider.java

@@ -10,28 +10,21 @@
  * Provider that supplies a UCP event listener for recording JFR events.
  * Integrates UCP events with Java Flight Recorder for low-overhead monitoring.
  */
-public final class JFRUCPEventListenerProvider implements UCPEventListenerProvider {
-
-  private final UCPEventListener listener;
+public final class JFRUCPEventListenerProvider
+  implements UCPEventListenerProvider {
 
   /**
    * Singleton listener that records UCP events as JFR events.
    * Thread-safe and optimized for minimal overhead.
    */
-  public static final UCPEventListener TRACE_EVENT_LISTENER = new UCPEventListener() {
+  public static final UCPEventListener TRACE_EVENT_LISTENER =
+    new UCPEventListener() {
     @Override
     public void onUCPEvent(EventType eventType, UCPEventContext context) {
       UCPEventFactory.recordEvent(eventType, context);
     }
   };
 
-  /**
-   * Creates a new provider instance.
-   */
-  public JFRUCPEventListenerProvider() {
-    this.listener = TRACE_EVENT_LISTENER;
-  }
-
   /**
    * Returns the provider's unique identifier.
    *
@@ -50,6 +43,6 @@ public String getName() {
    */
   @Override
   public UCPEventListener getListener(Map<String, String> config) {
-    return listener;
+    return TRACE_EVENT_LISTENER;
   }
 }

ojdbc-provider-observability/src/main/java/oracle/ucp/provider/observability/jfr/core/UCPBaseEvent.java

@@ -6,8 +6,9 @@
 import java.util.Objects;
 
 /**
- * Abstract base class for UCP JFR events providing common fields and initialization.
- * All UCP events extend this class to inherit standard pool metrics and metadata.
+ * Abstract base class for UCP JFR events providing common fields
+ * and initialization. All UCP events extend this class to inherit
+ * standard pool metrics and metadata.
  */
 @Category("UCP Events")
 @Description("Base UCP Event")
@@ -19,6 +20,7 @@ public abstract class UCPBaseEvent extends Event {
 
   /** Event timestamp in milliseconds since epoch */
   @Label("Timestamp")
+  @Timestamp(Timestamp.MILLISECONDS_SINCE_EPOCH)
   protected long timestamp;
 
   /** Maximum configured pool size */

ojdbc-provider-observability/src/main/java/oracle/ucp/provider/observability/jfr/core/UCPEventFactory.java

@@ -1,5 +1,7 @@
 package oracle.ucp.provider.observability.jfr.core;
 
+import java.util.Objects;
+
 import jdk.jfr.Event;
 import oracle.ucp.events.core.UCPEventContext;
 import oracle.ucp.events.core.UCPEventListener;
@@ -9,7 +11,8 @@
 
 /**
  * Factory for creating and recording JFR events from UCP operations.
- * Maps UCP event types to specific JFR event classes and handles recording.
+ * Maps UCP event types to specific JFR event classes and handles
+ * recording.
  */
 public class UCPEventFactory {
 
@@ -22,56 +25,62 @@ public class UCPEventFactory {
    * @throws IllegalStateException if event type is unrecognized
    * @throws NullPointerException if parameters are null
    */
-  public static Event createEvent(UCPEventListener.EventType type, UCPEventContext ctx) {
+  public static Event createEvent(
+      UCPEventListener.EventType type, UCPEventContext ctx) {
+    Objects.requireNonNull(type, "EventType cannot be null");
     switch (type) {
-      // Pool Lifecycle Events
-      case POOL_CREATED:
-        return new PoolCreatedEvent(ctx);
-      case POOL_STARTING:
-        return new PoolStartingEvent(ctx);
-      case POOL_STARTED:
-        return new PoolStartedEvent(ctx);
-      case POOL_STOPPED:
-        return new PoolStoppedEvent(ctx);
-      case POOL_RESTARTING:
-        return new PoolRestartingEvent(ctx);
-      case POOL_RESTARTED:
-        return new PoolRestartedEvent(ctx);
-      case POOL_DESTROYED:
-        return new PoolDestroyedEvent(ctx);
+    // Pool Lifecycle Events
+    case POOL_CREATED:
+      return new PoolCreatedEvent(ctx);
+    case POOL_STARTING:
+      return new PoolStartingEvent(ctx);
+    case POOL_STARTED:
+      return new PoolStartedEvent(ctx);
+    case POOL_STOPPED:
+      return new PoolStoppedEvent(ctx);
+    case POOL_DESTROYED:
+      return new PoolDestroyedEvent(ctx);
 
-      // Connection Lifecycle Events
-      case CONNECTION_CREATED:
-        return new ConnectionCreatedEvent(ctx);
-      case CONNECTION_BORROWED:
-        return new ConnectionBorrowedEvent(ctx);
-      case CONNECTION_RETURNED:
-        return new ConnectionReturnedEvent(ctx);
-      case CONNECTION_CLOSED:
-        return new ConnectionClosedEvent(ctx);
+    // Connection Lifecycle Events
+    case CONNECTION_CREATED:
+      return new ConnectionCreatedEvent(ctx);
+    case CONNECTION_BORROWED:
+      return new ConnectionBorrowedEvent(ctx);
+    case CONNECTION_RETURNED:
+      return new ConnectionReturnedEvent(ctx);
+    case CONNECTION_CLOSED:
+      return new ConnectionClosedEvent(ctx);
 
-      // Maintenance Operations
-      case POOL_REFRESHED:
-        return new PoolRefreshedEvent(ctx);
-      case POOL_RECYCLED:
-        return new PoolRecycledEvent(ctx);
-      case POOL_PURGED:
-        return new PoolPurgedEvent(ctx);
+    // Maintenance Operations
+    case POOL_REFRESHED:
+      return new PoolRefreshedEvent(ctx);
+    case POOL_RECYCLED:
+      return new PoolRecycledEvent(ctx);
+    case POOL_PURGED:
+      return new PoolPurgedEvent(ctx);
 
-      default:
-        throw new IllegalStateException("Unexpected event type: " + type);
+    default:
+      throw new IllegalStateException(
+          "Unexpected event type: " + type);
     }
   }
 
   /**
-   * Creates and immediately records a JFR event for the UCP operation.
+   * Creates and immediately records a JFR event for the UCP
+   * operation. POOL_RESTARTING and POOL_RESTARTED events are
+   * silently ignored.
    *
    * @param type UCP event type to record
    * @param ctx event context with pool metrics
    * @throws NullPointerException if parameters are null
    */
-  public static void recordEvent(UCPEventListener.EventType type, UCPEventContext ctx) {
+  public static void recordEvent(
+      UCPEventListener.EventType type, UCPEventContext ctx) {
+    if (type == UCPEventListener.EventType.POOL_RESTARTING
+        || type == UCPEventListener.EventType.POOL_RESTARTED) {
+      return;
+    }
     Event event = createEvent(type, ctx);
     event.commit();
   }
-}
+}

ojdbc-provider-observability/src/main/java/oracle/ucp/provider/observability/jfr/events/connection/ConnectionBorrowedEvent.java

@@ -1,16 +1,17 @@
 package oracle.ucp.provider.observability.jfr.events.connection;
 
-import oracle.ucp.provider.observability.jfr.core.UCPBaseEvent;
 import jdk.jfr.Category;
 import jdk.jfr.Label;
 import jdk.jfr.Name;
 import oracle.ucp.events.core.UCPEventContext;
+import oracle.ucp.provider.observability.jfr.core.UCPBaseEvent;
 
 @Name("ucp.ConnectionBorrowed")
 @Label("Connection Borrowed")
-@Category({"UCP Events","Connection Lifecycle Events"})
+@Category({"UCP Events", "Connection Lifecycle Events"})
 public class ConnectionBorrowedEvent extends UCPBaseEvent {
+
   public ConnectionBorrowedEvent(UCPEventContext ctx) {
-        initCommonFields(ctx);
-    }
-}
+    initCommonFields(ctx);
+  }
+}

ojdbc-provider-observability/src/main/java/oracle/ucp/provider/observability/jfr/events/connection/ConnectionClosedEvent.java

@@ -3,14 +3,15 @@
 import jdk.jfr.Category;
 import jdk.jfr.Label;
 import jdk.jfr.Name;
-import oracle.ucp.provider.observability.jfr.core.UCPBaseEvent;
 import oracle.ucp.events.core.UCPEventContext;
+import oracle.ucp.provider.observability.jfr.core.UCPBaseEvent;
 
 @Name("ucp.ConnectionClosed")
 @Label("Connection Closed")
-@Category({"UCP Events","Connection Lifecycle Events"})
+@Category({"UCP Events", "Connection Lifecycle Events"})
 public class ConnectionClosedEvent extends UCPBaseEvent {
+
   public ConnectionClosedEvent(UCPEventContext ctx) {
     initCommonFields(ctx);
   }
-}
+}

ojdbc-provider-observability/src/main/java/oracle/ucp/provider/observability/jfr/events/connection/ConnectionCreatedEvent.java

@@ -1,15 +1,16 @@
 package oracle.ucp.provider.observability.jfr.events.connection;
 
-import oracle.ucp.provider.observability.jfr.core.UCPBaseEvent;
 import jdk.jfr.Category;
 import jdk.jfr.Label;
 import jdk.jfr.Name;
 import oracle.ucp.events.core.UCPEventContext;
+import oracle.ucp.provider.observability.jfr.core.UCPBaseEvent;
 
 @Name("ucp.ConnectionCreated")
 @Label("Connection Created")
-@Category({"UCP Events","Connection Lifecycle Events"})
+@Category({"UCP Events", "Connection Lifecycle Events"})
 public class ConnectionCreatedEvent extends UCPBaseEvent {
+
   public ConnectionCreatedEvent(UCPEventContext ctx) {
     initCommonFields(ctx);
   }

ojdbc-provider-observability/src/main/java/oracle/ucp/provider/observability/jfr/events/connection/ConnectionReturnedEvent.java

@@ -1,16 +1,17 @@
 package oracle.ucp.provider.observability.jfr.events.connection;
 
-import oracle.ucp.provider.observability.jfr.core.UCPBaseEvent;
 import jdk.jfr.Category;
 import jdk.jfr.Label;
 import jdk.jfr.Name;
 import oracle.ucp.events.core.UCPEventContext;
+import oracle.ucp.provider.observability.jfr.core.UCPBaseEvent;
 
 @Name("ucp.ConnectionReturned")
 @Label("Connection Returned")
-@Category({"UCP Events","Connection Lifecycle Events"})
+@Category({"UCP Events", "Connection Lifecycle Events"})
 public class ConnectionReturnedEvent extends UCPBaseEvent {
+
   public ConnectionReturnedEvent(UCPEventContext ctx) {
-        initCommonFields(ctx);
-    }
-}
+    initCommonFields(ctx);
+  }
+}

ojdbc-provider-observability/src/main/java/oracle/ucp/provider/observability/jfr/events/lifecycle/PoolCreatedEvent.java

@@ -1,17 +1,17 @@
 package oracle.ucp.provider.observability.jfr.events.lifecycle;
 
-import oracle.ucp.provider.observability.jfr.core.UCPBaseEvent;
 import jdk.jfr.Category;
-import jdk.jfr.Description;
 import jdk.jfr.Label;
 import jdk.jfr.Name;
 import oracle.ucp.events.core.UCPEventContext;
+import oracle.ucp.provider.observability.jfr.core.UCPBaseEvent;
 
 @Name("ucp.PoolCreated")
 @Label("Pool Created")
-@Category({"UCP Events","Pool Lifecycle Events"})
+@Category({"UCP Events", "Pool Lifecycle Events"})
 public class PoolCreatedEvent extends UCPBaseEvent {
+
   public PoolCreatedEvent(UCPEventContext ctx) {
-        initCommonFields(ctx);
-    }
-}
+    initCommonFields(ctx);
+  }
+}

ojdbc-provider-observability/src/main/java/oracle/ucp/provider/observability/jfr/events/lifecycle/PoolDestroyedEvent.java

@@ -1,14 +1,17 @@
 package oracle.ucp.provider.observability.jfr.events.lifecycle;
 
-import oracle.ucp.provider.observability.jfr.core.UCPBaseEvent;
 import jdk.jfr.Category;
 import jdk.jfr.Label;
 import jdk.jfr.Name;
 import oracle.ucp.events.core.UCPEventContext;
+import oracle.ucp.provider.observability.jfr.core.UCPBaseEvent;
 
 @Name("ucp.PoolDestroyed")
 @Label("Pool Destroyed")
-@Category({"UCP Events","Pool Lifecycle Events"})
+@Category({"UCP Events", "Pool Lifecycle Events"})
 public class PoolDestroyedEvent extends UCPBaseEvent {
-  public PoolDestroyedEvent(UCPEventContext ctx) { initCommonFields(ctx); }
+
+  public PoolDestroyedEvent(UCPEventContext ctx) {
+    initCommonFields(ctx);
+  }
 }