[grid] Making the tracing logs to be FINE(debug) level

Only outputting INFO for session creation and session
deletion.

Author: diemol

java/client/test/org/openqa/selenium/json/JsonOutputTest.java

@@ -690,7 +690,7 @@ public Optional<String> getNoValue() {
   }
 
   @Test
-  public void onRequsetShouldNotWriteClassNamesIntoJson() {
+  public void onRequestShouldNotWriteClassNamesIntoJson() {
     class WithClassName {
       public String getCheese() {
         return "gouda";

java/server/src/org/openqa/selenium/grid/distributor/Distributor.java

@@ -67,6 +67,7 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 import static org.openqa.selenium.remote.RemoteTags.CAPABILITIES;
@@ -118,6 +119,8 @@
  */
 public abstract class Distributor implements HasReadyState, Predicate<HttpRequest>, Routable {
 
+  private static final Logger LOG = Logger.getLogger(Distributor.class.getName());
+
   private final Route routes;
   protected final Tracer tracer;
   private final SlotSelector slotSelector;
@@ -173,7 +176,9 @@ public Either<SessionNotCreatedException, CreateSessionResponse> newSession(Http
 
       Iterator<Capabilities> iterator = payload.stream().iterator();
       attributeMap.put("request.payload", EventAttribute.setValue(payload.toString()));
-      span.addEvent("Session request received by the distributor", attributeMap);
+      String sessionReceivedMessage = "Session request received by the distributor";
+      span.addEvent(sessionReceivedMessage, attributeMap);
+      LOG.info(String.format("%s: \n %s", sessionReceivedMessage, payload));
 
       if (!iterator.hasNext()) {
         SessionNotCreatedException exception =
@@ -242,7 +247,9 @@ public Either<SessionNotCreatedException, CreateSessionResponse> newSession(Http
         span.setAttribute(AttributeKey.SESSION_URI.getKey(), sessionUri);
         attributeMap.put(AttributeKey.SESSION_URI.getKey(), EventAttribute.setValue(sessionUri));
 
-        span.addEvent("Session created by the distributor", attributeMap);
+        String sessionCreatedMessage = "Session created by the distributor";
+        span.addEvent(sessionCreatedMessage, attributeMap);
+        LOG.info(String.format("%s. Id: %s, Caps: %s", sessionCreatedMessage, sessionId, caps));
         return Either.right(sessionResponse);
 
       } else {

java/server/src/org/openqa/selenium/grid/log/LoggingFlags.java

@@ -33,30 +33,30 @@ public class LoggingFlags implements HasRoles {
 
   @Parameter(description = "Configure logging", hidden = true, names = "--configure-logging", arity = 1)
   @ConfigValue(section = "logging", name = "enable", example = "true")
-  private Boolean configureLogging = true;
+  private Boolean configureLogging;
 
-  @Parameter(description = "Use structured logs", names = "--structured-logs")
+  @Parameter(description = "Use structured logs", names = "--structured-logs", arity = 1)
   @ConfigValue(section = "logging", name = "structured-logs", example = "false")
-  private Boolean structuredLogs = false;
+  private Boolean structuredLogs;
 
   @Parameter(description = "Use plain log lines", names = "--plain-logs", arity = 1)
   @ConfigValue(section = "logging", name = "plain-logs", example = "true")
-  private Boolean plainLogs = true;
+  private Boolean plainLogs;
 
   @Parameter(description = "Enable trace collection", hidden = true, names = "--tracing", arity = 1)
   @ConfigValue(section = "logging", name = "tracing", example = "true")
-  private Boolean enableTracing = true;
+  private Boolean enableTracing;
 
   @Parameter(description = "File to write out logs", hidden = true, names = "--log", arity = 1)
   @ConfigValue(section = "logging", name = "log-file", example = "true")
   private String logFile;
 
   @Parameter(description = "Log encoding", names = "--log-encoding", arity = 1)
   @ConfigValue(section = "logging", name = "log-encoding", example = "UTF-8")
-  private String logEncoding = null;
+  private String logEncoding;
 
-  @Parameter(description = "Log level. Default logging level is INFO." +
-    "Log levels are described here https://docs.oracle.com/javase/7/docs/api/java/util/logging/Level.html ",
+  @Parameter(description = "Log level. Default logging level is INFO. Log levels are described here " +
+                           "https://docs.oracle.com/javase/7/docs/api/java/util/logging/Level.html",
     names = "--log-level", arity = 1)
   @ConfigValue(section = "logging", name = "log-level", example = "INFO")
   private String logLevel;

java/server/src/org/openqa/selenium/grid/log/LoggingOptions.java

@@ -166,7 +166,7 @@ public CompletableResultCode export(Collection<SpanData> spans) {
             map.put("attributes", attributeMap);
             String jsonString = getJsonString(map);
             if (status.isOk()) {
-              LOG.log(Level.INFO, jsonString);
+              LOG.log(Level.FINE, jsonString);
             } else {
               LOG.log(Level.WARNING, jsonString);
             }
@@ -188,7 +188,7 @@ public CompletableResultCode shutdown() {
     }).build());
 
     // The Jaeger exporter doesn't yet have a `TracerFactoryProvider`, so we
-    //shall look up the class using reflection, and beg for forgiveness
+    // shall look up the class using reflection, and beg for forgiveness
     // later.
     Optional<SpanExporter> maybeJaeger = JaegerTracing.findJaegerExporter();
     maybeJaeger.ifPresent(

java/server/src/org/openqa/selenium/grid/sessionmap/local/LocalSessionMap.java

@@ -39,12 +39,15 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.logging.Logger;
 
 import static org.openqa.selenium.remote.RemoteTags.SESSION_ID;
 import static org.openqa.selenium.remote.RemoteTags.SESSION_ID_EVENT;
 
 public class LocalSessionMap extends SessionMap {
 
+  private static final Logger LOG = Logger.getLogger(LocalSessionMap.class.getName());
+
   private final EventBus bus;
   private final Map<SessionId, Session> knownSessions = new ConcurrentHashMap<>();
   private final ReadWriteLock lock = new ReentrantReadWriteLock(/* be fair */ true);
@@ -62,7 +65,9 @@ public LocalSessionMap(Tracer tracer, EventBus bus) {
         SESSION_ID.accept(span, id);
         SESSION_ID_EVENT.accept(attributeMap, id);
         knownSessions.remove(id);
-        span.addEvent("Deleted session from local session map", attributeMap);
+        String sessionDeletedMessage = "Deleted session from local session map";
+        span.addEvent(sessionDeletedMessage, attributeMap);
+        LOG.info(String.format("%s, Id: %s", sessionDeletedMessage, id));
       }
     }));
   }