Add route param to stats counter

Author: smecsia

proxy/src/main/java/ru/qatools/gridrouter/ProxyServlet.java

@@ -87,9 +87,9 @@ protected String rewriteTarget(HttpServletRequest request) {
 
         if (isSessionDeleteRequest(request, command)) {
             LOGGER.info("[SESSION_DELETED] [{}] [{}] [{}]", remoteHost, route, command);
-            statsCounter.deleteSession(getFullSessionId(uri));
+            statsCounter.deleteSession(getFullSessionId(uri), route);
         } else {
-            statsCounter.updateSession(getFullSessionId(uri));
+            statsCounter.updateSession(getFullSessionId(uri), route);
         }
 
         try {

proxy/src/main/java/ru/qatools/gridrouter/RouteServlet.java

@@ -116,7 +116,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
                         replyWithOk(hubMessage, response);
                         LOGGER.info("[SESSION_CREATED] [{}] [{}] [{}] [{}] [{}] [{}]",
                                 user, remoteHost, browser, route, sessionId, attempt);
-                        statsCounter.startSession(hubMessage.getSessionId(), user, browser, actualVersion.getNumber());
+                        statsCounter.startSession(hubMessage.getSessionId(), user, browser, actualVersion.getNumber(), route);
                         return;
                     }
                     LOGGER.warn("[SESSION_FAILED] [{}] [{}] [{}] [{}] - {}",

proxy/src/main/java/ru/qatools/gridrouter/sessions/MemoryStatsCounter.java

@@ -21,7 +21,7 @@ public class MemoryStatsCounter implements StatsCounter {
     private final Map<String, BrowsersCountMap> user2browserCount = new HashMap<>();
 
     @Override
-    public synchronized void startSession(String sessionId, String user, String browser, String version) {
+    public synchronized void startSession(String sessionId, String user, String browser, String version, String route) {
         if (session2instant.put(sessionId, now()) == null) {
             session2user.put(sessionId, user);
             session2browserVersion.put(sessionId, new BrowserVersion(browser, version));
@@ -31,12 +31,12 @@ public synchronized void startSession(String sessionId, String user, String brow
     }
 
     @Override
-    public void updateSession(String sessionId) {
+    public void updateSession(String sessionId, String route) {
         session2instant.replace(sessionId, now());
     }
 
     @Override
-    public synchronized void deleteSession(String sessionId) {
+    public synchronized void deleteSession(String sessionId, String route) {
         if (session2instant.remove(sessionId) != null) {
             String user = session2user.remove(sessionId);
             BrowserVersion browser = session2browserVersion.remove(sessionId);

proxy/src/main/java/ru/qatools/gridrouter/sessions/StatsCounter.java

@@ -8,11 +8,25 @@
  */
 public interface StatsCounter {
 
-    void startSession(String sessionId, String user, String browser, String version);
+    default void startSession(String sessionId, String user, String browser, String version) {
+        startSession(sessionId, user, browser, version, null);
+    }
 
-    void updateSession(String sessionId);
+    default void updateSession(String sessionId) {
+        updateSession(sessionId, null);
+    }
 
-    void deleteSession(String sessionId);
+    default void deleteSession(String sessionId) {
+        deleteSession(sessionId, null);
+    }
+
+    void startSession(String sessionId, String user, String browser, String version, String route);
+
+    default void updateSession(String sessionId, String route) {
+
+    }
+
+    void deleteSession(String sessionId, String route);
 
     void expireSessionsOlderThan(Duration duration);