[java] Adding logging to track session creation and deletion

diemol · diemol · commit bcbd00917962 · 2022-04-21T16:59:38.000+02:00
[skip ci]
diff --git a/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java b/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java
@@ -487,7 +487,7 @@ public Either<SessionNotCreatedException, CreateSessionResponse> newSession(Sess
         EventAttribute.setValue(getClass().getName()));
 
       attributeMap.put("request.payload", EventAttribute.setValue(request.getDesiredCapabilities().toString()));
-      String sessionReceivedMessage = "Session request received by the distributor";
+      String sessionReceivedMessage = "Session request received by the Distributor";
       span.addEvent(sessionReceivedMessage, attributeMap);
       LOG.info(String.format("%s: \n %s", sessionReceivedMessage, request.getDesiredCapabilities()));
 
@@ -519,7 +519,7 @@ public Either<SessionNotCreatedException, CreateSessionResponse> newSession(Sess
         SlotId selectedSlot = reserveSlot(request.getRequestId(), caps);
         if (selectedSlot == null) {
           LOG.info(
-            String.format("Unable to find a free slot for request %s. %s ",
+            String.format("Unable to find a free slot for request %s. \n %s ",
                           request.getRequestId(),
                           caps));
           retry = true;
@@ -546,9 +546,10 @@ public Either<SessionNotCreatedException, CreateSessionResponse> newSession(Sess
           span.setAttribute(SESSION_URI.getKey(), sessionUri);
           attributeMap.put(SESSION_URI.getKey(), EventAttribute.setValue(sessionUri));
 
-          String sessionCreatedMessage = "Session created by the distributor";
+          String sessionCreatedMessage = "Session created by the Distributor";
           span.addEvent(sessionCreatedMessage, attributeMap);
-          LOG.info(String.format("%s. Id: %s, Caps: %s", sessionCreatedMessage, sessionId, sessionCaps));
+          LOG.info(
+            String.format("%s. Id: %s \n Caps: %s", sessionCreatedMessage, sessionId, sessionCaps));
 
           return Either.right(response);
         } catch (SessionNotCreatedException e) {
diff --git a/java/src/org/openqa/selenium/grid/node/local/LocalNode.java b/java/src/org/openqa/selenium/grid/node/local/LocalNode.java
@@ -167,8 +167,6 @@ private LocalNode(
       .removalListener((RemovalListener<SessionId, SessionSlot>) notification -> {
         if (notification.getKey() != null && notification.getValue() != null) {
           // Attempt to stop the session
-          LOG.log(Debug.getDebugLogLevel(), "Stopping session {0}",
-                  notification.getKey().toString());
           SessionSlot slot = notification.getValue();
           if (!slot.isAvailable()) {
             slot.stop();
@@ -374,6 +372,10 @@ public Either<WebDriverException, CreateSessionResponse> newSession(CreateSessio
           externalUri,
           slotToUse.isSupportingCdp(),
           sessionRequest.getDesiredCapabilities());
+
+        String sessionCreatedMessage = "Session created by the Node";
+        LOG.info(String.format("%s. Id: %s, Caps: %s", sessionCreatedMessage, sessionId, caps));
+
         return Either.right(new CreateSessionResponse(
           externalSession,
           getEncoder(session.getDownstreamDialect()).apply(externalSession)));
diff --git a/java/src/org/openqa/selenium/grid/node/local/SessionSlot.java b/java/src/org/openqa/selenium/grid/node/local/SessionSlot.java
@@ -113,6 +113,7 @@ public void stop() {
     currentSession = null;
     release();
     bus.fire(new SessionClosedEvent(id));
+    LOG.info(String.format("Stopping session %s", id));
   }
 
   @Override
diff --git a/java/src/org/openqa/selenium/grid/sessionmap/local/LocalSessionMap.java b/java/src/org/openqa/selenium/grid/sessionmap/local/LocalSessionMap.java
@@ -67,7 +67,7 @@ public LocalSessionMap(Tracer tracer, EventBus bus) {
         SESSION_ID.accept(span, id);
         SESSION_ID_EVENT.accept(attributeMap, id);
         knownSessions.remove(id);
-        String sessionDeletedMessage = "Deleted session from local session map";
+        String sessionDeletedMessage = "Deleted session from local Session Map";
         span.addEvent(sessionDeletedMessage, attributeMap);
         LOG.info(String.format("%s, Id: %s", sessionDeletedMessage, id));
       }

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ public void stop() {`
`113`	`113`	`currentSession = null;`
`114`	`114`	`release();`
`115`	`115`	`bus.fire(new SessionClosedEvent(id));`
	`116`	`+ LOG.info(String.format("Stopping session %s", id));`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public LocalSessionMap(Tracer tracer, EventBus bus) {`
`67`	`67`	`SESSION_ID.accept(span, id);`
`68`	`68`	`SESSION_ID_EVENT.accept(attributeMap, id);`
`69`	`69`	`knownSessions.remove(id);`
`70`		`- String sessionDeletedMessage = "Deleted session from local session map";`
	`70`	`+ String sessionDeletedMessage = "Deleted session from local Session Map";`
`71`	`71`	`span.addEvent(sessionDeletedMessage, attributeMap);`
`72`	`72`	`LOG.info(String.format("%s, Id: %s", sessionDeletedMessage, id));`
`73`	`73`	`}`