Skip to content

Open-source status page, incident response and uptime monitoring

add logging to private-regions app (#1759)

Thibault Le Ouay343ee0cd0cc7
diff --git a/apps/private-location/cmd/server/main.go b/apps/private-location/cmd/server/main.go
index 08d07a14d..febeb7759 100644
--- a/apps/private-location/cmd/server/main.go
+++ b/apps/private-location/cmd/server/main.go
@@ -12,7 +12,7 @@ import (
"github.com/openstatushq/openstatus/apps/private-location/internal/server"
)
-func gracefulShutdown(apiServer *http.Server, done chan bool) {
+func gracefulShutdown(apiServer *http.Server, cleanup func(context.Context), done chan bool) {
// Create context that listens for the interrupt signal from the OS.
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
defer stop()
@@ -20,7 +20,7 @@ func gracefulShutdown(apiServer *http.Server, done chan bool) {
// Listen for the interrupt signal.
<-ctx.Done()
- log.Println("shutting down gracefully, press Ctrl+C again to force")
+ fmt.Println("shutting down gracefully, press Ctrl+C again to force")
stop() // Allow Ctrl+C to force shutdown
// The context is used to inform the server it has 5 seconds to finish
@@ -31,6 +31,9 @@ func gracefulShutdown(apiServer *http.Server, done chan bool) {
log.Printf("Server forced to shutdown with error: %v", err)
}
+ // Cleanup log provider
+ cleanup(ctx)
+
log.Println("Server exiting")
// Notify the main goroutine that the shutdown is complete
@@ -39,13 +42,13 @@ func gracefulShutdown(apiServer *http.Server, done chan bool) {
func main() {
- server := server.NewServer()
+ server, cleanup := server.NewServer()
// Create a done channel to signal when the shutdown is complete
done := make(chan bool, 1)
// Run graceful shutdown in a separate goroutine
- go gracefulShutdown(server, done)
+ go gracefulShutdown(server, cleanup, done)
err := server.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
diff --git a/apps/private-location/go.mod b/apps/private-location/go.mod
index a098a43e9..6b3f66af6 100644
--- a/apps/private-location/go.mod
+++ b/apps/private-location/go.mod
@@ -6,6 +6,7 @@ require (
connectrpc.com/connect v1.19.1
github.com/go-chi/chi/v5 v5.2.3
github.com/go-chi/render v1.0.3
+ github.com/google/uuid v1.6.0
github.com/jmoiron/sqlx v1.4.0
github.com/joho/godotenv v1.5.1
github.com/mattn/go-sqlite3 v1.14.22
@@ -13,18 +14,38 @@ require (
github.com/rs/zerolog v1.34.0
github.com/stretchr/testify v1.11.1
github.com/tursodatabase/libsql-client-go v0.0.0-20240902231107-85af5b9d094d
+ go.opentelemetry.io/contrib/bridges/otelslog v0.14.0
+ go.opentelemetry.io/otel v1.39.0
+ go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.15.0
+ go.opentelemetry.io/otel/log v0.15.0
+ go.opentelemetry.io/otel/sdk v1.39.0
+ go.opentelemetry.io/otel/sdk/log v0.15.0
google.golang.org/protobuf v1.36.10
)
require (
github.com/ajg/form v1.5.1 // indirect
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
+ github.com/cenkalti/backoff/v5 v5.0.3 // indirect
+ github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/coder/websocket v1.8.12 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/go-logr/logr v1.4.3 // indirect
+ github.com/go-logr/stdr v1.2.2 // indirect
+ github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
+ go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+ go.opentelemetry.io/otel/metric v1.39.0 // indirect
+ go.opentelemetry.io/otel/trace v1.39.0 // indirect
+ go.opentelemetry.io/proto/otlp v1.9.0 // indirect
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
- golang.org/x/sys v0.29.0 // indirect
+ golang.org/x/net v0.47.0 // indirect
+ golang.org/x/sys v0.39.0 // indirect
+ golang.org/x/text v0.31.0 // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
+ google.golang.org/grpc v1.77.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/apps/private-location/go.sum b/apps/private-location/go.sum
index 5f8cfd247..fbb747a8e 100644
--- a/apps/private-location/go.sum
+++ b/apps/private-location/go.sum
@@ -6,6 +6,10 @@ github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
+github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
+github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
@@ -15,15 +19,30 @@ github.com/go-chi/chi/v5 v5.2.3 h1:WQIt9uxdsAbgIYgid+BpYc+liqQZGMHRaUwp0JUcvdE=
github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 h1:NmZ1PKzSTQbuGHw9DGPFomqkkLWMC+vZCkfs+FHv1Vg=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3/go.mod h1:zQrxl1YP88HQlA6i9c63DSVPFklWpGX4OWAc9bFuaH4=
github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
@@ -39,6 +58,8 @@ github.com/openstatushq/openstatus/apps/checker v0.0.0-20251012205355-e366f661c2
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
@@ -46,16 +67,53 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/tursodatabase/libsql-client-go v0.0.0-20240902231107-85af5b9d094d h1:dOMI4+zEbDI37KGb0TI44GUAwxHF9cMsIoDTJ7UmgfU=
github.com/tursodatabase/libsql-client-go v0.0.0-20240902231107-85af5b9d094d/go.mod h1:l8xTsYB90uaVdMHXMCxKKLSgw5wLYBwBKKefNIUnm9s=
+go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
+go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
+go.opentelemetry.io/contrib/bridges/otelslog v0.14.0 h1:eypSOd+0txRKCXPNyqLPsbSfA0jULgJcGmSAdFAnrCM=
+go.opentelemetry.io/contrib/bridges/otelslog v0.14.0/go.mod h1:CRGvIBL/aAxpQU34ZxyQVFlovVcp67s4cAmQu8Jh9mc=
+go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
+go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.15.0 h1:EKpiGphOYq3CYnIe2eX9ftUkyU+Y8Dtte8OaWyHJ4+I=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.15.0/go.mod h1:nWFP7C+T8TygkTjJ7mAyEaFaE7wNfms3nV/vexZ6qt0=
+go.opentelemetry.io/otel/log v0.15.0 h1:0VqVnc3MgyYd7QqNVIldC3dsLFKgazR6P3P3+ypkyDY=
+go.opentelemetry.io/otel/log v0.15.0/go.mod h1:9c/G1zbyZfgu1HmQD7Qj84QMmwTp2QCQsZH1aeoWDE4=
+go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
+go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
+go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
+go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
+go.opentelemetry.io/otel/sdk/log v0.15.0 h1:WgMEHOUt5gjJE93yqfqJOkRflApNif84kxoHWS9VVHE=
+go.opentelemetry.io/otel/sdk/log v0.15.0/go.mod h1:qDC/FlKQCXfH5hokGsNg9aUBGMJQsrUyeOiW5u+dKBQ=
+go.opentelemetry.io/otel/sdk/log/logtest v0.14.0 h1:Ijbtz+JKXl8T2MngiwqBlPaHqc4YCaP/i13Qrow6gAM=
+go.opentelemetry.io/otel/sdk/log/logtest v0.14.0/go.mod h1:dCU8aEL6q+L9cYTqcVOk8rM9Tp8WdnHOPLiBgp0SGOA=
+go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
+go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
+go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
+go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
+go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A=
+go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4=
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o=
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
+gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
+google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 h1:fCvbg86sFXwdrl5LgVcTEvNC+2txB5mgROGmRL5mrls=
+google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:+rXWjjaukWZun3mLfjmVnQi18E1AsFbDN9QdJ5YXLto=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
+google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/apps/private-location/internal/logs/logs.go b/apps/private-location/internal/logs/logs.go
new file mode 100644
index 000000000..99984cdd0
--- /dev/null
+++ b/apps/private-location/internal/logs/logs.go
@@ -0,0 +1,74 @@
+package logs
+
+import (
+ "log/slog"
+ "math/rand/v2"
+ "time"
+)
+
+func ShouldSample(event map[string]any) bool {
+ statusCode, _ := event["status_code"].(int)
+ durationMs, _ := event["duration_ms"].(int)
+ // Always capture: server errors
+ if statusCode >= 500 {
+ return true
+ }
+
+ // Always capture: explicit errors
+ if _, hasError := event["error"]; hasError {
+ return true
+ }
+
+ // Always capture: slow requests (above p99 - 2s threshold)
+ if durationMs > 2000 {
+ return true
+ }
+
+ // Higher sampling for client errors (4xx) - 100%
+ if statusCode >= 400 && statusCode < 500 {
+ return true
+ }
+
+ // Random sample successful, fast requests at 20%
+ return rand.Float64() < 0.2
+}
+
+// MapToAttrs converts a map[string]any to a slice of slog.Attr
+func MapToAttrs(m map[string]any) []slog.Attr {
+ attrs := make([]slog.Attr, 0, len(m))
+ for k, v := range m {
+ attrs = append(attrs, toAttr(k, v))
+ }
+ return attrs
+}
+
+func toAttr(key string, value any) slog.Attr {
+ switch v := value.(type) {
+ case string:
+ return slog.String(key, v)
+ case int:
+ return slog.Int(key, v)
+ case int64:
+ return slog.Int64(key, v)
+ case float64:
+ return slog.Float64(key, v)
+ case bool:
+ return slog.Bool(key, v)
+ case time.Time:
+ return slog.Time(key, v)
+ case time.Duration:
+ return slog.Duration(key, v)
+ case map[string]any:
+ return slog.Group(key, MapToAny(v)...)
+ default:
+ return slog.Any(key, v)
+ }
+}
+
+func MapToAny(m map[string]any) []any {
+ args := make([]any, 0, len(m)*2)
+ for k, v := range m {
+ args = append(args, toAttr(k, v))
+ }
+ return args
+}
diff --git a/apps/private-location/internal/server/routes.go b/apps/private-location/internal/server/routes.go
index c8a3763a1..276068c8b 100644
--- a/apps/private-location/internal/server/routes.go
+++ b/apps/private-location/internal/server/routes.go
@@ -1,20 +1,126 @@
package server
import (
+ "context"
+ "log/slog"
"net/http"
"os"
"time"
- _ "github.com/joho/godotenv/autoload"
-
"github.com/go-chi/chi/v5"
"github.com/go-chi/render"
+ "github.com/google/uuid"
"github.com/jmoiron/sqlx"
+ _ "github.com/joho/godotenv/autoload"
+ "github.com/openstatushq/openstatus/apps/private-location/internal/logs"
"github.com/openstatushq/openstatus/apps/private-location/internal/tinybird"
v1 "github.com/openstatushq/openstatus/apps/private-location/proto/private_location/v1"
)
-// Monitor represents a monitoring job.
+type contextKey string
+
+const (
+ requestIDKey contextKey = "request_id"
+ eventKey contextKey = "event"
+)
+
+// responseWriter wraps http.ResponseWriter to capture the status code
+type responseWriter struct {
+ http.ResponseWriter
+ status int
+}
+
+func (rw *responseWriter) WriteHeader(code int) {
+ rw.status = code
+ rw.ResponseWriter.WriteHeader(code)
+}
+
+func (rw *responseWriter) Write(b []byte) (int, error) {
+ if rw.status == 0 {
+ rw.status = http.StatusOK
+ }
+ return rw.ResponseWriter.Write(b)
+}
+
+// Logger returns a Chi middleware that logs request details
+func Logger() func(next http.Handler) http.Handler {
+ return func(next http.Handler) http.Handler {
+ return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ startTime := time.Now()
+
+ // Generate or get request ID
+ requestID := r.Header.Get("X-Request-ID")
+ if requestID == "" {
+ requestID = uuid.New().String()
+ }
+
+ // Build wide event context at request start
+ scheme := "http"
+ if r.TLS != nil {
+ scheme = "https"
+ }
+ fullURL := scheme + "://" + r.Host + r.RequestURI
+
+ event := map[string]any{
+ "timestamp": startTime.Format(time.RFC3339),
+ "request_id": requestID,
+ "method": r.Method,
+ "path": r.URL.Path,
+ "url": fullURL,
+ "user_agent": r.Header.Get("User-Agent"),
+ "content_type": r.Header.Get("Content-Type"),
+ }
+
+ // Store in context
+ ctx := context.WithValue(r.Context(), requestIDKey, requestID)
+ ctx = context.WithValue(ctx, eventKey, event)
+ r = r.WithContext(ctx)
+
+ // Wrap response writer to capture status code
+ wrapped := &responseWriter{ResponseWriter: w, status: 0}
+
+ // Process request
+ next.ServeHTTP(wrapped, r)
+
+ // After request - capture response details
+ duration := time.Since(startTime).Milliseconds()
+ status := wrapped.status
+ if status == 0 {
+ status = http.StatusOK
+ }
+
+ event["status_code"] = status
+ event["duration_ms"] = duration
+
+ if status >= 400 {
+ event["outcome"] = "error"
+ } else {
+ event["outcome"] = "success"
+ }
+
+ if logs.ShouldSample(event) {
+ attrs := logs.MapToAttrs(event)
+ slog.LogAttrs(r.Context(), slog.LevelInfo, "request done", attrs...)
+ }
+ })
+ }
+}
+
+// GetRequestID retrieves the request ID from context
+func GetRequestID(ctx context.Context) string {
+ if id, ok := ctx.Value(requestIDKey).(string); ok {
+ return id
+ }
+ return ""
+}
+
+// GetEvent retrieves the event map from context
+func GetEvent(ctx context.Context) map[string]any {
+ if event, ok := ctx.Value(eventKey).(map[string]any); ok {
+ return event
+ }
+ return nil
+}
type privateLocationHandler struct {
db *sqlx.DB
@@ -31,6 +137,9 @@ func NewPrivateLocationServer(db *sqlx.DB, tbClient tinybird.Client) *privateLoc
// RegisterRoutes sets up the HTTP routes for the server.
func (s *Server) RegisterRoutes() http.Handler {
r := chi.NewRouter()
+
+ r.Use(Logger())
+
r.Get("/health", s.healthHandler)
tinyBirdToken := os.Getenv("TINYBIRD_TOKEN")
diff --git a/apps/private-location/internal/server/server.go b/apps/private-location/internal/server/server.go
index 48387121f..3e695efe3 100644
--- a/apps/private-location/internal/server/server.go
+++ b/apps/private-location/internal/server/server.go
@@ -1,8 +1,9 @@
package server
import (
- // "database/sql"
+ "context"
"fmt"
+ "log/slog"
"net/http"
"os"
"strconv"
@@ -10,32 +11,104 @@ import (
"github.com/jmoiron/sqlx"
_ "github.com/joho/godotenv/autoload"
+ "go.opentelemetry.io/contrib/bridges/otelslog"
+ "go.opentelemetry.io/otel/attribute"
+ "go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp"
+ "go.opentelemetry.io/otel/log/global"
+ sdklog "go.opentelemetry.io/otel/sdk/log"
+ "go.opentelemetry.io/otel/sdk/resource"
+ semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
"github.com/openstatushq/openstatus/apps/private-location/internal/database"
)
type Server struct {
- port int
-
- db *sqlx.DB
+ port int
+ db *sqlx.DB
+ logger *slog.Logger
+ logProvider *sdklog.LoggerProvider
}
-func NewServer() *http.Server {
+// NewServer returns an HTTP server and a cleanup function to shutdown the log provider.
+func NewServer() (*http.Server, func(context.Context)) {
port, _ := strconv.Atoi(os.Getenv("PORT"))
- NewServer := &Server{
- port: port,
- db: database.New(),
+ logger, logProvider := setupLogger()
+
+ newServer := &Server{
+ port: port,
+ db: database.New(),
+ logger: logger,
+ logProvider: logProvider,
}
// Declare Server config
server := &http.Server{
- Addr: fmt.Sprintf(":%d", NewServer.port),
- Handler: NewServer.RegisterRoutes(),
+ Addr: fmt.Sprintf(":%d", newServer.port),
+ Handler: newServer.RegisterRoutes(),
IdleTimeout: time.Minute,
ReadTimeout: 10 * time.Second,
WriteTimeout: 30 * time.Second,
}
- return server
+ // Return cleanup function for graceful shutdown
+ cleanup := func(ctx context.Context) {
+ if logProvider != nil {
+ logProvider.Shutdown(ctx)
+ }
+ }
+
+ return server, cleanup
+}
+
+func setupLogger() (*slog.Logger, *sdklog.LoggerProvider) {
+ ctx := context.Background()
+
+ axiomToken := env("AXIOM_TOKEN", "")
+ axiomDataset := env("AXIOM_DATASET", "dev")
+
+ // If no Axiom token, return a standard logger
+ if axiomToken == "" {
+ logger := slog.Default()
+ return logger, nil
+ }
+
+ res := resource.NewWithAttributes(
+ semconv.SchemaURL,
+ semconv.ServiceNameKey.String("openstatus-private-location"),
+ semconv.ServiceVersionKey.String("1.0.0"),
+ attribute.String("environment", "production"),
+ )
+
+ // Set up OTLP log exporter for Axiom
+ exporter, err := otlploghttp.New(ctx,
+ otlploghttp.WithEndpointURL("https://eu-central-1.aws.edge.axiom.co/v1/logs"),
+ otlploghttp.WithHeaders(map[string]string{
+ "Authorization": "Bearer " + axiomToken,
+ "X-Axiom-Dataset": axiomDataset,
+ }),
+ )
+ if err != nil {
+ fmt.Fprintf(os.Stderr, "failed to create OTLP exporter: %v\n", err)
+ return slog.Default(), nil
+ }
+
+ // Create log provider with resource and batch processor
+ logProvider := sdklog.NewLoggerProvider(
+ sdklog.WithResource(res),
+ sdklog.WithProcessor(sdklog.NewBatchProcessor(exporter)),
+ )
+
+ global.SetLoggerProvider(logProvider)
+ logger := otelslog.NewLogger("openstatus-private-location")
+ slog.SetDefault(logger)
+
+ return logger, logProvider
+}
+
+func env(key, fallback string) string {
+ if value, ok := os.LookupEnv(key); ok {
+ return value
+ }
+ return fallback
}