Track usage by BotInstanceID #51540
Open
Track usage by BotInstanceID #51540
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
strideynet
changed the title
strideynet
force-pushed
the
strideynet/bot-instance-activity
branch
from
b3108ed to
3d542ff
Compare
strideynet
added
do-not-merge
backport/branch/v16
backport/branch/v17
no-changelog
strideynet
commented
Jan 29, 2025
espadolini
approved these changes
Jan 30, 2025
Comment on lines
+192
to
196
| // Put submission lock in place - whilst this is by-name for | ||
| // "user activity reports", it can be considered to protect resource | ||
| // presence and bot instance activity too. | ||
| debugPayload := fmt.Sprintf("%v %q", time.Now().Round(0), c.HostID) | ||
| if err := svc.createUserActivityReportsLock(ctx, submitLockDuration, []byte(debugPayload)); err != nil { |
There was a problem hiding this comment.
We could rename the method to be more general and move the comment to the lock name const instead?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of https://github.com/gravitational/cloud/issues/11855
As per RFD0166 - https://github.com/gravitational/cloud/pull/11766
Blocked on https://github.com/gravitational/cloud/pull/11852 merging to keep prehog protos in sync.
Example submitted report:
{ "userActivity": [ { "reportUuid": "Ybg2ByrsRI+wPGupVu7URw==", "clusterName": "+ZO2wFwFwUwJY1KktgC1CipsYhhOYFeC5heNuZ+SjeE=", "reporterHostid": "71t3oKtnW66IjxoSq13ejal7cR1ycv5tTjGB/Xn4ALk=", "startTime": "2025-01-29T13:45:00Z", "records": [ { "userName": "8Bq+CCVzADXtgnj30ZNSF/f4uyqaAlFXp1ao5TxWiCU=", "userKind": "USER_KIND_BOT", "spiffeSvidsIssued": "3", "botJoins": "1", "certificatesIssued": "4" }, { "userName": "5Hq3LdWDOcM6IMkbjjcS9APZD0YWwlW4zViWgKFTEmo=", "userKind": "USER_KIND_HUMAN", "logins": "1", "certificatesIssued": "1" } ] } ], "resourcePresence": [ { "reportUuid": "sgYcjoR7Rq+KGVvN9Vg+bg==", "clusterName": "+ZO2wFwFwUwJY1KktgC1CipsYhhOYFeC5heNuZ+SjeE=", "reporterHostid": "71t3oKtnW66IjxoSq13ejal7cR1ycv5tTjGB/Xn4ALk=", "startTime": "2025-01-29T13:00:00Z", "resourceKindReports": [ { "resourceKind": "RESOURCE_KIND_APP_SERVER", "resourceIds": [ "15992637790899819489" ] }, { "resourceKind": "RESOURCE_KIND_NODE", "resourceIds": [ "12563749572309375983" ] } ] } ], "botInstanceActivity": [ { "reportUuid": "YJxrZA86SWWQiNIETyzxAg==", "clusterName": "+ZO2wFwFwUwJY1KktgC1CipsYhhOYFeC5heNuZ+SjeE=", "reporterHostid": "71t3oKtnW66IjxoSq13ejal7cR1ycv5tTjGB/Xn4ALk=", "startTime": "2025-01-29T13:00:00Z", "records": [ { "botInstanceId": "0hRudVK6RaFWy+omhvmcYICxrCdG4Qrb+llkLB61zos=", "botUserName": "8Bq+CCVzADXtgnj30ZNSF/f4uyqaAlFXp1ao5TxWiCU=", "botJoins": "1", "spiffeSvidsIssued": "3", "certificatesIssued": "4" } ] } ] }Only backporting to v17/v16 as BotInstance functionality is not present in v15.