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

Updating exometer_labels converter #4507

Merged
merged 4 commits into from
Mar 13, 2025
Merged

Updating exometer_labels converter #4507

merged 4 commits into from
Mar 13, 2025

Conversation

DenysGonchar
Copy link
Collaborator

updating exometer_labels converter function

@mongoose-im
Copy link
Collaborator

mongoose-im commented Mar 12, 2025 •
edited
Loading

elasticsearch_and_cassandra_27 / elasticsearch_and_cassandra_mnesia / c172f67
Reports root/ big
OK: 683 / Failed: 0 / User-skipped: 72 / Auto-skipped: 0

small_tests_27 / small_tests / c172f67
Reports root / small

small_tests_26 / small_tests / c172f67
Reports root / small

small_tests_27_arm64 / small_tests / c172f67
Reports root / small

ldap_mnesia_26 / ldap_mnesia / c172f67
Reports root/ big
OK: 2300 / Failed: 0 / User-skipped: 1187 / Auto-skipped: 0

ldap_mnesia_27 / ldap_mnesia / c172f67
Reports root/ big
OK: 2300 / Failed: 0 / User-skipped: 1352 / Auto-skipped: 0

dynamic_domains_mysql_redis_27 / mysql_redis / c172f67
Reports root/ big
OK: 5140 / Failed: 0 / User-skipped: 154 / Auto-skipped: 0

internal_mnesia_27 / internal_mnesia / c172f67
Reports root/ big
OK: 2434 / Failed: 0 / User-skipped: 1218 / Auto-skipped: 0

pgsql_cets_27 / pgsql_cets / c172f67
Reports root/ big
OK: 5249 / Failed: 0 / User-skipped: 188 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_27 / pgsql_mnesia / c172f67
Reports root/ big
OK: 5174 / Failed: 1 / User-skipped: 119 / Auto-skipped: 0

mod_ping_SUITE:server_ping_kill:server_ping_pong 
{error,{test_case_failed,"Incorrect number of instrumentation events - matched: 0, expected: 1"}}

Report log

dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / c172f67
Reports root/ big
OK: 5010 / Failed: 0 / User-skipped: 119 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_27 / odbc_mssql_mnesia / c172f67
Reports root/ big
OK: 5170 / Failed: 0 / User-skipped: 124 / Auto-skipped: 0

cockroachdb_cets_27 / cockroachdb_cets / c172f67
Reports root/ big
OK: 5249 / Failed: 0 / User-skipped: 188 / Auto-skipped: 0

pgsql_mnesia_26 / pgsql_mnesia / c172f67
Reports root/ big
OK: 5387 / Failed: 0 / User-skipped: 128 / Auto-skipped: 0

pgsql_mnesia_27 / pgsql_mnesia / c172f67
Reports root/ big
OK: 5552 / Failed: 0 / User-skipped: 128 / Auto-skipped: 0

mysql_redis_27 / mysql_redis / c172f67
Reports root/ big
OK: 5531 / Failed: 0 / User-skipped: 149 / Auto-skipped: 0

mssql_mnesia_27 / odbc_mssql_mnesia / c172f67
Reports root/ big
OK: 5544 / Failed: 1 / User-skipped: 133 / Auto-skipped: 2

last_SUITE:valid_queries:last_online_user 
{error,
  {test_case_failed,
    {has_stanzas_but_shouldnt,
      {client,<<"alice_unnamed_5262@localhost/res1">>,escalus_tcp,
        <0.150064.0>,
        [{event_manager,<0.150063.0>},
         {server,<<"localhost">>},
         {username,<<"alicE_unnamed_5262">>},
         {resource,<<"res1">>}],
        [{event_client,
           [{event_manager,<0.150063.0>},
            {server,<<"localhost">>},
            {username,<<"alicE_unnamed_5262">>},
            {resource,<<"res1">>}]},
         {resource,<<"res1">>},
         {username,<<"alice_unnamed_5262">>},
         {server,<<"localhost">>},
         {host,<<"localhost">>},
         {port,5222},
         {auth,fun escalus_auth:auth_plain/2},
         {wspath,undefined},
         {username,<<"alicE_unnamed_5262">>},
         {server,<<"localhost">>},
         {password,<<"matygrysa">>},
         {stream_id,<<"3d0aa9181b7ba39f">>}]},
      [{xmlel,<<"presence">>,
         #{<<"from">> => <<"bob_unnamed_5262@localhost/res1">>,
           <<"to">> => <<"alice_unnamed_5262@localhost/res1">>},
         []}]}}}

