Skip to content
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

Jump to bottom

Add stats delta query #33

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Add stats delta query #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
545f680
Add stats delta query
heppu Jun 3, 2024
829190b
Add aggregator
heppu Jun 24, 2024
73e7e02
`go mod tidy`
tuommaki Jul 8, 2024
487d8a4
`dos2unix testdata/tables.sql`
tuommaki Jul 8, 2024
09ef56b
Add `delta_stats` table to test db
tuommaki Jul 8, 2024
66a731d
Fix stats queries
tuommaki Jul 8, 2024
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
2 changes: 1 addition & 1 deletion api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var assets embed.FS

type Store interface {
Search(filter string) ([]model.Event, error)
CachedStats(model.StatsRange) model.Stats
CachedStats(model.StatsRange) model.CombinedStats
Events() <-chan model.Event
TxInfo(id string) (model.TxInfo, error)
}
Expand Down
10 changes: 5 additions & 5 deletions api/broadcaster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,14 @@ func TestBroadcasterRetry(t *testing.T) {
}

type MockStore struct {
stats model.Stats
stats model.CombinedStats
searchResult []model.Event
searchErr error
events chan model.Event
txInfo model.TxInfo
}

func (m *MockStore) TxInfo(string) (model.TxInfo, error) { return m.txInfo, nil }
func (m *MockStore) CachedStats(model.StatsRange) model.Stats { return m.stats }
func (m *MockStore) Events() <-chan model.Event { return m.events }
func (m *MockStore) Search(string) ([]model.Event, error) { return m.searchResult, m.searchErr }
func (m *MockStore) TxInfo(string) (model.TxInfo, error) { return m.txInfo, nil }
func (m *MockStore) CachedStats(model.StatsRange) model.CombinedStats { return m.stats }
func (m *MockStore) Events() <-chan model.Event { return m.events }
func (m *MockStore) Search(string) ([]model.Event, error) { return m.searchResult, m.searchErr }
22 changes: 11 additions & 11 deletions api/templates/index.templ
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ templ Index() {
<body>
<div id="container">
@header()
@Stats(model.Stats{})
@Stats(model.CombinedStats{})
@Table(nil, url.Values{})
@footer()
</div>
Expand All @@ -32,45 +32,45 @@ templ TxPage(tx model.TxInfo) {
<body>
<div id="container">
@header()
@Stats(model.Stats{})
@Stats(model.CombinedStats{})
@Tx(tx)
@footer()
</div>
</body>
</html>
}

templ Stats(stats model.Stats) {
templ Stats(stats model.CombinedStats) {
<div id="stats">
<div id="left-stats">
<div class="number-block">
<div class="rolling-number" id="registered_users">{ format(stats.RegisteredUsers) }</div>
<div class="rolling-number" id="registered_users">{ format(stats.Stats.RegisteredUsers) }</div>
<div class="stat-bottom-row">
<div class="number-title">Registered Users</div>
<div class="stat-delta">{ formatPercentage(stats.RegisteredUsersDelta) }</div>
<div class="stat-delta">{ formatPercentage(stats.DeltaStats.RegisteredUsers) }</div>
</div>
</div>
<div class="number-block">
<div class="rolling-number" id="provers_deployed">{ format(stats.ProversDeployed) }</div>
<div class="rolling-number" id="provers_deployed">{ format(stats.Stats.ProversDeployed) }</div>
<div class="stat-bottom-row">
<div class="number-title">Provers Deployed</div>
<div class="stat-delta">{ formatPercentage(stats.ProversDeployedDelta) }</div>
<div class="stat-delta">{ formatPercentage(stats.DeltaStats.ProversDeployed) }</div>
</div>
</div>
</div>
<div id="right-stats">
<div class="number-block">
<div class="rolling-number" id="proofs_generated">{ format(stats.ProofsGenerated) }</div>
<div class="rolling-number" id="proofs_generated">{ format(stats.Stats.ProofsGenerated) }</div>
<div class="stat-bottom-row">
<div class="number-title">Proofs Generated</div>
<div class="stat-delta">{ formatPercentage(stats.ProofsGeneratedDelta) }</div>
<div class="stat-delta">{ formatPercentage(stats.DeltaStats.ProofsGenerated) }</div>
</div>
</div>
<div class="number-block">
<div class="rolling-number" id="proofs_verified">{ format(stats.ProofsVerified) }</div>
<div class="rolling-number" id="proofs_verified">{ format(stats.Stats.ProofsVerified) }</div>
<div class="stat-bottom-row">
<div class="number-title">Proof Verifications</div>
<div class="stat-delta">{ formatPercentage(stats.ProofsVerifiedDelta) }</div>
<div class="stat-delta">{ formatPercentage(stats.DeltaStats.ProofsVerified) }</div>
</div>
</div>
</div>
Expand Down
38 changes: 19 additions & 19 deletions api/templates/index_templ.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ import (

type Store interface {
Search(filter string) ([]model.Event, error)
Stats(model.StatsRange) (model.Stats, error)
Stats(model.StatsRange) (model.CombinedStats, error)
Events() <-chan model.Event
TxInfo(id string) (model.TxInfo, error)
Runnable
}

type CachedStore interface {
CachedStats(model.StatsRange) model.Stats
CachedStats(model.StatsRange) model.CombinedStats
}

type CombinedStore struct {
Expand Down Expand Up @@ -81,7 +81,6 @@ type Config struct {
LogLevel slog.Level `envconfig:"LOG_LEVEL" default:"info"`
}

// TODO: Proper config parsing
func ParseConfig(args ...string) (Config, error) {
var c Config
if err := envconfig.Process("", &c); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/devnet-explorer/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
_ "time/tzdata"

_ "github.com/KimMachineGun/automemlimit"
"github.com/kelseyhightower/envconfig"
_ "go.uber.org/automaxprocs"

"github.com/gevulotnetwork/devnet-explorer/app"
"github.com/kelseyhightower/envconfig"
)

func init() {
Expand Down
44 changes: 36 additions & 8 deletions model/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,32 @@ package model
import (
"database/sql/driver"
"encoding/json"
"errors"
"fmt"
"strings"
"time"
)

var ErrNotFound = errors.New("not found")

type Stats struct {
RegisteredUsers uint64 `json:"registered_users"`
ProofsGenerated uint64 `json:"proofs_generated"`
ProversDeployed uint64 `json:"programs"`
ProofsVerified uint64 `json:"proofs_verified"`
RegisteredUsersDelta float64 `json:"registered_users_delta"`
ProofsGeneratedDelta float64 `json:"proofs_generated_delta"`
ProversDeployedDelta float64 `json:"programs_delta"`
ProofsVerifiedDelta float64 `json:"proofs_verified_delta"`
CreatedAt time.Time `json:"created_at" db:"created_at"`
RegisteredUsers uint64 `json:"registered_users" db:"registered_users"`
ProofsGenerated uint64 `json:"proofs_generated" db:"proofs_generated"`
ProversDeployed uint64 `json:"programs" db:"programs"`
ProofsVerified uint64 `json:"proofs_verified" db:"proofs_verified"`
}

type DeltaStats struct {
RegisteredUsers float64 `json:"registered_users_delta" db:"registered_users_delta"`
ProofsGenerated float64 `json:"proofs_generated_delta" db:"proofs_generated_delta"`
ProversDeployed float64 `json:"programs_delta" db:"programs_delta"`
ProofsVerified float64 `json:"proofs_verified_delta" db:"proofs_verified_delta"`
}

type CombinedStats struct {
Stats
DeltaStats
}

type Event struct {
Expand Down Expand Up @@ -45,6 +57,7 @@ type TxLogEvent struct {

type StatsRange interface {
String() string
Since() time.Time
sr()
}

Expand All @@ -65,6 +78,21 @@ func (s sr) String() string {
}
}

func (s sr) Since() time.Time {
switch s {
case RangeWeek:
return time.Now().AddDate(0, 0, -7)
case RangeMonth:
return time.Now().AddDate(0, -1, 0)
case RangeHalfYear:
return time.Now().AddDate(0, -6, 0)
case RangeYear:
return time.Now().AddDate(-1, 0, 0)
default:
return time.Time{}
}
}

func (s sr) sr() {}

const (
Expand Down
61 changes: 61 additions & 0 deletions stats/aggregator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package stats

import (
"errors"
"fmt"
"log/slog"
"time"

"github.com/gevulotnetwork/devnet-explorer/model"
)

type Store interface {
LatestDailyStats() (model.Stats, error)
AggregateStats(time.Time) error
}

type Aggregator struct {
store Store
lastRan time.Time
done chan struct{}
}

func NewAggregator(store Store) *Aggregator {
return &Aggregator{
store: store,
done: make(chan struct{}),
}
}

func (a *Aggregator) Run() error {
s, err := a.store.LatestDailyStats()
if err != nil && !errors.Is(err, model.ErrNotFound) {
return fmt.Errorf("failed to get latest aggregated stats: %w", err)
}
a.lastRan = s.CreatedAt

t := time.NewTicker(time.Minute)
defer t.Stop()

for {
select {
case <-t.C:
now := time.Now()
if now.Day() > a.lastRan.Day() {
if err := a.store.AggregateStats(now); err != nil {
slog.Error("failed to aggregate stats", slog.String("error", err.Error()))
continue
}
a.lastRan = now
}

case <-a.done:
return nil
}
}
}

func (a *Aggregator) Stop() error {
close(a.done)
return nil
}
Loading