go/sliding-sync
go/sliding-sync
1
0
Fork 0
mirror of https://github.com/matrix-org/sliding-sync.git synced 2025-03-10 13:37:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #322 from matrix-org/kegan/rm-high-card-metric

Browse Source 
Remove temporary metric
This commit is contained in:
kegsay 2023-10-02 09:51:58 +01:00 committed by GitHub
commit 18b63419ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
state/accumulator.go
View File

@ -4,9 +4,9 @@ import (
"database/sql"
"encoding/json"
"fmt"
"github.com/matrix-org/sliding-sync/internal"
"github.com/matrix-org/sliding-sync/sync2"
"github.com/prometheus/client_golang/prometheus"
"github.com/getsentry/sentry-go"
@ -23,13 +23,12 @@ import (
// Accumulate function for timeline events. v2 sync must be called with a large enough timeline.limit
// for this to work!
type Accumulator struct {
db *sqlx.DB
roomsTable *RoomsTable
eventsTable *EventTable
snapshotTable *SnapshotTable
spacesTable *SpacesTable
entityName string
snapshotMemberCountVec *prometheus.HistogramVec // TODO: Remove, this is temporary to get a feeling how often a new snapshot is created
db *sqlx.DB
roomsTable *RoomsTable
eventsTable *EventTable
snapshotTable *SnapshotTable
spacesTable *SpacesTable
entityName string
}
func NewAccumulator(db *sqlx.DB) *Accumulator {
@ -283,10 +282,6 @@ func (a *Accumulator) Initialise(roomID string, state []json.RawMessage) (Initia
if err != nil {
return fmt.Errorf("failed to insert snapshot: %w", err)
}
if a.snapshotMemberCountVec != nil {
logger.Trace().Str("room_id", roomID).Int("members", len(memberNIDs)).Msg("Inserted new snapshot")
a.snapshotMemberCountVec.WithLabelValues(roomID).Observe(float64(len(memberNIDs)))
}
res.AddedEvents = true
latestNID := int64(0)
for _, nid := range otherNIDs {
@ -519,10 +514,6 @@ func (a *Accumulator) Accumulate(txn *sqlx.Tx, userID, roomID string, timeline s
if err = a.snapshotTable.Insert(txn, newSnapshot); err != nil {
return AccumulateResult{}, fmt.Errorf("failed to insert new snapshot: %w", err)
}
if a.snapshotMemberCountVec != nil {
logger.Trace().Str("room_id", roomID).Int("members", len(memNIDs)).Msg("Inserted new snapshot")
a.snapshotMemberCountVec.WithLabelValues(roomID).Observe(float64(len(memNIDs)))
}
snapID = newSnapshot.SnapshotID
}
if err := a.eventsTable.UpdateBeforeSnapshotID(txn, ev.NID, beforeSnapID, replacesNID); err != nil {

18
state/storage.go
View File

@ -4,13 +4,13 @@ import (
"context"
"encoding/json"
"fmt"
"github.com/matrix-org/sliding-sync/sync2"
"os"
"strings"
"github.com/matrix-org/sliding-sync/sync2"
"github.com/getsentry/sentry-go"
"github.com/lib/pq"
"github.com/prometheus/client_golang/prometheus"
"github.com/jmoiron/sqlx"
"github.com/matrix-org/sliding-sync/internal"
@ -88,17 +88,6 @@ func NewStorageWithDB(db *sqlx.DB, addPrometheusMetrics bool) *Storage {
entityName: "server",
}
if addPrometheusMetrics {
acc.snapshotMemberCountVec = prometheus.NewHistogramVec(prometheus.HistogramOpts{
Namespace: "sliding_sync",
Subsystem: "poller",
Name: "snapshot_size",
Help: "Number of membership events in a snapshot",
Buckets: []float64{100.0, 500.0, 1000.0, 5000.0, 10000.0, 20000.0, 50000.0, 100000.0, 150000.0},
}, []string{"room_id"})
prometheus.MustRegister(acc.snapshotMemberCountVec)
}
return &Storage{
Accumulator: acc,
ToDeviceTable: NewToDeviceTable(db),
@ -1047,9 +1036,6 @@ func (s *Storage) Teardown() {
if err != nil {
panic("Storage.Teardown: " + err.Error())
}
if s.Accumulator.snapshotMemberCountVec != nil {
prometheus.Unregister(s.Accumulator.snapshotMemberCountVec)
}
}
// circularSlice is a slice which can be appended to which will wraparound at `max`.