Port more metrics to MetricsContainer (#973)

* ref: Move FocusManager to kotlin.
* ref: Move Statistics to ConferenceMetrics.
* ref: Adjust variable names.
* ref: Adjust MetricsContainer metric names.
* Port more metrics to MetricsContainer.
* ref: Extract a function to update metrics.
* Remove jibri "pending" stats.
* ref: Move jibri metrics to MetricsContainer.
* fix: Return bad_request if "room" is missing, make param non-nullable.

Author: bgrozev

jicofo/src/main/java/org/jitsi/jicofo/FocusManager.java

@@ -25,7 +25,6 @@
 import org.jitsi.jicofo.bridge.colibri.*;
 import org.jitsi.jicofo.conference.source.*;
 import org.jitsi.jicofo.lipsynchack.*;
-import org.jitsi.jicofo.stats.*;
 import org.jitsi.jicofo.version.*;
 import org.jitsi.jicofo.xmpp.*;
 import org.jitsi.jicofo.xmpp.UtilKt;
@@ -678,14 +677,14 @@ private void inviteChatMember(ChatRoomMember chatRoomMember, boolean justJoined)
             List<String> features = getClientXmppProvider().discoverFeatures(chatRoomMember.getOccupantJid());
             final Participant participant = new Participant(chatRoomMember, features, logger, this);
 
-            Statistics.totalParticipants.inc();
+            ConferenceMetrics.participants.inc();
             if (!participant.supportsReceivingMultipleVideoStreams())
             {
-                Statistics.totalParticipantsNoMultiStream.inc();
+                ConferenceMetrics.participantsNoMultiStream.inc();
             }
             if (!participant.hasSourceNameSupport())
             {
-                Statistics.totalParticipantsNoSourceName.inc();
+                ConferenceMetrics.participantsNoSourceName.inc();
             }
 
             participants.put(chatRoomMember.getOccupantJid(), participant);
@@ -778,23 +777,6 @@ private boolean checkMinParticipants()
         return chatRoom != null && chatRoom.getMembersCount() >= minParticipants;
     }
 
-    /**
-     * Destroys the MUC room and deletes the conference which results in all
-     * participant being removed from the XMPP chat room.
-     * @param reason the reason text that will be advertised to all
-     *               participants upon exit.
-     */
-    public void destroy(String reason)
-    {
-        if (chatRoom == null)
-        {
-            logger.error("Unable to destroy conference MUC room, not joined");
-            return;
-        }
-
-        chatRoom.destroy(reason, null);
-    }
-
     /**
      * Expires all COLIBRI conferences.
      */
@@ -1019,7 +1001,7 @@ public StanzaError onSessionInfo(@NotNull JingleSession session, JingleIQ iq)
                     address,
                     bridgeSessionId));
         }
-        Statistics.totalParticipantsIceFailed.inc();
+        ConferenceMetrics.participantsIceFailed.inc();
 
         return null;
     }
@@ -1054,7 +1036,7 @@ public StanzaError onSessionTerminate(@NotNull JingleSession session, JingleIQ i
 
         if (restartRequested)
         {
-            Statistics.totalParticipantsRequestedRestart.inc();
+            ConferenceMetrics.participantsRequestedRestart.inc();
         }
 
         if (!Objects.equals(bridgeSessionId, existingBridgeSessionId))
@@ -1697,7 +1679,7 @@ private void reInviteParticipantsById(@NotNull List<String> participantIdsToRein
     {
         if (!participantIdsToReinvite.isEmpty())
         {
-            Statistics.totalParticipantsMoved.addAndGet(participantIdsToReinvite.size());
+            ConferenceMetrics.participantsMoved.addAndGet(participantIdsToReinvite.size());
             synchronized (participantLock)
             {
                 List<Participant> participantsToReinvite = new ArrayList<>();

jicofo/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConferenceImpl.java

@@ -43,7 +43,7 @@ public class Pin
     @Produces(MediaType.APPLICATION_JSON)
     public String getPins()
     {
-        return jicofoServices.getFocusManager().getPinnedConferences().toJSONString();
+        return jicofoServices.getFocusManager().getPinnedConferencesJson().toJSONString();
     }
 
     @POST