-
Notifications
You must be signed in to change notification settings - Fork 996
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use JitsiXmppStringprep, update smack #2127
Merged
Merged
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
5fb893a
ref: Do not register xmpp extensions for RAW UDP, we only support ICE.
bgrozev ce11d3d
ref: Remove unused code.
bgrozev 71a09c4
feat: Use JitsiXmppStringprep
bgrozev a5429b5
doc: Fix javadocs.
bgrozev 6ffee37
ref: Move queue stats out of Videobridge.java.
bgrozev d830d8a
ref: Move ulimit check out of Videobridge.java.
bgrozev de08326
ref: Move videobridgeExpireThread out of Videobridge.java.
bgrozev d8d7fd8
squash: Remove obsolete TODO.
bgrozev 7456b09
chore: Update jitsi-xmpp-extensions (JitsiXmppStringprep).
bgrozev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
jvb/src/main/kotlin/org/jitsi/videobridge/stats/QueueStats.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * Copyright @ 2024 - present 8x8, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.jitsi.videobridge.stats | ||
|
|
||
| import org.jitsi.nlj.RtpReceiverImpl | ||
| import org.jitsi.nlj.RtpSenderImpl | ||
| import org.jitsi.utils.OrderedJsonObject | ||
| import org.jitsi.utils.queue.CountingErrorHandler | ||
| import org.jitsi.utils.queue.QueueStatistics.Companion.getStatistics | ||
| import org.jitsi.videobridge.AbstractEndpointMessageTransport | ||
| import org.jitsi.videobridge.Endpoint | ||
| import org.jitsi.videobridge.relay.Relay | ||
| import org.jitsi.videobridge.relay.RelayEndpointSender | ||
| import org.json.simple.JSONObject | ||
|
|
||
| object QueueStats { | ||
| /** | ||
| * Gets statistics for the different `PacketQueue`s that this bridge | ||
| * uses. | ||
| * TODO: is there a better place for this? | ||
| */ | ||
| @JvmStatic | ||
| fun getQueueStats() = JSONObject().apply { | ||
| this["srtp_send_queue"] = getJsonFromQueueStatisticsAndErrorHandler( | ||
| Endpoint.queueErrorCounter, | ||
| "Endpoint-outgoing-packet-queue" | ||
| ) | ||
| this["relay_srtp_send_queue"] = getJsonFromQueueStatisticsAndErrorHandler( | ||
| Relay.queueErrorCounter, | ||
| "Relay-outgoing-packet-queue" | ||
| ) | ||
| this["relay_endpoint_sender_srtp_send_queue"] = getJsonFromQueueStatisticsAndErrorHandler( | ||
| RelayEndpointSender.queueErrorCounter, | ||
| "RelayEndpointSender-outgoing-packet-queue" | ||
| ) | ||
| this["rtp_receiver_queue"] = getJsonFromQueueStatisticsAndErrorHandler( | ||
| RtpReceiverImpl.queueErrorCounter, | ||
| "rtp-receiver-incoming-packet-queue" | ||
| ) | ||
| this["rtp_sender_queue"] = getJsonFromQueueStatisticsAndErrorHandler( | ||
| RtpSenderImpl.queueErrorCounter, | ||
| "rtp-sender-incoming-packet-queue" | ||
| ) | ||
| this["colibri_queue"] = getStatistics()["colibri-queue"] | ||
| this[AbstractEndpointMessageTransport.INCOMING_MESSAGE_QUEUE_ID] = | ||
| getJsonFromQueueStatisticsAndErrorHandler( | ||
| null, | ||
| AbstractEndpointMessageTransport.INCOMING_MESSAGE_QUEUE_ID | ||
| ) | ||
| } | ||
|
|
||
| private fun getJsonFromQueueStatisticsAndErrorHandler( | ||
| countingErrorHandler: CountingErrorHandler?, | ||
| queueName: String | ||
| ): OrderedJsonObject? { | ||
| var json = getStatistics()[queueName] as OrderedJsonObject? | ||
| if (countingErrorHandler != null) { | ||
| if (json == null) { | ||
| json = OrderedJsonObject() | ||
| json["dropped_packets"] = countingErrorHandler.numPacketsDropped | ||
| } | ||
| json["exceptions"] = countingErrorHandler.numExceptions | ||
| } | ||
|
|
||
| return json | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you've answered this TODO?