- gerrit-log - lists.osmocom.org

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: fix per-eNB ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL
by fixeria 23 Jul '25

23 Jul '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40717?usp=email ) Change subject: s1ap_proxy: fix per-eNB ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL ...................................................................... s1ap_proxy: fix per-eNB ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL The per-eNB variant of ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL was one-less, not counting the very first S1 Setup Req. The reason is that only the global variant is incremented before Global-eNB-ID is known. Change-Id: If57f0c43f41d5f38759f9746a4f6299d3233a450 Related: SYS#7065 --- M src/s1ap_proxy.erl M test/s1ap_proxy_test.erl 2 files changed, 13 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 9b7a105..953cf66 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -661,7 +661,16 @@ set_logging_prefix("eNB " ++ GlobalENBId), %% register per-eNB metrics ctr_reg_all(GlobalENBId), - {{ok, C}, S1#proxy_state{genb_id_str = GlobalENBId}}; + %% increment per-eNB ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, if needed + %% this is needed to count S1 Setup Req correctly + S2 = case S0#proxy_state.genb_id_str of + GlobalENBId -> S1; + _ -> + Ctr = s1gw_metrics:enb_metric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, GlobalENBId), + s1gw_metrics:ctr_inc(Ctr), + S1#proxy_state{genb_id_str = GlobalENBId} + end, + {{ok, C}, S2}; %% E-RAB SETUP REQUEST related IEs handle_ie([?'id-E-RABToBeSetupListBearerSUReq'], C, S) -> diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 55c9b40..61f4511 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -89,7 +89,7 @@ ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2), ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), %% per-eNB counters -%% ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2)]. @@ -114,7 +114,7 @@ ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), %% per-eNB counters -%% ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_REQ, 1), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_RSP, 1), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), @@ -344,7 +344,7 @@ ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), %% per-eNB counters -%% ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_REQ, 1), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_RSP, 1), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40717?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If57f0c43f41d5f38759f9746a4f6299d3233a450 Gerrit-Change-Number: 40717 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: fix per-eNB ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL
by fixeria 23 Jul '25

23 Jul '25

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40717?usp=email ) Change subject: s1ap_proxy: fix per-eNB ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40717?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If57f0c43f41d5f38759f9746a4f6299d3233a450 Gerrit-Change-Number: 40717 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Jul 2025 10:02:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: fix per-eNB ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL
by osmith 23 Jul '25

23 Jul '25

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40717?usp=email ) Change subject: s1ap_proxy: fix per-eNB ?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40717?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If57f0c43f41d5f38759f9746a4f6299d3233a450 Gerrit-Change-Number: 40717 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Jul 2025 10:00:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-s1gw[master]: rebar.{config,lock}: use a fork of exometer_report_statsd
by fixeria 23 Jul '25

23 Jul '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40701?usp=email ) Change subject: rebar.{config,lock}: use a fork of exometer_report_statsd ...................................................................... rebar.{config,lock}: use a fork of exometer_report_statsd As it turns out, the statsd reporter plugin that we have been using so far has a flaw: the way it reports counters differs from what daemons like statsd or collectd expect. The problem is that this plugin reports absolute (current) values, while the delta is expected. Change-Id: Ic5c80dd66b2659efc6bf148b91316b7e45dfaf7b Related: https://github.com/esl/exometer_report_statsd/pull/3 Related: SYS#7065, SYS#7307 --- M rebar.config M rebar.lock 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/rebar.config b/rebar.config index b69ef47..4be5a1c 100644 --- a/rebar.config +++ b/rebar.config @@ -14,7 +14,7 @@ {exometer_core, {git, "https://github.com/Feuerlabs/exometer_core.git", {branch, "master"}}}, {exometer_report_statsd, - {git, "https://github.com/esl/exometer_report_statsd.git", {branch, "master"}}} + {git, "https://github.com/osmocom/exometer_report_statsd.git", {branch, "counters"}}} ]}. %% test deps diff --git a/rebar.lock b/rebar.lock index 0b99137..ccee08d 100644 --- a/rebar.lock +++ b/rebar.lock @@ -9,8 +9,8 @@ {ref,"fc744c45bbe5de2ab0ee550e2667f93f7abbb618"}}, 0}, {<<"exometer_report_statsd">>, - {git,"https://github.com/esl/exometer_report_statsd.git", - {ref,"f1c369becb6e57871f1c7b0e491f6c3a302a65ee"}}, + {git,"https://github.com/osmocom/exometer_report_statsd.git", + {ref,"d35a98edf87996f2ab9ef0feda93b38677b0d063"}}, 0}, {<<"hut">>,{pkg,<<"hut">>,<<"1.3.0">>},1}, {<<"jiffy">>, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40701?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ic5c80dd66b2659efc6bf148b91316b7e45dfaf7b Gerrit-Change-Number: 40701 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy_test: test_s1_setup/1: proxy S1 SETUP RESPONSE PDU
by fixeria 23 Jul '25

