The introduction of the RSTL lock has considerably changed the behavior the locks.Global section of serverStatus because the RSTL metrics are currently lumped in with global lock metrics. Diagnosability will be improved if these lock metrics are reported separately.

In addition the inclusion of the PBWM metrics in the locks.Global section has hampered diagnosability in the past, so we should also separate those metrics out.

Specific strawman proposal: introduce new locks.RSTL and locks.PBWM alongside locks.Global, which will now include only global lock metrics and not RSTL or PBWM metrics:

        "locks" : {
                "Global" : {
                        "acquireCount" : ...
                        "acquireWaitCount" : ...
                        "timeAcquiringMicros" : ...
                },
                "PBWM" : ...
                "RSTL" : ...
                "Database" : ...
                "Collection" : ...
                "oplog" : ...
        },

As part of this work we should also verify that clients waiting on the RSTL and PBWM locks will be reported as queued in the globalLock.currentQueue section, as the reported queues are an important diagnostic metric.