-
Notifications
You must be signed in to change notification settings - Fork 39
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.
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
Collect metrics from the gateway #2171
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
d051e42
Collect some metrics from the gateway
zkokelj 5aba9b6
store metrics in cosmosDB
zkokelj 2c76230
enable running sqlite without metrics implemented
zkokelj 775d63f
use constants for time
zkokelj 1300c2a
use shorter period for testing on dev-testnet
zkokelj 3f588ac
updates for active user count and prunning active users
zkokelj f9dd47a
test with shorter intervals on dev testnet
zkokelj 0f675c9
adjust metric timings
zkokelj File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,189 @@ | ||
package metrics | ||
|
||
import ( | ||
"crypto/sha256" | ||
"encoding/hex" | ||
"log" | ||
"sync" | ||
"sync/atomic" | ||
"time" | ||
|
||
"github.com/ten-protocol/go-ten/tools/walletextension/storage/database/cosmosdb" | ||
) | ||
|
||
const ( | ||
// Persistence intervals (how often metrics are saved to CosmosDB) | ||
MetricsPersistInterval = 10 * time.Minute | ||
|
||
// Cleanup intervals (how often inactive users are cleaned up) | ||
InactiveUserCleanupInterval = 1 * time.Hour | ||
|
||
// Activity thresholds | ||
UserInactivityThreshold = 30 * 24 * time.Hour // 30 days | ||
MonthlyActiveUserWindow = 30 * 24 * time.Hour // 30 days | ||
) | ||
|
||
// Metrics interface defines the metrics operations | ||
type Metrics interface { | ||
RecordNewUser() | ||
RecordAccountRegistered() | ||
RecordUserActivity(anonymousID string) | ||
GetTotalUsers() uint64 | ||
GetTotalAccountsRegistered() uint64 | ||
GetMonthlyActiveUsers() int | ||
Stop() | ||
} | ||
|
||
type MetricsTracker struct { | ||
totalUsers atomic.Uint64 | ||
accountsRegistered atomic.Uint64 | ||
activeUsers map[string]time.Time // key is double-hashed userID | ||
activeUserLock sync.RWMutex | ||
storage *cosmosdb.MetricsStorageCosmosDB | ||
persistTicker *time.Ticker | ||
} | ||
|
||
func NewMetricsTracker(storage *cosmosdb.MetricsStorageCosmosDB) Metrics { | ||
mt := &MetricsTracker{ | ||
activeUsers: make(map[string]time.Time), | ||
storage: storage, | ||
persistTicker: time.NewTicker(MetricsPersistInterval), | ||
} | ||
|
||
// Load existing metrics | ||
if metrics, err := storage.LoadMetrics(); err == nil { | ||
mt.totalUsers.Store(metrics.TotalUsers) | ||
mt.accountsRegistered.Store(metrics.AccountsRegistered) | ||
|
||
mt.activeUserLock.Lock() | ||
for hashedUserID, timestamp := range metrics.ActiveUsers { | ||
if t, err := time.Parse(time.RFC3339, timestamp); err == nil { | ||
mt.activeUsers[hashedUserID] = t | ||
} | ||
} | ||
mt.activeUserLock.Unlock() | ||
} | ||
|
||
// Start cleanup routine for inactive users | ||
go mt.cleanupInactiveUsers() | ||
go mt.persistMetrics() | ||
|
||
return mt | ||
} | ||
|
||
// hashUserID creates a double-hashed version of the userID | ||
func (mt *MetricsTracker) hashUserID(userID []byte) string { | ||
// First hash | ||
firstHash := sha256.Sum256(userID) | ||
// Second hash | ||
secondHash := sha256.Sum256(firstHash[:]) | ||
return hex.EncodeToString(secondHash[:]) | ||
} | ||
|
||
func (mt *MetricsTracker) RecordNewUser() { | ||
mt.totalUsers.Add(1) | ||
} | ||
|
||
// RecordAccountRegistered increments the total number of registered accounts | ||
func (mt *MetricsTracker) RecordAccountRegistered() { | ||
mt.accountsRegistered.Add(1) | ||
} | ||
|
||
// RecordUserActivity updates the last activity timestamp for a user | ||
func (mt *MetricsTracker) RecordUserActivity(anonymousID string) { | ||
hashedUserID := mt.hashUserID([]byte(anonymousID)) | ||
|
||
mt.activeUserLock.Lock() | ||
mt.activeUsers[hashedUserID] = time.Now() | ||
mt.activeUserLock.Unlock() | ||
} | ||
|
||
// GetTotalUsers returns the total number of registered users | ||
func (mt *MetricsTracker) GetTotalUsers() uint64 { | ||
return mt.totalUsers.Load() | ||
} | ||
|
||
// GetTotalAccountsRegistered returns the total number of registered accounts | ||
func (mt *MetricsTracker) GetTotalAccountsRegistered() uint64 { | ||
return mt.accountsRegistered.Load() | ||
} | ||
|
||
// GetMonthlyActiveUsers returns the number of users active in the last 30 days | ||
func (mt *MetricsTracker) GetMonthlyActiveUsers() int { | ||
mt.activeUserLock.RLock() | ||
defer mt.activeUserLock.RUnlock() | ||
|
||
count := 0 | ||
activeThreshold := time.Now().Add(-MonthlyActiveUserWindow) | ||
|
||
for _, lastActive := range mt.activeUsers { | ||
if lastActive.After(activeThreshold) { | ||
count++ | ||
} | ||
} | ||
return count | ||
} | ||
|
||
// persistMetrics periodically saves metrics to CosmosDB | ||
func (mt *MetricsTracker) persistMetrics() { | ||
for range mt.persistTicker.C { | ||
mt.saveMetrics() | ||
} | ||
} | ||
|
||
func (mt *MetricsTracker) saveMetrics() { | ||
mt.activeUserLock.RLock() | ||
activeUsersMap := make(map[string]string) | ||
for hashedUserID, timestamp := range mt.activeUsers { | ||
activeUsersMap[hashedUserID] = timestamp.UTC().Format(time.RFC3339) | ||
} | ||
mt.activeUserLock.RUnlock() | ||
|
||
metrics := &cosmosdb.MetricsDocument{ | ||
ID: cosmosdb.METRICS_DOC_ID, | ||
TotalUsers: mt.totalUsers.Load(), | ||
AccountsRegistered: mt.accountsRegistered.Load(), | ||
ActiveUsers: activeUsersMap, | ||
} | ||
|
||
if err := mt.storage.SaveMetrics(metrics); err != nil { | ||
// Either log the error properly or return it | ||
log.Printf("Failed to persist metrics: %v", err) | ||
} | ||
} | ||
|
||
func (mt *MetricsTracker) cleanupInactiveUsers() { | ||
ticker := time.NewTicker(InactiveUserCleanupInterval) | ||
for range ticker.C { | ||
mt.activeUserLock.Lock() | ||
inactiveThreshold := time.Now().Add(-UserInactivityThreshold) | ||
|
||
for userID, lastActive := range mt.activeUsers { | ||
if lastActive.Before(inactiveThreshold) { | ||
delete(mt.activeUsers, userID) | ||
} | ||
} | ||
mt.activeUserLock.Unlock() | ||
} | ||
} | ||
|
||
// Stop cleanly stops the metrics tracker | ||
func (mt *MetricsTracker) Stop() { | ||
mt.persistTicker.Stop() | ||
mt.saveMetrics() // Final save before stopping | ||
} | ||
|
||
// NoOpMetricsTracker implements Metrics interface but does nothing | ||
type NoOpMetricsTracker struct{} | ||
|
||
func NewNoOpMetricsTracker() Metrics { | ||
return &NoOpMetricsTracker{} | ||
} | ||
|
||
func (mt *NoOpMetricsTracker) RecordNewUser() {} | ||
func (mt *NoOpMetricsTracker) RecordAccountRegistered() {} | ||
func (mt *NoOpMetricsTracker) RecordUserActivity(string) {} | ||
func (mt *NoOpMetricsTracker) GetTotalUsers() uint64 { return 0 } | ||
func (mt *NoOpMetricsTracker) GetTotalAccountsRegistered() uint64 { return 0 } | ||
func (mt *NoOpMetricsTracker) GetMonthlyActiveUsers() int { return 0 } | ||
func (mt *NoOpMetricsTracker) Stop() {} |
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
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
133 changes: 133 additions & 0 deletions
133
tools/walletextension/storage/database/cosmosdb/metrics_storage.go
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,133 @@ | ||
package cosmosdb | ||
|
||
import ( | ||
"context" | ||
"encoding/json" | ||
"fmt" | ||
"strings" | ||
"time" | ||
|
||
"github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos" | ||
) | ||
|
||
const ( | ||
METRICS_CONTAINER_NAME = "metrics" | ||
METRICS_DOC_ID = "global_metrics" | ||
) | ||
|
||
type MetricsDocument struct { | ||
ID string `json:"id"` | ||
TotalUsers uint64 `json:"totalUsers"` | ||
AccountsRegistered uint64 `json:"accountsRegistered"` | ||
ActiveUsers map[string]string `json:"activeUsers"` // double-hashed userID -> ISO timestamp | ||
ActiveUsersCount int `json:"activeUsersCount"` | ||
LastUpdated string `json:"lastUpdated"` | ||
} | ||
|
||
// MetricsStorageCosmosDB handles metrics persistence in CosmosDB | ||
type MetricsStorageCosmosDB struct { | ||
client *azcosmos.Client | ||
metricsContainer *azcosmos.ContainerClient | ||
} | ||
|
||
func NewMetricsStorage(connectionString string) (*MetricsStorageCosmosDB, error) { | ||
client, err := azcosmos.NewClientFromConnectionString(connectionString, nil) | ||
if err != nil { | ||
return nil, fmt.Errorf("failed to create CosmosDB client: %w", err) | ||
} | ||
|
||
ctx := context.Background() | ||
|
||
// Ensure database exists | ||
_, err = client.CreateDatabase(ctx, azcosmos.DatabaseProperties{ID: DATABASE_NAME}, nil) | ||
if err != nil && !strings.Contains(err.Error(), "Conflict") { | ||
return nil, fmt.Errorf("failed to create database: %w", err) | ||
} | ||
|
||
metricsContainer, err := client.NewContainer(DATABASE_NAME, METRICS_CONTAINER_NAME) | ||
if err != nil { | ||
return nil, fmt.Errorf("failed to get metrics container: %w", err) | ||
} | ||
|
||
return &MetricsStorageCosmosDB{ | ||
client: client, | ||
metricsContainer: metricsContainer, | ||
}, nil | ||
} | ||
|
||
func (m *MetricsStorageCosmosDB) LoadMetrics() (*MetricsDocument, error) { | ||
ctx := context.Background() | ||
partitionKey := azcosmos.NewPartitionKeyString(METRICS_DOC_ID) | ||
|
||
response, err := m.metricsContainer.ReadItem(ctx, partitionKey, METRICS_DOC_ID, nil) | ||
if err != nil { | ||
if strings.Contains(err.Error(), "NotFound") { | ||
// Initialize with empty metrics if not found | ||
return &MetricsDocument{ | ||
ID: METRICS_DOC_ID, | ||
ActiveUsers: make(map[string]string), | ||
}, nil | ||
} | ||
return nil, err | ||
} | ||
|
||
var doc MetricsDocument | ||
if err := json.Unmarshal(response.Value, &doc); err != nil { | ||
return nil, err | ||
} | ||
return &doc, nil | ||
} | ||
|
||
func (m *MetricsStorageCosmosDB) SaveMetrics(metrics *MetricsDocument) error { | ||
ctx := context.Background() | ||
partitionKey := azcosmos.NewPartitionKeyString(METRICS_DOC_ID) | ||
|
||
// Calculate active users count and clean up inactive users | ||
activeThreshold := time.Now().Add(-30 * 24 * time.Hour) // 30 days | ||
activeCount := 0 | ||
activeUsersMap := make(map[string]string) | ||
|
||
for userID, timestampStr := range metrics.ActiveUsers { | ||
if timestamp, err := time.Parse(time.RFC3339, timestampStr); err == nil { | ||
if timestamp.After(activeThreshold) { | ||
activeCount++ | ||
activeUsersMap[userID] = timestampStr | ||
} | ||
} | ||
} | ||
|
||
metrics.ActiveUsers = activeUsersMap // Only keep active users | ||
metrics.ActiveUsersCount = activeCount | ||
metrics.LastUpdated = time.Now().UTC().Format(time.RFC3339) | ||
|
||
docJSON, err := json.Marshal(metrics) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
_, err = m.metricsContainer.UpsertItem(ctx, partitionKey, docJSON, nil) | ||
return err | ||
} | ||
|
||
// NoOpMetricsStorage is a no-op implementation of metrics storage | ||
type noOpMetricsStorage struct{} | ||
|
||
// MetricsStorage interface defines the metrics storage operations | ||
type MetricsStorage interface { | ||
LoadMetrics() (*MetricsDocument, error) | ||
SaveMetrics(*MetricsDocument) error | ||
} | ||
|
||
func NewNoOpMetricsStorage() MetricsStorage { | ||
return &noOpMetricsStorage{} | ||
} | ||
|
||
func (n *noOpMetricsStorage) LoadMetrics() (*MetricsDocument, error) { | ||
return &MetricsDocument{ | ||
ActiveUsers: make(map[string]string), | ||
}, nil | ||
} | ||
|
||
func (n *noOpMetricsStorage) SaveMetrics(*MetricsDocument) error { | ||
return nil | ||
} |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the problem with this is that it's volatile. Any restart of the gateway will wipe the numbers
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added a fix for that.
Metrics are now regularly stored in CosmosDB.