feat: use charmbracelet logger #5

+71 -7

4 changed files

Diff round #0

expand all

unified split

go.mod

go.sum

internal

server

app.go

log

log.go

+14

go.mod

··· 9 github.com/bluesky-social/indigo v0.0.0-20251003000214-3259b215110e 10 github.com/bluesky-social/jetstream v0.0.0-20250414024304-d17bd81a945e 11 github.com/carlmjohnson/versioninfo v0.22.5 12 github.com/go-chi/chi/v5 v5.2.1 13 github.com/gorilla/sessions v1.4.0 14 github.com/ipfs/go-cid v0.4.1 ··· 28 require ( 29 github.com/a-h/parse v0.0.0-20250122154542-74294addb73e // indirect 30 github.com/andybalholm/brotli v1.1.0 // indirect 31 github.com/beorn7/perks v1.0.1 // indirect 32 github.com/cenkalti/backoff/v4 v4.3.0 // indirect 33 github.com/cespare/xxhash/v2 v2.3.0 // indirect 34 github.com/cli/browser v1.3.0 // indirect 35 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect 36 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect 37 github.com/fatih/color v1.16.0 // indirect 38 github.com/felixge/httpsnoop v1.0.4 // indirect 39 github.com/fsnotify/fsnotify v1.7.0 // indirect 40 github.com/go-logr/logr v1.4.2 // indirect 41 github.com/go-logr/stdr v1.2.2 // indirect 42 github.com/goccy/go-json v0.10.2 // indirect ··· 69 github.com/lestrrat-go/httprc v1.0.4 // indirect 70 github.com/lestrrat-go/iter v1.0.2 // indirect 71 github.com/lestrrat-go/option v1.0.1 // indirect 72 github.com/mattn/go-colorable v0.1.13 // indirect 73 github.com/mattn/go-isatty v0.0.20 // indirect 74 github.com/minio/sha256-simd v1.0.1 // indirect 75 github.com/mr-tron/base58 v1.2.0 // indirect 76 github.com/multiformats/go-base32 v0.1.0 // indirect 77 github.com/multiformats/go-base36 v0.2.0 // indirect 78 github.com/multiformats/go-multibase v0.2.0 // indirect ··· 85 github.com/prometheus/client_model v0.6.1 // indirect 86 github.com/prometheus/common v0.54.0 // indirect 87 github.com/prometheus/procfs v0.15.1 // indirect 88 github.com/segmentio/asm v1.2.0 // indirect 89 github.com/spaolacci/murmur3 v1.1.0 // indirect 90 gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b // indirect 91 gitlab.com/yawning/tuplehash v0.0.0-20230713102510-df83abbf9a02 // indirect 92 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect ··· 97 go.uber.org/multierr v1.11.0 // indirect 98 go.uber.org/zap v1.26.0 // indirect 99 golang.org/x/crypto v0.40.0 // indirect 100 golang.org/x/mod v0.26.0 // indirect 101 golang.org/x/sys v0.34.0 // indirect 102 golang.org/x/time v0.8.0 // indirect

··· 9 github.com/bluesky-social/indigo v0.0.0-20251003000214-3259b215110e 10 github.com/bluesky-social/jetstream v0.0.0-20250414024304-d17bd81a945e 11 github.com/carlmjohnson/versioninfo v0.22.5 12 + github.com/charmbracelet/log v0.4.2 13 github.com/go-chi/chi/v5 v5.2.1 14 github.com/gorilla/sessions v1.4.0 15 github.com/ipfs/go-cid v0.4.1 ··· 29 require ( 30 github.com/a-h/parse v0.0.0-20250122154542-74294addb73e // indirect 31 github.com/andybalholm/brotli v1.1.0 // indirect 32 + github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect 33 github.com/beorn7/perks v1.0.1 // indirect 34 github.com/cenkalti/backoff/v4 v4.3.0 // indirect 35 github.com/cespare/xxhash/v2 v2.3.0 // indirect 36 + github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect 37 + github.com/charmbracelet/lipgloss v1.1.0 // indirect 38 + github.com/charmbracelet/x/ansi v0.8.0 // indirect 39 + github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect 40 + github.com/charmbracelet/x/term v0.2.1 // indirect 41 github.com/cli/browser v1.3.0 // indirect 42 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect 43 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect 44 github.com/fatih/color v1.16.0 // indirect 45 github.com/felixge/httpsnoop v1.0.4 // indirect 46 github.com/fsnotify/fsnotify v1.7.0 // indirect 47 + github.com/go-logfmt/logfmt v0.6.0 // indirect 48 github.com/go-logr/logr v1.4.2 // indirect 49 github.com/go-logr/stdr v1.2.2 // indirect 50 github.com/goccy/go-json v0.10.2 // indirect ··· 77 github.com/lestrrat-go/httprc v1.0.4 // indirect 78 github.com/lestrrat-go/iter v1.0.2 // indirect 79 github.com/lestrrat-go/option v1.0.1 // indirect 80 + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect 81 github.com/mattn/go-colorable v0.1.13 // indirect 82 github.com/mattn/go-isatty v0.0.20 // indirect 83 + github.com/mattn/go-runewidth v0.0.16 // indirect 84 github.com/minio/sha256-simd v1.0.1 // indirect 85 github.com/mr-tron/base58 v1.2.0 // indirect 86 + github.com/muesli/termenv v0.16.0 // indirect 87 github.com/multiformats/go-base32 v0.1.0 // indirect 88 github.com/multiformats/go-base36 v0.2.0 // indirect 89 github.com/multiformats/go-multibase v0.2.0 // indirect ··· 96 github.com/prometheus/client_model v0.6.1 // indirect 97 github.com/prometheus/common v0.54.0 // indirect 98 github.com/prometheus/procfs v0.15.1 // indirect 99 + github.com/rivo/uniseg v0.4.7 // indirect 100 github.com/segmentio/asm v1.2.0 // indirect 101 github.com/spaolacci/murmur3 v1.1.0 // indirect 102 + github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect 103 gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b // indirect 104 gitlab.com/yawning/tuplehash v0.0.0-20230713102510-df83abbf9a02 // indirect 105 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect ··· 110 go.uber.org/multierr v1.11.0 // indirect 111 go.uber.org/zap v1.26.0 // indirect 112 golang.org/x/crypto v0.40.0 // indirect 113 + golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect 114 golang.org/x/mod v0.26.0 // indirect 115 golang.org/x/sys v0.34.0 // indirect 116 golang.org/x/time v0.8.0 // indirect

+27

go.sum

··· 5 github.com/a-h/templ v0.3.898/go.mod h1:oLBbZVQ6//Q6zpvSMPTuBK0F3qOtBdFBcGRspcT+VNQ= 6 github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= 7 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= 8 + github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= 9 + github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= 10 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= 11 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= 12 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= ··· 24 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= 25 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= 26 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= 27 + github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs= 28 + github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk= 29 + github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= 30 + github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30= 31 + github.com/charmbracelet/log v0.4.2 h1:hYt8Qj6a8yLnvR+h7MwsJv/XvmBJXiueUcI3cIxsyig= 32 + github.com/charmbracelet/log v0.4.2/go.mod h1:qifHGX/tc7eluv2R6pWIpyHDDrrb/AG71Pf2ysQu5nw= 33 + github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE= 34 + github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q= 35 + github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8= 36 + github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= 37 + github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ= 38 + github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg= 39 github.com/cli/browser v1.3.0 h1:LejqCrpWr+1pRqmEPDGnTZOjsMe7sehifLynZJuqJpo= 40 github.com/cli/browser v1.3.0/go.mod h1:HH8s+fOAxjhQoBUAsKuPCbqUuxZDhQ2/aD+SzsEfBTk= 41 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= ··· 56 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= 57 github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8= 58 github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops= 59 + github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= 60 + github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= 61 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= 62 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= 63 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= ··· 164 github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= 165 github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= 166 github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= 167 + github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= 168 + github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= 169 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= 170 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= 171 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= 172 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= 173 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= 174 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= 175 + github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= 176 + github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= 177 github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= 178 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= 179 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM= 180 github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= 181 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= 182 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= 183 + github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc= 184 + github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk= 185 github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE= 186 github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI= 187 github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0= ··· 218 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= 219 github.com/redis/go-redis/v9 v9.14.0 h1:u4tNCjXOyzfgeLN+vAZaW1xUooqWDqVEsZN0U01jfAE= 220 github.com/redis/go-redis/v9 v9.14.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw= 221 + github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= 222 + github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= 223 + github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= 224 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= 225 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= 226 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= ··· 256 github.com/whyrusleeping/cbor v0.0.0-20171005072247-63513f603b11/go.mod h1:Wlo/SzPmxVp6vXpGt/zaXhHH0fn4IxgqZc82aKg6bpQ= 257 github.com/whyrusleeping/cbor-gen v0.2.1-0.20241030202151-b7a6831be65e h1:28X54ciEwwUxyHn9yrZfl5ojgF4CBNLWX7LR0rvBkf4= 258 github.com/whyrusleeping/cbor-gen v0.2.1-0.20241030202151-b7a6831be65e/go.mod h1:pM99HXyEbSQHcosHc0iW7YFmwnscr+t9Te4ibko05so= 259 + github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= 260 + github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= 261 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 262 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 263 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=

internal/server/app.go

··· 19 "yoten.app/internal/consumer" 20 "yoten.app/internal/db" 21 "yoten.app/internal/server/config" 22 "yoten.app/internal/server/oauth" 23 "yoten.app/internal/server/views" 24 ) ··· 37 Posthog posthog.Client 38 IdResolver *atproto.Resolver 39 Session *session.SessionStore 40 ComputedData ComputedData 41 } 42 ··· 47 } 48 49 func Make(ctx context.Context, config *config.Config) (*Server, error) { 50 d, err := db.Make(config.Core.DbPath) 51 if err != nil { 52 return nil, err ··· 106 Posthog: posthog, 107 IdResolver: idResolver, 108 Session: sess, 109 ComputedData: computed, 110 } 111

··· 19 "yoten.app/internal/consumer" 20 "yoten.app/internal/db" 21 "yoten.app/internal/server/config" 22 + "yoten.app/internal/server/log" 23 "yoten.app/internal/server/oauth" 24 "yoten.app/internal/server/views" 25 ) ··· 38 Posthog posthog.Client 39 IdResolver *atproto.Resolver 40 Session *session.SessionStore 41 + Logger *slog.Logger 42 ComputedData ComputedData 43 } 44 ··· 49 } 50 51 func Make(ctx context.Context, config *config.Config) (*Server, error) { 52 + logger := log.FromContext(ctx) 53 + 54 d, err := db.Make(config.Core.DbPath) 55 if err != nil { 56 return nil, err ··· 110 Posthog: posthog, 111 IdResolver: idResolver, 112 Session: sess, 113 + Logger: logger, 114 ComputedData: computed, 115 } 116

+25 -7

internal/server/log/log.go

··· 4 "context" 5 "log/slog" 6 "os" 7 ) 8 9 - // NewHandler sets up a new slog.Handler with the service name as an attribute 10 func NewHandler(name string) slog.Handler { 11 - handler := slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{}) 12 - 13 - var attrs []slog.Attr 14 - attrs = append(attrs, slog.Attr{Key: "service", Value: slog.StringValue(name)}) 15 - handler.WithAttrs(attrs) 16 - return handler 17 } 18 19 func New(name string) *slog.Logger { ··· 45 46 return slog.Default() 47 }