Report log

mssql_mnesia_27 / odbc_mssql_mnesia / c172f67
Reports root/ big
OK: 6 / Failed: 0 / User-skipped: 0 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_27 / pgsql_mnesia / c172f67
Reports root/ big
OK: 221 / Failed: 3 / User-skipped: 36 / Auto-skipped: 0

chrzaszcz
chrzaszcz reviewed Mar 12, 2025
View reviewed changes
Copy link
Member

@chrzaszcz chrzaszcz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes look good in general, but IMO, we need to prevent labels getting out of sync in the future. I added some suggestions.

src/instrument/mongoose_instrument_exometer.erl
[CacheName];
exometer_labels(#{} = Labels) when map_size(Labels) =:= 0 ->
[];
exometer_labels(#{} = Labels) ->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might end up with unexpected warnings that we ignore (because we don't check warnings in tests)... that's my only concern. Wouldn't it be better to make it fail fast, i.e. omit this clause? We could also enforce correct label syntax in mongoose_instrument itself.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After discussion, we've decided that this could be done separately.

@DenysGonchar DenysGonchar force-pushed the updating-exometer_labels-converter branch from c172f67 to d3ce54b Compare March 12, 2025 14:52
@mongoose-im
Copy link
Collaborator

mongoose-im commented Mar 12, 2025 •
edited
Loading

elasticsearch_and_cassandra_27 / elasticsearch_and_cassandra_mnesia / d3ce54b
Reports root/ big
OK: 683 / Failed: 0 / User-skipped: 72 / Auto-skipped: 0

small_tests_27 / small_tests / d3ce54b
Reports root / small

small_tests_27_arm64 / small_tests / d3ce54b
Reports root / small

small_tests_26 / small_tests / d3ce54b
Reports root / small

ldap_mnesia_27 / ldap_mnesia / d3ce54b
Reports root/ big
OK: 2300 / Failed: 0 / User-skipped: 1352 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_27 / pgsql_mnesia / d3ce54b
Reports root/ big
OK: 5175 / Failed: 0 / User-skipped: 119 / Auto-skipped: 0

internal_mnesia_27 / internal_mnesia / d3ce54b
Reports root/ big
OK: 2434 / Failed: 0 / User-skipped: 1218 / Auto-skipped: 0

dynamic_domains_mysql_redis_27 / mysql_redis / d3ce54b
Reports root/ big
OK: 5140 / Failed: 0 / User-skipped: 154 / Auto-skipped: 0

mysql_redis_27 / mysql_redis / d3ce54b
Reports root/ big
OK: 5531 / Failed: 0 / User-skipped: 149 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_27 / odbc_mssql_mnesia / d3ce54b
Reports root/ big
OK: 5170 / Failed: 0 / User-skipped: 124 / Auto-skipped: 0

ldap_mnesia_26 / ldap_mnesia / d3ce54b
Reports root/ big
OK: 2300 / Failed: 0 / User-skipped: 1187 / Auto-skipped: 0

pgsql_cets_27 / pgsql_cets / d3ce54b
Reports root/ big
OK: 5249 / Failed: 0 / User-skipped: 188 / Auto-skipped: 0

pgsql_mnesia_27 / pgsql_mnesia / d3ce54b
Reports root/ big
OK: 5552 / Failed: 0 / User-skipped: 128 / Auto-skipped: 0

cockroachdb_cets_27 / cockroachdb_cets / d3ce54b
Reports root/ big
OK: 5260 / Failed: 7 / User-skipped: 188 / Auto-skipped: 0

pubsub_SUITE:dag+last_item_cache:send_last_published_item_no_items_test 
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"alice_send_last_published_item_no_items_test_3852@localhost/res1">>,
          escalus_tcp,<0.118227.0>,
          [{event_manager,<0.118223.0>},
           {server,<<"localhost">>},
           {username,
             <<"alicE_send_last_published_item_no_items_test_3852">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.118223.0>},
            {server,<<"localhost">>},
            {username,
              <<"alicE_send_last_published_item_no_items_test_3852">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,
             <<"alice_send_last_published_item_no_items_test_3852">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,fun escalus_auth:auth_plain/2},
           {wspath,undefined},
           {username,
             <<"alicE_send_last_published_item_no_items_test_3852">>},
           {server,<<"localhost">>},
           {password,<<"matygrysa">>},
           {stream_id,<<"f95b055f5c2d76b5">>}]},
        5000],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {pubsub_tools,receive_response,3,
       [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
        {line,434}]},
     {pubsub_tools,receive_and_c...

Report log

pubsub_SUITE:dag+last_item_cache:send_last_published_item_no_items_test 
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"alice_send_last_published_item_no_items_test_3854@localhost/res1">>,
          escalus_tcp,<0.118303.0>,
          [{event_manager,<0.118291.0>},
           {server,<<"localhost">>},
           {username,
             <<"alicE_send_last_published_item_no_items_test_3854">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.118291.0>},
            {server,<<"localhost">>},
            {username,
              <<"alicE_send_last_published_item_no_items_test_3854">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,
             <<"alice_send_last_published_item_no_items_test_3854">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,fun escalus_auth:auth_plain/2},
           {wspath,undefined},
           {username,
             <<"alicE_send_last_published_item_no_items_test_3854">>},
           {server,<<"localhost">>},
           {password,<<"matygrysa">>},
           {stream_id,<<"fa408917f6db67ae">>}]},
        5000],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {pubsub_tools,receive_response,3,
       [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
        {line,434}]},
     {pubsub_tools,receive_and_c...

Report log

pubsub_SUITE:tree+last_item_cache:send_last_published_item_no_items_test 
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"alice_send_last_published_item_no_items_test_3909@localhost/res1">>,
          escalus_tcp,<0.119587.0>,
          [{event_manager,<0.119576.0>},
           {server,<<"localhost">>},
           {username,
             <<"alicE_send_last_published_item_no_items_test_3909">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.119576.0>},
            {server,<<"localhost">>},
            {username,
              <<"alicE_send_last_published_item_no_items_test_3909">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,
             <<"alice_send_last_published_item_no_items_test_3909">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,fun escalus_auth:auth_plain/2},
           {wspath,undefined},
           {username,
             <<"alicE_send_last_published_item_no_items_test_3909">>},
           {server,<<"localhost">>},
           {password,<<"matygrysa">>},
           {stream_id,<<"bb5a168356d10f67">>}]},
        5000],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {pubsub_tools,receive_response,3,
       [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
        {line,434}]},
     {pubsub_tools,receive_and_c...

Report log

pubsub_SUITE:tree+last_item_cache:send_last_published_item_no_items_test 
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"alice_send_last_published_item_no_items_test_3913@localhost/res1">>,
          escalus_tcp,<0.119665.0>,
          [{event_manager,<0.119662.0>},
           {server,<<"localhost">>},
           {username,
             <<"alicE_send_last_published_item_no_items_test_3913">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.119662.0>},
            {server,<<"localhost">>},
            {username,
              <<"alicE_send_last_published_item_no_items_test_3913">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,
             <<"alice_send_last_published_item_no_items_test_3913">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,fun escalus_auth:auth_plain/2},
           {wspath,undefined},
           {username,
             <<"alicE_send_last_published_item_no_items_test_3913">>},
           {server,<<"localhost">>},
           {password,<<"matygrysa">>},
           {stream_id,<<"2da9b0027e057862">>}]},
        5000],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {pubsub_tools,receive_response,3,
       [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
        {line,434}]},
     {pubsub_tools,receive_and_c...

Report log

pubsub_SUITE:tree+last_item_cache:send_last_published_item_no_items_test 
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"alice_send_last_published_item_no_items_test_3915@localhost/res1">>,
          escalus_tcp,<0.119741.0>,
          [{event_manager,<0.119730.0>},
           {server,<<"localhost">>},
           {username,
             <<"alicE_send_last_published_item_no_items_test_3915">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.119730.0>},
            {server,<<"localhost">>},
            {username,
              <<"alicE_send_last_published_item_no_items_test_3915">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,
             <<"alice_send_last_published_item_no_items_test_3915">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,fun escalus_auth:auth_plain/2},
           {wspath,undefined},
           {username,
             <<"alicE_send_last_published_item_no_items_test_3915">>},
           {server,<<"localhost">>},
           {password,<<"matygrysa">>},
           {stream_id,<<"e3fa4a5c27133a6d">>}]},
        5000],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {pubsub_tools,receive_response,3,
       [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
        {line,434}]},
     {pubsub_tools,receive_and_c...

Report log

pubsub_SUITE:tree+last_item_cache:send_last_published_item_no_items_test 
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"alice_send_last_published_item_no_items_test_3917@localhost/res1">>,
          escalus_tcp,<0.119818.0>,
          [{event_manager,<0.119798.0>},
           {server,<<"localhost">>},
           {username,
             <<"alicE_send_last_published_item_no_items_test_3917">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.119798.0>},
            {server,<<"localhost">>},
            {username,
              <<"alicE_send_last_published_item_no_items_test_3917">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,
             <<"alice_send_last_published_item_no_items_test_3917">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,fun escalus_auth:auth_plain/2},
           {wspath,undefined},
           {username,
             <<"alicE_send_last_published_item_no_items_test_3917">>},
           {server,<<"localhost">>},
           {password,<<"matygrysa">>},
           {stream_id,<<"140dd1790c7616b9">>}]},
        5000],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {pubsub_tools,receive_response,3,
       [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
        {line,434}]},
     {pubsub_tools,receive_and_c...

Report log

pubsub_SUITE:tree+last_item_cache:send_last_published_item_no_items_test 
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"alice_send_last_published_item_no_items_test_3922@localhost/res1">>,
          escalus_tcp,<0.119895.0>,
          [{event_manager,<0.119893.0>},
           {server,<<"localhost">>},
           {username,
             <<"alicE_send_last_published_item_no_items_test_3922">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.119893.0>},
            {server,<<"localhost">>},
            {username,
              <<"alicE_send_last_published_item_no_items_test_3922">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,
             <<"alice_send_last_published_item_no_items_test_3922">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,fun escalus_auth:auth_plain/2},
           {wspath,undefined},
           {username,
             <<"alicE_send_last_published_item_no_items_test_3922">>},
           {server,<<"localhost">>},
           {password,<<"matygrysa">>},
           {stream_id,<<"cdc6226c9da4243d">>}]},
        5000],
       [{file,
          "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {pubsub_tools,receive_response,3,
       [{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
        {line,434}]},
     {pubsub_tools,receive_and_c...

Report log

dynamic_domains_pgsql_mnesia_26 / pgsql_mnesia / d3ce54b
Reports root/ big
OK: 5010 / Failed: 0 / User-skipped: 119 / Auto-skipped: 0

mssql_mnesia_27 / odbc_mssql_mnesia / d3ce54b
Reports root/ big
OK: 5547 / Failed: 0 / User-skipped: 133 / Auto-skipped: 0

pgsql_mnesia_26 / pgsql_mnesia / d3ce54b
Reports root/ big
OK: 5387 / Failed: 0 / User-skipped: 128 / Auto-skipped: 0

cockroachdb_cets_27 / cockroachdb_cets / d3ce54b
Reports root/ big
OK: 117 / Failed: 0 / User-skipped: 2 / Auto-skipped: 0

@codecov Codecov
Copy link

codecov bot commented Mar 12, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.76%. Comparing base (9b22c7b) to head (d3ce54b).
Report is 8 commits behind head on feature/listeners.

Additional details and impacted files 
@@                  Coverage Diff                  @@
##           feature/listeners    #4507      +/-   ##
=====================================================
- Coverage              85.79%   85.76%   -0.03%     
=====================================================
  Files                    564      564              
  Lines                  33816    33824       +8     
=====================================================
- Hits                   29013    29010       -3     
- Misses                  4803     4814      +11

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

chrzaszcz
chrzaszcz approved these changes Mar 13, 2025
View reviewed changes
src/instrument/mongoose_instrument_exometer.erl
[CacheName];
exometer_labels(#{} = Labels) when map_size(Labels) =:= 0 ->
[];
exometer_labels(#{} = Labels) ->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After discussion, we've decided that this could be done separately.

@chrzaszcz chrzaszcz merged commit d5662df into feature/listeners Mar 13, 2025
4 checks passed
@chrzaszcz chrzaszcz deleted the updating-exometer_labels-converter branch March 13, 2025 08:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrzaszcz chrzaszcz chrzaszcz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@DenysGonchar @mongoose-im @chrzaszcz