feat(app): export PublicHandler + StartBackground for in-process embedding

The unified cloud binary constructs the o11y runtime in-process and serves /v1/o11y/* through its own HTTP stack (o11y.SetHandler), instead of running a standalone Deployment behind a reverse proxy. Two accessors complete the embedding contract documented in mount.go: - PublicHandler() exposes the fully-wired public router (middleware + routes) that createPublicServer builds — the exact handler Start binds on the query listener — so the embedder serves byte-identical /v1/o11y/* surface. - StartBackground(ctx) runs the alert rule manager only, without binding the query HTTP / pprof / OpAMP listeners the embedding host does not want. Maintenance patch off v1.3.12 (the version cloud pins). No behavior change for the standalone server.
feat(o11y): migrate hanzoai/zip -> zap-proto/zip on cloud-compatible v1.3.7 base
2026-07-04 20:57:30 -07:00 · 2026-07-02 02:21:47 -07:00 · 2026-06-08 16:04:25 -07:00
12 changed files with 101 additions and 618 deletions
@@ -1,6 +1,6 @@
 module github.com/hanzoai/o11y

-go 1.26.3
+go 1.26.4

 require (
 	dario.cat/mergo v1.0.2
@@ -28,7 +28,6 @@ require (
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
 	github.com/hanzoai/cloud v0.0.0-20260519060517-1e48ac6d14e3
 	github.com/hanzoai/common v0.67.7
-	github.com/hanzoai/zip v0.1.0
 	github.com/huandu/go-sqlbuilder v1.35.0
 	github.com/json-iterator/go v1.1.13-0.20220915233716-71ac16282d12
 	github.com/knadh/koanf/parsers/json v1.0.0
@@ -47,7 +46,6 @@ require (
 	github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/alertmanager v0.31.0
-	github.com/prometheus/client_golang v1.23.2
 	github.com/redis/go-redis/extra/redisotel/v9 v9.15.1
 	github.com/redis/go-redis/v9 v9.17.2
 	github.com/rs/cors v1.11.1
@@ -66,6 +64,7 @@ require (
 	github.com/uptrace/bun/dialect/pgdialect v1.2.9
 	github.com/uptrace/bun/dialect/sqlitedialect v1.2.9
 	github.com/uptrace/bun/extra/bunotel v1.2.9
+	github.com/zap-proto/zip v1.1.0
 	go.opentelemetry.io/collector/confmap v1.51.0
 	go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.63.0
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0
@@ -107,6 +106,9 @@ require (
 	github.com/bytedance/sonic/loader v0.5.1 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/cloudwego/base64x v0.1.6 // indirect
+	github.com/dlclark/regexp2/v2 v2.2.1 // indirect
+	github.com/dop251/goja v0.0.0-20260607120635-348e6bea910d // indirect
+	github.com/evanw/esbuild v0.28.1 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.13 // indirect
 	github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
 	github.com/go-openapi/swag/conv v0.25.4 // indirect
@@ -122,6 +124,7 @@ require (
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.30.2 // indirect
+	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
 	github.com/goccy/go-yaml v1.19.2 // indirect
 	github.com/gofiber/fiber/v3 v3.2.0 // indirect
 	github.com/gofiber/schema v1.7.1 // indirect
@@ -129,6 +132,8 @@ require (
 	github.com/google/pprof v0.0.0-20260202012954-cb029daf43ef // indirect
 	github.com/gorilla/rpc v1.2.1 // indirect
 	github.com/grandcat/zeroconf v1.0.0 // indirect
+	github.com/hanzoai/exporter-toolkit v0.15.2 // indirect
+	github.com/hanzoai/sigv4 v0.4.2 // indirect
 	github.com/hashicorp/go-metrics v0.5.4 // indirect
 	github.com/knadh/koanf/maps v0.1.2 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
@@ -137,7 +142,6 @@ require (
 	github.com/mattn/go-isatty v0.0.21 // indirect
 	github.com/ncruces/go-strftime v1.0.0 // indirect
 	github.com/philhofer/fwd v1.2.0 // indirect
-	github.com/prometheus/common v0.67.5 // indirect
 	github.com/redis/go-redis/extra/rediscmd/v9 v9.15.1 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/swaggest/refl v1.4.0 // indirect
@@ -148,6 +152,8 @@ require (
 	github.com/uptrace/opentelemetry-go-extra/otelsql v0.3.2 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.70.0 // indirect
+	github.com/zap-proto/go v1.3.0 // indirect
+	github.com/zap-proto/http v0.1.0 // indirect
 	go.mongodb.org/mongo-driver/v2 v2.5.0 // indirect
 	go.opentelemetry.io/collector/internal/componentalias v0.145.0 // indirect
 	go.opentelemetry.io/collector/pdata v1.51.0 // indirect
@@ -165,10 +171,8 @@ require (
 	github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
 	github.com/andybalholm/brotli v1.2.1 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
 	github.com/coder/quartz v0.3.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.6.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -197,7 +201,6 @@ require (
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.1.3 // indirect
 	github.com/gopherjs/gopherjs v1.17.2 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-msgpack/v2 v2.1.5 // indirect
@@ -212,7 +215,6 @@ require (
 	github.com/jessevdk/go-flags v1.6.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/klauspost/compress v1.18.5 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
@@ -225,8 +227,6 @@ require (
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
 	github.com/oklog/run v1.2.0 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/oklog/ulid/v2 v2.1.1
@@ -236,10 +236,6 @@ require (
 	github.com/pelletier/go-toml/v2 v2.3.0 // indirect
 	github.com/pierrec/lz4/v4 v4.1.26 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/exporter-toolkit v0.15.1 // indirect
-	github.com/prometheus/procfs v0.20.1 // indirect
-	github.com/prometheus/sigv4 v0.4.1 // indirect
 	github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
 	github.com/segmentio/asm v1.2.1 // indirect
@@ -264,20 +260,12 @@ require (
 	go.opentelemetry.io/collector/extension/xextension v0.144.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.51.0 // indirect
 	go.opentelemetry.io/collector/semconv v0.128.1-0.20250610090210-188191247685
-	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.65.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.10.0 // indirect
 	go.uber.org/mock v0.6.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/mod v0.34.0 // indirect
 	golang.org/x/sys v0.43.0 // indirect
 	golang.org/x/time v0.15.0 // indirect
 	golang.org/x/tools v0.43.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
-	google.golang.org/grpc v1.80.0 // indirect
 	gopkg.in/telebot.v3 v3.3.8 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
@@ -300,3 +288,5 @@ exclude github.com/knadh/koanf v1.5.0
 exclude github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83

 exclude github.com/ugorji/go v1.1.4
+
+replace github.com/prometheus/alertmanager => github.com/hanzoai/alertmanager v0.28.2
@@ -68,6 +68,8 @@ github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7Oputl
 github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/datadog-go v3.7.1+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/Masterminds/semver/v3 v3.5.0 h1:kQceYJfbupGfZOKZQg0kou0DgAKhzDg2NZPAwZ/2OOE=
+github.com/Masterminds/semver/v3 v3.5.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/SigNoz/expr v1.17.7-beta h1:FyZkleM5dTQ0O6muQfwGpoH5A2ohmN/XTasRCO72gAA=
 github.com/SigNoz/expr v1.17.7-beta/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
@@ -153,8 +155,6 @@ github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEe
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-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/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -195,8 +195,12 @@ github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da h1:aIftn67I1fkbMa5
 github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/dlclark/regexp2/v2 v2.2.1 h1:mf4KkFUj0gJuarK8P+LgiS+Lit7m9N1yAwEfPbee7R0=
+github.com/dlclark/regexp2/v2 v2.2.1/go.mod h1:avUrQvPaLz2DrFNHJF0taWAFFX2C1GMSSoeiqFjcBmU=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/dop251/goja v0.0.0-20260607120635-348e6bea910d h1:xbM5U2EvWKkHxzEQJ2DEn20FwolWZahuTnVHr6WL3Q4=
+github.com/dop251/goja v0.0.0-20260607120635-348e6bea910d/go.mod h1:Sc+QOu1WruvaaeT/cxFez/pXHpI9ZDjg/E8QNfSVveI=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
@@ -216,6 +220,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanw/esbuild v0.28.1 h1:ds+yuRyUaZGx++GR56CrCeuXh8PVhVM4xq8v7PNELFc=
+github.com/evanw/esbuild v0.28.1/go.mod h1:D2vIQZqV/vIf/VRHtViaUtViZmG7o+kKmlBfVQuRi48=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
@@ -314,6 +320,8 @@ github.com/go-playground/validator/v10 v10.30.2 h1:JiFIMtSSHb2/XBUbWM4i/MpeQm9ZK
 github.com/go-playground/validator/v10 v10.30.2/go.mod h1:mAf2pIOVXjTEBrwUMGKkCWKKPs9NheYGabeB04txQSc=
 github.com/go-redis/redismock/v9 v9.2.0 h1:ZrMYQeKPECZPjOj5u9eyOjg8Nnb0BS9lkVIZ6IpsKLw=
 github.com/go-redis/redismock/v9 v9.2.0/go.mod h1:18KHfGDK4Y6c2R0H38EUGWAdc7ZQS9gfYxc94k7rWT0=
+github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
+github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=
 github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
@@ -443,14 +451,16 @@ github.com/grandcat/zeroconf v1.0.0 h1:uHhahLBKqwWBV6WZUDAT71044vwOTL+McW0mBJvo6
 github.com/grandcat/zeroconf v1.0.0/go.mod h1:lTKmG1zh86XyCoUeIHSA4FJMBwCJiQmGfcP2PdzytEs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
+github.com/hanzoai/alertmanager v0.28.2 h1:40fm5ZDq4MZ7CJwPb7AHVa1DU9kHK5lgMuJUJK7frT4=
+github.com/hanzoai/alertmanager v0.28.2/go.mod h1:SOwWSWO7p9CaBKr+bp1IrPfTPjftxp+cnyBK9GhgJFs=
 github.com/hanzoai/cloud v0.0.0-20260519060517-1e48ac6d14e3 h1:PqJ0LRSRsvNl02MX9uknaalVAotWZXREFyy/cjA+zaM=
 github.com/hanzoai/cloud v0.0.0-20260519060517-1e48ac6d14e3/go.mod h1:d9Nw4Nr1iLc5UbDJugzOrYpylEWLBbjixE5mhOhGXnk=
 github.com/hanzoai/common v0.67.7 h1:6LAzDF4MOPVE6TvtA7gtYRvWESCTI5g0Hsqhe00XTd4=
 github.com/hanzoai/common v0.67.7/go.mod h1:5bHRjMM3zyieuv0xi4S4HRlC2drcyfPGVJRQUT8moQo=
-github.com/hanzoai/zip v0.1.0 h1:rsGLHl0cr7EBvp2EQk6KoEizBpOvgU7Uv0JP9GJ7cnw=
-github.com/hanzoai/zip v0.1.0/go.mod h1:3G+k2wy5bQ1wld66m0OPH8/LJ0kgIeNi1KPymMmlbf4=
+github.com/hanzoai/exporter-toolkit v0.15.2 h1:RdnKP6wAgvC1aiQUU7Q6zOD11B7eNjsI2Y7TyGYMeCw=
+github.com/hanzoai/exporter-toolkit v0.15.2/go.mod h1:oBqGFmpt+4OMz6/vYcjAvQuip44gAKtjsiD+cMdXdew=
+github.com/hanzoai/sigv4 v0.4.2 h1:54Rf9+beoz8qbsEPHRV12t6nRsdQVl5MeC5rM/CTPCA=
+github.com/hanzoai/sigv4 v0.4.2/go.mod h1:XK0PvD8QWO8ivnSftKRCvjk8M5jjhOMUeyF4Wm+ZFYY=
 github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
 github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -519,7 +529,6 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -581,8 +590,8 @@ github.com/luxfi/mdns v0.1.0 h1:VB3mQcETc9j5SY1S6lAgFtuGr/rjWuDgPYnxS+OKWMQ=
 github.com/luxfi/mdns v0.1.0/go.mod h1:/3dheKVjUk2yiS/ocH1IDzeLXOIe+kpVsErIGDOZdiQ=
 github.com/luxfi/metric v1.5.7 h1:LoSPEUpak2SLcynF+LT2cXjl9ECp4nY+Lia9zudmDv4=
 github.com/luxfi/metric v1.5.7/go.mod h1:CMguEhyuLi4YUWyXimJ+UHply99BDFrL0pxedB7rBqM=
-github.com/luxfi/zap v0.2.0 h1:RzvOkp3EoN5UCkpnqfObHLM1sEHy7YcxXKuermhE/VA=
-github.com/luxfi/zap v0.2.0/go.mod h1:2hydPSa/XMCMtfW6/DC9M5Bt03N5h75QwCV5Vypsqr4=
+github.com/luxfi/pq v1.0.3 h1:pFlQm1+5FuKTDUh2y/23bXWkN4I2Rc5iuxJypwDFFMs=
+github.com/luxfi/pq v1.0.3/go.mod h1:8bppZcRElfrVt0n3nYCZW3iX1TvhvzNbdjNdK1irgIE=
 github.com/luxfi/zap v0.6.0 h1:baVcYKeqaNemGisYFtYtfIvVLW4hRXZo3wlXtOkk7NM=
 github.com/luxfi/zap v0.6.0/go.mod h1:1SDWtb4B3kxkd3VKLDae0x7lMtlvAsWLQxhhNIYsePI=
 github.com/magefile/mage v1.15.1-0.20241126214340-bdc92f694516 h1:aAO0L0ulox6m/CLRYvJff+jWXYYCKGpEm3os7dM/Z+M=
@@ -640,7 +649,6 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWu
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
 github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
@@ -690,8 +698,6 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/prometheus/alertmanager v0.31.0 h1:DQW02uIUNNiAa9AD9VA5xaFw5D+xrV+bocJc4gN9bEU=
-github.com/prometheus/alertmanager v0.31.0/go.mod h1:zWPQwhbLt2ybee8rL921UONeQ59Oncash+m/hGP17tU=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
@@ -711,8 +717,6 @@ github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB8
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTUGI4=
 github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw=
-github.com/prometheus/exporter-toolkit v0.15.1 h1:XrGGr/qWl8Gd+pqJqTkNLww9eG8vR/CoRk0FubOKfLE=
-github.com/prometheus/exporter-toolkit v0.15.1/go.mod h1:P/NR9qFRGbCFgpklyhix9F6v6fFr/VQB/CVsrMDGKo4=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
@@ -720,8 +724,6 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.20.1 h1:XwbrGOIplXW/AU3YhIhLODXMJYyC1isLFfYCsTEycfc=
 github.com/prometheus/procfs v0.20.1/go.mod h1:o9EMBZGRyvDrSPH1RqdxhojkuXstoe4UlK79eF5TGGo=
-github.com/prometheus/sigv4 v0.4.1 h1:EIc3j+8NBea9u1iV6O5ZAN8uvPq2xOIUPcqCTivHuXs=
-github.com/prometheus/sigv4 v0.4.1/go.mod h1:eu+ZbRvsc5TPiHwqh77OWuCnWK73IdkETYY46P4dXOU=
 github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++5Fg=
 github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
@@ -875,6 +877,12 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/zap-proto/go v1.3.0 h1:S3rMoawwhH/BbSZ4G8zG05hJoQnMSMDPzIq75diCTqE=
+github.com/zap-proto/go v1.3.0/go.mod h1:914SNGTH6Rv3Yu1MweWJBPEN8FZlo5C39QyhaB0C7Q0=
+github.com/zap-proto/http v0.1.0 h1:aA8NmU/a0yM7QFU5tjXPYHFiBUcoHn92wjMy181o50M=
+github.com/zap-proto/http v0.1.0/go.mod h1:UYfGhDDCetgxs65XSev8Lpf65COg5vKQK+cWwZGh4zQ=
+github.com/zap-proto/zip v1.1.0 h1:JDIVblpbbutKHt+wzVr4VACyJZwytGuR1aMuyQqOhnw=
+github.com/zap-proto/zip v1.1.0/go.mod h1:8ENateaAvSg2ACuO4B03ntl8dGeWxnpXpOc9zRDhZPA=
 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
 go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU=
@@ -915,18 +923,10 @@ go.opentelemetry.io/collector/semconv v0.128.1-0.20250610090210-188191247685 h1:
 go.opentelemetry.io/collector/semconv v0.128.1-0.20250610090210-188191247685/go.mod h1:OPXer4l43X23cnjLXIZnRj/qQOjSuq4TgBLI76P9hns=
 go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.63.0 h1:rATLgFjv0P9qyXQR/aChJ6JVbMtXOQjt49GgT36cBbk=
 go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.63.0/go.mod h1:34csimR1lUhdT5HH4Rii9aKPrvBcnFRwxLwcevsU+Kk=
-go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.65.0 h1:ab5U7DpTjjN8pNgwqlA/s0Csb+N2Raqo9eTSDhfg4Z8=
-go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.65.0/go.mod h1:nwFJC46Dxhqz5R9k7IV8To/Z46JPvW+GNKhTxQQlUzg=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 h1:7iP2uCb7sGddAr30RRS6xjKy7AZ2JtTOPA3oolgVSw8=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0/go.mod h1:c7hN3ddxs/z6q9xwvfLPk+UHlWRQyaeR1LdgfL/66l0=
 go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
 go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 h1:88Y4s2C8oTui1LGM6bTWkw0ICGcOLCAI5l6zsD1j20k=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0/go.mod h1:Vl1/iaggsuRlrHf/hfPJPvVag77kKyvrLeD10kpMl+A=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 h1:DvJDOPmSWQHWywQS6lKL+pb8s3gBLOZUtw4N+mavW1I=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0/go.mod h1:EtekO9DEJb4/jRyN4v4Qjc2yA7AtfCBuz2FynRUWTXs=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 h1:3iZJKlCZufyRzPzlQhUIWVmfltrXuGyfjREgGP3UUjc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0/go.mod h1:/G+nUPfhq2e+qiXMGxMwumDrP5jtzU+mWN7/sjT2rak=
 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.39.0 h1:8UPA4IbVZxpsD76ihGOQiFml99GPAEZLohDXvqHdi6U=
 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.39.0/go.mod h1:MZ1T/+51uIVKlRzGw1Fo46KEWThjlCBZKl2LzY5nv4g=
 go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
@@ -938,8 +938,6 @@ go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHS
 go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
 go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=
-go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk=
 go.opentelemetry.io/proto/slim/otlp v1.9.0 h1:fPVMv8tP3TrsqlkH1HWYUpbCY9cAIemx184VGkS6vlE=
 go.opentelemetry.io/proto/slim/otlp v1.9.0/go.mod h1:xXdeJJ90Gqyll+orzUkY4bOd2HECo5JofeoLpymVqdI=
 go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development v0.2.0 h1:o13nadWDNkH/quoDomDUClnQBpdQQ2Qqv0lQBjIXjE8=
@@ -1178,6 +1176,7 @@ golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
 golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -1265,8 +1264,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
-gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -1391,10 +1388,6 @@ google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX
 google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
 google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
 google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
-google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -1425,8 +1418,6 @@ google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ5
 google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
 google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
 google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
-google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -5,7 +5,7 @@ import (
 	"sync"

 	"github.com/hanzoai/cloud"
-	"github.com/hanzoai/zip"
+	"github.com/zap-proto/zip"
 	luxlog "github.com/luxfi/log"
 )

@@ -8,7 +8,7 @@ import (

 	"github.com/hanzoai/cloud"
 	"github.com/hanzoai/o11y"
-	"github.com/hanzoai/zip"
+	"github.com/zap-proto/zip"
 )

 func TestMountWithoutHandlerReturns503(t *testing.T) {
@@ -24,7 +24,7 @@ import (
 	"github.com/prometheus/alertmanager/dispatch"
 	"github.com/prometheus/alertmanager/notify"
 	"github.com/prometheus/alertmanager/provider/mem"
-	"github.com/prometheus/client_golang/prometheus"
+	"github.com/luxfi/metric"
 	"github.com/hanzoai/common/model"
 	"github.com/hanzoai/common/promslog"

@@ -364,8 +364,8 @@ route:
 	providerSettings := createTestProviderSettings()
 	logger := providerSettings.Logger
 	route := dispatch.NewRoute(conf.Route, nil)
-	marker := alertmanagertypes.NewMarker(prometheus.NewRegistry())
-	alerts, err := mem.NewAlerts(context.Background(), marker, time.Hour, 0, nil, logger, prometheus.NewRegistry(), nil)
+	marker := alertmanagertypes.NewMarker(metric.NewRegistry())
+	alerts, err := mem.NewAlerts(context.Background(), marker, time.Hour, 0, nil, logger, metric.NewRegistry(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -373,7 +373,7 @@ route:

 	timeout := func(d time.Duration) time.Duration { return time.Duration(0) }
 	recorder := &recordStage{alerts: make(map[string]map[model.Fingerprint]*alertmanagertypes.Alert)}
-	metrics := NewDispatcherMetrics(false, prometheus.NewRegistry())
+	metrics := NewDispatcherMetrics(false, metric.NewRegistry())
 	store := nfroutingstoretest.NewMockSQLRouteStore()
 	store.MatchExpectationsInOrder(false)
 	nfManager, err := rulebasednotification.New(context.Background(), providerSettings, nfmanager.Config{}, store)
@@ -637,8 +637,8 @@ route:
 	providerSettings := createTestProviderSettings()
 	logger := providerSettings.Logger
 	route := dispatch.NewRoute(conf.Route, nil)
-	marker := alertmanagertypes.NewMarker(prometheus.NewRegistry())
-	alerts, err := mem.NewAlerts(context.Background(), marker, time.Hour, 0, nil, logger, prometheus.NewRegistry(), nil)
+	marker := alertmanagertypes.NewMarker(metric.NewRegistry())
+	alerts, err := mem.NewAlerts(context.Background(), marker, time.Hour, 0, nil, logger, metric.NewRegistry(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -646,7 +646,7 @@ route:

 	timeout := func(d time.Duration) time.Duration { return time.Duration(0) }
 	recorder := &recordStage{alerts: make(map[string]map[model.Fingerprint]*alertmanagertypes.Alert)}
-	metrics := NewDispatcherMetrics(false, prometheus.NewRegistry())
+	metrics := NewDispatcherMetrics(false, metric.NewRegistry())
 	store := nfroutingstoretest.NewMockSQLRouteStore()
 	store.MatchExpectationsInOrder(false)
 	nfManager, err := rulebasednotification.New(context.Background(), providerSettings, nfmanager.Config{}, store)
@@ -896,8 +896,8 @@ route:
 	providerSettings := createTestProviderSettings()
 	logger := providerSettings.Logger
 	route := dispatch.NewRoute(conf.Route, nil)
-	marker := alertmanagertypes.NewMarker(prometheus.NewRegistry())
-	alerts, err := mem.NewAlerts(context.Background(), marker, time.Hour, 0, nil, logger, prometheus.NewRegistry(), nil)
+	marker := alertmanagertypes.NewMarker(metric.NewRegistry())
+	alerts, err := mem.NewAlerts(context.Background(), marker, time.Hour, 0, nil, logger, metric.NewRegistry(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -905,7 +905,7 @@ route:

 	timeout := func(d time.Duration) time.Duration { return time.Duration(0) }
 	recorder := &recordStage{alerts: make(map[string]map[model.Fingerprint]*alertmanagertypes.Alert)}
-	metrics := NewDispatcherMetrics(false, prometheus.NewRegistry())
+	metrics := NewDispatcherMetrics(false, metric.NewRegistry())
 	store := nfroutingstoretest.NewMockSQLRouteStore()
 	store.MatchExpectationsInOrder(false)
 	nfManager, err := rulebasednotification.New(context.Background(), providerSettings, nfmanager.Config{}, store)
@@ -1158,15 +1158,15 @@ func newAlert(labels model.LabelSet) *alertmanagertypes.Alert {

 func TestDispatcherRace(t *testing.T) {
 	logger := promslog.NewNopLogger()
-	marker := alertmanagertypes.NewMarker(prometheus.NewRegistry())
-	alerts, err := mem.NewAlerts(context.Background(), marker, time.Hour, 0, nil, logger, prometheus.NewRegistry(), nil)
+	marker := alertmanagertypes.NewMarker(metric.NewRegistry())
+	alerts, err := mem.NewAlerts(context.Background(), marker, time.Hour, 0, nil, logger, metric.NewRegistry(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer alerts.Close()

 	timeout := func(d time.Duration) time.Duration { return time.Duration(0) }
-	metrics := NewDispatcherMetrics(false, prometheus.NewRegistry())
+	metrics := NewDispatcherMetrics(false, metric.NewRegistry())
 	nfManager := nfmanagertest.NewMock()
 	// Set up default expectation that won't be called in this race test
 	dispatcher := NewDispatcher(alerts, nil, nil, marker, timeout, nil, logger, metrics, nfManager, "test-org")
@@ -1194,15 +1194,15 @@ route:
 	route := dispatch.NewRoute(conf.Route, nil)
 	providerSettings := createTestProviderSettings()
 	logger := providerSettings.Logger
-	marker := alertmanagertypes.NewMarker(prometheus.NewRegistry())
-	alerts, err := mem.NewAlerts(context.Background(), marker, time.Hour, 0, nil, logger, prometheus.NewRegistry(), nil)
+	marker := alertmanagertypes.NewMarker(metric.NewRegistry())
+	alerts, err := mem.NewAlerts(context.Background(), marker, time.Hour, 0, nil, logger, metric.NewRegistry(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer alerts.Close()
 	timeout := func(d time.Duration) time.Duration { return d }
 	recorder := &recordStage{alerts: make(map[string]map[model.Fingerprint]*alertmanagertypes.Alert)}
-	metrics := NewDispatcherMetrics(false, prometheus.NewRegistry())
+	metrics := NewDispatcherMetrics(false, metric.NewRegistry())
 	store := nfroutingstoretest.NewMockSQLRouteStore()
 	store.MatchExpectationsInOrder(false)
 	nfManager, err := rulebasednotification.New(context.Background(), providerSettings, nfmanager.Config{}, store)
@@ -1263,10 +1263,10 @@ route:
 }

 func TestDispatcher_DoMaintenance(t *testing.T) {
-	r := prometheus.NewRegistry()
+	r := metric.NewRegistry()
 	marker := alertmanagertypes.NewMarker(r)

-	alerts, err := mem.NewAlerts(context.Background(), marker, time.Minute, 0, nil, promslog.NewNopLogger(), prometheus.NewRegistry(), nil)
+	alerts, err := mem.NewAlerts(context.Background(), marker, time.Minute, 0, nil, promslog.NewNopLogger(), metric.NewRegistry(), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1370,8 +1370,8 @@ route:
 			providerSettings := createTestProviderSettings()
 			logger := providerSettings.Logger
 			route := dispatch.NewRoute(conf.Route, nil)
-			marker := alertmanagertypes.NewMarker(prometheus.NewRegistry())
-			alerts, err := mem.NewAlerts(context.Background(), marker, time.Hour, 0, nil, logger, prometheus.NewRegistry(), nil)
+			marker := alertmanagertypes.NewMarker(metric.NewRegistry())
+			alerts, err := mem.NewAlerts(context.Background(), marker, time.Hour, 0, nil, logger, metric.NewRegistry(), nil)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -1379,7 +1379,7 @@ route:

 			timeout := func(d time.Duration) time.Duration { return time.Duration(0) }
 			recorder := &recordStage{alerts: make(map[string]map[model.Fingerprint]*alertmanagertypes.Alert)}
-			metrics := NewDispatcherMetrics(false, prometheus.NewRegistry())
+			metrics := NewDispatcherMetrics(false, metric.NewRegistry())
 			store := nfroutingstoretest.NewMockSQLRouteStore()
 			store.MatchExpectationsInOrder(false)
 			nfManager, err := rulebasednotification.New(context.Background(), providerSettings, nfmanager.Config{}, store)
@@ -19,7 +19,7 @@ import (
 	"github.com/hanzoai/o11y/pkg/valuer"

 	"github.com/go-openapi/strfmt"
-	"github.com/prometheus/client_golang/prometheus"
+	"github.com/luxfi/metric"
 	"github.com/hanzoai/common/model"

 	"github.com/stretchr/testify/require"
@@ -88,7 +88,7 @@ func TestEndToEndAlertManagerFlow(t *testing.T) {

 	srvCfg := NewConfig()
 	stateStore := alertmanagertypestest.NewStateStore()
-	registry := prometheus.NewRegistry()
+	registry := metric.NewRegistry()
 	logger := slog.New(slog.DiscardHandler)
 	server, err := New(context.Background(), logger, registry, srvCfg, orgID, stateStore, notificationManager)
 	require.NoError(t, err)
@@ -16,7 +16,7 @@ import (
 	"github.com/go-openapi/strfmt"
 	"github.com/prometheus/alertmanager/api/v2/models"
 	"github.com/prometheus/alertmanager/config"
-	"github.com/prometheus/client_golang/prometheus"
+	"github.com/luxfi/metric"
 	commoncfg "github.com/hanzoai/common/config"
 	"github.com/hanzoai/common/model"
 	"github.com/stretchr/testify/assert"
@@ -25,7 +25,7 @@ import (

 func TestServerSetConfigAndStop(t *testing.T) {
 	notificationManager := nfmanagertest.NewMock()
-	server, err := New(context.Background(), slog.New(slog.DiscardHandler), prometheus.NewRegistry(), NewConfig(), "1", alertmanagertypestest.NewStateStore(), notificationManager)
+	server, err := New(context.Background(), slog.New(slog.DiscardHandler), metric.NewRegistry(), NewConfig(), "1", alertmanagertypestest.NewStateStore(), notificationManager)
 	require.NoError(t, err)

 	amConfig, err := alertmanagertypes.NewDefaultConfig(alertmanagertypes.GlobalConfig{}, alertmanagertypes.RouteConfig{GroupInterval: 1 * time.Minute, RepeatInterval: 1 * time.Minute, GroupWait: 1 * time.Minute}, "1")
@@ -37,7 +37,7 @@ func TestServerSetConfigAndStop(t *testing.T) {

 func TestServerTestReceiverTypeWebhook(t *testing.T) {
 	notificationManager := nfmanagertest.NewMock()
-	server, err := New(context.Background(), slog.New(slog.DiscardHandler), prometheus.NewRegistry(), NewConfig(), "1", alertmanagertypestest.NewStateStore(), notificationManager)
+	server, err := New(context.Background(), slog.New(slog.DiscardHandler), metric.NewRegistry(), NewConfig(), "1", alertmanagertypestest.NewStateStore(), notificationManager)
 	require.NoError(t, err)

 	amConfig, err := alertmanagertypes.NewDefaultConfig(alertmanagertypes.GlobalConfig{}, alertmanagertypes.RouteConfig{GroupInterval: 1 * time.Minute, RepeatInterval: 1 * time.Minute, GroupWait: 1 * time.Minute}, "1")
@@ -85,7 +85,7 @@ func TestServerPutAlerts(t *testing.T) {
 	srvCfg := NewConfig()
 	srvCfg.Route.GroupInterval = 1 * time.Second
 	notificationManager := nfmanagertest.NewMock()
-	server, err := New(context.Background(), slog.New(slog.DiscardHandler), prometheus.NewRegistry(), srvCfg, "1", stateStore, notificationManager)
+	server, err := New(context.Background(), slog.New(slog.DiscardHandler), metric.NewRegistry(), srvCfg, "1", stateStore, notificationManager)
 	require.NoError(t, err)

 	amConfig, err := alertmanagertypes.NewDefaultConfig(srvCfg.Global, srvCfg.Route, "1")
@@ -133,7 +133,7 @@ func TestServerTestAlert(t *testing.T) {
 	srvCfg := NewConfig()
 	srvCfg.Route.GroupInterval = 1 * time.Second
 	notificationManager := nfmanagertest.NewMock()
-	server, err := New(context.Background(), slog.New(slog.DiscardHandler), prometheus.NewRegistry(), srvCfg, "1", stateStore, notificationManager)
+	server, err := New(context.Background(), slog.New(slog.DiscardHandler), metric.NewRegistry(), srvCfg, "1", stateStore, notificationManager)
 	require.NoError(t, err)

 	amConfig, err := alertmanagertypes.NewDefaultConfig(srvCfg.Global, srvCfg.Route, "1")
@@ -238,7 +238,7 @@ func TestServerTestAlertContinuesOnFailure(t *testing.T) {
 	srvCfg := NewConfig()
 	srvCfg.Route.GroupInterval = 1 * time.Second
 	notificationManager := nfmanagertest.NewMock()
-	server, err := New(context.Background(), slog.New(slog.DiscardHandler), prometheus.NewRegistry(), srvCfg, "1", stateStore, notificationManager)
+	server, err := New(context.Background(), slog.New(slog.DiscardHandler), metric.NewRegistry(), srvCfg, "1", stateStore, notificationManager)
 	require.NoError(t, err)

 	amConfig, err := alertmanagertypes.NewDefaultConfig(srvCfg.Global, srvCfg.Route, "1")
@@ -1,85 +0,0 @@
-package querier
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestShouldRemoveMatcher(t *testing.T) {
-	tests := []struct {
-		name     string
-		value    string
-		allVars  map[string]bool
-		expected bool
-	}{
-		{
-			name:     "$var pattern match",
-			value:    "$host.name",
-			allVars:  map[string]bool{"host.name": true},
-			expected: true,
-		},
-		{
-			name:     "{{var}} pattern match",
-			value:    "{{host.name}}",
-			allVars:  map[string]bool{"host.name": true},
-			expected: true,
-		},
-		{
-			name:     "[[var]] pattern match",
-			value:    "[[host.name]]",
-			allVars:  map[string]bool{"host.name": true},
-			expected: true,
-		},
-		{
-			name:     "variable not in allVars",
-			value:    "$other.var",
-			allVars:  map[string]bool{"host.name": true},
-			expected: false,
-		},
-		{
-			name:     "no variable pattern in value",
-			value:    "host.name",
-			allVars:  map[string]bool{"host.name": true},
-			expected: false,
-		},
-		{
-			name:     "variable in middle of string (not at start, won't match)",
-			value:    "prefix$host.namesuffix",
-			allVars:  map[string]bool{"host.name": true},
-			expected: false, // TrimPrefix only works if $ is at the start
-		},
-		{
-			name:     "empty allVars",
-			value:    "$host.name",
-			allVars:  map[string]bool{},
-			expected: false,
-		},
-		{
-			name:     "incomplete {{var}} pattern (missing closing, still matches)",
-			value:    "{{host.name",
-			allVars:  map[string]bool{"host.name": true},
-			expected: true, // TrimPrefix removes {{, TrimSuffix does nothing, checks "host.name"
-		},
-		{
-			name:     "mixed patterns (only first pattern at start matches)",
-			value:    "$host.name{{env}}",
-			allVars:  map[string]bool{"host.name": true},
-			expected: false, // TrimPrefix removes $, checks "host.name{{env}}" which is not in allVars
-		},
-		{
-			name:     "partial match should not match for {{var}}",
-			value:    "{{host.name.suffix}}",
-			allVars:  map[string]bool{"host.name": true},
-			expected: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			remover := &allVarRemover{allVars: tt.allVars}
-			result := remover.shouldRemoveMatcher(tt.value)
-			assert.Equal(t, tt.expected, result, "shouldRemoveMatcher(%q) with allVars=%v", tt.value, tt.allVars)
-		})
-	}
-}
@@ -1,441 +0,0 @@
-package querier
-
-import (
-	"log/slog"
-	"strings"
-	"testing"
-
-	"github.com/hanzoai/o11y/pkg/errors"
-	qbv5 "github.com/hanzoai/o11y/pkg/types/querybuildertypes/querybuildertypesv5"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestRemoveAllVarMatchers(t *testing.T) {
-	logger := slog.Default()
-	q := &promqlQuery{logger: logger}
-
-	tests := []struct {
-		name      string
-		query     string
-		vars      map[string]qbv5.VariableItem
-		expected  string
-		expectErr bool
-	}{
-		{
-			name:  "remove $var pattern with __all__",
-			query: `sum(rate({__name__="system.cpu.time", "host.name"=~"$host.name"}[5m]))`,
-			vars: map[string]qbv5.VariableItem{
-				"host.name": {
-					Type:  qbv5.DynamicVariableType,
-					Value: "__all__",
-				},
-			},
-			expected:  `sum(rate({__name__="system.cpu.time"}[5m]))`,
-			expectErr: false,
-		},
-		{
-			name:  "remove {{var}} pattern with __all__",
-			query: `sum(rate({__name__="system.cpu.time", "host.name"=~"{{host.name}}"}[5m]))`,
-			vars: map[string]qbv5.VariableItem{
-				"host.name": {
-					Type:  qbv5.DynamicVariableType,
-					Value: "__all__",
-				},
-			},
-			expected:  `sum(rate({__name__="system.cpu.time"}[5m]))`,
-			expectErr: false,
-		},
-		{
-			name:  "remove [[var]] pattern with __all__",
-			query: `sum(rate({__name__="system.cpu.time", "host.name"=~"[[host.name]]"}[5m]))`,
-			vars: map[string]qbv5.VariableItem{
-				"host.name": {
-					Type:  qbv5.DynamicVariableType,
-					Value: "__all__",
-				},
-			},
-			expected:  `sum(rate({__name__="system.cpu.time"}[5m]))`,
-			expectErr: false,
-		},
-		{
-			name:  "multiple variables, one with __all__",
-			query: `sum(rate({__name__="system.cpu.time", "host.name"=~"$host.name", "env"="$env"}[5m]))`,
-			vars: map[string]qbv5.VariableItem{
-				"host.name": {
-					Type:  qbv5.DynamicVariableType,
-					Value: "__all__",
-				},
-				"env": {
-					Type:  qbv5.DynamicVariableType,
-					Value: "production",
-				},
-			},
-			expected:  `sum(rate({__name__="system.cpu.time",env="$env"}[5m]))`,
-			expectErr: false,
-		},
-		{
-			name:  "no __all__ variables, query unchanged",
-			query: `sum(rate({__name__="system.cpu.time", "host.name"=~"$host.name"}[5m]))`,
-			vars: map[string]qbv5.VariableItem{
-				"host.name": {
-					Type:  qbv5.DynamicVariableType,
-					Value: "host1",
-				},
-			},
-			expected:  `sum(rate({__name__="system.cpu.time", "host.name"=~"$host.name"}[5m]))`,
-			expectErr: false,
-		},
-		{
-			name:  "non-dynamic variable type, not removed",
-			query: `sum(rate({__name__="system.cpu.time", "host.name"=~"$host.name"}[5m]))`,
-			vars: map[string]qbv5.VariableItem{
-				"host.name": {
-					Type:  qbv5.QueryVariableType,
-					Value: "__all__",
-				},
-			},
-			expected:  `sum(rate({__name__="system.cpu.time", "host.name"=~"$host.name"}[5m]))`,
-			expectErr: false,
-		},
-		{
-			name:  "invalid PromQL query",
-			query: `invalid promql query syntax {`,
-			vars: map[string]qbv5.VariableItem{
-				"host.name": {
-					Type:  qbv5.DynamicVariableType,
-					Value: "__all__",
-				},
-			},
-			expected:  "",
-			expectErr: true,
-		},
-		{
-			name:  "invalid PromQL query with mismatched brackets",
-			query: `sum(rate({__name__="system.cpu.time", "host.name"=~"$host.name"}[5m]`,
-			vars: map[string]qbv5.VariableItem{
-				"host.name": {
-					Type:  qbv5.DynamicVariableType,
-					Value: "__all__",
-				},
-			},
-			expected:  "",
-			expectErr: true,
-		},
-		{
-			name:      "empty vars map",
-			query:     `sum(rate({__name__="system.cpu.time", "host.name"=~"$host.name"}[5m]))`,
-			vars:      map[string]qbv5.VariableItem{},
-			expected:  `sum(rate({__name__="system.cpu.time", "host.name"=~"$host.name"}[5m]))`,
-			expectErr: false,
-		},
-		{
-			name:  "multiple matchers with __all__ variable",
-			query: `sum(rate({__name__="system.cpu.time", "host.name"=~"$host.name", "env"="$env", "region"=~"$region"}[5m]))`,
-			vars: map[string]qbv5.VariableItem{
-				"host.name": {
-					Type:  qbv5.DynamicVariableType,
-					Value: "__all__",
-				},
-				"env": {
-					Type:  qbv5.DynamicVariableType,
-					Value: "__all__",
-				},
-				"region": {
-					Type:  qbv5.DynamicVariableType,
-					Value: "us-east",
-				},
-			},
-			expected:  `sum(rate({__name__="system.cpu.time",region=~"$region"}[5m]))`,
-			expectErr: false,
-		},
-		{
-			name:  "__all__ value not string type",
-			query: `sum(rate({__name__="system.cpu.time", "host.name"=~"$host.name"}[5m]))`,
-			vars: map[string]qbv5.VariableItem{
-				"host.name": {
-					Type:  qbv5.DynamicVariableType,
-					Value: 123, // Not a string
-				},
-			},
-			expected:  `sum(rate({__name__="system.cpu.time", "host.name"=~"$host.name"}[5m]))`,
-			expectErr: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result, err := q.removeAllVarMatchers(tt.query, tt.vars)
-			if tt.expectErr {
-				assert.Error(t, err)
-			} else {
-				assert.NoError(t, err)
-				assert.Equal(t, tt.expected, result, "removeAllVarMatchers(%q) with vars=%v", tt.query, tt.vars)
-			}
-		})
-	}
-}
-
-func TestEnhancePromQLError(t *testing.T) {
-	parseErr := errors.Newf(errors.TypeInvalidInput, errors.CodeInvalidInput, "unexpected character: '.' at position 12")
-
-	t.Run("dotted name patterns", func(t *testing.T) {
-		tests := []struct {
-			name                  string
-			query                 string
-			wantDottedNameHint    bool
-			wantDottedNameExample string
-		}{
-			{
-				name:                  "query with unquoted dotted metric name",
-				query:                 `sum(rate(k8s.container.restarts[5m]))`,
-				wantDottedNameHint:    true,
-				wantDottedNameExample: "k8s.container.restarts",
-			},
-			{
-				name:                  "query with unquoted dotted label in group by",
-				query:                 `sum by (k8s.pod.name) (rate(requests_total[5m]))`,
-				wantDottedNameHint:    true,
-				wantDottedNameExample: "k8s.pod.name",
-			},
-			{
-				name:                  "query with unquoted dotted label in filter",
-				query:                 `requests_total{k8s.namespace.name="default"}`,
-				wantDottedNameHint:    true,
-				wantDottedNameExample: "k8s.namespace.name",
-			},
-			{
-				name:                  "query with multiple unquoted dotted names",
-				query:                 `sum by (k8s.pod.name, deployment.environment) (increase(k8s.container.restarts[15m]))`,
-				wantDottedNameHint:    true,
-				wantDottedNameExample: "k8s.pod.name", // should match first one
-			},
-			{
-				name:               "query without dotted names - no hint",
-				query:              `sum(rate(http_requests_total[5m]))`,
-				wantDottedNameHint: false,
-			},
-			{
-				name:               "query with properly quoted dotted names - no hint",
-				query:              `sum(rate({"k8s.container.restarts"}[5m]))`,
-				wantDottedNameHint: false,
-			},
-			{
-				name:               "query with dotted name inside regex string - no hint",
-				query:              `requests_total{pod=~"k8s.pod.name.*"}`,
-				wantDottedNameHint: false,
-			},
-		}
-
-		for _, tt := range tests {
-			t.Run(tt.name, func(t *testing.T) {
-				err := enhancePromQLError(tt.query, parseErr)
-				errMsg := err.Error()
-
-				assert.True(t, strings.Contains(errMsg, parseErr.Error()),
-					"error should contain original parse error message")
-
-				if tt.wantDottedNameHint {
-					assert.True(t, strings.Contains(errMsg, "Hint:"),
-						"error should contain hint for dotted name query")
-					assert.True(t, strings.Contains(errMsg, "UTF-8 syntax"),
-						"error should mention UTF-8 syntax")
-					assert.True(t, strings.Contains(errMsg, tt.wantDottedNameExample),
-						"error should contain the dotted name example: %s", tt.wantDottedNameExample)
-				} else {
-					assert.False(t, strings.Contains(errMsg, "Hint:"),
-						"error should not contain hint for non-dotted-name query")
-				}
-			})
-		}
-	})
-
-	t.Run("quoted metric outside braces patterns", func(t *testing.T) {
-		tests := []struct {
-			name               string
-			query              string
-			wantHint           bool
-			wantMetricInHint   string
-		}{
-			{
-				name:             "quoted metric name followed by selector",
-				query:            `"kube_pod_status_ready_time"{"condition"="true"}`,
-				wantHint:         true,
-				wantMetricInHint: "kube_pod_status_ready_time",
-			},
-			{
-				name:             "quoted metric with space before brace",
-				query:            `"kube_pod_labels" {"label"!=""}`,
-				wantHint:         true,
-				wantMetricInHint: "kube_pod_labels",
-			},
-			{
-				name:             "complex query with quoted metric outside braces",
-				query:            `min by (namespace) ("kube_pod_status_ready_time"{"condition"="true"})`,
-				wantHint:         true,
-				wantMetricInHint: "kube_pod_status_ready_time",
-			},
-			{
-				name:             "label_replace with quoted metric outside braces",
-				query:            `label_replace("kube_pod_labels"{"label_cnpg_io_cluster"!=""}, "cluster","$1","label","(.+)")`,
-				wantHint:         true,
-				wantMetricInHint: "kube_pod_labels",
-			},
-			{
-				name:     "correctly formatted query - no hint",
-				query:    `{"kube_pod_status_ready_time", condition="true"}`,
-				wantHint: false,
-			},
-			{
-				name:     "old syntax without quotes - no hint for this pattern",
-				query:    `kube_pod_status_ready_time{condition="true"}`,
-				wantHint: false,
-			},
-		}
-
-		for _, tt := range tests {
-			t.Run(tt.name, func(t *testing.T) {
-				err := enhancePromQLError(tt.query, parseErr)
-				errMsg := err.Error()
-
-				assert.True(t, strings.Contains(errMsg, parseErr.Error()),
-					"error should contain original parse error message")
-
-				if tt.wantHint {
-					assert.True(t, strings.Contains(errMsg, "Hint:"),
-						"error should contain hint")
-					assert.True(t, strings.Contains(errMsg, "inside the braces"),
-						"error should mention putting metric inside braces")
-					assert.True(t, strings.Contains(errMsg, tt.wantMetricInHint),
-						"error should contain the metric name: %s", tt.wantMetricInHint)
-				}
-			})
-		}
-	})
-}
-
-func TestUnquotedDottedNamePattern(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    string
-		expected string // empty string means no match expected
-	}{
-		{
-			name:     "metric name at start",
-			input:    "k8s.pod.name",
-			expected: "k8s.pod.name",
-		},
-		{
-			name:     "label in group by clause",
-			input:    "sum by (k8s.pod.name) (rate(x[5m]))",
-			expected: "k8s.pod.name",
-		},
-		{
-			name:     "label in filter",
-			input:    "metric{k8s.namespace.name=\"default\"}",
-			expected: "k8s.namespace.name",
-		},
-		{
-			name:     "metric with underscore and dots",
-			input:    "http_server.request.duration",
-			expected: "http_server.request.duration",
-		},
-		{
-			name:     "quoted metric name - no match",
-			input:    `{"k8s.pod.name"}`,
-			expected: "",
-		},
-		{
-			name:     "inside regex string - no match",
-			input:    `{pod=~"k8s.pod.name.*"}`,
-			expected: "",
-		},
-		{
-			name:     "simple metric without dots - no match",
-			input:    "http_requests_total",
-			expected: "",
-		},
-		{
-			name:     "single dot only - no match",
-			input:    "a.b",
-			expected: "a.b",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			matches := unquotedDottedNamePattern.FindStringSubmatch(tt.input)
-			if tt.expected == "" {
-				assert.True(t, len(matches) < 2 || matches[1] == "",
-					"expected no match for input %q but got %v", tt.input, matches)
-			} else {
-				assert.True(t, len(matches) >= 2,
-					"expected match for input %q but got none", tt.input)
-				if len(matches) >= 2 {
-					assert.Equal(t, tt.expected, matches[1],
-						"unexpected match for input %q", tt.input)
-				}
-			}
-		})
-	}
-}
-
-func TestQuotedMetricOutsideBracesPattern(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    string
-		expected string // empty string means no match expected
-	}{
-		{
-			name:     "quoted metric followed by braces",
-			input:    `"kube_pod_status_ready_time"{"condition"="true"}`,
-			expected: "kube_pod_status_ready_time",
-		},
-		{
-			name:     "quoted metric with space before brace",
-			input:    `"kube_pod_labels" {"label"!=""}`,
-			expected: "kube_pod_labels",
-		},
-		{
-			name:     "quoted metric in label_replace",
-			input:    `label_replace("kube_pod_labels"{"x"="y"}, "a","b","c","d")`,
-			expected: "kube_pod_labels",
-		},
-		{
-			name:     "quoted metric with dots",
-			input:    `"k8s.container.restarts"{"pod"="test"}`,
-			expected: "k8s.container.restarts",
-		},
-		{
-			name:     "correct UTF-8 syntax - no match",
-			input:    `{"kube_pod_status_ready_time", condition="true"}`,
-			expected: "",
-		},
-		{
-			name:     "old syntax without quotes - no match",
-			input:    `kube_pod_status_ready_time{condition="true"}`,
-			expected: "",
-		},
-		{
-			name:     "quoted string in label value - no match",
-			input:    `metric{label="value"}{other="x"}`,
-			expected: "",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			matches := quotedMetricOutsideBracesPattern.FindStringSubmatch(tt.input)
-			if tt.expected == "" {
-				assert.True(t, len(matches) < 2 || matches[1] == "",
-					"expected no match for input %q but got %v", tt.input, matches)
-			} else {
-				assert.True(t, len(matches) >= 2,
-					"expected match for input %q but got none", tt.input)
-				if len(matches) >= 2 {
-					assert.Equal(t, tt.expected, matches[1],
-						"unexpected match for input %q", tt.input)
-				}
-			}
-		})
-	}
-}
@@ -180,6 +180,35 @@ func (s Server) HealthCheckStatus() chan healthcheck.Status {
 	return s.unavailableChannel
 }

+// PublicHandler returns the fully-wired public HTTP handler for /v1/o11y/*:
+// the router with all middleware (AuthN/AuthZ, timeout, api-key, CORS, compress)
+// and every registered route, exactly as built by createPublicServer. It is the
+// value the standalone server binds on the query HTTP listener.
+//
+// The unified cloud binary constructs the same runtime in-process and installs
+// this handler via o11y.SetHandler (see mount.go), serving /v1/o11y/* through
+// cloud's own HTTP stack instead of binding this listener. One handler, one way:
+// standalone and cloud serve byte-identical middleware+routes.
+func (s *Server) PublicHandler() http.Handler {
+	return s.httpServer.Handler
+}
+
+// StartBackground starts the alert rule manager WITHOUT binding the standalone
+// query HTTP listener, the pprof debug port, or the OpAMP websocket. The unified
+// cloud binary calls this after installing PublicHandler so alert evaluation runs
+// in-process while cloud's HTTP stack serves /v1/o11y/*.
+//
+// This is the embedded-mode counterpart to Start: Start owns the process (it
+// binds listeners and blocks in goroutines), whereas an embedding host owns its
+// own listeners and only needs o11y's background evaluation loop. OpAMP collector
+// management (a second websocket listener on constants.OpAmpWsEndpoint) is
+// intentionally NOT started here — telemetry ingest continues via the existing
+// collector→telemetrystore path, independent of this control loop.
+func (s *Server) StartBackground(ctx context.Context) error {
+	s.ruleManager.Start(ctx)
+	return nil
+}
+
 func (s *Server) createPublicServer(api *APIHandler, web web.Web) (*http.Server, error) {
 	r := NewRouter()

@@ -6,7 +6,10 @@ import (
 )

 func TestPromQLFilterExtractor_Extract(t *testing.T) {
-	extractor := NewPromQLFilterExtractor()
+	extractor, err := NewExtractor(ExtractorTypePromQL)
+	if err != nil {
+		t.Fatalf("NewExtractor(PromQL): %v", err)
+	}

 	tests := []struct {
 		name               string
@@ -53,10 +53,6 @@ func TestNewProviderFactories(t *testing.T) {
 		)
 	})

-	assert.NotPanics(t, func() {
-		NewPrometheusProviderFactories(telemetrystoretest.New(telemetrystore.Config{Provider: "datastore"}, sqlmock.QueryMatcherEqual))
-	})
-
 	assert.NotPanics(t, func() {
 		orgGetter := implorganization.NewGetter(implorganization.NewStore(sqlstoretest.New(sqlstore.Config{Provider: "sqlite"}, sqlmock.QueryMatcherEqual)), nil)
 		notificationManager := nfmanagertest.NewMock()