Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add bad Stream health hook #5567

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add bad Stream health hook #5567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0a88180
add a hook for bad stream health
USAMAWIZARD Sep 14, 2023
7d735f2
Merge branch 'master' into add-badhealth-Hook
USAMAWIZARD Sep 14, 2023
060736b
Update AntMediaApplicationAdapter.java
USAMAWIZARD Sep 18, 2023
e520187
Merge branch 'master' into add-badhealth-Hook
USAMAWIZARD Sep 18, 2023
200803a
Update AntMediaApplicationAdapter.java
USAMAWIZARD Sep 18, 2023
23c3393
add test cases
USAMAWIZARD Sep 22, 2023
5c69046
Merge branch 'master' into add-badhealth-Hook
USAMAWIZARD Sep 22, 2023
7ca7860
Update AntMediaApplicationAdapter.java
USAMAWIZARD Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion src/main/java/io/antmedia/AntMediaApplicationAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ public class AntMediaApplicationAdapter extends MultiThreadedApplicationAdapter
public static final String HOOK_ACTION_PUBLISH_TIMEOUT_ERROR = "publishTimeoutError";
public static final String HOOK_ACTION_ENCODER_NOT_OPENED_ERROR = "encoderNotOpenedError";
public static final String HOOK_ACTION_ENDPOINT_FAILED = "endpointFailed";
public static final String HOOK_ACTION_BAD_STREAM_HEALTH = "badStreamHealth";


public static final String STREAMS = "streams";

Expand Down Expand Up @@ -480,6 +482,22 @@ public String getListenerHookURL(@NotNull Broadcast broadcast)
return listenerHookURL;

}
public void badStreamHealthHook(String streamId,String parameterName, double healthParameter) {
Broadcast broadcast = getDataStore().get(streamId);

if (broadcast != null) {
final String listenerHookURL = getListenerHookURL(broadcast);
if (listenerHookURL != null && !listenerHookURL.isEmpty()) {
final String name = broadcast.getName();
final String category = broadcast.getCategory();
logger.info("Calling Bad Stream Health hook for stream:{}", streamId);
Map<String, Double> badHealth = new HashMap<>();
badHealth.put(parameterName, healthParameter);

vertx.runOnContext(e -> notifyHook(listenerHookURL, streamId, HOOK_ACTION_BAD_STREAM_HEALTH, name, category, null, null, badHealth.toString()));
}
}
}

public void closeBroadcast(String streamId) {

Expand Down Expand Up @@ -578,7 +596,6 @@ public void startPublish(String streamId, long absoluteStartTimeMs, String publi
try {

Broadcast broadcast = updateBroadcastStatus(streamId, absoluteStartTimeMs, publishType, getDataStore().get(streamId));

final String listenerHookURL = getListenerHookURL(broadcast);
if (listenerHookURL != null && !listenerHookURL.isEmpty())
{
Expand Down Expand Up @@ -1044,6 +1061,9 @@ public void setQualityParameters(String id, String quality, double speed, int pe
broadcastLocal.setUpdateTime(updateTimeMs);
broadcastLocal.setQuality(quality);
getDataStore().updateBroadcastFields(id, broadcastLocal);
if( speed < 0.9 || speed >1.3 ) {
badStreamHealthHook(id, "speed", speed);
}
}

});
Expand Down
25 changes: 25 additions & 0 deletions src/test/java/io/antmedia/test/AntMediaApplicationAdaptorUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,32 @@ public void testCloseBroadcast() {
broadcast = db.get(broadcast.getStreamId());
assertEquals(AntMediaApplicationAdapter.BROADCAST_STATUS_FINISHED, broadcast.getStatus());
}
@Test
public void testBadStreamHealthHook() throws Exception {

AntMediaApplicationAdapter appAdaptorSpy = Mockito.spy(adapter);

DataStore dataStore = new InMemoryDataStore("db");
Broadcast broadcast = new Broadcast();

broadcast.setStreamId("stream1");
broadcast.setName("stream1");
String listenerHookURL = "http://www.example.com/listenerhookurl";
broadcast.setListenerHookURL(listenerHookURL);
dataStore.save(broadcast);

assertNotNull(appAdaptorSpy.getVertx());
appAdaptorSpy.setDataStore(dataStore);

appAdaptorSpy.setQualityParameters("stream1","speed", 2,1,1);

Awaitility.await().pollDelay(2, TimeUnit.SECONDS).atMost(10, TimeUnit.SECONDS).until(()-> {
verify(appAdaptorSpy).badStreamHealthHook("stream1","speed", 2);
verify(appAdaptorSpy).notifyHook(listenerHookURL, "stream1", Application.HOOK_ACTION_BAD_STREAM_HEALTH , broadcast.getName(), broadcast.getCategory(), null, null, "{speed=2.0}");
return true;
});

}
@Test
public void testInitializationFile() {

Expand Down