Skip to content

CLDSRV-822: Backport to 7.10 #6066

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

Open
tmacro wants to merge 3 commits into
base: development/7.10
Choose a base branch
from
+10 −5
Open

CLDSRV-822: Backport to 7.10 #6066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c7aaa3
bf(CLDSRV-822): Add removedDeleteMarkers when set to numberOfObjects …
tmacro Jan 12, 2026
454b7b4
Bump Utapi to 7.10.21
tmacro Jan 28, 2026
11ce8cb
Bump version
tmacro Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/utapi/utilities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,11 @@ function pushMetric(action, log, metricObj) {
oldByteLength,
numberOfObjects,
};

if (removedDeleteMarkers) {
utapiObj.numberOfObjects = numberOfObjects + removedDeleteMarkers;
}

// If `authInfo` is included by the API, get the account's canonical ID for
// account-level metrics and the shortId for user-level metrics. Otherwise
// check if the canonical ID is already provided for account-level metrics.
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "s3",
"version": "7.10.59",
"version": "7.10.60",
"description": "S3 connector",
"main": "index.js",
"engines": {
Expand Down Expand Up @@ -34,7 +34,7 @@
"level-mem": "^5.0.1",
"moment": "^2.26.0",
"npm-run-all": "~4.1.5",
"utapi": "git+https://github.com/scality/utapi#7.10.20",
"utapi": "git+https://github.com/scality/utapi#7.10.21",
"utf8": "~2.1.1",
"uuid": "^3.0.1",
"vaultclient": "scality/vaultclient#7.10.10",
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5325,9 +5325,9 @@ user-home@^2.0.0:
dependencies:
os-homedir "^1.0.0"

"utapi@git+https://github.com/scality/utapi#7.10.20":
version "7.10.20"
resolved "git+https://github.com/scality/utapi#5c854c5a417194de024c29a234f11583ed76e8b0"
"utapi@git+https://github.com/scality/utapi#7.10.21":
version "7.10.21"
resolved "git+https://github.com/scality/utapi#5f129f471d9b834ad9b1f25f9841fc2678fff950"
dependencies:
"@hapi/joi" "^17.1.1"
"@senx/warp10" "^1.0.14"
Expand Down
Loading