23 Jul '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40714?usp=email ) Change subject: s1ap_proxy_test: test_s1_setup/1: proxy S1 SETUP RESPONSE PDU ...................................................................... s1ap_proxy_test: test_s1_setup/1: proxy S1 SETUP RESPONSE PDU Change-Id: If0906c9e598c66189d27f7c6f3985337a7358862 Related: SYS#7065 --- M test/s1ap_proxy_test.erl 1 file changed, 20 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index d606a18..3ea8b89 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -41,8 +41,8 @@ %% ------------------------------------------------------------------ s1ap_proxy_test_() -> - [{"S1 SETUP REQUEST (unmodified)", - ?TC(fun test_s1_setup_req/1)}, + [{"S1 SETUP REQUEST/RESPONSE (unmodified)", + ?TC(fun test_s1_setup/1)}, {"E-RAB SETUP REQUEST/RESPONSE", ?TC(fun test_e_rab_setup/1)}, {"E-RAB SETUP REQUEST (failure)", @@ -73,13 +73,15 @@ %% actual testcases %% ------------------------------------------------------------------ -test_s1_setup_req(#{handler := Pid}) -> +test_s1_setup(#{handler := Pid}) -> SetupReq = s1_setup_req_pdu(), - %% Expect the PDU to be proxied unmodified + SetupRsp = s1_setup_rsp_pdu(), + %% Expect the PDUs to be proxied unmodified [?_assertEqual({forward, SetupReq}, s1ap_proxy:process_pdu(Pid, SetupReq)), - ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 1), - ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 1), - ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 1)]. + ?_assertEqual({forward, SetupRsp}, s1ap_proxy:process_pdu(Pid, SetupRsp)), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2)]. test_e_rab_setup(#{handler := Pid}) -> @@ -374,6 +376,17 @@ >>. +%% S1 SETUP RESPONSE +s1_setup_rsp_pdu() -> + << 16#20, 16#11, 16#00, 16#29, 16#00, 16#00, 16#03, 16#00, + 16#3d, 16#40, 16#0e, 16#05, 16#80, 16#6f, 16#70, 16#65, + 16#6e, 16#35, 16#67, 16#73, 16#2d, 16#6d, 16#6d, 16#65, + 16#30, 16#00, 16#69, 16#00, 16#0b, 16#00, 16#00, 16#00, + 16#f1, 16#10, 16#00, 16#00, 16#00, 16#02, 16#00, 16#01, + 16#00, 16#57, 16#40, 16#01, 16#ff + >>. + + %% [eNB <- MME] E-RAB SETUP REQUEST e_rab_setup_req_pdu(TLA, TEID) when is_binary(TLA), is_integer(TEID) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40714?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If0906c9e598c66189d27f7c6f3985337a7358862 Gerrit-Change-Number: 40714 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy_test: also test per-eNB counters
by fixeria 23 Jul '25

23 Jul '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40715?usp=email ) Change subject: s1ap_proxy_test: also test per-eNB counters ...................................................................... s1ap_proxy_test: also test per-eNB counters Change-Id: I59f35b3301fcc04845709c55cc1e2cf0055cb0e3 Related: SYS#7065 --- M test/s1ap_proxy_test.erl 1 file changed, 39 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 3ea8b89..55c9b40 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -5,9 +5,14 @@ -include("pfcp_mock.hrl"). +-define(GlobalENBId, "001-01-0"). + -define(_assertMetric(Name, Value), ?_assertEqual(Value, s1gw_metrics:get_current_value(Name))). +-define(_assertMetricENB(Name, Value), + ?_assertMetric(s1gw_metrics:enb_metric(Name, ?GlobalENBId), Value)). + %% ------------------------------------------------------------------ %% setup functions @@ -79,9 +84,14 @@ %% Expect the PDUs to be proxied unmodified [?_assertEqual({forward, SetupReq}, s1ap_proxy:process_pdu(Pid, SetupReq)), ?_assertEqual({forward, SetupRsp}, s1ap_proxy:process_pdu(Pid, SetupRsp)), + %% global counters ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2), ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2), - ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2)]. + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), + %% per-eNB counters +%% ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2)]. test_e_rab_setup(#{handler := Pid}) -> @@ -92,13 +102,24 @@ SetupRspIn = e_rab_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), SetupRspExp = e_rab_setup_rsp_pdu(?ADDR_C2U, ?TEID_C2U), - [?_assertEqual({forward, SetupReqExp}, s1ap_proxy:process_pdu(Pid, SetupReqIn)), + [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, s1_setup_req_pdu())), + ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, s1_setup_rsp_pdu())), + ?_assertEqual({forward, SetupReqExp}, s1ap_proxy:process_pdu(Pid, SetupReqIn)), ?_assertEqual({forward, SetupRspExp}, s1ap_proxy:process_pdu(Pid, SetupRspIn)), - ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2), + %% global counters + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_REQ, 1), ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_RSP, 1), - ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), + %% per-eNB counters +%% ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_REQ, 1), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ERAB_SETUP_RSP, 1), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), ?_assertMatch({ok, _}, s1ap_proxy:fetch_erab(Pid, {7, 9, 6})), ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. @@ -311,13 +332,24 @@ InitCtxSetupRspIn = initial_context_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), InitCtxSetupRspExp = initial_context_setup_rsp_pdu(?ADDR_C2U, ?TEID_C2U), - [?_assertEqual({forward, InitCtxSetupReqExp}, s1ap_proxy:process_pdu(Pid, InitCtxSetupReqIn)), + [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, s1_setup_req_pdu())), + ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, s1_setup_rsp_pdu())), + ?_assertEqual({forward, InitCtxSetupReqExp}, s1ap_proxy:process_pdu(Pid, InitCtxSetupReqIn)), ?_assertEqual({forward, InitCtxSetupRspExp}, s1ap_proxy:process_pdu(Pid, InitCtxSetupRspIn)), - ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2), + %% global counters + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_REQ, 1), ?_assertMetric(?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_RSP, 1), - ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), + ?_assertMetric(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), + %% per-eNB counters +%% ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_ALL, 2 + 2), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_REQ, 1), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_IN_PKT_INIT_CTX_RSP, 1), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), + ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40715?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I59f35b3301fcc04845709c55cc1e2cf0055cb0e3 Gerrit-Change-Number: 40715 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: cache GlobalENBId string
by fixeria 23 Jul '25