··· 4 "context" 5 "log/slog" 6 "os" 7 + 8 + "github.com/charmbracelet/log" 9 ) 10 11 func NewHandler(name string) slog.Handler { 12 + return log.NewWithOptions(os.Stderr, log.Options{ 13 + ReportTimestamp: true, 14 + Prefix: name, 15 + Level: log.DebugLevel, 16 + }) 17 } 18 19 func New(name string) *slog.Logger { ··· 45 46 return slog.Default() 47 } 48 + 49 + // Sublogger derives a new logger from an existing one by appending a suffix to 50 + // its prefix. 51 + func SubLogger(base *slog.Logger, suffix string) *slog.Logger { 52 + // Try to get the underlying charmbracelet logger. 53 + if cl, ok := base.Handler().(*log.Logger); ok { 54 + prefix := cl.GetPrefix() 55 + if prefix != "" { 56 + prefix = prefix + "/" + suffix 57 + } else { 58 + prefix = suffix 59 + } 60 + return slog.New(NewHandler(prefix)) 61 + } 62 + 63 + // Fallback to no known handler type. 64 + return slog.New(NewHandler(suffix)) 65 + }

History

1 round 0 comments

brookjeynes.dev submitted #0 5mo

1 commit

expand

14d5022a

feat: use charmbracelet logger

expand 0 comments

pull request successfully merged