Skip to content

Conversation

@sampaiodiego
Copy link
Member

@sampaiodiego sampaiodiego commented May 23, 2025

https://rocketchat.atlassian.net/browse/ARCH-1620

Proposed changes (including videos or screenshots)

The metrics will be sent like this:

rocketchat_rest_api_count{status="200",method="post",version="v1",entrypoint="method.call/permissions:get"} 1
rocketchat_rest_api_count{status="200",method="get",version="v1",entrypoint="me"} 3
rocketchat_rest_api_count{status="200",method="get",version="v1",entrypoint="roles.list"} 5
rocketchat_rest_api_count{status="200",method="get",version="v1",entrypoint="livechat/agents/:agentId/departments"} 2

Before the fix they were not being grouped as shown below, creating multiple entries for the same route:

rocketchat_rest_api_count{method="GET",version="v1",entrypoint="/v1/livechat/agents/DMqFRxxxdXm9R/departments",status="200"} 4471
rocketchat_rest_api_count{method="GET",version="v1",entrypoint="/v1/livechat/agents/o7d5BSxxxMokYR/departments",status="200"} 823
rocketchat_rest_api_count{method="GET",version="v1",entrypoint="/v1/livechat/agents/ZD9xBxxxgh2DqhF/departments",status="200"} 717

Issue(s)

Introduced by #34999

Steps to test or reproduce

Further comments

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented May 23, 2025

Looks like this PR is not ready to merge, because of the following issues:

  • This PR is targeting the wrong base branch. It should target 7.7.0, but it targets 7.8.0

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

@changeset-bot
Copy link

changeset-bot bot commented May 23, 2025

🦋 Changeset detected

Latest commit: fceb082

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 36 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/ddp-client Patch
@rocket.chat/freeswitch Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/models Patch
@rocket.chat/network-broker Patch
@rocket.chat/mock-providers Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/ui-voip Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@github-actions
Copy link
Contributor

PR Preview Action v1.6.1

🚀 View preview at
https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-36070/

Built to branch gh-pages at 2025-05-23 18:49 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@codecov
Copy link

codecov bot commented May 23, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 64.95%. Comparing base (518b3a2) to head (fceb082).
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #36070      +/-   ##
===========================================
+ Coverage    64.94%   64.95%   +0.01%     
===========================================
  Files         3110     3110              
  Lines        93668    93681      +13     
  Branches     17793    17798       +5     
===========================================
+ Hits         60829    60847      +18     
+ Misses       30056    30051       -5     
  Partials      2783     2783              
Flag Coverage Δ
e2e 58.40% <ø> (ø)
unit 71.64% <100.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 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.

@sampaiodiego sampaiodiego force-pushed the fix-rest-api-metrics branch from 631bf4d to fceb082 Compare May 23, 2025 21:27
@ggazzo ggazzo marked this pull request as ready for review May 23, 2025 21:36
@ggazzo ggazzo added this to the 7.7.0 milestone May 23, 2025
@ggazzo ggazzo added the stat: QA assured Means it has been tested and approved by a company insider label May 23, 2025
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label May 23, 2025
@ggazzo ggazzo merged commit 83794ad into develop May 23, 2025
43 of 44 checks passed
@ggazzo ggazzo deleted the fix-rest-api-metrics branch May 23, 2025 22:10
ggazzo pushed a commit that referenced this pull request May 23, 2025
@sampaiodiego
Copy link
Member Author

/backport 7.6.3

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jun 3, 2025

Pull request #36134 added to Project: "undefined"

@sampaiodiego
Copy link
Member Author

/backport 7.5.2

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jun 3, 2025

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-7.5.2-36070
git cherry-pick 83794ad04611d795c25c1718cc4100b2bb2277c4
// solve the conflict
git push

after that just run /backport 7.5.2 again

sampaiodiego added a commit that referenced this pull request Jun 3, 2025
@sampaiodiego
Copy link
Member Author

/backport 7.5.2

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Jun 3, 2025

Pull request #36136 added to Project: "Patch 7.5.2"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants