Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
private location: update db driver (#2863)
Thibault Le Ouay715ab93c0979
diff --git a/apps/private-location/Dockerfile b/apps/private-location/Dockerfileindex 381c08195..6ab021a35 100644--- a/apps/private-location/Dockerfile+++ b/apps/private-location/Dockerfile@@ -3,33 +3,30 @@# See https://github.com/lenra-io/dofigen# builder-FROM golang@sha256:51a7c389a5ddaf82f527191a1e9bff9928655130a44e4975dd1d7e0acf59f1ae AS builder-ARG TARGETARCH-ARG TARGETOS+FROM golang@sha256:dc9ad6c05acc7a88e5b71bde60a5fe3bd4b9f0db209011711b464107438a8107 AS builderLABEL \- org.opencontainers.image.base.digest="sha256:51a7c389a5ddaf82f527191a1e9bff9928655130a44e4975dd1d7e0acf59f1ae" \- org.opencontainers.image.base.name="docker.io/golang:1.26-alpine" \+ org.opencontainers.image.base.digest="sha256:dc9ad6c05acc7a88e5b71bde60a5fe3bd4b9f0db209011711b464107438a8107" \+ org.opencontainers.image.base.name="docker.io/golang:1.26-bookworm" \org.opencontainers.image.stage="builder"ENV \- CGO_ENABLED="0" \- TZ="UTC"+ TZ="UTC" \+ CGO_ENABLED="1"WORKDIR /go/src/appCOPY \--link \"." "."RUN <<EOF-apk add --no-cache tzdatago mod download-GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -trimpath -ldflags "-s -w" -o private-location ./cmd/server+go build -trimpath -ldflags "-s -w" -o private-location ./cmd/serverEOF# runtime-FROM alpine@sha256:ce64758a109eb420d874a118f87920e625e12d3634e03b4a5573fd9f6e5d3507 AS runtime+FROM debian@sha256:7c7b2c966bc9ee8cedfeef67e0e279108992c77681fa595db4a9d65c06ccc587 AS runtimeLABEL \io.dofigen.version="2.8.0" \org.opencontainers.image.authors="OpenStatus Team" \- org.opencontainers.image.base.digest="sha256:ce64758a109eb420d874a118f87920e625e12d3634e03b4a5573fd9f6e5d3507" \- org.opencontainers.image.base.name="docker.io/alpine:3.21" \+ org.opencontainers.image.base.digest="sha256:7c7b2c966bc9ee8cedfeef67e0e279108992c77681fa595db4a9d65c06ccc587" \+ org.opencontainers.image.base.name="docker.io/debian:bookworm-slim" \org.opencontainers.image.description="Private location orchestrator for OpenStatus" \org.opencontainers.image.source="https://github.com/openstatusHQ/openstatus" \org.opencontainers.image.title="OpenStatus Private Location" \@@ -54,6 +51,12 @@ COPY \--chown=1000:1000 \--link \"/go/src/app/private-location" "/opt/bin/private-location"+USER 0:0+RUN <<EOF+apt-get update+apt-get install -y --no-install-recommends wget+rm -rf /var/lib/apt/lists/*+EOFUSER 1000:1000EXPOSE 8080HEALTHCHECK \@@ -61,5 +64,5 @@ HEALTHCHECK \--timeout=10s \--start-period=30s \--retries=3 \- CMD wget --spider -q http://localhost:8080/health || exit 1+ CMD wget -q -O /dev/null http://localhost:8080/health || exit 1CMD ["/opt/bin/private-location"]diff --git a/apps/private-location/dofigen.lock b/apps/private-location/dofigen.lockindex 675f34a5b..b2e73a455 100644--- a/apps/private-location/dofigen.lock+++ b/apps/private-location/dofigen.lock@@ -3,38 +3,34 @@ effective: |builder:fromImage:path: golang- digest: sha256:51a7c389a5ddaf82f527191a1e9bff9928655130a44e4975dd1d7e0acf59f1ae+ digest: sha256:dc9ad6c05acc7a88e5b71bde60a5fe3bd4b9f0db209011711b464107438a8107label:- org.opencontainers.image.base.name: docker.io/golang:1.26-alpine+ org.opencontainers.image.base.name: docker.io/golang:1.26-bookwormorg.opencontainers.image.stage: builder- org.opencontainers.image.base.digest: sha256:51a7c389a5ddaf82f527191a1e9bff9928655130a44e4975dd1d7e0acf59f1ae+ org.opencontainers.image.base.digest: sha256:dc9ad6c05acc7a88e5b71bde60a5fe3bd4b9f0db209011711b464107438a8107workdir: /go/src/app- arg:- TARGETOS: ''- TARGETARCH: ''env:- CGO_ENABLED: '0'TZ: UTC+ CGO_ENABLED: '1'copy:- paths:- .target: .run:- - apk add --no-cache tzdata- go mod download- - GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -trimpath -ldflags "-s -w" -o private-location ./cmd/server+ - go build -trimpath -ldflags "-s -w" -o private-location ./cmd/serverfromImage:- path: alpine- digest: sha256:ce64758a109eb420d874a118f87920e625e12d3634e03b4a5573fd9f6e5d3507+ path: debian+ digest: sha256:7c7b2c966bc9ee8cedfeef67e0e279108992c77681fa595db4a9d65c06ccc587label:+ org.opencontainers.image.description: Private location orchestrator for OpenStatus+ org.opencontainers.image.authors: OpenStatus Teamio.dofigen.version: 2.8.0- org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus+ org.opencontainers.image.base.name: docker.io/debian:bookworm-slimorg.opencontainers.image.vendor: OpenStatus- org.opencontainers.image.base.name: docker.io/alpine:3.21- org.opencontainers.image.base.digest: sha256:ce64758a109eb420d874a118f87920e625e12d3634e03b4a5573fd9f6e5d3507- org.opencontainers.image.description: Private location orchestrator for OpenStatusorg.opencontainers.image.title: OpenStatus Private Location- org.opencontainers.image.authors: OpenStatus Team+ org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus+ org.opencontainers.image.base.digest: sha256:7c7b2c966bc9ee8cedfeef67e0e279108992c77681fa595db4a9d65c06ccc587user:user: '1000'group: '1000'@@ -56,12 +52,17 @@ effective: |paths:- /go/src/app/private-locationtarget: /opt/bin/private-location+ root:+ run:+ - apt-get update+ - apt-get install -y --no-install-recommends wget+ - rm -rf /var/lib/apt/lists/*cmd:- /opt/bin/private-locationexpose:- port: 8080healthcheck:- cmd: wget --spider -q http://localhost:8080/health || exit 1+ cmd: wget -q -O /dev/null http://localhost:8080/health || exit 1interval: 15stimeout: 10sstart: 30s@@ -69,44 +70,40 @@ effective: |images:docker.io:library:- alpine:- '3.21':- digest: sha256:ce64758a109eb420d874a118f87920e625e12d3634e03b4a5573fd9f6e5d3507golang:- 1.26-alpine:- digest: sha256:51a7c389a5ddaf82f527191a1e9bff9928655130a44e4975dd1d7e0acf59f1ae+ 1.26-bookworm:+ digest: sha256:dc9ad6c05acc7a88e5b71bde60a5fe3bd4b9f0db209011711b464107438a8107+ debian:+ bookworm-slim:+ digest: sha256:7c7b2c966bc9ee8cedfeef67e0e279108992c77681fa595db4a9d65c06ccc587resources:dofigen.yml:- hash: acc14b01834402aab4f21cd4a168169eb464731acaa35ab27f1eaa2fd2cbdd28+ hash: d04fca5247e646329f8612305da818b8d5ae47f9bae8c811690e0a61dd819b5dcontent: |builders:# Stage 1: Build Go binarybuilder:- fromImage: golang:1.26-alpine- platform: $BUILDPLATFORM+ # go-libsql links a prebuilt glibc static library through cgo, so build+ # natively on Debian for each target platform (no cross-compilation).+ fromImage: golang:1.26-bookwormlabel:org.opencontainers.image.stage: builderworkdir: /go/src/app- # Build-time arguments (overwritten by .env.docker at runtime)- args:- TARGETOS: ""- TARGETARCH: ""env:TZ: UTC- CGO_ENABLED: "0"+ CGO_ENABLED: "1"copy:# Copy source code- . .run:- - apk add --no-cache tzdata- go mod download# Build optimized binary# -trimpath: Remove file system paths from binary# -ldflags "-s -w": Strip debug info and symbol table- - GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -trimpath -ldflags "-s -w" -o private-location ./cmd/server+ - go build -trimpath -ldflags "-s -w" -o private-location ./cmd/server- # Runtime stage- fromImage: alpine:3.21+ # Runtime stage (glibc, required by go-libsql)+ fromImage: debian:bookworm-slim# Metadata labelslabel:@@ -129,6 +126,13 @@ resources:source: /go/src/app/private-locationtarget: /opt/bin/private-location+ # wget is used by the healthcheck+ root:+ run:+ - apt-get update+ - apt-get install -y --no-install-recommends wget+ - rm -rf /var/lib/apt/lists/*+env:TZ: UTCUSER: "1000"@@ -146,7 +150,7 @@ resources:timeout: 10sstart: 30sretries: 3- cmd: wget --spider -q http://localhost:8080/health || exit 1+ cmd: wget -q -O /dev/null http://localhost:8080/health || exit 1# Start applicationcmd:diff --git a/apps/private-location/dofigen.yml b/apps/private-location/dofigen.ymlindex 7a6fa8463..e50821de7 100644--- a/apps/private-location/dofigen.yml+++ b/apps/private-location/dofigen.yml@@ -1,31 +1,27 @@builders:# Stage 1: Build Go binarybuilder:- fromImage: golang:1.26-alpine- platform: $BUILDPLATFORM+ # go-libsql links a prebuilt glibc static library through cgo, so build+ # natively on Debian for each target platform (no cross-compilation).+ fromImage: golang:1.26-bookwormlabel:org.opencontainers.image.stage: builderworkdir: /go/src/app- # Build-time arguments (overwritten by .env.docker at runtime)- args:- TARGETOS: ""- TARGETARCH: ""env:TZ: UTC- CGO_ENABLED: "0"+ CGO_ENABLED: "1"copy:# Copy source code- . .run:- - apk add --no-cache tzdata- go mod download# Build optimized binary# -trimpath: Remove file system paths from binary# -ldflags "-s -w": Strip debug info and symbol table- - GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -trimpath -ldflags "-s -w" -o private-location ./cmd/server+ - go build -trimpath -ldflags "-s -w" -o private-location ./cmd/server-# Runtime stage-fromImage: alpine:3.21+# Runtime stage (glibc, required by go-libsql)+fromImage: debian:bookworm-slim# Metadata labelslabel:@@ -48,6 +44,13 @@ copy:source: /go/src/app/private-locationtarget: /opt/bin/private-location+# wget is used by the healthcheck+root:+ run:+ - apt-get update+ - apt-get install -y --no-install-recommends wget+ - rm -rf /var/lib/apt/lists/*+env:TZ: UTCUSER: "1000"@@ -65,7 +68,7 @@ healthcheck:timeout: 10sstart: 30sretries: 3- cmd: wget --spider -q http://localhost:8080/health || exit 1+ cmd: wget -q -O /dev/null http://localhost:8080/health || exit 1# Start applicationcmd:diff --git a/apps/private-location/go.mod b/apps/private-location/go.modindex ad5d31c68..b64d727d0 100644--- a/apps/private-location/go.mod+++ b/apps/private-location/go.mod@@ -9,10 +9,10 @@ require (github.com/google/uuid v1.6.0github.com/jmoiron/sqlx v1.4.0github.com/joho/godotenv v1.5.1- github.com/mattn/go-sqlite3 v1.14.22+ github.com/libsql/sqlite-antlr4-parser v0.0.0-20240327125255-dbf53b6cbf06github.com/openstatushq/openstatus/apps/checker v0.0.0-20251012205355-e366f661c23egithub.com/stretchr/testify v1.11.1- github.com/tursodatabase/libsql-client-go v0.0.0-20240902231107-85af5b9d094d+ github.com/tursodatabase/go-libsql v0.0.0-20260424063416-3051e37e6e04go.opentelemetry.io/contrib/bridges/otelslog v0.14.0go.opentelemetry.io/otel v1.39.0go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.15.0@@ -27,7 +27,6 @@ require (github.com/antlr4-go/antlr/v4 v4.13.0 // indirectgithub.com/cenkalti/backoff/v5 v5.0.3 // indirectgithub.com/cespare/xxhash/v2 v2.3.0 // indirect- github.com/coder/websocket v1.8.12 // indirectgithub.com/davecgh/go-spew v1.1.1 // indirectgithub.com/go-logr/logr v1.4.3 // indirectgithub.com/go-logr/stdr v1.2.2 // indirectdiff --git a/apps/private-location/go.sum b/apps/private-location/go.sumindex fbb747a8e..4f5d71fb2 100644--- a/apps/private-location/go.sum+++ b/apps/private-location/go.sum@@ -10,8 +10,6 @@ github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xgithub.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=github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=@@ -45,6 +43,8 @@ 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/libsql/sqlite-antlr4-parser v0.0.0-20240327125255-dbf53b6cbf06 h1:JLvn7D+wXjH9g4Jsjo+VqmzTUpl/LX7vfr6VOfSWTdM=+github.com/libsql/sqlite-antlr4-parser v0.0.0-20240327125255-dbf53b6cbf06/go.mod h1:FUkZ5OHjlGPjnM2UyGJz9TypXQFgYqw6AFNO1UiROTM=github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=@@ -55,6 +55,7 @@ github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5ogithub.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=github.com/openstatushq/openstatus/apps/checker v0.0.0-20251012205355-e366f661c23e h1:54C0zQNHzGszQseO2QcNzM8fL7vyAYk03pRtrJIyoV0=github.com/openstatushq/openstatus/apps/checker v0.0.0-20251012205355-e366f661c23e/go.mod h1:R84xAJYFys7XOZTDk/AyjJi4Ga9ovtLhJsfTLgTsYKg=+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=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=@@ -65,8 +66,8 @@ github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=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=+github.com/tursodatabase/go-libsql v0.0.0-20260424063416-3051e37e6e04 h1:9nlqEMruvXDPynGbZ0RE67kKnkkg3NdnjGccvRABefc=+github.com/tursodatabase/go-libsql v0.0.0-20260424063416-3051e37e6e04/go.mod h1:TjsB2miB8RW2Sse8sdxzVTdeGlx74GloD5zJYUC38d8=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=@@ -95,6 +96,8 @@ golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/ygolang.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/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=+golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=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=@@ -117,3 +120,5 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNgopkg.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=+gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=+gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=diff --git a/apps/private-location/internal/database/database.go b/apps/private-location/internal/database/database.goindex bb0cecd07..eed40a42b 100644--- a/apps/private-location/internal/database/database.go+++ b/apps/private-location/internal/database/database.go@@ -3,11 +3,21 @@ package databaseimport ("database/sql""fmt"+ "net/url""os"+ "time""github.com/jmoiron/sqlx"_ "github.com/joho/godotenv/autoload"- _ "github.com/tursodatabase/libsql-client-go/libsql"+ _ "github.com/tursodatabase/go-libsql"+)++const (+ // Bound the pool so bursts of concurrent ingests can't open an unbounded+ // number of remote libSQL connections (see #2861).+ maxOpenConns = 16+ maxIdleConns = 16+ connMaxIdleTime = time.Minute)var (@@ -23,19 +33,41 @@ func New() *sqlx.DB {return dbInstance}- url := fmt.Sprintf("%s?auth_token=%s", dbUrl, authToken)- c, err := sql.Open("libsql", url)+ db, err := Open(dbUrl, authToken)if err != nil {- fmt.Fprintf(os.Stderr, "failed to open db %s: %s", url, err)+ fmt.Fprintf(os.Stderr, "failed to open db %s: %s", dbUrl, err)os.Exit(1)}-- db := sqlx.NewDb(c, "sqlite3")dbInstance = dbreturn db}+// Open opens a libSQL database with a bounded connection pool.+// dsn can be a remote URL (libsql://, http://, https://) or a local file: URL.+func Open(dsn string, token string) (*sqlx.DB, error) {+ if token != "" {+ u, err := url.Parse(dsn)+ if err != nil {+ return nil, err+ }+ q := u.Query()+ q.Set("authToken", token)+ u.RawQuery = q.Encode()+ dsn = u.String()+ }++ c, err := sql.Open("libsql", dsn)+ if err != nil {+ return nil, err+ }+ c.SetMaxOpenConns(maxOpenConns)+ c.SetMaxIdleConns(maxIdleConns)+ c.SetConnMaxIdleTime(connMaxIdleTime)++ return sqlx.NewDb(c, "sqlite3"), nil+}+// Close closes the database connection.func Close() error {if dbInstance != nil {diff --git a/apps/private-location/internal/server/ingest_common.go b/apps/private-location/internal/server/ingest_common.goindex 8b4e3c5f8..26cb011de 100644--- a/apps/private-location/internal/server/ingest_common.go+++ b/apps/private-location/internal/server/ingest_common.go@@ -7,6 +7,9 @@ import ("github.com/openstatushq/openstatus/apps/private-location/internal/database")+// dbTimeout bounds how long a single query waits for a pooled connection and runs.+const dbTimeout = 5 * time.Second+// ingestContext holds common data needed for ingestiontype ingestContext struct {Monitor database.Monitor@@ -15,8 +18,11 @@ type ingestContext struct {// getIngestContext retrieves monitor and private location data for ingestionfunc (h *privateLocationHandler) getIngestContext(ctx context.Context, token string, monitorID string) (*ingestContext, error) {+ monitorCtx, cancelMonitor := context.WithTimeout(ctx, dbTimeout)+ defer cancelMonitor()+var monitor database.Monitor- err := h.db.Get(&monitor, "SELECT monitor.id, monitor.workspace_id, monitor.url, monitor.method, monitor.assertions FROM monitor JOIN private_location_to_monitor a ON monitor.id = a.monitor_id JOIN private_location b ON a.private_location_id = b.id WHERE b.token = ? AND monitor.deleted_at IS NULL and monitor.id = ?", token, monitorID)+ err := h.db.GetContext(monitorCtx, &monitor, "SELECT monitor.id, monitor.workspace_id, monitor.url, monitor.method, monitor.assertions FROM monitor JOIN private_location_to_monitor a ON monitor.id = a.monitor_id JOIN private_location b ON a.private_location_id = b.id WHERE b.token = ? AND monitor.deleted_at IS NULL and monitor.id = ?", token, monitorID)if err != nil {if holder := GetEvent(ctx); holder != nil {holder.Event["error"] = map[string]any{@@ -29,7 +35,9 @@ func (h *privateLocationHandler) getIngestContext(ctx context.Context, token str}var region database.PrivateLocation- err = h.db.Get(®ion, "SELECT private_location.id FROM private_location join private_location_to_monitor a ON private_location.id = a.private_location_id WHERE a.monitor_id = ? AND private_location.token = ?", monitor.ID, token)+ regionCtx, cancelRegion := context.WithTimeout(ctx, dbTimeout)+ defer cancelRegion()+ err = h.db.GetContext(regionCtx, ®ion, "SELECT private_location.id FROM private_location join private_location_to_monitor a ON private_location.id = a.private_location_id WHERE a.monitor_id = ? AND private_location.token = ?", monitor.ID, token)if err != nil {if holder := GetEvent(ctx); holder != nil {holder.Event["error"] = map[string]any{@@ -68,7 +76,10 @@ func (h *privateLocationHandler) sendEventAndUpdateLastSeen(ctx context.Context,}}- _, dbErr := h.db.NamedExec("UPDATE private_location SET last_seen_at = :last_seen_at WHERE id = :id", map[string]any{+ // Detached from the request so a cancelled probe still records last_seen_at.+ dbCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), dbTimeout)+ defer cancel()+ _, dbErr := h.db.NamedExecContext(dbCtx, "UPDATE private_location SET last_seen_at = :last_seen_at WHERE id = :id", map[string]any{"last_seen_at": time.Now().Unix(),"id": regionID,})diff --git a/apps/private-location/internal/server/ingest_http_test.go b/apps/private-location/internal/server/ingest_http_test.goindex 00b07fd4e..589699c4b 100644--- a/apps/private-location/internal/server/ingest_http_test.go+++ b/apps/private-location/internal/server/ingest_http_test.go@@ -12,7 +12,8 @@ import ("connectrpc.com/connect""github.com/jmoiron/sqlx"- _ "github.com/mattn/go-sqlite3"+ "github.com/libsql/sqlite-antlr4-parser/sqliteparserutils"+ "github.com/openstatushq/openstatus/apps/private-location/internal/database""github.com/openstatushq/openstatus/apps/private-location/internal/server""github.com/openstatushq/openstatus/apps/private-location/internal/tinybird""github.com/openstatushq/openstatus/apps/private-location/internal/workflows"@@ -26,12 +27,27 @@ func testDB() *sqlx.DB {if err != nil {log.Fatalln(err)}- db, err := sqlx.Connect("sqlite3", f.Name())+ db, err := database.Open("file:"+f.Name(), "")if err != nil {log.Fatalln(err)}+ // libSQL enforces foreign keys by default and the fixture isn't insert-ordered.+ // The pragma is per-connection, so pin the pool to a single connection.+ db.SetMaxOpenConns(1)+ db.MustExec("PRAGMA foreign_keys = OFF")+dat, err := os.ReadFile("./db_testdata")- db.MustExec(string(dat))+ if err != nil {+ log.Fatalln(err)+ }+ // libSQL executes a single statement per call, so run the fixture one statement at a time.+ stmts, info := sqliteparserutils.SplitStatement(string(dat))+ if info.IncompleteCreateTriggerStatement || info.IncompleteMultilineComment {+ log.Fatalln("db_testdata ends with an incomplete statement")+ }+ for _, stmt := range stmts {+ db.MustExec(stmt)+ }return db}diff --git a/apps/private-location/internal/server/monitors.go b/apps/private-location/internal/server/monitors.goindex 29d4f47d2..d09ab7530 100644--- a/apps/private-location/internal/server/monitors.go+++ b/apps/private-location/internal/server/monitors.go@@ -181,8 +181,11 @@ func (h *privateLocationHandler) Monitors(ctx context.Context, req *connect.Requreturn nil, connect.NewError(connect.CodeUnauthenticated, ErrMissingToken)}+ locationCtx, cancelLocation := context.WithTimeout(ctx, dbTimeout)+ defer cancelLocation()+var location database.PrivateLocation- if err := h.db.Get(&location, "SELECT id, name FROM private_location WHERE token = ?", token); err != nil {+ if err := h.db.GetContext(locationCtx, &location, "SELECT id, name FROM private_location WHERE token = ?", token); err != nil {// An unknown token used to fall through to an empty monitor list, so a// probe configured with a typo looked healthy while checking nothing.if errors.Is(err, sql.ErrNoRows) {@@ -191,8 +194,11 @@ func (h *privateLocationHandler) Monitors(ctx context.Context, req *connect.Requreturn nil, connect.NewError(connect.CodeInternal, err)}+ monitorsCtx, cancelMonitors := context.WithTimeout(ctx, dbTimeout)+ defer cancelMonitors()+var monitors []database.Monitor- err := h.db.Select(&monitors, "SELECT monitor.id, monitor.job_type, monitor.url, monitor.periodicity, monitor.method, monitor.body, monitor.timeout, monitor.degraded_after, monitor.follow_redirects, monitor.headers, monitor.assertions, monitor.workspace_id, monitor.retry, monitor.otel_endpoint, monitor.otel_headers, monitor.grpc_service, monitor.grpc_tls FROM monitor JOIN private_location_to_monitor a ON monitor.id = a.monitor_id JOIN private_location b ON a.private_location_id = b.id WHERE b.token = ? AND monitor.deleted_at IS NULL and monitor.active = 1", token)+ err := h.db.SelectContext(monitorsCtx, &monitors, "SELECT monitor.id, monitor.job_type, monitor.url, monitor.periodicity, monitor.method, monitor.body, monitor.timeout, monitor.degraded_after, monitor.follow_redirects, monitor.headers, monitor.assertions, monitor.workspace_id, monitor.retry, monitor.otel_endpoint, monitor.otel_headers, monitor.grpc_service, monitor.grpc_tls FROM monitor JOIN private_location_to_monitor a ON monitor.id = a.monitor_id JOIN private_location b ON a.private_location_id = b.id WHERE b.token = ? AND monitor.deleted_at IS NULL and monitor.active = 1", token)if err != nil {return nil, connect.NewError(connect.CodeInternal, err)}