TrueCloudLab/frostfs-s3-gw
17
3
Fork 19
Code Issues 28 Pull requests 7 Projects Releases 18 Packages Activity Actions

[#271] Add namespace label to billing metrics #273

Merged
alexvanin merged 1 commit from mbiryukova/frostfs-s3-gw:feature/group_billing_metrics into master 2023-12-05 06:41:21 +00:00
Conversation 0 Commits 1 Files changed 8 +41 -18
mbiryukova commented 2023-12-01 11:52:45 +00:00
Member
Copy link

Signed-off-by: Marina Biryukova m.biryukova@yadro.com

Signed-off-by: Marina Biryukova <m.biryukova@yadro.com>
mbiryukova self-assigned this 2023-12-01 11:52:45 +00:00
mbiryukova requested review from storage-services-committers 2023-12-01 11:57:40 +00:00
mbiryukova requested review from storage-services-developers 2023-12-01 11:57:40 +00:00
alexvanin reviewed 2023-12-01 12:38:25 +00:00
api/middleware/metrics.go Outdated
@ -19,4 +19,1 @@
type (
UsersStat interface {
Update(user, bucket, cnrID string, reqType int, in, out uint64)
}
alexvanin commented 2023-12-01 12:26:26 +00:00
Owner
Copy link

Was it basically unused?

Was it basically unused?
mbiryukova commented 2023-12-01 12:41:16 +00:00
Author
Member
Copy link

yes

yes
dkirillov commented 2023-12-01 13:43:00 +00:00
Member
Copy link

Or we can extend this interface to use it in stats function and make *metrics.AppMetrics to implement this interface. Though it leads to a little refactor to avoid cycle dependencies

Or we can extend this interface to use it in `stats` function and make `*metrics.AppMetrics` to implement this interface. Though it leads to a little refactor to avoid cycle dependencies
dkirillov marked this conversation as resolved
metrics/billing.go
@ -129,11 +133,18 @@ func (u *UsersAPIStats) Update(user, bucket, cnrID string, reqType RequestType,
cid: cnrID,
alexvanin commented 2023-12-01 12:38:23 +00:00
Owner
Copy link

Is it possible to keep namespace as a part of the key? Container IDs are unique across the system and every container has single namespace value. Maybe we can avoid additional namespaceBucketStat map then?

Is it possible to keep namespace as a part of the key? Container IDs are unique across the system and every container has single namespace value. Maybe we can avoid additional `namespaceBucketStat` map then?
👍 1
mbiryukova commented 2023-12-01 15:20:58 +00:00
Author
Member
Copy link

Changed

Changed
alexvanin marked this conversation as resolved
mbiryukova force-pushed feature/group_billing_metrics from c015e63463 to 5d25820b18 2023-12-01 15:04:45 +00:00 Compare
dkirillov reviewed 2023-12-04 06:33:51 +00:00
api/middleware/metrics.go Outdated
@ -83,3 +79,3 @@
user := resolveUser(r.Context())
cnrID := resolveCID(r.Context(), reqInfo)
appMetrics.Update(user, reqInfo.BucketName, cnrID, requestTypeFromAPI(reqInfo.API), in.countBytes, out.countBytes)
appMetrics.Update(user, reqInfo.BucketName, cnrID, reqInfo.Namespace, requestTypeFromAPI(reqInfo.API), in.countBytes, out.countBytes)
dkirillov commented 2023-12-04 06:33:51 +00:00
Member
Copy link

Do we have to handle namespace alias? @alexvanin

Do we have to handle namespace alias? @alexvanin
alexvanin commented 2023-12-04 09:42:02 +00:00
Owner
Copy link

Good catch. We definitely should.

Good catch. We definitely should.
dkirillov marked this conversation as resolved
mbiryukova force-pushed feature/group_billing_metrics from 5d25820b18 to 93cf7c462b 2023-12-04 12:03:12 +00:00 Compare
dkirillov approved these changes 2023-12-04 12:19:06 +00:00
dkirillov left a comment
Member
Copy link

LGTM

LGTM
alexvanin approved these changes 2023-12-05 06:41:12 +00:00
alexvanin merged commit 93cf7c462b into master 2023-12-05 06:41:21 +00:00
alexvanin deleted branch feature/group_billing_metrics 2023-12-05 06:41:22 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
dkirillov
alexvanin
TrueCloudLab/storage-services-developers
Labels
Clear labels   
P0

Highest

  
P1

High

  
P2

Medium

  
P3

Low

  
good first issue

Good for newcomers

  
Infrastructure

Infrastructure, Automation, CI/CD or DevOps related stuff

  
blocked

The issue or PR is blocked by something

  
bug

Something is not working

  
config

Configuration format update or breaking change

  
discussion

Talking about something in order to reach a decision or to exchange ideas

  
documentation

Documentation related

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
go

Language features adoption

  
help wanted

Extra attention is needed

  
internal

   
invalid

Something is wrong

  
kludge

This is a kludge and we know it

  
observability

Related to metrics, tracing and logs

  
perfomance

Perfomance related

  
question

More information is needed

  
refactoring

Refactoring

  
wontfix

This won't be fixed

No labels
P0
P1
P2
P3
good first issue
Infrastructure
blocked
bug
config
discussion
documentation
duplicate
enhancement
go
help wanted
internal
invalid
kludge
observability
perfomance
question
refactoring
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
mbiryukova
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: TrueCloudLab/frostfs-s3-gw#273
No description provided.
Delete branch "mbiryukova/frostfs-s3-gw:feature/group_billing_metrics"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?