res_pjsip_outbound_registration.c: Filter redundant statsd reporting.
authorRichard Mudgett <rmudgett@digium.com>
Thu, 1 Dec 2016 00:25:11 +0000 (18:25 -0600)
committerRichard Mudgett <rmudgett@digium.com>
Fri, 2 Dec 2016 17:56:59 +0000 (11:56 -0600)
Increasing the testsuite shutdown timeout before forcibly killing
Asterisk allowed more events to be sent out.  Some tests failed as
a result.  The tests/channels/pjsip/statsd/registrations failed
because we now get the statsd events that a comment in the test
configuration stated couldn't be intercepted.  Unfortunately, we
get a variable number of events because of internal status state
transition races generating redundant statsd events.

We were reporting redundant statsd PJSIP.registrations.state changes
for internal state changes that equated to the same thing publicly.

* Made update_client_state_status() filter out redundant statsd
updates.

ASTERISK-26527

Change-Id: If851c7d514bb530d9226e4941ba97dcf52000646

CHANGES
res/res_pjsip_outbound_registration.c

diff --git a/CHANGES b/CHANGES
index 886cd00..431218f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -79,6 +79,12 @@ res_pjproject
  * Added new pjproject.conf startup section "log_level' option to set the
    initial maximum PJPROJECT logging level.
 
+res_pjsip_outbound_registration
+------------------
+ * Statsd no longer logs redundant status PJSIP.registrations.state changes
+   for internal state transitions that don't change the reported public status
+   state.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 14.1.0 to Asterisk 14.2.0 ------------
 ------------------------------------------------------------------------------
index 29701a1..d486ccd 100644 (file)
@@ -627,15 +627,30 @@ static void schedule_registration(struct sip_outbound_registration_client_state
 
 static void update_client_state_status(struct sip_outbound_registration_client_state *client_state, enum sip_outbound_registration_status status)
 {
+       const char *status_old;
+       const char *status_new;
+
        if (client_state->status == status) {
+               /* Status state did not change at all. */
+               return;
+       }
+
+       status_old = sip_outbound_registration_status_str(client_state->status);
+       status_new = sip_outbound_registration_status_str(status);
+       client_state->status = status;
+
+       if (!strcmp(status_old, status_new)) {
+               /*
+                * The internal status state may have changed but the status
+                * state we tell the world did not change at all.
+                */
                return;
        }
 
        ast_statsd_log_string_va("PJSIP.registrations.state.%s", AST_STATSD_GAUGE, "-1", 1.0,
-               sip_outbound_registration_status_str(client_state->status));
+               status_old);
        ast_statsd_log_string_va("PJSIP.registrations.state.%s", AST_STATSD_GAUGE, "+1", 1.0,
-               sip_outbound_registration_status_str(status));
-       client_state->status = status;
+               status_new);
 }
 
 /*! \brief Callback function for unregistering (potentially) and destroying state */