Skip to content

Commit

Permalink
Merge branch 'bugfix/CLDSRV-45/add_crr_metrics_utapiv2' into q/7.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@bert-e
bert-e committed Nov 2, 2021
2 parents ceab89c + ef166ef commit 6c12d83
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 61 deletions.
6 changes: 4 additions & 2 deletions lib/utapi/utilities.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,9 @@ function pushMetric(action, log, metricObj) {

let objectDelta = isDelete ? -numberOfObjects : numberOfObjects;
// putDeleteMarkerObject does not pass numberOfObjects
if (action === 'putDeleteMarkerObject') {
if (action === 'putDeleteMarkerObject'
|| action === 'replicateDelete'
|| action === 'replicateObject') {
objectDelta = 1;
} else if (action === 'multiObjectDelete') {
objectDelta = -(numberOfObjects + removedDeleteMarkers);
Expand All @@ -305,7 +307,7 @@ function pushMetric(action, log, metricObj) {
}
}
utapiObj.account = authInfo ? evalAuthInfo(authInfo, canonicalID, action).accountId : canonicalID;
utapiObj.user = authInfo ? evalAuthInfo(authInfo, canonicalID, action).userId : '';
utapiObj.user = authInfo ? evalAuthInfo(authInfo, canonicalID, action).userId : undefined;
return utapi.pushMetric(utapiObj);
}
const utapiObj = {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"npm-run-all": "~4.1.5",
"sinon": "^9.0.2",
"sproxydclient": "scality/sproxydclient#8.0.2",
"utapi": "scality/utapi#1af6532",
"utapi": "scality/utapi#7.10.2",
"utf8": "~2.1.1",
"uuid": "^3.0.1",
"vaultclient": "scality/vaultclient#17b52918bd10d748ffe51a3bc05657fe83b81f54",
Expand Down
38 changes: 38 additions & 0 deletions tests/utapi/utilities.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,44 @@ const testEvents = [{
incomingBytes: 26,
outgoingBytes: 0,
},
}, {
action: 'replicateObject',
metrics: {
bucket: 'source-bucket',
keys: ['mykey'],
newByteLength: 26,
oldByteLength: null,
},
expected: {
objectDelta: 1,
sizeDelta: 26,
incomingBytes: 26,
outgoingBytes: 0,
},
}, {
action: 'replicateDelete',
metrics: {
bucket: 'source-bucket',
keys: ['mykey'],
},
expected: {
objectDelta: 1,
sizeDelta: undefined,
incomingBytes: undefined,
outgoingBytes: 0,
},
}, {
action: 'replicateTags',
metrics: {
bucket: 'source-bucket',
keys: ['mykey'],
},
expected: {
objectDelta: undefined,
sizeDelta: undefined,
incomingBytes: undefined,
outgoingBytes: 0,
},
}];

describe('utapi v2 pushmetrics utility', () => {
Expand Down
100 changes: 42 additions & 58 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -658,53 +658,31 @@ arraybuffer.slice@~0.0.7:
optionalDependencies:
ioctl "2.0.0"

arsenal@scality/Arsenal#580e25a:
version "7.5.0"
resolved "https://codeload.github.com/scality/Arsenal/tar.gz/580e25a9e84acf2a2a8dec6c83f69f862804d85f"
dependencies:
"@hapi/joi" "^15.1.0"
JSONStream "^1.0.0"
ajv "6.12.2"
async "~2.1.5"
debug "~2.3.3"
diskusage "^1.1.1"
ioredis "4.9.5"
ipaddr.js "1.9.1"
level "~5.0.1"
level-sublevel "~6.6.5"
node-forge "^0.7.1"
simple-glob "^0.2"
socket.io "~2.3.0"
socket.io-client "~2.3.0"
utf8 "2.1.2"
uuid "^3.0.1"
werelogs scality/werelogs#0ff7ec82
xml2js "~0.4.23"
optionalDependencies:
ioctl "2.0.0"

arsenal@scality/Arsenal#65966f5:
version "7.7.0"
resolved "https://codeload.github.com/scality/Arsenal/tar.gz/65966f5ddf93b048906d14a8c26056abfd4c22ba"
arsenal@scality/Arsenal#7.10.1:
version "7.10.1"
resolved "https://codeload.github.com/scality/Arsenal/tar.gz/ce7bba1f8d8b4078335f65e8eaa49f6454ddbf46"
dependencies:
"@hapi/joi" "^15.1.0"
JSONStream "^1.0.0"
agentkeepalive "^4.1.3"
ajv "6.12.2"
async "~2.1.5"
base-x "3.0.8"
base62 "2.0.1"
debug "~2.6.9"
diskusage "^1.1.1"
ioredis "4.9.5"
ipaddr.js "1.9.1"
level "~5.0.1"
level-sublevel "~6.6.5"
node-forge "^0.7.1"
prom-client "10.2.3"
simple-glob "^0.2"
socket.io "~2.3.0"
socket.io-client "~2.3.0"
utf8 "2.1.2"
uuid "^3.0.1"
werelogs scality/werelogs#0ff7ec82
werelogs scality/werelogs#8.1.0
xml2js "~0.4.23"
optionalDependencies:
ioctl "2.0.0"
Expand Down Expand Up @@ -869,6 +847,21 @@ aws-sdk@2.905.0:
uuid "3.3.2"
xml2js "0.4.19"

aws-sdk@^2.1005.0:
version "2.1019.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1019.0.tgz#3859bcadcabc02aa7c663ee3aca42eb1345c8251"
integrity sha512-mnL9CROb3JHdAIbwjy0yr7Lj76KVA8+LyDFexIq/J/YtjbqdfEsb/KdeQIGEBCdlOqUrcJmeD0GcklZ4ve6fnQ==
dependencies:
buffer "4.9.2"
events "1.1.1"
ieee754 "1.1.13"
jmespath "0.15.0"
querystring "0.2.0"
sax "1.2.1"
url "0.10.3"
uuid "3.3.2"
xml2js "0.4.19"

aws-sign2@~0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
Expand Down Expand Up @@ -1708,13 +1701,6 @@ debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
dependencies:
ms "^2.1.1"

debug@~2.3.3:
version "2.3.3"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
integrity sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=
dependencies:
ms "0.7.2"

debug@~4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
Expand Down Expand Up @@ -4455,11 +4441,6 @@ ms@0.7.1:
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
integrity sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=

ms@0.7.2:
version "0.7.2"
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
integrity sha1-riXPJRKziFodldfwN4aNhDESR2U=

ms@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
Expand Down Expand Up @@ -5036,6 +5017,13 @@ prom-client@10.2.3:
dependencies:
tdigest "^0.1.1"

prom-client@^13.1.0:
version "13.2.0"
resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-13.2.0.tgz#99d13357912dd400f8911b77df19f7b328a93e92"
integrity sha512-wGr5mlNNdRNzEhRYXgboUU2LxHWIojxscJKmtG3R8f4/KiWqyYgXTLHs0+Ted7tG3zFT7pgHJbtomzZ1L0ARaQ==
dependencies:
tdigest "^0.1.1"

promise-fs@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/promise-fs/-/promise-fs-2.1.1.tgz#0b725a592c165ff16157d1f13640ba390637e557"
Expand Down Expand Up @@ -6778,14 +6766,15 @@ user-home@^2.0.0:
dependencies:
os-homedir "^1.0.0"

utapi@scality/utapi#1af6532:
version "7.8.0"
resolved "https://codeload.github.com/scality/utapi/tar.gz/1af6532d83b7e323a62d9048cd6478cab12dfa71"
utapi@scality/utapi#7.10.2:
version "7.10.2"
resolved "https://codeload.github.com/scality/utapi/tar.gz/1ae4abee19e42f1c1268604b406e524de155b9fb"
dependencies:
"@hapi/joi" "^17.1.1"
"@senx/warp10" "^1.0.14"
arsenal scality/Arsenal#65966f5
arsenal scality/Arsenal#7.10.1
async "^3.2.0"
aws-sdk "^2.1005.0"
aws4 "^1.8.0"
body-parser "^1.19.0"
bucketclient scality/bucketclient
Expand All @@ -6801,9 +6790,10 @@ utapi@scality/utapi#1af6532:
needle "^2.5.0"
node-schedule "^1.3.2"
oas-tools "^2.1.8"
prom-client "^13.1.0"
uuid "^3.3.2"
vaultclient scality/vaultclient#ff9e92f
werelogs scality/werelogs#0a4c576
vaultclient scality/vaultclient#9013faab804a7ee61bd8bc4c71de89c3498bb6c0
werelogs scality/werelogs#8.1.0

utf8@2.1.2, utf8@~2.1.1:
version "2.1.2"
Expand Down Expand Up @@ -6895,14 +6885,14 @@ vaultclient@scality/vaultclient#17b52918bd10d748ffe51a3bc05657fe83b81f54:
werelogs scality/werelogs#8.1.0
xml2js "0.4.19"

vaultclient@scality/vaultclient#ff9e92f:
version "7.5.1"
resolved "https://codeload.github.com/scality/vaultclient/tar.gz/ff9e92fd8e35c16bbc20f5e4ee0531d8bffedbf2"
vaultclient@scality/vaultclient#9013faab804a7ee61bd8bc4c71de89c3498bb6c0:
version "7.10.1"
resolved "https://codeload.github.com/scality/vaultclient/tar.gz/9013faab804a7ee61bd8bc4c71de89c3498bb6c0"
dependencies:
agentkeepalive "^4.1.3"
arsenal scality/Arsenal#580e25a
arsenal scality/Arsenal#7.10.1
commander "2.20.0"
werelogs scality/werelogs#4e0d97c
werelogs scality/werelogs#8.1.0
xml2js "0.4.19"

verror@1.10.0:
Expand Down Expand Up @@ -6937,12 +6927,6 @@ werelogs@scality/werelogs#351a2a3:
dependencies:
safe-json-stringify "1.0.3"

werelogs@scality/werelogs#4e0d97c:
version "7.4.1"
resolved "https://codeload.github.com/scality/werelogs/tar.gz/4e0d97cf69ea7ed60bea90756278513e7e7ea9b1"
dependencies:
safe-json-stringify "1.0.3"

werelogs@scality/werelogs#8.1.0:
version "8.1.0"
resolved "https://codeload.github.com/scality/werelogs/tar.gz/e8f828725642c54c511cdbe580b18f43d3589313"
Expand Down

0 comments on commit 6c12d83

Please sign in to comment.