fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41758?usp=email )

Change subject: s1gw_metrics: remove ?S1GW_{CTR,GAUGE}_S1AP_PROXY_UPLINK_PACKETS_QUEUED ......................................................................

s1gw_metrics: remove ?S1GW_{CTR,GAUGE}_S1AP_PROXY_UPLINK_PACKETS_QUEUED

We no longer queue any packets, so these metrics are not relevant.

Change-Id: I6c4c4a751dbe5a245f16515a1a1d65acf33468e9 Related: 4614fc3 ("s1ap_proxy: move S1 SETUP handling to sctp_proxy") Related: SYS#7052 --- M include/s1gw_metrics.hrl M src/s1gw_metrics.erl 2 files changed, 1 insertion(+), 5 deletions(-)

Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved

diff --git a/include/s1gw_metrics.hrl b/include/s1gw_metrics.hrl index 385b5fa..8f78821 100644 --- a/include/s1gw_metrics.hrl +++ b/include/s1gw_metrics.hrl @@ -11,7 +11,6 @@ -define(S1GW_CTR_PFCP_UNEXPECTED_PDU, [ctr, pfcp, unexpected_pdu]). -define(S1GW_CTR_S1AP_ENB_ALL_RX, [ctr, s1ap, enb, all, rx]). -define(S1GW_CTR_S1AP_ENB_ALL_RX_UNKNOWN_ENB, [ctr, s1ap, enb, all, rx_unknown_enb]). --define(S1GW_CTR_S1AP_PROXY_UPLINK_PACKETS_QUEUED, [ctr, s1ap, proxy, uplink_packets_queued]). -define(S1GW_CTR_S1AP_PROXY_EXCEPTION, [ctr, s1ap, proxy, exception]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, [ctr, s1ap, proxy, in_pkt, all]). -define(S1GW_CTR_S1AP_PROXY_IN_PKT_DROP_ALL, [ctr, s1ap, proxy, in_pkt, drop, all]). @@ -56,7 +55,6 @@

-define(S1GW_GAUGE_PFCP_ASSOCIATED, [gauge, pfcp, associated]). -define(S1GW_GAUGE_S1AP_ENB_NUM_SCTP_CONNECTIONS, [gauge, s1ap, enb, num_sctp_connections]). --define(S1GW_GAUGE_S1AP_PROXY_UPLINK_PACKETS_QUEUED, [gauge, s1ap, proxy, uplink_packets_queued]).

%% NOTE: Remember to add new entries to s1gw_metric:init()!

diff --git a/src/s1gw_metrics.erl b/src/s1gw_metrics.erl index bb4bd97..1368c5b 100644 --- a/src/s1gw_metrics.erl +++ b/src/s1gw_metrics.erl @@ -65,7 +65,6 @@ ?S1GW_CTR_PFCP_UNEXPECTED_PDU, ?S1GW_CTR_S1AP_ENB_ALL_RX, ?S1GW_CTR_S1AP_ENB_ALL_RX_UNKNOWN_ENB, - ?S1GW_CTR_S1AP_PROXY_UPLINK_PACKETS_QUEUED, ?S1GW_CTR_S1AP_PROXY_EXCEPTION, %% exception(s) occurred %% s1ap_proxy: INcoming PDU counters ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, %% received total @@ -106,8 +105,7 @@

-define(S1GW_GAUGES, [ ?S1GW_GAUGE_PFCP_ASSOCIATED, - ?S1GW_GAUGE_S1AP_ENB_NUM_SCTP_CONNECTIONS, - ?S1GW_GAUGE_S1AP_PROXY_UPLINK_PACKETS_QUEUED + ?S1GW_GAUGE_S1AP_ENB_NUM_SCTP_CONNECTIONS ]).

-type counter() :: [ctr | _].