pico

feat(auth): subscribe to pico's metric-drain pipe rss

created pr with 32.1 on 2024-11-12T21:13:35Z · by c8ef7d19

added 32.2 on 2024-11-14T15:42:32Z · by c8ef7d19


                      1:  7ec3569 = 1:  7ec3569 feat(auth): subscribe to pico's metric-drain pipe


                      2:  8a197f0 = 2:  8a197f0 chore: update pubsub


                      3:  d4bda15 = 3:  d4bda15 refactor: use pipe for analytics


                      -:  ------- > 4:  2b7c358 chore: prep for release

cmds

checkout latest patchset:

ssh pr.pico.sh print 32 | git am -3

checkout any patchset in a patch request:

ssh pr.pico.sh print 32.[rev] | git am -3

add changes to patch request:

git format-patch main --stdout | ssh pr.pico.sh pr add 32

Patchset `32.1` on 2024-11-12T21:13:35Z · commit d4bda15

feat(auth): subscribe to pico's metric-drain pipe

Eric Bower 2024-11-11T02:41:27Z

chore: update pubsub

Eric Bower 2024-11-12T16:29:38Z

→ refactor: use pipe for analytics

Eric Bower 2024-11-12T21:12:05Z

refactor: use pipe for analytics

Eric Bower 2024-11-12T21:12:05Z

Semantic diff summary

0 added, 3 modified, 0 signature changed, 0 removed across 1 analyzed file

shared/analytics.go

chunk lines 4-10 modified
chunk lines 13-19 modified
function_declaration AnalyticsCollect modified

+13 -3 shared/analytics.go #

......@@ -4,6 +4,7 @@ import (
	"crypto/hmac"
	"crypto/sha256"
	"encoding/hex"
	"encoding/json"
	"errors"
	"fmt"
	"log/slog"

......@@ -12,6 +13,7 @@ import (
	"net/url"

	"github.com/picosh/pico/db"
	"github.com/picosh/pubsub"
	"github.com/simplesurance/go-ip-anonymizer/ipanonymizer"
	"github.com/x-way/crawlerdetect"
)

......@@ -124,10 +126,18 @@ func AnalyticsVisitFromRequest(r *http.Request, dbpool db.DB, userID string, sec
}

func AnalyticsCollect(ch chan *db.AnalyticsVisits, dbpool db.DB, logger *slog.Logger) {
	for view := range ch {
		err := dbpool.InsertVisit(view)
	info := NewPicoPipeClient()
	metricDrain := pubsub.NewRemoteClientWriter(info, logger, 0)
	go metricDrain.KeepAlive("pub metric-drain -b=false")

	for visit := range ch {
		data, err := json.Marshal(visit)
		if err != nil {
			logger.Error("could not json marshall visit record", "err", err)
		}
		_, err = metricDrain.Write(data)
		if err != nil {
			logger.Error("could not insert view record", "err", err)
			logger.Error("could not write to metric-drain", "err", err)
		}
	}
}

...	...		@@ -124,10 +126,18 @@ func AnalyticsVisitFromRequest(r *http.Request, dbpool db.DB, userID string, sec
124	126		}
125	127
126	128		func AnalyticsCollect(ch chan db.AnalyticsVisits, dbpool db.DB, logger slog.Logger) {
127		-	for view := range ch {
128		-	err := dbpool.InsertVisit(view)
	129	+	info := NewPicoPipeClient()
	130	+	metricDrain := pubsub.NewRemoteClientWriter(info, logger, 0)
	131	+	go metricDrain.KeepAlive("pub metric-drain -b=false")
	132	+
	133	+	for visit := range ch {
	134	+	data, err := json.Marshal(visit)
	135	+	if err != nil {
	136	+	logger.Error("could not json marshall visit record", "err", err)
	137	+	}
	138	+	_, err = metricDrain.Write(data)
129	139		if err != nil {
130		-	logger.Error("could not insert view record", "err", err)
	140	+	logger.Error("could not write to metric-drain", "err", err)
131	141		}
132	142		}
133	143		}

...	...		@@ -4,6 +4,7 @@ import (
4	4		"crypto/hmac"
5	5		"crypto/sha256"
6	6		"encoding/hex"
	7	+	"encoding/json"
7	8		"errors"
8	9		"fmt"
9	10		"log/slog"

...	...		@@ -12,6 +13,7 @@ import (
12	13		"net/url"
13	14
14	15		"github.com/picosh/pico/db"
	16	+	"github.com/picosh/pubsub"
15	17		"github.com/simplesurance/go-ip-anonymizer/ipanonymizer"
16	18		"github.com/x-way/crawlerdetect"
17	19		)

pico

Patchset 32.1 on 2024-11-12T21:13:35Z · commit d4bda15

Patchset `32.1` on 2024-11-12T21:13:35Z · commit d4bda15