23 Jul '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40716?usp=email ) Change subject: s1ap_proxy: cache GlobalENBId string ...................................................................... s1ap_proxy: cache GlobalENBId string Avoid calling genb_id_str/1 every time a counter is incremented. Generate the string once, cache, and use it in ctr_inc/2. Change-Id: I68d394213563c68757b7490e6af2321259feda4f Related: SYS#7065 --- M src/s1ap_proxy.erl 1 file changed, 6 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 17403ec..9b7a105 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -74,6 +74,7 @@ erabs :: dict:dict(), enb_id :: undefined | non_neg_integer(), plmn_id :: undefined | plmn_id(), + genb_id_str :: undefined | string(), mme_ue_id :: undefined | mme_ue_id(), enb_ue_id :: undefined | enb_ue_id(), erab_id :: undefined | erab_id(), @@ -237,12 +238,10 @@ parse_enb_id({'long-macroENB-ID', << ID:21 >>}) -> ID. --spec genb_id_str(proxy_state()) -> string() | none. +-spec genb_id_str(proxy_state()) -> string(). genb_id_str(#proxy_state{plmn_id = {MCC, MNC}, enb_id = ENBId}) -> - MCC ++ "-" ++ MNC ++ "-" ++ integer_to_list(ENBId); - -genb_id_str(#proxy_state{}) -> none. + MCC ++ "-" ++ MNC ++ "-" ++ integer_to_list(ENBId). %% register a single per-eNB counter @@ -270,8 +269,8 @@ when C0 :: [ctr | _], S :: proxy_state(). ctr_inc([ctr | _] = C0, S) -> - case genb_id_str(S) of - none -> + case S#proxy_state.genb_id_str of + undefined -> %% increment the global counter only s1gw_metrics:ctr_inc(C0); GlobalENBId -> @@ -662,7 +661,7 @@ set_logging_prefix("eNB " ++ GlobalENBId), %% register per-eNB metrics ctr_reg_all(GlobalENBId), - {{ok, C}, S1}; + {{ok, C}, S1#proxy_state{genb_id_str = GlobalENBId}}; %% E-RAB SETUP REQUEST related IEs handle_ie([?'id-E-RABToBeSetupListBearerSUReq'], C, S) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40716?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I68d394213563c68757b7490e6af2321259feda4f Gerrit-Change-Number: 40716 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: rebar.{config,lock}: use a fork of exometer_report_statsd
by osmith 23 Jul '25

23 Jul '25

Attention is currently required from: fixeria, laforge, pespin. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40701?usp=email ) Change subject: rebar.{config,lock}: use a fork of exometer_report_statsd ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: 1+1=2 with Pau's earlier +1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40701?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ic5c80dd66b2659efc6bf148b91316b7e45dfaf7b Gerrit-Change-Number: 40701 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Jul 2025 09:58:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-s1gw[master]: rebar.{config,lock}: use a fork of exometer_report_statsd
by osmith 23 Jul '25

23 Jul '25

Attention is currently required from: fixeria, laforge, pespin. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40701?usp=email ) Change subject: rebar.{config,lock}: use a fork of exometer_report_statsd ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40701?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ic5c80dd66b2659efc6bf148b91316b7e45dfaf7b Gerrit-Change-Number: 40701 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Jul 2025 09:57:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-s1gw[master]: rebar.lock: use more recent exometer_core
by fixeria 23 Jul '25

23 Jul '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40700?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: rebar.lock: use more recent exometer_core ...................................................................... rebar.lock: use more recent exometer_core The more recent version drops dependency on hut [1] in favor of Erlang's built-in logger module. [1] https://github.com/tolbrino/hut Change-Id: Ic0fad544d1763ac84a69d1ee7df498d80c1c5f3e --- M rebar.lock 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/rebar.lock b/rebar.lock index 0c6730a..0b99137 100644 --- a/rebar.lock +++ b/rebar.lock @@ -6,7 +6,7 @@ 0}, {<<"exometer_core">>, {git,"https://github.com/Feuerlabs/exometer_core.git", - {ref,"f9c7abc095edc893c9354a3d5f061715de1d9e79"}}, + {ref,"fc744c45bbe5de2ab0ee550e2667f93f7abbb618"}}, 0}, {<<"exometer_report_statsd">>, {git,"https://github.com/esl/exometer_report_statsd.git", -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40700?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ic0fad544d1763ac84a69d1ee7df498d80c1c5f3e Gerrit-Change-Number: 40700 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log