From 6dba8b117c9f45d2fece59ba780a668f744d1147 Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Tue, 26 Aug 2025 13:40:26 +0200
Subject: [PATCH 01/17] runtimes/core: Add requests counter metric

---
 Cargo.lock                                | 708 +++++++++++++++++++---
 runtimes/core/Cargo.toml                  |   7 +
 runtimes/core/src/api/auth/local.rs       |   6 +
 runtimes/core/src/api/endpoint.rs         |  19 +-
 runtimes/core/src/api/manager.rs          |   3 +
 runtimes/core/src/api/server.rs           |   7 +
 runtimes/core/src/lib.rs                  |  19 +-
 runtimes/core/src/metadata/gce.rs         | 176 ++++++
 runtimes/core/src/metadata/mod.rs         |  95 +++
 runtimes/core/src/metrics/counter.rs      |  80 +++
 runtimes/core/src/metrics/exporter/gcp.rs | 210 +++++++
 runtimes/core/src/metrics/exporter/mod.rs |   2 +
 runtimes/core/src/metrics/manager.rs      | 185 ++++++
 runtimes/core/src/metrics/mod.rs          |  18 +
 runtimes/core/src/metrics/registry.rs     | 154 +++++
 runtimes/core/src/metrics/test.rs         | 354 +++++++++++
 runtimes/core/src/pubsub/manager.rs       |  13 +
 17 files changed, 1948 insertions(+), 108 deletions(-)
 create mode 100644 runtimes/core/src/metadata/gce.rs
 create mode 100644 runtimes/core/src/metadata/mod.rs
 create mode 100644 runtimes/core/src/metrics/counter.rs
 create mode 100644 runtimes/core/src/metrics/exporter/gcp.rs
 create mode 100644 runtimes/core/src/metrics/exporter/mod.rs
 create mode 100644 runtimes/core/src/metrics/manager.rs
 create mode 100644 runtimes/core/src/metrics/mod.rs
 create mode 100644 runtimes/core/src/metrics/registry.rs
 create mode 100644 runtimes/core/src/metrics/test.rs

diff --git a/Cargo.lock b/Cargo.lock
index 462758d190..e6e8892e73 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -744,7 +744,7 @@ dependencies = [
  "http 1.2.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.5.2",
+ "hyper 1.7.0",
  "hyper-util",
  "itoa",
  "matchit",
@@ -925,7 +925,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "shlex",
  "syn 2.0.95",
  "which",
@@ -976,6 +976,31 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "bon"
+version = "3.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f44aa969f86ffb99e5c2d51f393ec9ed6e9fe2f47b609c917b0071f129854d29"
+dependencies = [
+ "bon-macros",
+ "rustversion",
+]
+
+[[package]]
+name = "bon-macros"
+version = "3.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1e78cd86b6a6515d87392332fd63c4950ed3e50eab54275259a5f59f3666f90"
+dependencies = [
+ "darling 0.21.3",
+ "ident_case",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.95",
+]
+
 [[package]]
 name = "brotli"
 version = "3.5.0"
@@ -1037,9 +1062,12 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.9.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "bytes-utils"
@@ -1089,6 +1117,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
 version = "0.4.39"
@@ -1395,8 +1429,18 @@ version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.20.10",
+ "darling_macro 0.20.10",
+]
+
+[[package]]
+name = "darling"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+dependencies = [
+ "darling_core 0.21.3",
+ "darling_macro 0.21.3",
 ]
 
 [[package]]
@@ -1413,13 +1457,38 @@ dependencies = [
  "syn 2.0.95",
 ]
 
+[[package]]
+name = "darling_core"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.11.1",
+ "syn 2.0.95",
+]
+
 [[package]]
 name = "darling_macro"
 version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
- "darling_core",
+ "darling_core 0.20.10",
+ "quote",
+ "syn 2.0.95",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+dependencies = [
+ "darling_core 0.21.3",
  "quote",
  "syn 2.0.95",
 ]
@@ -1437,6 +1506,20 @@ dependencies = [
  "parking_lot_core",
 ]
 
+[[package]]
+name = "dashmap"
+version = "6.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.6.0"
@@ -1466,12 +1549,12 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071"
 dependencies = [
  "powerfmt",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -1631,6 +1714,7 @@ dependencies = [
  "anyhow",
  "assert_matches",
  "async-stream",
+ "async-trait",
  "aws-config",
  "aws-credential-types",
  "aws-sdk-s3",
@@ -1649,6 +1733,7 @@ dependencies = [
  "cidr",
  "colored",
  "cookie",
+ "dashmap 6.1.0",
  "duct",
  "email_address",
  "env_logger 0.10.2",
@@ -1658,16 +1743,19 @@ dependencies = [
  "futures-core",
  "futures-util",
  "gjson",
- "google-cloud-gax",
+ "google-cloud-api",
+ "google-cloud-gax 0.17.0",
  "google-cloud-googleapis",
+ "google-cloud-monitoring-v3",
  "google-cloud-pubsub",
  "google-cloud-storage",
+ "google-cloud-wkt",
  "hex",
  "hmac",
  "http 1.2.0",
  "http-body-util",
  "httpdate",
- "hyper 1.5.2",
+ "hyper 1.7.0",
  "indexmap 2.7.0",
  "insta",
  "jsonwebtoken",
@@ -1675,6 +1763,8 @@ dependencies = [
  "malachite",
  "matchit",
  "md5",
+ "metrics",
+ "metrics-util",
  "mime",
  "native-tls",
  "once_cell",
@@ -1693,7 +1783,7 @@ dependencies = [
  "radix_fmt",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.12",
+ "reqwest 0.12.23",
  "rsa",
  "serde",
  "serde_json",
@@ -1711,7 +1801,7 @@ dependencies = [
  "tokio-stream",
  "tokio-tungstenite 0.21.0",
  "tokio-util",
- "tower-http",
+ "tower-http 0.5.2",
  "tower-service",
  "tracing",
  "tracing-subscriber",
@@ -1733,7 +1823,7 @@ dependencies = [
  "flate2",
  "futures",
  "http 1.2.0",
- "hyper 1.5.2",
+ "hyper 1.7.0",
  "libc",
  "log",
  "openssl",
@@ -1741,7 +1831,7 @@ dependencies = [
  "prost 0.12.6",
  "prost-build 0.12.6",
  "prost-types 0.12.6",
- "reqwest 0.12.12",
+ "reqwest 0.12.23",
  "serde",
  "serde_json",
  "tokio",
@@ -1797,6 +1887,12 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
 [[package]]
 name = "env_filter"
 version = "0.1.3"
@@ -2133,9 +2229,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi",
  "wasi 0.14.2+wasi-0.2.4",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -2180,6 +2278,19 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "google-cloud-api"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a67dd9819a0fed2c9251b3455e76149e0ebd30f5ad96ff9ff2cec2e2a5037a5"
+dependencies = [
+ "bytes",
+ "google-cloud-wkt",
+ "serde",
+ "serde_json",
+ "serde_with",
+]
+
 [[package]]
 name = "google-cloud-auth"
 version = "0.13.2"
@@ -2214,7 +2325,7 @@ dependencies = [
  "google-cloud-token",
  "home",
  "jsonwebtoken",
- "reqwest 0.12.12",
+ "reqwest 0.12.23",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
@@ -2224,6 +2335,28 @@ dependencies = [
  "urlencoding",
 ]
 
+[[package]]
+name = "google-cloud-auth"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62d8757f37377c6436b94c6efaf7f9c3c6e48a213bb0790f7a639a9ba0183764"
+dependencies = [
+ "async-trait",
+ "base64 0.22.1",
+ "bon",
+ "google-cloud-gax 1.0.0",
+ "http 1.2.0",
+ "reqwest 0.12.23",
+ "rustc_version",
+ "rustls 0.23.20",
+ "rustls-pemfile 2.2.0",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.10",
+ "time",
+ "tokio",
+]
+
 [[package]]
 name = "google-cloud-gax"
 version = "0.17.0"
@@ -2240,6 +2373,47 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "google-cloud-gax"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4e6b1718e2a6965a7fbb282f23645e7adb8e0a012848258bbd6f580307b684f"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures",
+ "google-cloud-rpc",
+ "google-cloud-wkt",
+ "http 1.2.0",
+ "pin-project",
+ "rand 0.9.2",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.10",
+ "tokio",
+]
+
+[[package]]
+name = "google-cloud-gax-internal"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c7ec794189133a50fd3901af3cd7faa37a0a6bb331e49e58df652a37f035552"
+dependencies = [
+ "bytes",
+ "google-cloud-auth 1.0.0",
+ "google-cloud-gax 1.0.0",
+ "google-cloud-rpc",
+ "http 1.2.0",
+ "http-body-util",
+ "percent-encoding",
+ "reqwest 0.12.23",
+ "rustc_version",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.10",
+ "tokio",
+]
+
 [[package]]
 name = "google-cloud-googleapis"
 version = "0.12.0"
@@ -2268,11 +2442,33 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04f945a208886a13d07636f38fb978da371d0abc3e34bad338124b9f8c135a8f"
 dependencies = [
- "reqwest 0.12.12",
+ "reqwest 0.12.23",
  "thiserror 1.0.69",
  "tokio",
 ]
 
+[[package]]
+name = "google-cloud-monitoring-v3"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5fa201d8a275c591bdc79a2c04cc758ff220f5587c748787b182c9049c918a7"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "google-cloud-api",
+ "google-cloud-gax 1.0.0",
+ "google-cloud-gax-internal",
+ "google-cloud-rpc",
+ "google-cloud-type",
+ "google-cloud-wkt",
+ "lazy_static",
+ "reqwest 0.12.23",
+ "serde",
+ "serde_json",
+ "serde_with",
+ "tracing",
+]
+
 [[package]]
 name = "google-cloud-pubsub"
 version = "0.22.1"
@@ -2282,7 +2478,7 @@ dependencies = [
  "async-channel",
  "async-stream",
  "google-cloud-auth 0.13.2",
- "google-cloud-gax",
+ "google-cloud-gax 0.17.0",
  "google-cloud-googleapis",
  "google-cloud-token",
  "prost-types 0.12.6",
@@ -2292,6 +2488,19 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "google-cloud-rpc"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eaa87d841e35c69efa61786e7e7462b4ebdb96df7be79775aeb698b4c0cc52e"
+dependencies = [
+ "bytes",
+ "google-cloud-wkt",
+ "serde",
+ "serde_json",
+ "serde_with",
+]
+
 [[package]]
 name = "google-cloud-storage"
 version = "0.22.1"
@@ -2312,7 +2521,7 @@ dependencies = [
  "percent-encoding",
  "pkcs8 0.10.2",
  "regex",
- "reqwest 0.12.12",
+ "reqwest 0.12.23",
  "reqwest-middleware",
  "ring 0.17.8",
  "serde",
@@ -2334,6 +2543,35 @@ dependencies = [
  "async-trait",
 ]
 
+[[package]]
+name = "google-cloud-type"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a7190c5c073b273d952e6a01913302ce54f050861ead96d607089d380afdd8a"
+dependencies = [
+ "bytes",
+ "google-cloud-wkt",
+ "serde",
+ "serde_json",
+ "serde_with",
+]
+
+[[package]]
+name = "google-cloud-wkt"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccfa292c272695eb966fe8b08c78cabb35e7775771a1c7f97b58f7dcb7bfb26"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "serde",
+ "serde_json",
+ "serde_with",
+ "thiserror 2.0.10",
+ "time",
+ "url",
+]
+
 [[package]]
 name = "group"
 version = "0.12.1"
@@ -2498,7 +2736,7 @@ dependencies = [
  "new_debug_unreachable",
  "once_cell",
  "phf 0.11.3",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "triomphe",
 ]
 
@@ -2547,12 +2785,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
- "futures-util",
+ "futures-core",
  "http 1.2.0",
  "http-body 1.0.1",
  "pin-project-lite",
@@ -2599,7 +2837,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2",
+ "socket2 0.5.8",
  "tokio",
  "tower-service",
  "tracing",
@@ -2608,13 +2846,14 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.5.2"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
+checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "futures-channel",
- "futures-util",
+ "futures-core",
  "h2 0.4.7",
  "http 1.2.0",
  "http-body 1.0.1",
@@ -2622,6 +2861,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
+ "pin-utils",
  "smallvec",
  "tokio",
  "want",
@@ -2651,13 +2891,14 @@ checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http 1.2.0",
- "hyper 1.5.2",
+ "hyper 1.7.0",
  "hyper-util",
  "rustls 0.23.20",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.1",
  "tower-service",
+ "webpki-roots 0.26.11",
 ]
 
 [[package]]
@@ -2693,7 +2934,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.5.2",
+ "hyper 1.7.0",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -2703,21 +2944,28 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.10"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
 dependencies = [
+ "base64 0.22.1",
  "bytes",
  "futures-channel",
+ "futures-core",
  "futures-util",
  "http 1.2.0",
  "http-body 1.0.1",
- "hyper 1.5.2",
+ "hyper 1.7.0",
+ "ipnet",
+ "libc",
+ "percent-encoding",
  "pin-project-lite",
- "socket2",
+ "socket2 0.6.0",
+ "system-configuration 0.6.1",
  "tokio",
  "tower-service",
  "tracing",
+ "windows-registry",
 ]
 
 [[package]]
@@ -2956,6 +3204,16 @@ version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
+[[package]]
+name = "iri-string"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
 [[package]]
 name = "is-macro"
 version = "0.3.7"
@@ -3038,9 +3296,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.76"
+version = "0.3.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -3097,9 +3355,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.176"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
 
 [[package]]
 name = "libloading"
@@ -3203,6 +3461,12 @@ dependencies = [
  "hashbrown 0.15.2",
 ]
 
+[[package]]
+name = "lru-slab"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
+
 [[package]]
 name = "malachite"
 version = "0.6.1"
@@ -3313,6 +3577,36 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "metrics"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25dea7ac8057892855ec285c440160265225438c3c45072613c25a4b26e98ef5"
+dependencies = [
+ "ahash",
+ "portable-atomic",
+]
+
+[[package]]
+name = "metrics-util"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe8db7a05415d0f919ffb905afa37784f71901c9a773188876984b4f769ab986"
+dependencies = [
+ "aho-corasick",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "hashbrown 0.15.2",
+ "indexmap 2.7.0",
+ "metrics",
+ "ordered-float",
+ "quanta",
+ "radix_trie",
+ "rand 0.9.2",
+ "rand_xoshiro",
+ "sketches-ddsketch",
+]
+
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -3445,6 +3739,15 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
+[[package]]
+name = "nibble_vec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+dependencies = [
+ "smallvec",
+]
+
 [[package]]
 name = "nix"
 version = "0.24.3"
@@ -3635,6 +3938,15 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "ordered-float"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "os_pipe"
 version = "1.2.1"
@@ -4036,7 +4348,7 @@ dependencies = [
  "serde",
  "serde_yaml 0.8.26",
  "sfv",
- "socket2",
+ "socket2 0.6.0",
  "strum",
  "strum_macros",
  "thread_local",
@@ -4107,7 +4419,7 @@ dependencies = [
  "pingora-http",
  "pingora-ketama",
  "pingora-runtime",
- "rand 0.9.1",
+ "rand 0.9.2",
  "tokio",
 ]
 
@@ -4120,7 +4432,7 @@ dependencies = [
  "arrayvec",
  "hashbrown 0.15.2",
  "parking_lot",
- "rand 0.9.1",
+ "rand 0.9.2",
 ]
 
 [[package]]
@@ -4248,6 +4560,12 @@ dependencies = [
  "syn 2.0.95",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
 [[package]]
 name = "postgres-native-tls"
 version = "0.5.0"
@@ -4274,7 +4592,7 @@ dependencies = [
  "log",
  "md-5",
  "memchr",
- "rand 0.9.1",
+ "rand 0.9.2",
  "sha2",
  "stringprep",
 ]
@@ -4433,7 +4751,7 @@ dependencies = [
  "bitflags 2.9.4",
  "lazy_static",
  "num-traits",
- "rand 0.9.1",
+ "rand 0.9.2",
  "rand_chacha 0.9.0",
  "rand_xorshift",
  "regex-syntax 0.8.5",
@@ -4553,6 +4871,21 @@ version = "2.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
 
+[[package]]
+name = "quanta"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7"
+dependencies = [
+ "crossbeam-utils",
+ "libc",
+ "once_cell",
+ "raw-cpuid",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "web-sys",
+ "winapi",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -4570,6 +4903,61 @@ dependencies = [
  "rand 0.8.5",
 ]
 
+[[package]]
+name = "quinn"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash 2.1.1",
+ "rustls 0.23.20",
+ "socket2 0.6.0",
+ "thiserror 2.0.10",
+ "tokio",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
+dependencies = [
+ "bytes",
+ "getrandom 0.3.3",
+ "lru-slab",
+ "rand 0.9.2",
+ "ring 0.17.8",
+ "rustc-hash 2.1.1",
+ "rustls 0.23.20",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.10",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2 0.6.0",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.38"
@@ -4591,6 +4979,16 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426"
 
+[[package]]
+name = "radix_trie"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+dependencies = [
+ "endian-type",
+ "nibble_vec",
+]
+
 [[package]]
 name = "rand"
 version = "0.4.6"
@@ -4630,9 +5028,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
@@ -4728,6 +5126,24 @@ dependencies = [
  "rand_core 0.9.3",
 ]
 
+[[package]]
+name = "rand_xoshiro"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41"
+dependencies = [
+ "rand_core 0.9.3",
+]
+
+[[package]]
+name = "raw-cpuid"
+version = "11.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"
+dependencies = [
+ "bitflags 2.9.4",
+]
+
 [[package]]
 name = "rdrand"
 version = "0.4.0"
@@ -4847,9 +5263,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.12"
+version = "0.12.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
+checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -4861,36 +5277,37 @@ dependencies = [
  "http 1.2.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.5.2",
+ "hyper 1.7.0",
  "hyper-rustls 0.27.5",
  "hyper-tls 0.6.0",
  "hyper-util",
- "ipnet",
  "js-sys",
  "log",
  "mime",
  "mime_guess",
  "native-tls",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile 2.2.0",
+ "quinn",
+ "rustls 0.23.20",
+ "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper 1.0.2",
- "system-configuration 0.6.1",
  "tokio",
  "tokio-native-tls",
+ "tokio-rustls 0.26.1",
  "tokio-util",
  "tower 0.5.2",
+ "tower-http 0.6.6",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "windows-registry",
+ "webpki-roots 1.0.2",
 ]
 
 [[package]]
@@ -4902,7 +5319,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "http 1.2.0",
- "reqwest 0.12.12",
+ "reqwest 0.12.23",
  "serde",
  "thiserror 1.0.69",
  "tower-service",
@@ -5013,6 +5430,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.1"
@@ -5080,7 +5503,9 @@ version = "0.23.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
 dependencies = [
+ "log",
  "once_cell",
+ "ring 0.17.8",
  "rustls-pki-types",
  "rustls-webpki 0.102.8",
  "subtle",
@@ -5135,6 +5560,9 @@ name = "rustls-pki-types"
 version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
@@ -5315,18 +5743,28 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5410,7 +5848,7 @@ version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
- "darling",
+ "darling 0.20.10",
  "proc-macro2",
  "quote",
  "syn 2.0.95",
@@ -5582,6 +6020,12 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
+[[package]]
+name = "sketches-ddsketch"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a"
+
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -5624,6 +6068,16 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -5830,7 +6284,7 @@ source = "git+https://github.com/encoredev/swc?branch=node-resolve-exports#3ccdd
 dependencies = [
  "hstr",
  "once_cell",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "serde",
 ]
 
@@ -5841,7 +6295,7 @@ source = "git+https://github.com/encoredev/swc?branch=node-resolve-exports#3ccdd
 dependencies = [
  "ahash",
  "anyhow",
- "dashmap",
+ "dashmap 5.5.3",
  "once_cell",
  "regex",
  "serde",
@@ -5861,7 +6315,7 @@ dependencies = [
  "new_debug_unreachable",
  "num-bigint",
  "once_cell",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "serde",
  "siphasher 0.3.11",
  "string_cache",
@@ -5896,7 +6350,7 @@ version = "0.45.9"
 source = "git+https://github.com/encoredev/swc?branch=node-resolve-exports#3ccddcb7d70380b6952296717b2d9f2056f4c2ac"
 dependencies = [
  "anyhow",
- "dashmap",
+ "dashmap 5.5.3",
  "indexmap 1.9.3",
  "normpath",
  "once_cell",
@@ -5939,7 +6393,7 @@ dependencies = [
  "indexmap 1.9.3",
  "once_cell",
  "phf 0.10.1",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "serde",
  "smallvec",
  "swc_atoms",
@@ -5959,7 +6413,7 @@ dependencies = [
  "indexmap 1.9.3",
  "num_cpus",
  "once_cell",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "swc_atoms",
  "swc_common",
  "swc_ecma_ast",
@@ -6241,9 +6695,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.37"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
 dependencies = [
  "deranged",
  "itoa",
@@ -6256,15 +6710,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.2"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
 
 [[package]]
 name = "time-macros"
-version = "0.2.19"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
 dependencies = [
  "num-conv",
  "time-core",
@@ -6308,7 +6762,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2",
+ "socket2 0.5.8",
  "tokio-macros",
  "windows-sys 0.52.0",
 ]
@@ -6403,8 +6857,8 @@ dependencies = [
  "pin-project-lite",
  "postgres-protocol",
  "postgres-types",
- "rand 0.9.1",
- "socket2",
+ "rand 0.9.2",
+ "socket2 0.5.8",
  "tokio",
  "tokio-util",
  "whoami",
@@ -6593,7 +7047,7 @@ dependencies = [
  "tower-layer",
  "tower-service",
  "tracing",
- "webpki-roots",
+ "webpki-roots 0.25.4",
 ]
 
 [[package]]
@@ -6657,6 +7111,24 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "tower-http"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+dependencies = [
+ "bitflags 2.9.4",
+ "bytes",
+ "futures-util",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "iri-string",
+ "pin-project-lite",
+ "tower 0.5.2",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -7089,20 +7561,22 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.99"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.99"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
 dependencies = [
  "bumpalo",
  "log",
@@ -7114,9 +7588,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.49"
+version = "0.4.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
+checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -7127,9 +7601,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.99"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -7137,9 +7611,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.99"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7150,9 +7624,12 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.99"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "wasm-streams"
@@ -7169,9 +7646,19 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.76"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7193,6 +7680,24 @@ version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
+[[package]]
+name = "webpki-roots"
+version = "0.26.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
+dependencies = [
+ "webpki-roots 1.0.2",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "which"
 version = "4.4.2"
@@ -7266,34 +7771,39 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
 [[package]]
 name = "windows-registry"
-version = "0.2.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
 dependencies = [
+ "windows-link",
  "windows-result",
  "windows-strings",
- "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.2.0"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.1.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
- "windows-result",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
diff --git a/runtimes/core/Cargo.toml b/runtimes/core/Cargo.toml
index e1695dd0c1..94cd250044 100644
--- a/runtimes/core/Cargo.toml
+++ b/runtimes/core/Cargo.toml
@@ -10,6 +10,7 @@ rttrace = []
 [dependencies]
 pingora = { version = "0.4", features = ["lb", "openssl"] }
 anyhow = "1.0.76"
+async-trait = "0.1"
 base64 = "0.21.5"
 gjson = "0.8.1"
 prost = "0.12.3"
@@ -123,6 +124,12 @@ email_address = "0.2.9"
 cookie = "0.18.1"
 malachite = "0.6.1"
 byteorder = "1.5.0"
+metrics = "0.24.2"
+metrics-util = { version = "0.20.0", features = ["registry", "storage"] }
+dashmap = "6.1.0"
+google-cloud-monitoring-v3 = "1.0.0"
+google-cloud-api = "1.0.0"
+google-cloud-wkt = "1.0.0"
 
 [build-dependencies]
 prost-build = "0.12.3"
diff --git a/runtimes/core/src/api/auth/local.rs b/runtimes/core/src/api/auth/local.rs
index a9c88fad64..3cfaf6e519 100644
--- a/runtimes/core/src/api/auth/local.rs
+++ b/runtimes/core/src/api/auth/local.rs
@@ -2,6 +2,7 @@ use crate::api::auth::{AuthHandler, AuthPayload, AuthRequest, AuthResponse};
 use crate::api::schema::encoding::Schema;
 use crate::api::{APIResult, HandlerResponse, HandlerResponseInner, PValues};
 use crate::log::LogFromRust;
+use crate::metrics::Counter;
 use crate::model::{AuthRequestData, RequestData};
 use crate::trace::Tracer;
 use crate::{api, model, EndpointName};
@@ -14,6 +15,7 @@ pub struct LocalAuthHandler {
     pub schema: Schema,
     pub handler: RwLock<Option<Arc<dyn api::TypedHandler>>>,
     pub tracer: Tracer,
+    pub requests_total: Counter,
 }
 
 impl LocalAuthHandler {
@@ -152,7 +154,9 @@ impl AuthHandler for LocalAuthHandler {
                             user_id: auth_uid.clone(),
                         })),
                     };
+
                     self.tracer.request_span_end(&model_resp, false);
+                    self.requests_total.increment_with([("code", "ok")]);
                     Ok(AuthResponse::Authenticated {
                         auth_uid,
                         auth_data,
@@ -165,6 +169,8 @@ impl AuthHandler for LocalAuthHandler {
                         data: model::ResponseData::Auth(Err(e.clone())),
                     };
                     self.tracer.request_span_end(&model_resp, false);
+                    self.requests_total
+                        .increment_with([("code", e.code.to_string())]);
                     Err(e)
                 }
             }
diff --git a/runtimes/core/src/api/endpoint.rs b/runtimes/core/src/api/endpoint.rs
index 83f8697f03..8cbb8c74d4 100644
--- a/runtimes/core/src/api/endpoint.rs
+++ b/runtimes/core/src/api/endpoint.rs
@@ -23,6 +23,7 @@ use crate::api::{jsonschema, schema, ErrCode, Error};
 use crate::encore::parser::meta::v1::rpc;
 use crate::encore::parser::meta::v1::{self as meta, selector};
 use crate::log::LogFromRust;
+use crate::metrics::Counter;
 use crate::model::StreamDirection;
 use crate::names::EndpointName;
 use crate::trace;
@@ -406,6 +407,7 @@ pub(super) struct EndpointHandler {
     pub endpoint: Arc<Endpoint>,
     pub handler: Arc<dyn BoxedHandler>,
     pub shared: Arc<SharedEndpointData>,
+    pub requests_total: Counter,
 }
 
 #[derive(Debug)]
@@ -427,6 +429,7 @@ impl Clone for EndpointHandler {
             endpoint: self.endpoint.clone(),
             handler: self.handler.clone(),
             shared: self.shared.clone(),
+            requests_total: self.requests_total.clone(),
         }
     }
 }
@@ -601,7 +604,6 @@ impl EndpointHandler {
             let duration = tokio::time::Instant::now().duration_since(request.start);
 
             // If we had a request failure, log that separately.
-
             if let ResponseData::Typed(Err(err)) = &resp {
                 logger.error(Some(&request), "request failed", Some(err), {
                     let mut fields = crate::log::Fields::new();
@@ -629,6 +631,12 @@ impl EndpointHandler {
                 });
             }
 
+            let code = match &resp {
+                ResponseData::Typed(Ok(_)) => "ok".to_string(),
+                ResponseData::Typed(Err(err)) => err.code.to_string(),
+                ResponseData::Raw(resp) => ErrCode::from(resp.status()).to_string(),
+            };
+
             logger.info(Some(&request), "request completed", {
                 let mut fields = crate::log::Fields::new();
                 let dur_ms = (duration.as_secs() as f64 * 1000f64)
@@ -644,13 +652,7 @@ impl EndpointHandler {
                     )),
                 );
 
-                let code = match &resp {
-                    ResponseData::Typed(Ok(_)) => "ok".to_string(),
-                    ResponseData::Typed(Err(err)) => err.code.to_string(),
-                    ResponseData::Raw(resp) => ErrCode::from(resp.status()).to_string(),
-                };
-
-                fields.insert("code".into(), serde_json::Value::String(code));
+                fields.insert("code".into(), serde_json::Value::String(code.clone()));
                 Some(fields)
             });
 
@@ -685,6 +687,7 @@ impl EndpointHandler {
                     }),
                 };
                 self.shared.tracer.request_span_end(&model_resp, sensitive);
+                self.requests_total.increment_with([("code", code)]);
             }
 
             if let Ok(val) = HeaderValue::from_str(request.span.0.serialize_encore().as_str()) {
diff --git a/runtimes/core/src/api/manager.rs b/runtimes/core/src/api/manager.rs
index f4f2fe2fb4..14b5a9e79a 100644
--- a/runtimes/core/src/api/manager.rs
+++ b/runtimes/core/src/api/manager.rs
@@ -18,6 +18,7 @@ use crate::api::{
 };
 use crate::encore::parser::meta::v1 as meta;
 use crate::encore::runtime::v1 as runtime;
+use crate::metrics::requests_total_counter;
 use crate::trace::Tracer;
 use crate::{api, model, pubsub, secrets, EncoreName, EndpointName, Hosted};
 
@@ -283,6 +284,7 @@ fn build_auth_handler(
     // let is_local = hosted_services.contains(&explicit.service_name);
     let is_local = true;
     let name = EndpointName::new(explicit.service_name.clone(), auth.name.clone());
+    let requests_total = requests_total_counter(&explicit.service_name, &auth.name);
 
     let auth_data = registry.schema(auth_data_schema_idx);
     let auth_handler = if is_local {
@@ -294,6 +296,7 @@ fn build_auth_handler(
                 schema,
                 handler: Default::default(),
                 tracer,
+                requests_total,
             },
         )?
     } else {
diff --git a/runtimes/core/src/api/server.rs b/runtimes/core/src/api/server.rs
index 3c922fbf49..02c9a74040 100644
--- a/runtimes/core/src/api/server.rs
+++ b/runtimes/core/src/api/server.rs
@@ -12,6 +12,7 @@ use crate::api::static_assets::StaticAssetsHandler;
 use crate::api::{self, ToResponse};
 use crate::api::{paths, reqauth, schema, BoxedHandler, EndpointMap};
 use crate::encore::parser::meta::v1 as meta;
+use crate::metrics::requests_total_counter;
 use crate::names::EndpointName;
 use crate::trace;
 
@@ -92,11 +93,14 @@ impl Server {
                             // For static asset routes, configure the static asset handler directly.
                             // There's no need to defer it for dynamic runtime registration.
                             let static_handler = StaticAssetsHandler::new(assets);
+                            let requests_total =
+                                requests_total_counter(&ep.name.service(), &ep.name.endpoint());
 
                             let handler = EndpointHandler {
                                 endpoint: ep.clone(),
                                 handler: Arc::new(static_handler),
                                 shared: shared.clone(),
+                                requests_total,
                             };
                             server_handler.set(handler);
                         }
@@ -153,11 +157,14 @@ impl Server {
             None => Ok(()), // anyhow::bail!("no handler found for endpoint: {}", endpoint_name),
             Some(h) => {
                 let endpoint = self.endpoints.get(&endpoint_name).unwrap().to_owned();
+                let requests_total =
+                    requests_total_counter(&endpoint.name.service(), &endpoint.name.endpoint());
 
                 let handler = EndpointHandler {
                     endpoint,
                     handler,
                     shared: self.shared.clone(),
+                    requests_total,
                 };
 
                 h.add(handler);
diff --git a/runtimes/core/src/lib.rs b/runtimes/core/src/lib.rs
index 150cd6e126..d587eafe80 100644
--- a/runtimes/core/src/lib.rs
+++ b/runtimes/core/src/lib.rs
@@ -24,6 +24,8 @@ pub mod error;
 pub mod infracfg;
 pub mod log;
 pub mod meta;
+pub mod metadata;
+pub mod metrics;
 pub mod model;
 mod names;
 pub mod objects;
@@ -209,6 +211,7 @@ pub struct Runtime {
     app_meta: meta::AppMeta,
     compute: ComputeConfig,
     runtime: tokio::runtime::Runtime,
+    metrics: metrics::Manager,
 }
 
 impl Runtime {
@@ -238,6 +241,7 @@ impl Runtime {
 
         let mut deployment = cfg.deployment.take().unwrap_or_default();
         let service_discovery = deployment.service_discovery.take().unwrap_or_default();
+        let observability = deployment.observability.take().unwrap_or_default();
 
         let http_client = reqwest::Client::builder()
             .build()
@@ -250,11 +254,18 @@ impl Runtime {
         );
         let platform_validator = Arc::new(platform_validator);
 
+        // Initialize metrics manager from runtime config
+        let metrics_manager = metrics::Manager::from_runtime_config(
+            &observability,
+            &environment,
+            &http_client,
+            tokio_rt.handle().clone(),
+        );
+
         // Set up observability.
         let disable_tracing =
             testing || std::env::var("ENCORE_NOTRACE").is_ok_and(|v| !v.is_empty());
         let tracer = if !disable_tracing {
-            let observability = deployment.observability.take().unwrap_or_default();
             let trace_endpoint = observability
                 .tracing
                 .into_iter()
@@ -411,6 +422,7 @@ impl Runtime {
             app_meta,
             compute,
             runtime: tokio_rt,
+            metrics: metrics_manager,
         })
     }
 
@@ -444,6 +456,11 @@ impl Runtime {
         &self.api
     }
 
+    #[inline]
+    pub fn metrics(&self) -> &metrics::Manager {
+        &self.metrics
+    }
+
     #[inline]
     pub fn endpoints(&self) -> &api::EndpointMap {
         self.api.endpoints()
diff --git a/runtimes/core/src/metadata/gce.rs b/runtimes/core/src/metadata/gce.rs
new file mode 100644
index 0000000000..1ae4ebcd21
--- /dev/null
+++ b/runtimes/core/src/metadata/gce.rs
@@ -0,0 +1,176 @@
+//! GCE metadata client implementation based on golangs "cloud.google.com/go/compute/metadata"
+
+use std::time::Duration;
+use tokio::sync::OnceCell;
+
+#[derive(Debug, thiserror::Error)]
+pub enum GceMetadataError {
+    #[error("HTTP request failed: {0}")]
+    HttpRequest(#[from] reqwest::Error),
+    #[error("GCE metadata not defined (404)")]
+    NotDefined,
+    #[error("GCE metadata server temporarily unavailable (503)")]
+    ServiceUnavailable,
+    #[error("GCE metadata server returned error status: {status}")]
+    HttpStatus { status: reqwest::StatusCode },
+    #[error("Failed to read response body: {0}")]
+    ResponseBody(reqwest::Error),
+}
+
+// Default metadata server IP as documented by Google
+const METADATA_IP: &str = "169.254.169.254";
+// Env to override metadata server host, if not set the METADATA_IP will be used
+const METADATA_HOST_ENV: &str = "GCE_METADATA_HOST";
+const METADATA_FLAVOR_HEADER: &str = "Metadata-Flavor";
+const GOOGLE_HEADER_VALUE: &str = "Google";
+const USER_AGENT: &str = "encore-runtime/0.1.0";
+// Timeout and retry configuration
+const REQUEST_TIMEOUT: Duration = Duration::from_secs(5);
+const MAX_RETRIES: usize = 3;
+
+// Global cache for instance ID to ensure it's shared across all calls
+static INSTANCE_ID_CACHE: OnceCell<String> = OnceCell::const_new();
+
+#[derive(Debug)]
+pub struct GceMetadataClient {
+    http_client: reqwest::Client,
+}
+
+impl GceMetadataClient {
+    pub fn new(http_client: reqwest::Client) -> Self {
+        Self { http_client }
+    }
+
+    /// Build metadata URL, checking GCE_METADATA_HOST environment variable first
+    fn build_metadata_url(path: &str) -> String {
+        let host = std::env::var(METADATA_HOST_ENV).unwrap_or_else(|_| METADATA_IP.to_string());
+        let path = path.trim_start_matches('/'); // Remove leading slashes like Go does
+        format!("http://{}/computeMetadata/v1/{}", host, path)
+    }
+
+    /// Get the instance ID from GCE metadata server, with global caching
+    /// This ensures only one HTTP request is made even with concurrent calls
+    pub async fn instance_id(&self) -> Result<String, GceMetadataError> {
+        let instance_id = INSTANCE_ID_CACHE
+            .get_or_try_init(|| async { self.fetch_metadata("instance/id").await })
+            .await?;
+
+        Ok(instance_id.clone())
+    }
+
+    /// Fetch metadata from the GCE metadata server
+    pub async fn fetch_metadata(&self, path: &str) -> Result<String, GceMetadataError> {
+        let url = Self::build_metadata_url(path);
+        log::debug!("Fetching GCE metadata from: {}", url);
+
+        for attempt in 1..=MAX_RETRIES {
+            let result = self.try_fetch(&url).await;
+
+            match &result {
+                Ok(_) => {
+                    log::debug!("Successfully fetched GCE metadata from {}", path);
+                    return result;
+                }
+                Err(e) if attempt == MAX_RETRIES => {
+                    log::error!(
+                        "Failed to fetch GCE metadata after {} attempts: {}",
+                        MAX_RETRIES,
+                        e
+                    );
+                    return result;
+                }
+                Err(e) => {
+                    log::warn!("Attempt {} failed: {}, retrying...", attempt, e);
+                    tokio::time::sleep(Duration::from_millis(100 * attempt as u64)).await;
+                }
+            }
+        }
+
+        unreachable!("unexpected failure fetching metadata")
+    }
+
+    async fn try_fetch(&self, url: &str) -> Result<String, GceMetadataError> {
+        let response = self
+            .http_client
+            .get(url)
+            .header(METADATA_FLAVOR_HEADER, GOOGLE_HEADER_VALUE)
+            .header(http::header::USER_AGENT, USER_AGENT)
+            .timeout(REQUEST_TIMEOUT)
+            .send()
+            .await?;
+
+        let status = response.status();
+        if status.is_success() {
+            let text = response
+                .text()
+                .await
+                .map_err(GceMetadataError::ResponseBody)?;
+            Ok(text.trim().to_string())
+        } else if status == reqwest::StatusCode::NOT_FOUND {
+            Err(GceMetadataError::NotDefined)
+        } else if status == reqwest::StatusCode::SERVICE_UNAVAILABLE {
+            Err(GceMetadataError::ServiceUnavailable)
+        } else {
+            Err(GceMetadataError::HttpStatus { status })
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::time::Duration;
+
+    #[tokio::test]
+    async fn test_gce_metadata_client_creation() {
+        let http_client = reqwest::Client::builder()
+            .timeout(Duration::from_secs(1))
+            .build()
+            .unwrap();
+
+        let client = GceMetadataClient::new(http_client);
+
+        // Test that the client can be created without panic
+        assert!(format!("{:?}", client).contains("GceMetadataClient"));
+    }
+
+    #[tokio::test]
+    async fn test_singleton_cache_behavior() {
+        // Verify the cache is initially empty
+        assert!(INSTANCE_ID_CACHE.get().is_none());
+
+        // Test that we can set a value (simulating successful fetch)
+        let test_id = "test-instance-123".to_string();
+        let result = INSTANCE_ID_CACHE.set(test_id.clone());
+        assert!(result.is_ok());
+
+        // Verify the cached value can be retrieved
+        assert_eq!(INSTANCE_ID_CACHE.get(), Some(&test_id));
+    }
+
+    #[test]
+    fn test_metadata_url_construction() {
+        // Test default URL construction (no environment variable)
+        std::env::remove_var(METADATA_HOST_ENV);
+        let url = GceMetadataClient::build_metadata_url("instance/id");
+        assert_eq!(url, "http://169.254.169.254/computeMetadata/v1/instance/id");
+
+        // Test with leading slash removal
+        let url = GceMetadataClient::build_metadata_url("/instance/id");
+        assert_eq!(url, "http://169.254.169.254/computeMetadata/v1/instance/id");
+    }
+
+    #[test]
+    fn test_metadata_host_env_var() {
+        // Test custom host via environment variable
+        std::env::set_var(METADATA_HOST_ENV, "custom.metadata.host");
+        let url = GceMetadataClient::build_metadata_url("instance/id");
+        assert_eq!(
+            url,
+            "http://custom.metadata.host/computeMetadata/v1/instance/id"
+        );
+
+        // Clean up
+        std::env::remove_var(METADATA_HOST_ENV);
+    }
+}
diff --git a/runtimes/core/src/metadata/mod.rs b/runtimes/core/src/metadata/mod.rs
new file mode 100644
index 0000000000..b84faebb6d
--- /dev/null
+++ b/runtimes/core/src/metadata/mod.rs
@@ -0,0 +1,95 @@
+use std::collections::HashMap;
+
+use crate::encore::runtime::v1::{environment::Cloud, Environment};
+use anyhow::Context;
+
+mod gce;
+
+#[derive(Debug, Clone, Default)]
+pub struct ContainerMetadata {
+    pub service_id: String,
+    pub revision_id: String,
+    pub instance_id: String,
+    pub env_name: String,
+}
+
+impl ContainerMetadata {
+    pub fn labels(&self) -> Vec<(String, String)> {
+        vec![
+            ("service_id".to_string(), self.service_id.clone()),
+            ("revision_id".to_string(), self.revision_id.clone()),
+            ("instance_id".to_string(), self.instance_id.clone()),
+            ("env_name".to_string(), self.env_name.clone()),
+        ]
+    }
+
+    pub async fn collect(env: &Environment, http_client: &reqwest::Client) -> anyhow::Result<Self> {
+        match env.cloud() {
+            Cloud::Gcp | Cloud::Encore => Self::collect_gcp(env, http_client).await,
+            Cloud::Aws | Cloud::Azure | Cloud::Unspecified | Cloud::Local => anyhow::bail!(
+                "can't collect container meta in {}",
+                env.cloud().as_str_name()
+            ),
+        }
+    }
+
+    async fn collect_gcp(env: &Environment, http_client: &reqwest::Client) -> anyhow::Result<Self> {
+        let service = std::env::var("K_SERVICE").map_err(|_| {
+            anyhow::anyhow!("unable to get service ID: env variable 'K_SERVICE' unset")
+        })?;
+
+        let revision = std::env::var("K_REVISION").map_err(|_| {
+            anyhow::anyhow!("unable to get revision ID: env variable 'K_REVISION' unset")
+        })?;
+
+        let revision = revision
+            .strip_prefix(&format!("{}-", service))
+            .unwrap_or(&revision)
+            .to_string();
+
+        let instance_id = match std::env::var("K_POD") {
+            Ok(pod_id) => {
+                // If we have a K8s POD name, take the last part of it which is the random pod ID
+                // On GKE, the InstanceID appears to be the Node, so if the multiple replicas are running
+                // on the same InstanceID then we'd have a collision. This is unlikely, but possible -
+                // hence why we use the pod ID instead.
+                pod_id
+                    .rsplit('-')
+                    .next()
+                    .ok_or_else(|| anyhow::anyhow!("invalid instance ID '{}'", pod_id))?
+                    .to_string()
+            }
+            Err(_) => {
+                // If we don't have a K8s POD name, we're running on Cloud Run and can get the instance ID from the metadata server
+                let metadata_client = gce::GceMetadataClient::new(http_client.clone());
+
+                metadata_client
+                    .instance_id()
+                    .await
+                    .context("failed to get instance ID from GCE metadata server")?
+            }
+        };
+
+        Ok(Self {
+            service_id: service,
+            revision_id: revision,
+            instance_id,
+            env_name: env.env_name.clone(),
+        })
+    }
+
+    // TODO(fredr): implement collect for aws
+}
+
+/// Process environment variable substitution in labels
+/// Replaces $ENV:VARIABLE_NAME with the actual environment variable value
+pub fn process_env_substitution(labels: &mut HashMap<String, String>) {
+    for (_, value) in labels.iter_mut() {
+        if value.starts_with("$ENV:") {
+            let env_var = &value[5..];
+            if let Ok(env_value) = std::env::var(env_var) {
+                *value = env_value;
+            }
+        }
+    }
+}
diff --git a/runtimes/core/src/metrics/counter.rs b/runtimes/core/src/metrics/counter.rs
new file mode 100644
index 0000000000..8658cb0961
--- /dev/null
+++ b/runtimes/core/src/metrics/counter.rs
@@ -0,0 +1,80 @@
+use std::collections::HashMap;
+
+/// A counter with base labels that can be incremented with additional labels
+#[derive(Debug, Clone)]
+pub struct Counter {
+    metric_name: &'static str,
+    base_labels: HashMap<String, String>,
+}
+
+impl Counter {
+    /// Create a new counter with the given metric name
+    pub fn new(metric_name: &'static str) -> Self {
+        Self {
+            metric_name,
+            base_labels: HashMap::new(),
+        }
+    }
+
+    /// Add multiple labels to the counter's base labels
+    pub fn with_labels<K, V>(
+        mut self,
+        new_labels: impl IntoIterator<Item = (K, V)>,
+    ) -> Self
+    where
+        K: Into<String>,
+        V: Into<String>,
+    {
+        for (key, value) in new_labels {
+            self.base_labels.insert(key.into(), value.into());
+        }
+        self
+    }
+
+    /// Increment the counter
+    pub fn increment(&self) {
+        use metrics::{Key, Label, Metadata};
+
+        metrics::with_recorder(|recorder| {
+            let labels: Vec<Label> = self
+                .base_labels
+                .iter()
+                .map(|(k, v)| Label::new(k.clone(), v.clone()))
+                .collect();
+
+            let key = Key::from_parts(self.metric_name, labels);
+            let metadata =
+                Metadata::new(module_path!(), metrics::Level::INFO, Some(module_path!()));
+            let counter = recorder.register_counter(&key, &metadata);
+            counter.increment(1);
+        });
+    }
+
+    /// Increment the counter with additional labels
+    pub fn increment_with<K, V>(&self, extra_labels: impl IntoIterator<Item = (K, V)>)
+    where
+        K: Into<String>,
+        V: Into<String>,
+    {
+        use metrics::{Key, Label, Metadata};
+
+        metrics::with_recorder(|recorder| {
+            let mut labels: Vec<Label> = self
+                .base_labels
+                .iter()
+                .map(|(k, v)| Label::new(k.clone(), v.clone()))
+                .collect();
+
+            // Add extra labels
+            for (key, value) in extra_labels {
+                labels.push(Label::new(key.into(), value.into()));
+            }
+
+            let key = Key::from_parts(self.metric_name, labels);
+            let metadata =
+                Metadata::new(module_path!(), metrics::Level::INFO, Some(module_path!()));
+            let counter = recorder.register_counter(&key, &metadata);
+            counter.increment(1);
+        });
+    }
+}
diff --git a/runtimes/core/src/metrics/exporter/gcp.rs b/runtimes/core/src/metrics/exporter/gcp.rs
new file mode 100644
index 0000000000..13cdf8a7ad
--- /dev/null
+++ b/runtimes/core/src/metrics/exporter/gcp.rs
@@ -0,0 +1,210 @@
+use crate::metadata::ContainerMetadata;
+use crate::metrics::manager::Exporter;
+use crate::metrics::{CollectedMetric, MetricValue};
+use anyhow::Context;
+use dashmap::DashMap;
+use google_cloud_api::model::metric_descriptor::{MetricKind, ValueType};
+use google_cloud_api::model::{Metric, MonitoredResource};
+use google_cloud_monitoring_v3::client::MetricService;
+use google_cloud_monitoring_v3::model::{Point, TimeInterval, TimeSeries, TypedValue};
+use std::collections::HashMap;
+use std::sync::Arc;
+use std::time::{Duration, SystemTime};
+
+#[derive(Clone)]
+pub struct Gcp {
+    client: Arc<LazyMonitoringClient>,
+    project_id: String,
+    monitored_resource_type: String,
+    monitored_resource_labels: HashMap<String, String>,
+    metric_names: HashMap<String, String>,
+    container_meta: ContainerMetadata,
+    first_seen: Arc<DashMap<u64, SystemTime>>,
+}
+
+impl std::fmt::Debug for Gcp {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Gcp")
+            .field("project_id", &self.project_id)
+            .field("monitored_resource_type", &self.monitored_resource_type)
+            .field("monitored_resource_labels", &self.monitored_resource_labels)
+            .field("metric_names", &self.metric_names)
+            .field("container_meta", &self.container_meta)
+            .field("first_seen", &self.first_seen)
+            .finish()
+    }
+}
+struct LazyMonitoringClient {
+    cell: tokio::sync::OnceCell<anyhow::Result<MetricService>>,
+}
+
+impl LazyMonitoringClient {
+    fn new() -> Self {
+        Self {
+            cell: tokio::sync::OnceCell::new(),
+        }
+    }
+
+    async fn get(&self) -> &anyhow::Result<MetricService> {
+        self.cell
+            .get_or_init(|| async {
+                MetricService::builder()
+                    .build()
+                    .await
+                    .inspect_err(|e| log::error!("Failed to create GCP monitoring client: {e:?}"))
+                    .context("create monitoring client")
+            })
+            .await
+    }
+}
+
+impl Gcp {
+    pub fn new(
+        project_id: String,
+        monitored_resource_type: String,
+        monitored_resource_labels: HashMap<String, String>,
+        metric_names: HashMap<String, String>,
+        container_meta: ContainerMetadata,
+        first_seen: Arc<DashMap<u64, SystemTime>>,
+    ) -> Self {
+        Self {
+            client: Arc::new(LazyMonitoringClient::new()),
+            project_id,
+            monitored_resource_type,
+            monitored_resource_labels,
+            metric_names,
+            container_meta,
+            first_seen,
+        }
+    }
+
+    async fn export_metrics(&self, metrics: Vec<CollectedMetric>) -> Result<(), anyhow::Error> {
+        if metrics.is_empty() {
+            return Ok(());
+        }
+
+        let client = match self.client.get().await {
+            Ok(client) => client,
+            Err(e) => {
+                log::error!("Failed to get monitoring client: {}", e);
+                return Err(anyhow::anyhow!("Failed to get monitoring client: {}", e));
+            }
+        };
+
+        log::info!(
+            "Exporting {} metrics to GCP project {}",
+            metrics.len(),
+            self.project_id
+        );
+
+        // Convert our metrics to Google Cloud TimeSeries format
+        let time_series = self.get_metric_data(metrics);
+        // TODO(fredr): add sys-metrics
+
+        // Send metrics in batches (Google Cloud allows up to 200 time series per request)
+        for batch in time_series.chunks(200) {
+            if let Err(e) = self.send_time_series_batch(client, batch.to_vec()).await {
+                log::error!("Failed to export metrics batch: {}", e);
+                // Continue with remaining batches even if one fails
+            }
+        }
+
+        Ok(())
+    }
+
+    fn get_metric_data(&self, collected: Vec<CollectedMetric>) -> Vec<TimeSeries> {
+        let end_time = SystemTime::now();
+        let ts_end_time: google_cloud_wkt::Timestamp = end_time.try_into().unwrap_or_default();
+
+        let mut data: Vec<TimeSeries> = Vec::with_capacity(collected.len());
+        let container_labels = self.container_meta.labels();
+        let container_labels_len = container_labels.len();
+
+        for metric in collected {
+            let cloud_metric_name = match self.metric_names.get(&metric.name) {
+                Some(name) => name,
+                None => continue,
+            };
+
+            // Pre-allocate exact capacity for labels
+            let mut labels: HashMap<String, String> =
+                HashMap::with_capacity(container_labels_len + metric.labels.len());
+            labels.extend(container_labels.clone());
+            labels.extend(metric.labels.clone());
+
+            let (kind, value_type, typed_value, interval) = match metric.value {
+                MetricValue::Counter(val) => {
+                    let start_time: google_cloud_wkt::Timestamp = self
+                        .first_seen
+                        .get(&metric.key.get_hash())
+                        .map(|entry| *entry)
+                        .unwrap_or_else(|| end_time - Duration::from_millis(1)) // this should never happen, but just so we dont have to handle errors
+                        .try_into()
+                        .unwrap_or_default();
+
+                    (
+                        MetricKind::Cumulative,
+                        ValueType::Int64,
+                        TypedValue::new().set_int64_value(val as i64),
+                        TimeInterval::new()
+                            .set_start_time(start_time)
+                            .set_end_time(ts_end_time),
+                    )
+                }
+                MetricValue::Gauge(val) => (
+                    MetricKind::Gauge,
+                    ValueType::Double,
+                    TypedValue::new().set_double_value(val),
+                    TimeInterval::new().set_end_time(ts_end_time),
+                ),
+            };
+
+            data.push(
+                TimeSeries::new()
+                    .set_metric_kind(kind)
+                    .set_metric(
+                        Metric::new()
+                            .set_type(format!("custom.googleapis.com/{}", cloud_metric_name))
+                            .set_labels(labels),
+                    )
+                    .set_resource(
+                        MonitoredResource::new()
+                            .set_type(&self.monitored_resource_type)
+                            .set_labels(&self.monitored_resource_labels),
+                    )
+                    .set_value_type(value_type)
+                    .set_points(vec![Point::new()
+                        .set_interval(interval)
+                        .set_value(typed_value)]),
+            );
+        }
+
+        data
+    }
+
+    async fn send_time_series_batch(
+        &self,
+        client: &MetricService,
+        time_series: Vec<google_cloud_monitoring_v3::model::TimeSeries>,
+    ) -> Result<(), anyhow::Error> {
+        client
+            .create_time_series()
+            .set_name(format!("projects/{}", self.project_id))
+            .set_time_series(time_series)
+            .send()
+            .await
+            .map_err(anyhow::Error::new)?;
+
+        log::debug!("Successfully exported metrics batch to GCP");
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+impl Exporter for Gcp {
+    async fn export(&self, metrics: Vec<CollectedMetric>) {
+        if let Err(err) = self.export_metrics(metrics).await {
+            log::error!("Failed to export metrics to GCP: {}", err);
+        }
+    }
+}
diff --git a/runtimes/core/src/metrics/exporter/mod.rs b/runtimes/core/src/metrics/exporter/mod.rs
new file mode 100644
index 0000000000..77980efef5
--- /dev/null
+++ b/runtimes/core/src/metrics/exporter/mod.rs
@@ -0,0 +1,2 @@
+mod gcp;
+pub use gcp::Gcp;
diff --git a/runtimes/core/src/metrics/manager.rs b/runtimes/core/src/metrics/manager.rs
new file mode 100644
index 0000000000..8328b895d9
--- /dev/null
+++ b/runtimes/core/src/metrics/manager.rs
@@ -0,0 +1,185 @@
+use crate::{
+    encore::runtime::v1::{self as pb, Environment},
+    metadata::{process_env_substitution, ContainerMetadata},
+    metrics::{exporter, registry::Registry},
+};
+use std::sync::Arc;
+use std::time::Duration;
+
+#[derive(Debug, Clone)]
+enum ProviderType {
+    Gcp(pb::metrics_provider::GcpCloudMonitoring),
+    EncoreCloud(pb::metrics_provider::GcpCloudMonitoring),
+    // TODO(fredr) add these:
+    // - Aws(pb::metrics_provider::AwsCloudWatch),
+    // - Prometheus(pb::metrics_provider::PrometheusRemoteWrite),
+    // - Datadog(pb::metrics_provider::Datadog),
+}
+
+impl ProviderType {
+    fn from_config(provider: &pb::MetricsProvider) -> Option<Self> {
+        match &provider.provider {
+            Some(pb::metrics_provider::Provider::Gcp(config)) => Some(Self::Gcp(config.clone())),
+            Some(pb::metrics_provider::Provider::EncoreCloud(config)) => {
+                Some(Self::EncoreCloud(config.clone()))
+            }
+            _ => {
+                log::warn!("unsupported metrics provider: {:?}", provider.provider);
+                None
+            }
+        }
+    }
+
+    fn create_exporter(
+        &self,
+        reg: &Registry,
+        env: &Environment,
+        http_client: &reqwest::Client,
+        runtime_handle: tokio::runtime::Handle,
+    ) -> Arc<dyn Exporter + Send + Sync> {
+        match self {
+            Self::Gcp(config) | Self::EncoreCloud(config) => {
+                runtime_handle.block_on(Self::create_gcp_exporter(config, reg, env, http_client))
+            }
+        }
+    }
+
+    async fn create_gcp_exporter(
+        provider_cfg: &pb::metrics_provider::GcpCloudMonitoring,
+        reg: &Registry,
+        env: &Environment,
+        http_client: &reqwest::Client,
+    ) -> Arc<dyn Exporter + Send + Sync> {
+        let container_meta = ContainerMetadata::collect(env, http_client)
+            .await
+            .unwrap_or_else(|_| ContainerMetadata {
+                env_name: env.env_name.clone(),
+                ..Default::default()
+            });
+
+        let mut labels = provider_cfg.monitored_resource_labels.clone();
+
+        // Add container instance ID to node_id if present
+        if let Some(node_id) = labels.get("node_id").cloned() {
+            labels.insert(
+                "node_id".to_string(),
+                format!("{}-{}", node_id, container_meta.instance_id),
+            );
+        }
+
+        process_env_substitution(&mut labels);
+
+        Arc::new(exporter::Gcp::new(
+            provider_cfg.project_id.clone(),
+            provider_cfg.monitored_resource_type.clone(),
+            labels,
+            provider_cfg.metric_names.clone(),
+            container_meta,
+            reg.first_seen(),
+        ))
+    }
+}
+
+#[derive(Clone)]
+pub struct Manager {
+    exporter: Option<Arc<dyn Exporter>>,
+    registry: Registry,
+}
+
+impl Manager {
+    pub fn new() -> Self {
+        let registry = Registry::new();
+
+        #[cfg(not(test))]
+        if let Err(e) = metrics::set_global_recorder(registry.clone()) {
+            log::warn!("Failed to set metrics recorder: {}", e);
+        }
+
+        Self {
+            exporter: None,
+            registry,
+        }
+    }
+
+    #[cfg(test)]
+    pub fn with_local_recorder<T>(&self, f: impl FnOnce() -> T) -> T {
+        metrics::with_local_recorder(&self.registry, f)
+    }
+
+    pub fn from_runtime_config(
+        observability: &pb::Observability,
+        environment: &pb::Environment,
+        http_client: &reqwest::Client,
+        runtime_handle: tokio::runtime::Handle,
+    ) -> Self {
+        let mut manager = Self::new();
+
+        for metrics_provider in &observability.metrics {
+            if let Some(provider_type) = ProviderType::from_config(metrics_provider) {
+                manager.exporter = Some(provider_type.create_exporter(
+                    &manager.registry,
+                    environment,
+                    http_client,
+                    runtime_handle.clone(),
+                ));
+                break; // Take the first valid provider
+            }
+        }
+
+        // Start collection if we have an exporter
+        if manager.exporter.is_some() {
+            let collection_interval = observability
+                .metrics
+                .first()
+                .and_then(|p| p.collection_interval.as_ref())
+                .and_then(|d| Duration::try_from(d.clone()).ok())
+                .unwrap_or(Duration::from_secs(60)); // Default to 1 minute
+
+            manager.start_collection_loop(runtime_handle, collection_interval);
+        }
+
+        manager
+    }
+
+    pub fn with_exporter(mut self, exporter: std::sync::Arc<dyn Exporter + Send + Sync>) -> Self {
+        self.exporter = Some(exporter);
+        self
+    }
+
+    pub async fn collect_and_export(&self) {
+        let metrics = self.registry.collect();
+        if let Some(ref exporter) = self.exporter {
+            exporter.export(metrics).await;
+        }
+    }
+
+    pub fn collect_metrics(&self) -> Vec<crate::metrics::CollectedMetric> {
+        self.registry.collect()
+    }
+
+    pub fn start_collection_loop(
+        &self,
+        runtime_handle: tokio::runtime::Handle,
+        interval: std::time::Duration,
+    ) {
+        let manager = self.clone();
+        runtime_handle.spawn(async move {
+            let mut interval_timer = tokio::time::interval(interval);
+            loop {
+                interval_timer.tick().await;
+                manager.collect_and_export().await;
+            }
+        });
+    }
+}
+
+impl Default for Manager {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[async_trait::async_trait]
+pub trait Exporter: Send + Sync + std::fmt::Debug {
+    async fn export(&self, metrics: Vec<crate::metrics::CollectedMetric>);
+}
diff --git a/runtimes/core/src/metrics/mod.rs b/runtimes/core/src/metrics/mod.rs
new file mode 100644
index 0000000000..136beae91c
--- /dev/null
+++ b/runtimes/core/src/metrics/mod.rs
@@ -0,0 +1,18 @@
+mod counter;
+mod exporter;
+mod manager;
+mod registry;
+
+#[cfg(test)]
+mod test;
+
+pub use counter::Counter;
+pub use manager::Manager;
+pub use registry::{CollectedMetric, MetricInfo, MetricValue, Registry};
+
+pub fn requests_total_counter(service: &str, endpoint: &str) -> Counter {
+    crate::metrics::Counter::new("e_requests_total").with_labels([
+        ("service", service.to_string()),
+        ("endpoint", endpoint.to_string()),
+    ])
+}
diff --git a/runtimes/core/src/metrics/registry.rs b/runtimes/core/src/metrics/registry.rs
new file mode 100644
index 0000000000..2c66e4dfb4
--- /dev/null
+++ b/runtimes/core/src/metrics/registry.rs
@@ -0,0 +1,154 @@
+use dashmap::DashMap;
+use metrics::{Key, KeyName, Metadata, Recorder, Unit};
+use metrics_util::registry::{AtomicStorage, Registry as MetricsRegistry};
+use std::sync::atomic::Ordering;
+use std::sync::Arc;
+use std::time::SystemTime;
+
+#[derive(Clone)]
+pub struct Registry {
+    inner: Arc<MetricsRegistry<Key, AtomicStorage>>,
+    first_seen: Arc<DashMap<u64, SystemTime>>,
+}
+
+impl Registry {
+    pub fn new() -> Self {
+        Self {
+            inner: Arc::new(MetricsRegistry::atomic()),
+            first_seen: Arc::new(DashMap::new()),
+        }
+    }
+
+    pub fn first_seen(&self) -> Arc<DashMap<u64, SystemTime>> {
+        Arc::clone(&self.first_seen)
+    }
+
+    pub fn collect(&self) -> Vec<CollectedMetric> {
+        let mut collected_metrics = Vec::new();
+        let timestamp = SystemTime::now();
+
+        // Collect counters
+        self.inner.visit_counters(|key, counter| {
+            let name = key.name().to_string();
+            let labels: Vec<(String, String)> = key
+                .labels()
+                .map(|label| (label.key().to_string(), label.value().to_string()))
+                .collect();
+
+            let count_value = counter.load(Ordering::Relaxed);
+            collected_metrics.push(CollectedMetric {
+                name,
+                labels,
+                value: MetricValue::Counter(count_value),
+                timestamp,
+                key: key.clone(),
+            });
+        });
+
+        // Collect gauges
+        self.inner.visit_gauges(|key, gauge| {
+            let name = key.name().to_string();
+            let labels: Vec<(String, String)> = key
+                .labels()
+                .map(|label| (label.key().to_string(), label.value().to_string()))
+                .collect();
+
+            let f64_value = f64::from_bits(gauge.load(Ordering::Relaxed));
+            collected_metrics.push(CollectedMetric {
+                name,
+                labels,
+                value: MetricValue::Gauge(f64_value),
+                timestamp,
+                key: key.clone(),
+            });
+        });
+
+        // TODO(fredr): Collect histograms
+
+        collected_metrics
+    }
+
+    /// Record the first registration time for a timeseries ID (only if not already registered)
+    fn record_first_seen(&self, key: &Key) {
+        self.first_seen
+            .entry(key.get_hash())
+            .or_insert_with(SystemTime::now);
+    }
+}
+
+// Implement the metrics Recorder trait to capture metrics
+impl Recorder for Registry {
+    fn describe_counter(
+        &self,
+        _key: KeyName,
+        _unit: Option<Unit>,
+        _description: metrics::SharedString,
+    ) {
+    }
+
+    fn describe_gauge(
+        &self,
+        _key: KeyName,
+        _unit: Option<Unit>,
+        _description: metrics::SharedString,
+    ) {
+    }
+
+    fn describe_histogram(
+        &self,
+        _key: KeyName,
+        _unit: Option<Unit>,
+        _description: metrics::SharedString,
+    ) {
+    }
+
+    fn register_counter(&self, key: &Key, _metadata: &Metadata<'_>) -> metrics::Counter {
+        self.record_first_seen(key);
+        let counter_handle = self.inner.get_or_create_counter(key, |c| c.clone());
+        metrics::Counter::from_arc(counter_handle)
+    }
+
+    fn register_gauge(&self, key: &Key, _metadata: &Metadata<'_>) -> metrics::Gauge {
+        self.record_first_seen(key);
+        let gauge_handle = self.inner.get_or_create_gauge(key, |g| g.clone());
+        metrics::Gauge::from_arc(gauge_handle)
+    }
+
+    fn register_histogram(&self, key: &Key, _metadata: &Metadata<'_>) -> metrics::Histogram {
+        self.record_first_seen(key);
+        let histogram_handle = self.inner.get_or_create_histogram(key, |h| h.clone());
+        metrics::Histogram::from_arc(histogram_handle)
+    }
+}
+
+impl Default for Registry {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct MetricInfo {
+    pub name: String,
+}
+
+impl MetricInfo {
+    pub fn new(name: String) -> Self {
+        Self { name }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum MetricValue {
+    Counter(u64),
+    Gauge(f64),
+}
+
+#[derive(Debug, Clone)]
+pub struct CollectedMetric {
+    pub name: String,
+    pub labels: Vec<(String, String)>,
+    pub value: MetricValue,
+    pub timestamp: std::time::SystemTime,
+    pub key: Key,
+}
diff --git a/runtimes/core/src/metrics/test.rs b/runtimes/core/src/metrics/test.rs
new file mode 100644
index 0000000000..41dc56a5ea
--- /dev/null
+++ b/runtimes/core/src/metrics/test.rs
@@ -0,0 +1,354 @@
+use super::*;
+use metrics::{Key, Label, Metadata, Recorder};
+use std::sync::Arc;
+
+#[cfg(test)]
+mod counter_tests {
+    use super::*;
+
+    #[test]
+    fn test_counter_with_labels() {
+        let manager = Manager::new();
+
+        manager.with_local_recorder(|| {
+            let counter = Counter::new("test_counter_with_labels").with_labels([
+                ("service", "test_service".to_string()),
+                ("method", "GET".to_string()),
+            ]);
+            counter.increment();
+        });
+
+        let collected = manager.collect_metrics();
+        let metric = collected
+            .iter()
+            .find(|m| m.name == "test_counter_with_labels");
+        assert!(metric.is_some());
+
+        let m = metric.unwrap();
+        assert_eq!(m.labels.len(), 2);
+        assert!(m
+            .labels
+            .contains(&("service".to_string(), "test_service".to_string())));
+        assert!(m
+            .labels
+            .contains(&("method".to_string(), "GET".to_string())));
+    }
+
+    #[test]
+    fn test_counter_increment() {
+        let manager = Manager::new();
+
+        manager.with_local_recorder(|| {
+            let counter = Counter::new("test_increment");
+            counter.increment();
+        });
+
+        let collected = manager.collect_metrics();
+        assert!(!collected.is_empty());
+
+        let metric = collected.iter().find(|m| m.name == "test_increment");
+        assert!(metric.is_some());
+
+        if let Some(m) = metric {
+            match m.value {
+                MetricValue::Counter(value) => assert_eq!(value, 1),
+                _ => panic!("Expected counter value"),
+            }
+        }
+    }
+
+    #[test]
+    fn test_counter_increment_with_extra_labels() {
+        let manager = Manager::new();
+
+        manager.with_local_recorder(|| {
+            let counter = Counter::new("test_increment_with_labels")
+                .with_labels([("service", "test".to_string())]);
+
+            counter.increment_with([("status", "200"), ("method", "POST")]);
+        });
+
+        let collected = manager.collect_metrics();
+        let metric = collected
+            .iter()
+            .find(|m| m.name == "test_increment_with_labels");
+        assert!(metric.is_some());
+
+        if let Some(m) = metric {
+            assert_eq!(m.labels.len(), 3); // base + 2 extra labels
+            assert!(m
+                .labels
+                .contains(&("service".to_string(), "test".to_string())));
+            assert!(m
+                .labels
+                .contains(&("status".to_string(), "200".to_string())));
+            assert!(m
+                .labels
+                .contains(&("method".to_string(), "POST".to_string())));
+        }
+    }
+}
+
+#[cfg(test)]
+mod registry_tests {
+    use super::*;
+    use std::time::Duration;
+
+    #[test]
+    fn test_registry_collect_counters() {
+        let registry = Registry::new();
+
+        // Register a counter manually
+        let key = Key::from_parts("test_counter", vec![Label::new("label", "value")]);
+        let metadata = Metadata::new(module_path!(), metrics::Level::INFO, Some(module_path!()));
+        let counter = registry.register_counter(&key, &metadata);
+        counter.increment(5);
+
+        let collected = registry.collect();
+        assert_eq!(collected.len(), 1);
+
+        let metric = &collected[0];
+        assert_eq!(metric.name, "test_counter");
+        assert_eq!(metric.labels.len(), 1);
+        match metric.value {
+            MetricValue::Counter(value) => assert_eq!(value, 5),
+            _ => panic!("Expected counter value"),
+        }
+    }
+
+    #[test]
+    fn test_registry_collect_gauges() {
+        let registry = Registry::new();
+
+        let key = Key::from_parts("test_gauge", vec![]);
+        let metadata = Metadata::new(module_path!(), metrics::Level::INFO, Some(module_path!()));
+        let gauge = registry.register_gauge(&key, &metadata);
+        gauge.set(42.5);
+
+        let collected = registry.collect();
+        assert_eq!(collected.len(), 1);
+
+        let metric = &collected[0];
+        assert_eq!(metric.name, "test_gauge");
+        match metric.value {
+            MetricValue::Gauge(value) => assert!((value - 42.5).abs() < f64::EPSILON),
+            _ => panic!("Expected gauge value"),
+        }
+    }
+
+    #[test]
+    fn test_registry_first_seen() {
+        let registry = Registry::new();
+        let key = Key::from_parts("test_metric", vec![]);
+
+        let before = std::time::SystemTime::now();
+        let metadata = Metadata::new(module_path!(), metrics::Level::INFO, Some(module_path!()));
+        let _counter = registry.register_counter(&key, &metadata);
+        let after = std::time::SystemTime::now();
+
+        let first_seen = registry.first_seen();
+        let recorded_time = first_seen.get(&key.get_hash());
+        assert!(recorded_time.is_some());
+
+        let time = *recorded_time.unwrap();
+        assert!(time >= before && time <= after);
+
+        // re-register should not update first seen
+        let _counter = registry.register_counter(&key, &metadata);
+        let first_seen2 = registry.first_seen();
+        let recorded_time2 = first_seen2.get(&key.get_hash());
+        let time2 = *recorded_time2.unwrap();
+
+        assert_eq!(time, time2)
+    }
+
+    #[test]
+    fn test_registry_first_seen_only_once() {
+        let registry = Registry::new();
+        let key = Key::from_parts("test_metric", vec![]);
+
+        let metadata = Metadata::new(module_path!(), metrics::Level::INFO, Some(module_path!()));
+        let _counter1 = registry.register_counter(&key, &metadata);
+        std::thread::sleep(Duration::from_millis(10));
+        let _counter2 = registry.register_counter(&key, &metadata);
+
+        let first_seen = registry.first_seen();
+        assert_eq!(first_seen.len(), 1); // Only one entry should exist
+    }
+}
+
+#[cfg(test)]
+mod manager_tests {
+    use super::*;
+
+    #[test]
+    fn test_manager_new() {
+        let manager = Manager::new();
+        // Test that manager starts with empty metrics
+        assert!(manager.collect_metrics().is_empty());
+    }
+
+    #[test]
+    fn test_manager_collect_metrics() {
+        let manager = Manager::new();
+
+        manager.with_local_recorder(|| {
+            let counter = Counter::new("test_manager_counter");
+            counter.increment();
+        });
+
+        let collected = manager.collect_metrics();
+        assert!(!collected.is_empty());
+
+        let metric = collected.iter().find(|m| m.name == "test_manager_counter");
+        assert!(metric.is_some());
+    }
+
+    #[derive(Debug)]
+    struct MockExporter {
+        exported_metrics: Arc<std::sync::Mutex<Vec<Vec<CollectedMetric>>>>,
+    }
+
+    impl MockExporter {
+        fn new() -> Self {
+            Self {
+                exported_metrics: Arc::new(std::sync::Mutex::new(Vec::new())),
+            }
+        }
+
+        fn get_exported_metrics(&self) -> Vec<Vec<CollectedMetric>> {
+            self.exported_metrics.lock().unwrap().clone()
+        }
+    }
+
+    #[async_trait::async_trait]
+    impl super::super::manager::Exporter for MockExporter {
+        async fn export(&self, metrics: Vec<CollectedMetric>) {
+            self.exported_metrics.lock().unwrap().push(metrics);
+        }
+    }
+
+    #[tokio::test]
+    async fn test_manager_with_exporter() {
+        let mock_exporter = Arc::new(MockExporter::new());
+        let manager = Manager::new().with_exporter(mock_exporter.clone());
+
+        manager.with_local_recorder(|| {
+            let counter = Counter::new("test_export_counter");
+            counter.increment();
+        });
+
+        // Collect and export
+        manager.collect_and_export().await;
+
+        let exported = mock_exporter.get_exported_metrics();
+        assert_eq!(exported.len(), 1);
+        assert!(!exported[0].is_empty());
+
+        let metric = exported[0].iter().find(|m| m.name == "test_export_counter");
+        assert!(metric.is_some());
+    }
+}
+
+#[cfg(test)]
+mod helper_function_tests {
+    use super::*;
+
+    #[test]
+    fn test_requests_total_counter() {
+        let manager = Manager::new();
+
+        manager.with_local_recorder(|| {
+            let counter = requests_total_counter("user_service", "/api/users");
+            counter.increment();
+        });
+
+        let collected = manager.collect_metrics();
+        let metric = collected.iter().find(|m| m.name == "e_requests_total");
+        assert!(metric.is_some());
+
+        let m = metric.unwrap();
+        assert_eq!(m.labels.len(), 2);
+        assert!(m
+            .labels
+            .contains(&("service".to_string(), "user_service".to_string())));
+        assert!(m
+            .labels
+            .contains(&("endpoint".to_string(), "/api/users".to_string())));
+    }
+
+    #[test]
+    fn test_requests_total_counter_usage() {
+        let manager = Manager::new();
+
+        manager.with_local_recorder(|| {
+            let counter = requests_total_counter("api", "/health");
+            counter.increment();
+            counter.increment();
+        });
+
+        let collected = manager.collect_metrics();
+        let metric = collected.iter().find(|m| m.name == "e_requests_total");
+        assert!(metric.is_some());
+
+        if let Some(m) = metric {
+            match m.value {
+                MetricValue::Counter(value) => assert_eq!(value, 2),
+                _ => panic!("Expected counter value"),
+            }
+
+            assert!(m
+                .labels
+                .contains(&("service".to_string(), "api".to_string())));
+            assert!(m
+                .labels
+                .contains(&("endpoint".to_string(), "/health".to_string())));
+        }
+    }
+}
+
+#[cfg(test)]
+mod collected_metric_tests {
+    use super::*;
+
+    #[test]
+    fn test_collected_metric_new() {
+        let key = Key::from_parts("test", vec![]);
+        let timestamp = std::time::SystemTime::now();
+        let metric = CollectedMetric {
+            name: "test_metric".to_string(),
+            labels: vec![("label".to_string(), "value".to_string())],
+            value: MetricValue::Counter(42),
+            timestamp,
+            key: key.clone(),
+        };
+
+        assert_eq!(metric.name, "test_metric");
+        assert_eq!(
+            metric.labels,
+            vec![("label".to_string(), "value".to_string())]
+        );
+        assert_eq!(metric.timestamp, timestamp);
+        assert_eq!(metric.key, key);
+        match metric.value {
+            MetricValue::Counter(value) => assert_eq!(value, 42),
+            _ => panic!("Expected counter value"),
+        }
+    }
+
+    #[test]
+    fn test_metric_value_variants() {
+        let counter_value = MetricValue::Counter(100);
+        let gauge_value = MetricValue::Gauge(3.21);
+
+        match counter_value {
+            MetricValue::Counter(val) => assert_eq!(val, 100),
+            _ => panic!("Expected counter"),
+        }
+
+        match gauge_value {
+            MetricValue::Gauge(val) => assert!((val - 3.21).abs() < f64::EPSILON),
+            _ => panic!("Expected gauge"),
+        }
+    }
+}
diff --git a/runtimes/core/src/pubsub/manager.rs b/runtimes/core/src/pubsub/manager.rs
index 797d33be24..65aa83e6f4 100644
--- a/runtimes/core/src/pubsub/manager.rs
+++ b/runtimes/core/src/pubsub/manager.rs
@@ -15,6 +15,7 @@ use crate::encore::parser::meta::v1 as meta;
 use crate::encore::parser::schema::v1 as schema;
 use crate::encore::runtime::v1 as pb;
 use crate::log::LogFromRust;
+use crate::metrics::{requests_total_counter, Counter};
 use crate::model::{PubSubRequestData, RequestData, ResponseData, SpanId, SpanKey, TraceId};
 use crate::names::EncoreName;
 use crate::pubsub::noop::NoopCluster;
@@ -154,6 +155,10 @@ impl SubscriptionObj {
                 obj: self.clone(),
                 handlers: RwLock::new(Vec::new()),
                 counter: AtomicUsize::new(0),
+                requests_total: requests_total_counter(
+                    &self.service,
+                    &format!("{}/{}", &self.topic, &self.subscription),
+                ),
             })
         });
         h.add_handler(handler);
@@ -170,6 +175,7 @@ pub struct SubHandler {
     obj: Arc<SubscriptionObj>,
     handlers: RwLock<Vec<Arc<dyn SubscriptionHandler>>>,
     counter: AtomicUsize,
+    requests_total: Counter,
 }
 
 const ATTR_PARENT_TRACE_ID: &str = "encore_parent_trace_id";
@@ -259,7 +265,14 @@ impl SubHandler {
                 duration: tokio::time::Instant::now().duration_since(start),
                 data: ResponseData::PubSub(result.clone()),
             };
+
+            let code = match &result {
+                Ok(_) => "ok".to_string(),
+                Err(err) => err.code.to_string(),
+            };
+
             self.obj.tracer.request_span_end(&resp, false);
+            self.requests_total.increment_with([("code", code)]);
             result
         })
     }

From 554069d27afcbbc6e539701c27f8d6d261b38bbe Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Fri, 10 Oct 2025 16:28:17 +0200
Subject: [PATCH 02/17] clippy & fmt

---
 runtimes/core/src/api/server.rs      | 4 ++--
 runtimes/core/src/metrics/counter.rs | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/runtimes/core/src/api/server.rs b/runtimes/core/src/api/server.rs
index 02c9a74040..4edca40fbb 100644
--- a/runtimes/core/src/api/server.rs
+++ b/runtimes/core/src/api/server.rs
@@ -94,7 +94,7 @@ impl Server {
                             // There's no need to defer it for dynamic runtime registration.
                             let static_handler = StaticAssetsHandler::new(assets);
                             let requests_total =
-                                requests_total_counter(&ep.name.service(), &ep.name.endpoint());
+                                requests_total_counter(ep.name.service(), ep.name.endpoint());
 
                             let handler = EndpointHandler {
                                 endpoint: ep.clone(),
@@ -158,7 +158,7 @@ impl Server {
             Some(h) => {
                 let endpoint = self.endpoints.get(&endpoint_name).unwrap().to_owned();
                 let requests_total =
-                    requests_total_counter(&endpoint.name.service(), &endpoint.name.endpoint());
+                    requests_total_counter(endpoint.name.service(), endpoint.name.endpoint());
 
                 let handler = EndpointHandler {
                     endpoint,
diff --git a/runtimes/core/src/metrics/counter.rs b/runtimes/core/src/metrics/counter.rs
index 8658cb0961..1eaf81f62b 100644
--- a/runtimes/core/src/metrics/counter.rs
+++ b/runtimes/core/src/metrics/counter.rs
@@ -17,10 +17,7 @@ impl Counter {
     }
 
     /// Add multiple labels to the counter's base labels
-    pub fn with_labels<K, V>(
-        mut self,
-        new_labels: impl IntoIterator<Item = (K, V)>,
-    ) -> Self
+    pub fn with_labels<K, V>(mut self, new_labels: impl IntoIterator<Item = (K, V)>) -> Self
     where
         K: Into<String>,
         V: Into<String>,

From e6c0df4babbba34286bed626ae00b77f78d65257 Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Wed, 15 Oct 2025 09:56:34 +0200
Subject: [PATCH 03/17] refactor metrics registry and add a system metric

---
 Cargo.lock                                | 226 +++---
 runtimes/core/Cargo.toml                  |   2 +-
 runtimes/core/src/api/auth/local.rs       |  10 +-
 runtimes/core/src/api/endpoint.rs         |   6 +-
 runtimes/core/src/api/manager.rs          |  17 +-
 runtimes/core/src/api/server.rs           |  20 +-
 runtimes/core/src/lib.rs                  |   3 +-
 runtimes/core/src/metadata/gce.rs         |  61 --
 runtimes/core/src/metrics/atomic.rs       |  82 ++
 runtimes/core/src/metrics/counter.rs      | 183 +++--
 runtimes/core/src/metrics/exporter/gcp.rs |  84 ++-
 runtimes/core/src/metrics/exporter/mod.rs |   5 +
 runtimes/core/src/metrics/gauge.rs        | 135 ++++
 runtimes/core/src/metrics/manager.rs      |  27 +-
 runtimes/core/src/metrics/mod.rs          |  35 +-
 runtimes/core/src/metrics/registry.rs     | 379 +++++++---
 runtimes/core/src/metrics/system.rs       |  86 +++
 runtimes/core/src/metrics/test.rs         | 870 +++++++++++++++++-----
 runtimes/core/src/pubsub/manager.rs       |  15 +-
 19 files changed, 1671 insertions(+), 575 deletions(-)
 create mode 100644 runtimes/core/src/metrics/atomic.rs
 create mode 100644 runtimes/core/src/metrics/gauge.rs
 create mode 100644 runtimes/core/src/metrics/system.rs

diff --git a/Cargo.lock b/Cargo.lock
index e6e8892e73..f22cc9b710 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1764,7 +1764,6 @@ dependencies = [
  "matchit",
  "md5",
  "metrics",
- "metrics-util",
  "mime",
  "native-tls",
  "once_cell",
@@ -1793,6 +1792,7 @@ dependencies = [
  "sha2",
  "sha3",
  "subtle",
+ "sysinfo",
  "thiserror 1.0.69",
  "tokio",
  "tokio-nsq",
@@ -1887,12 +1887,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "endian-type"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
-
 [[package]]
 name = "env_filter"
 version = "0.1.3"
@@ -2979,7 +2973,7 @@ dependencies = [
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows-core",
+ "windows-core 0.52.0",
 ]
 
 [[package]]
@@ -3587,26 +3581,6 @@ dependencies = [
  "portable-atomic",
 ]
 
-[[package]]
-name = "metrics-util"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe8db7a05415d0f919ffb905afa37784f71901c9a773188876984b4f769ab986"
-dependencies = [
- "aho-corasick",
- "crossbeam-epoch",
- "crossbeam-utils",
- "hashbrown 0.15.2",
- "indexmap 2.7.0",
- "metrics",
- "ordered-float",
- "quanta",
- "radix_trie",
- "rand 0.9.2",
- "rand_xoshiro",
- "sketches-ddsketch",
-]
-
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -3739,15 +3713,6 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
-[[package]]
-name = "nibble_vec"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
-dependencies = [
- "smallvec",
-]
-
 [[package]]
 name = "nix"
 version = "0.24.3"
@@ -3785,6 +3750,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -3869,6 +3843,25 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "objc2-core-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
+dependencies = [
+ "bitflags 2.9.4",
+]
+
+[[package]]
+name = "objc2-io-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
+dependencies = [
+ "libc",
+ "objc2-core-foundation",
+]
+
 [[package]]
 name = "object"
 version = "0.36.7"
@@ -3938,15 +3931,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "ordered-float"
-version = "4.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "os_pipe"
 version = "1.2.1"
@@ -4871,21 +4855,6 @@ version = "2.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
 
-[[package]]
-name = "quanta"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7"
-dependencies = [
- "crossbeam-utils",
- "libc",
- "once_cell",
- "raw-cpuid",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "web-sys",
- "winapi",
-]
-
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -4979,16 +4948,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426"
 
-[[package]]
-name = "radix_trie"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
-dependencies = [
- "endian-type",
- "nibble_vec",
-]
-
 [[package]]
 name = "rand"
 version = "0.4.6"
@@ -5126,24 +5085,6 @@ dependencies = [
  "rand_core 0.9.3",
 ]
 
-[[package]]
-name = "rand_xoshiro"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41"
-dependencies = [
- "rand_core 0.9.3",
-]
-
-[[package]]
-name = "raw-cpuid"
-version = "11.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"
-dependencies = [
- "bitflags 2.9.4",
-]
-
 [[package]]
 name = "rdrand"
 version = "0.4.0"
@@ -6020,12 +5961,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
-[[package]]
-name = "sketches-ddsketch"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a"
-
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -6546,6 +6481,20 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "sysinfo"
+version = "0.37.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16607d5caffd1c07ce073528f9ed972d88db15dd44023fa57142963be3feb11f"
+dependencies = [
+ "libc",
+ "memchr",
+ "ntapi",
+ "objc2-core-foundation",
+ "objc2-io-kit",
+ "windows",
+]
+
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@@ -7762,6 +7711,28 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows"
+version = "0.61.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
+dependencies = [
+ "windows-collections",
+ "windows-core 0.61.2",
+ "windows-future",
+ "windows-link",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
+dependencies = [
+ "windows-core 0.61.2",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@@ -7771,12 +7742,68 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
+dependencies = [
+ "windows-core 0.61.2",
+ "windows-link",
+ "windows-threading",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+]
+
 [[package]]
 name = "windows-link"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
+[[package]]
+name = "windows-numerics"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
+dependencies = [
+ "windows-core 0.61.2",
+ "windows-link",
+]
+
 [[package]]
 name = "windows-registry"
 version = "0.5.3"
@@ -7864,6 +7891,15 @@ dependencies = [
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-threading"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
diff --git a/runtimes/core/Cargo.toml b/runtimes/core/Cargo.toml
index 94cd250044..71cc6406a4 100644
--- a/runtimes/core/Cargo.toml
+++ b/runtimes/core/Cargo.toml
@@ -125,11 +125,11 @@ cookie = "0.18.1"
 malachite = "0.6.1"
 byteorder = "1.5.0"
 metrics = "0.24.2"
-metrics-util = { version = "0.20.0", features = ["registry", "storage"] }
 dashmap = "6.1.0"
 google-cloud-monitoring-v3 = "1.0.0"
 google-cloud-api = "1.0.0"
 google-cloud-wkt = "1.0.0"
+sysinfo = "0.37.2"
 
 [build-dependencies]
 prost-build = "0.12.3"
diff --git a/runtimes/core/src/api/auth/local.rs b/runtimes/core/src/api/auth/local.rs
index 3cfaf6e519..79e3c39f98 100644
--- a/runtimes/core/src/api/auth/local.rs
+++ b/runtimes/core/src/api/auth/local.rs
@@ -1,8 +1,9 @@
+use crate::metrics::counter;
+
 use crate::api::auth::{AuthHandler, AuthPayload, AuthRequest, AuthResponse};
 use crate::api::schema::encoding::Schema;
 use crate::api::{APIResult, HandlerResponse, HandlerResponseInner, PValues};
 use crate::log::LogFromRust;
-use crate::metrics::Counter;
 use crate::model::{AuthRequestData, RequestData};
 use crate::trace::Tracer;
 use crate::{api, model, EndpointName};
@@ -15,7 +16,7 @@ pub struct LocalAuthHandler {
     pub schema: Schema,
     pub handler: RwLock<Option<Arc<dyn api::TypedHandler>>>,
     pub tracer: Tracer,
-    pub requests_total: Counter,
+    pub requests_total: counter::Schema<u64>,
 }
 
 impl LocalAuthHandler {
@@ -156,7 +157,7 @@ impl AuthHandler for LocalAuthHandler {
                     };
 
                     self.tracer.request_span_end(&model_resp, false);
-                    self.requests_total.increment_with([("code", "ok")]);
+                    self.requests_total.with([("code", "ok")]).increment();
                     Ok(AuthResponse::Authenticated {
                         auth_uid,
                         auth_data,
@@ -170,7 +171,8 @@ impl AuthHandler for LocalAuthHandler {
                     };
                     self.tracer.request_span_end(&model_resp, false);
                     self.requests_total
-                        .increment_with([("code", e.code.to_string())]);
+                        .with([("code", &e.code.to_string())])
+                        .increment();
                     Err(e)
                 }
             }
diff --git a/runtimes/core/src/api/endpoint.rs b/runtimes/core/src/api/endpoint.rs
index 8cbb8c74d4..cbe091e74c 100644
--- a/runtimes/core/src/api/endpoint.rs
+++ b/runtimes/core/src/api/endpoint.rs
@@ -23,7 +23,7 @@ use crate::api::{jsonschema, schema, ErrCode, Error};
 use crate::encore::parser::meta::v1::rpc;
 use crate::encore::parser::meta::v1::{self as meta, selector};
 use crate::log::LogFromRust;
-use crate::metrics::Counter;
+use crate::metrics::counter;
 use crate::model::StreamDirection;
 use crate::names::EndpointName;
 use crate::trace;
@@ -407,7 +407,7 @@ pub(super) struct EndpointHandler {
     pub endpoint: Arc<Endpoint>,
     pub handler: Arc<dyn BoxedHandler>,
     pub shared: Arc<SharedEndpointData>,
-    pub requests_total: Counter,
+    pub requests_total: counter::Schema<u64>,
 }
 
 #[derive(Debug)]
@@ -687,7 +687,7 @@ impl EndpointHandler {
                     }),
                 };
                 self.shared.tracer.request_span_end(&model_resp, sensitive);
-                self.requests_total.increment_with([("code", code)]);
+                self.requests_total.with([("code", &code)]).increment();
             }
 
             if let Ok(val) = HeaderValue::from_str(request.span.0.serialize_encore().as_str()) {
diff --git a/runtimes/core/src/api/manager.rs b/runtimes/core/src/api/manager.rs
index 14b5a9e79a..a65a27d9d1 100644
--- a/runtimes/core/src/api/manager.rs
+++ b/runtimes/core/src/api/manager.rs
@@ -18,7 +18,6 @@ use crate::api::{
 };
 use crate::encore::parser::meta::v1 as meta;
 use crate::encore::runtime::v1 as runtime;
-use crate::metrics::requests_total_counter;
 use crate::trace::Tracer;
 use crate::{api, model, pubsub, secrets, EncoreName, EndpointName, Hosted};
 
@@ -44,6 +43,7 @@ pub struct ManagerConfig<'a> {
     pub runtime: tokio::runtime::Handle,
     pub testing: bool,
     pub proxied_push_subs: HashMap<String, EncoreName>,
+    pub metrics: &'a crate::metrics::Manager,
 }
 
 pub struct Manager {
@@ -58,6 +58,7 @@ pub struct Manager {
 
     gateways: HashMap<EncoreName, Gateway>,
     testing: bool,
+    metrics: crate::metrics::Manager,
 }
 
 impl ManagerConfig<'_> {
@@ -165,6 +166,7 @@ impl ManagerConfig<'_> {
                 &service_registry,
                 self.http_client.clone(),
                 self.tracer.clone(),
+                self.metrics.registry(),
             )
             .context("unable to build authenticator")?;
 
@@ -201,6 +203,7 @@ impl ManagerConfig<'_> {
                 inbound_svc_auth,
                 self.tracer.clone(),
                 auth_data_schemas,
+                Arc::new(self.metrics.registry().clone()),
             )
             .context("unable to create API server")?;
             Some(server)
@@ -218,6 +221,7 @@ impl ManagerConfig<'_> {
             runtime: self.runtime,
             healthz: healthz_handler,
             testing: self.testing,
+            metrics: self.metrics.clone(),
         })
     }
 }
@@ -246,6 +250,7 @@ fn build_auth_handler(
     service_registry: &ServiceRegistry,
     http_client: reqwest::Client,
     tracer: Tracer,
+    metrics_registry: &crate::metrics::Registry,
 ) -> anyhow::Result<Option<auth::Authenticator>> {
     let Some(explicit) = &gw.explicit else {
         return Ok(None);
@@ -284,7 +289,11 @@ fn build_auth_handler(
     // let is_local = hosted_services.contains(&explicit.service_name);
     let is_local = true;
     let name = EndpointName::new(explicit.service_name.clone(), auth.name.clone());
-    let requests_total = requests_total_counter(&explicit.service_name, &auth.name);
+    let requests_total = crate::metrics::requests_total_counter(
+        metrics_registry,
+        &explicit.service_name,
+        &auth.name,
+    );
 
     let auth_data = registry.schema(auth_data_schema_idx);
     let auth_handler = if is_local {
@@ -333,6 +342,10 @@ impl Manager {
         self.service_registry.endpoints()
     }
 
+    pub fn metrics_registry(&self) -> &crate::metrics::Registry {
+        self.metrics.registry()
+    }
+
     pub fn stream(
         &self,
         endpoint_name: EndpointName,
diff --git a/runtimes/core/src/api/server.rs b/runtimes/core/src/api/server.rs
index 4edca40fbb..b06d920985 100644
--- a/runtimes/core/src/api/server.rs
+++ b/runtimes/core/src/api/server.rs
@@ -12,7 +12,6 @@ use crate::api::static_assets::StaticAssetsHandler;
 use crate::api::{self, ToResponse};
 use crate::api::{paths, reqauth, schema, BoxedHandler, EndpointMap};
 use crate::encore::parser::meta::v1 as meta;
-use crate::metrics::requests_total_counter;
 use crate::names::EndpointName;
 use crate::trace;
 
@@ -38,6 +37,9 @@ pub struct Server {
 
     /// Data shared between all endpoints.
     shared: Arc<SharedEndpointData>,
+
+    /// Metrics registry for creating metrics
+    metrics_registry: Arc<crate::metrics::Registry>,
 }
 
 impl Server {
@@ -48,6 +50,7 @@ impl Server {
         inbound_svc_auth: Vec<Arc<dyn svcauth::ServiceAuthMethod>>,
         tracer: trace::Tracer,
         auth_data_schemas: HashMap<String, Option<JSONSchema>>,
+        metrics_registry: Arc<crate::metrics::Registry>,
     ) -> anyhow::Result<Self> {
         // Register the routes, and track the handlers in a map so we can easily
         // set the request handler when registered.
@@ -93,8 +96,11 @@ impl Server {
                             // For static asset routes, configure the static asset handler directly.
                             // There's no need to defer it for dynamic runtime registration.
                             let static_handler = StaticAssetsHandler::new(assets);
-                            let requests_total =
-                                requests_total_counter(ep.name.service(), ep.name.endpoint());
+                            let requests_total = crate::metrics::requests_total_counter(
+                                &metrics_registry,
+                                ep.name.service(),
+                                ep.name.endpoint(),
+                            );
 
                             let handler = EndpointHandler {
                                 endpoint: ep.clone(),
@@ -134,6 +140,7 @@ impl Server {
             hosted_endpoints: Mutex::new(handler_map),
             router: Mutex::new(Some(router)),
             shared,
+            metrics_registry,
         })
     }
 
@@ -157,8 +164,11 @@ impl Server {
             None => Ok(()), // anyhow::bail!("no handler found for endpoint: {}", endpoint_name),
             Some(h) => {
                 let endpoint = self.endpoints.get(&endpoint_name).unwrap().to_owned();
-                let requests_total =
-                    requests_total_counter(endpoint.name.service(), endpoint.name.endpoint());
+                let requests_total = crate::metrics::requests_total_counter(
+                    &self.metrics_registry,
+                    endpoint.name.service(),
+                    endpoint.name.endpoint(),
+                );
 
                 let handler = EndpointHandler {
                     endpoint,
diff --git a/runtimes/core/src/lib.rs b/runtimes/core/src/lib.rs
index d587eafe80..ad4a9a68ac 100644
--- a/runtimes/core/src/lib.rs
+++ b/runtimes/core/src/lib.rs
@@ -341,7 +341,7 @@ impl Runtime {
             .collect::<Result<HashMap<_, _>, anyhow::Error>>()
             .context("failed to resolve gateway push subscriptions")?;
 
-        let pubsub = pubsub::Manager::new(tracer.clone(), resources.pubsub_clusters, &md)?;
+        let pubsub = pubsub::Manager::new(tracer.clone(), resources.pubsub_clusters, &md, Arc::new(metrics_manager.registry().clone()))?;
         let objects =
             objects::Manager::new(&secrets, tracer.clone(), resources.bucket_clusters, &md);
         let sqldb = sqldb::ManagerConfig {
@@ -399,6 +399,7 @@ impl Runtime {
             runtime: tokio_rt.handle().clone(),
             testing,
             proxied_push_subs,
+            metrics: &metrics_manager,
         }
         .build()
         .context("unable to initialize api manager")?;
diff --git a/runtimes/core/src/metadata/gce.rs b/runtimes/core/src/metadata/gce.rs
index 1ae4ebcd21..c778b9bcaf 100644
--- a/runtimes/core/src/metadata/gce.rs
+++ b/runtimes/core/src/metadata/gce.rs
@@ -61,14 +61,12 @@ impl GceMetadataClient {
     /// Fetch metadata from the GCE metadata server
     pub async fn fetch_metadata(&self, path: &str) -> Result<String, GceMetadataError> {
         let url = Self::build_metadata_url(path);
-        log::debug!("Fetching GCE metadata from: {}", url);
 
         for attempt in 1..=MAX_RETRIES {
             let result = self.try_fetch(&url).await;
 
             match &result {
                 Ok(_) => {
-                    log::debug!("Successfully fetched GCE metadata from {}", path);
                     return result;
                 }
                 Err(e) if attempt == MAX_RETRIES => {
@@ -115,62 +113,3 @@ impl GceMetadataClient {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::time::Duration;
-
-    #[tokio::test]
-    async fn test_gce_metadata_client_creation() {
-        let http_client = reqwest::Client::builder()
-            .timeout(Duration::from_secs(1))
-            .build()
-            .unwrap();
-
-        let client = GceMetadataClient::new(http_client);
-
-        // Test that the client can be created without panic
-        assert!(format!("{:?}", client).contains("GceMetadataClient"));
-    }
-
-    #[tokio::test]
-    async fn test_singleton_cache_behavior() {
-        // Verify the cache is initially empty
-        assert!(INSTANCE_ID_CACHE.get().is_none());
-
-        // Test that we can set a value (simulating successful fetch)
-        let test_id = "test-instance-123".to_string();
-        let result = INSTANCE_ID_CACHE.set(test_id.clone());
-        assert!(result.is_ok());
-
-        // Verify the cached value can be retrieved
-        assert_eq!(INSTANCE_ID_CACHE.get(), Some(&test_id));
-    }
-
-    #[test]
-    fn test_metadata_url_construction() {
-        // Test default URL construction (no environment variable)
-        std::env::remove_var(METADATA_HOST_ENV);
-        let url = GceMetadataClient::build_metadata_url("instance/id");
-        assert_eq!(url, "http://169.254.169.254/computeMetadata/v1/instance/id");
-
-        // Test with leading slash removal
-        let url = GceMetadataClient::build_metadata_url("/instance/id");
-        assert_eq!(url, "http://169.254.169.254/computeMetadata/v1/instance/id");
-    }
-
-    #[test]
-    fn test_metadata_host_env_var() {
-        // Test custom host via environment variable
-        std::env::set_var(METADATA_HOST_ENV, "custom.metadata.host");
-        let url = GceMetadataClient::build_metadata_url("instance/id");
-        assert_eq!(
-            url,
-            "http://custom.metadata.host/computeMetadata/v1/instance/id"
-        );
-
-        // Clean up
-        std::env::remove_var(METADATA_HOST_ENV);
-    }
-}
diff --git a/runtimes/core/src/metrics/atomic.rs b/runtimes/core/src/metrics/atomic.rs
new file mode 100644
index 0000000000..5531407da0
--- /dev/null
+++ b/runtimes/core/src/metrics/atomic.rs
@@ -0,0 +1,82 @@
+use std::sync::{
+    atomic::{AtomicU64, Ordering},
+    Arc,
+};
+
+use crate::metrics::{CounterOps, GaugeOps};
+
+impl CounterOps<u64> for AtomicU64 {
+    fn increment(&self, value: u64) {
+        self.fetch_add(value, Ordering::Release);
+    }
+
+    fn get(&self) -> crate::metrics::MetricValue {
+        crate::metrics::MetricValue::CounterU64(self.load(Ordering::Acquire))
+    }
+}
+
+impl CounterOps<i64> for AtomicU64 {
+    fn increment(&self, value: i64) {
+        self.fetch_add(value as u64, Ordering::Release);
+    }
+
+    fn get(&self) -> crate::metrics::MetricValue {
+        crate::metrics::MetricValue::CounterI64(self.load(Ordering::Acquire) as i64)
+    }
+}
+
+impl<T> CounterOps<T> for Arc<AtomicU64>
+where
+    AtomicU64: CounterOps<T>,
+{
+    fn increment(&self, value: T) {
+        CounterOps::<T>::increment(&(**self), value)
+    }
+
+    fn get(&self) -> crate::metrics::MetricValue {
+        CounterOps::<T>::get(&(**self))
+    }
+}
+
+impl GaugeOps<u64> for AtomicU64 {
+    fn set(&self, value: u64) {
+        self.swap(value, Ordering::AcqRel);
+    }
+
+    fn get(&self) -> crate::metrics::MetricValue {
+        crate::metrics::MetricValue::GaugeU64(self.load(Ordering::Acquire))
+    }
+}
+
+impl GaugeOps<i64> for AtomicU64 {
+    fn set(&self, value: i64) {
+        self.swap(value as u64, Ordering::AcqRel);
+    }
+
+    fn get(&self) -> crate::metrics::MetricValue {
+        crate::metrics::MetricValue::GaugeI64(self.load(Ordering::Acquire) as i64)
+    }
+}
+
+impl GaugeOps<f64> for AtomicU64 {
+    fn set(&self, value: f64) {
+        self.swap(value.to_bits(), Ordering::AcqRel);
+    }
+
+    fn get(&self) -> crate::metrics::MetricValue {
+        crate::metrics::MetricValue::GaugeF64(f64::from_bits(self.load(Ordering::Acquire)))
+    }
+}
+
+impl<T> GaugeOps<T> for Arc<AtomicU64>
+where
+    AtomicU64: GaugeOps<T>,
+{
+    fn set(&self, value: T) {
+        GaugeOps::<T>::set(&(**self), value)
+    }
+
+    fn get(&self) -> crate::metrics::MetricValue {
+        GaugeOps::<T>::get(&(**self))
+    }
+}
diff --git a/runtimes/core/src/metrics/counter.rs b/runtimes/core/src/metrics/counter.rs
index 1eaf81f62b..0e0df078af 100644
--- a/runtimes/core/src/metrics/counter.rs
+++ b/runtimes/core/src/metrics/counter.rs
@@ -1,77 +1,140 @@
-use std::collections::HashMap;
+use malachite::base::num::basic::traits::One;
 
-/// A counter with base labels that can be incremented with additional labels
-#[derive(Debug, Clone)]
-pub struct Counter {
-    metric_name: &'static str,
-    base_labels: HashMap<String, String>,
+use crate::metrics;
+use std::collections::{HashMap, HashSet};
+use std::marker::PhantomData;
+use std::sync::atomic::AtomicU64;
+use std::sync::Arc;
+
+pub trait CounterOps<T> {
+    fn increment(&self, value: T);
+    fn get(&self) -> crate::metrics::MetricValue;
+}
+
+/// A typed counter that can be incremented
+/// T must be compatible with CounterOps for type-safe operations
+pub struct Counter<T> {
+    atomic: Arc<AtomicU64>,
+    _phantom: PhantomData<T>,
 }
 
-impl Counter {
-    /// Create a new counter with the given metric name
-    pub fn new(metric_name: &'static str) -> Self {
+impl<T> Counter<T>
+where
+    Arc<AtomicU64>: CounterOps<T>,
+    T: One,
+{
+    /// Create a new counter with the given atomic storage
+    /// This is typically called by Registry, not directly by users
+    pub(crate) fn new(atomic: Arc<AtomicU64>) -> Self {
         Self {
-            metric_name,
-            base_labels: HashMap::new(),
+            atomic,
+            _phantom: PhantomData,
         }
     }
 
-    /// Add multiple labels to the counter's base labels
-    pub fn with_labels<K, V>(mut self, new_labels: impl IntoIterator<Item = (K, V)>) -> Self
+    /// Increment the counter by 1
+    pub fn increment(&self) {
+        CounterOps::increment(&self.atomic, T::ONE);
+    }
+
+    /// Get the current value of the counter
+    pub fn get(&self) -> metrics::MetricValue {
+        CounterOps::get(&self.atomic)
+    }
+}
+
+/// A counter schema that defines static labels and required dynamic label keys
+/// Validates dynamic labels at increment time and creates separate time series
+/// for each unique combination of static + dynamic labels
+#[derive(Clone, Debug)]
+pub struct Schema<T> {
+    name: String,
+    static_labels: Vec<(String, String)>,
+    required_dynamic_keys: HashSet<String>,
+    registry: Arc<metrics::Registry>,
+    _phantom: PhantomData<T>,
+}
+
+impl<T> Schema<T>
+where
+    Arc<AtomicU64>: CounterOps<T>,
+    T: One + Send + Sync + 'static,
+{
+    /// Create a new counter schema
+    pub(crate) fn new(
+        name: String,
+        static_labels: Vec<(String, String)>,
+        required_dynamic_keys: HashSet<String>,
+        registry: Arc<metrics::Registry>,
+    ) -> Self {
+        Self {
+            name,
+            static_labels,
+            required_dynamic_keys,
+            registry,
+            _phantom: PhantomData,
+        }
+    }
+
+    pub fn with<L, K, V>(&self, dynamic_labels: L) -> Counter<T>
     where
-        K: Into<String>,
-        V: Into<String>,
+        L: IntoIterator<Item = (K, V)>,
+        K: AsRef<str>,
+        V: AsRef<str>,
     {
-        for (key, value) in new_labels {
-            self.base_labels.insert(key.into(), value.into());
+        // Convert dynamic_labels to HashMap first
+        let dynamic_labels_map: HashMap<String, String> = dynamic_labels
+            .into_iter()
+            .map(|(k, v)| (k.as_ref().to_string(), v.as_ref().to_string()))
+            .collect();
+
+        // Validate required keys are present
+        let missing: Vec<String> = self
+            .required_dynamic_keys
+            .iter()
+            .filter(|key| !dynamic_labels_map.contains_key(*key))
+            .cloned()
+            .collect();
+
+        if !missing.is_empty() {
+            log::warn!(
+                "missing required dynamic labels for metric '{}': {:?}, required keys: {:?}",
+                self.name,
+                missing,
+                self.required_dynamic_keys
+            );
         }
-        self
-    }
 
-    /// Increment the counter
-    pub fn increment(&self) {
-        use metrics::{Key, Label, Metadata};
-
-        metrics::with_recorder(|recorder| {
-            let labels: Vec<Label> = self
-                .base_labels
-                .iter()
-                .map(|(k, v)| Label::new(k.clone(), v.clone()))
-                .collect();
-
-            let key = Key::from_parts(self.metric_name, labels);
-            let metadata =
-                Metadata::new(module_path!(), metrics::Level::INFO, Some(module_path!()));
-            let counter = recorder.register_counter(&key, &metadata);
-            counter.increment(1);
-        });
+        self.get_or_create_counter(dynamic_labels_map)
     }
 
-    /// Increment the counter with additional labels
-    pub fn increment_with<K, V>(&self, extra_labels: impl IntoIterator<Item = (K, V)>)
+    /// Increment the counter with the given dynamic labels
+    pub fn increment(&self)
     where
-        K: Into<String>,
-        V: Into<String>,
+        T: One,
     {
-        use metrics::{Key, Label, Metadata};
-
-        metrics::with_recorder(|recorder| {
-            let mut labels: Vec<Label> = self
-                .base_labels
-                .iter()
-                .map(|(k, v)| Label::new(k.clone(), v.clone()))
-                .collect();
-
-            // Add extra labels
-            for (key, value) in extra_labels {
-                labels.push(Label::new(key.into(), value.into()));
-            }
-
-            let key = Key::from_parts(self.metric_name, labels);
-            let metadata =
-                Metadata::new(module_path!(), metrics::Level::INFO, Some(module_path!()));
-            let counter = recorder.register_counter(&key, &metadata);
-            counter.increment(1);
-        });
+        if !self.required_dynamic_keys.is_empty() {
+            log::warn!(
+                "incrementing counter '{}' without required dynamic labels, required keys: {:?}",
+                self.name,
+                self.required_dynamic_keys
+            );
+        }
+
+        self.get_or_create_counter(HashMap::new()).increment();
+    }
+
+    /// Get or create a counter for the given dynamic labels
+    fn get_or_create_counter(&self, dynamic_labels: HashMap<String, String>) -> Counter<T> {
+        // Create merged labels (static + dynamic)
+        let mut merged_labels = self.static_labels.clone();
+        for (key, value) in dynamic_labels {
+            merged_labels.push((key, value));
+        }
+
+        self.registry.get_or_create_counter(
+            &self.name,
+            merged_labels.iter().map(|(k, v)| (k.as_str(), v.as_str())),
+        )
     }
 }
diff --git a/runtimes/core/src/metrics/exporter/gcp.rs b/runtimes/core/src/metrics/exporter/gcp.rs
index 13cdf8a7ad..22cd05427c 100644
--- a/runtimes/core/src/metrics/exporter/gcp.rs
+++ b/runtimes/core/src/metrics/exporter/gcp.rs
@@ -1,17 +1,16 @@
 use crate::metadata::ContainerMetadata;
-use crate::metrics::manager::Exporter;
+use crate::metrics::exporter::Exporter;
 use crate::metrics::{CollectedMetric, MetricValue};
 use anyhow::Context;
-use dashmap::DashMap;
 use google_cloud_api::model::metric_descriptor::{MetricKind, ValueType};
 use google_cloud_api::model::{Metric, MonitoredResource};
 use google_cloud_monitoring_v3::client::MetricService;
 use google_cloud_monitoring_v3::model::{Point, TimeInterval, TimeSeries, TypedValue};
 use std::collections::HashMap;
 use std::sync::Arc;
-use std::time::{Duration, SystemTime};
+use std::time::SystemTime;
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct Gcp {
     client: Arc<LazyMonitoringClient>,
     project_id: String,
@@ -19,21 +18,9 @@ pub struct Gcp {
     monitored_resource_labels: HashMap<String, String>,
     metric_names: HashMap<String, String>,
     container_meta: ContainerMetadata,
-    first_seen: Arc<DashMap<u64, SystemTime>>,
 }
 
-impl std::fmt::Debug for Gcp {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Gcp")
-            .field("project_id", &self.project_id)
-            .field("monitored_resource_type", &self.monitored_resource_type)
-            .field("monitored_resource_labels", &self.monitored_resource_labels)
-            .field("metric_names", &self.metric_names)
-            .field("container_meta", &self.container_meta)
-            .field("first_seen", &self.first_seen)
-            .finish()
-    }
-}
+#[derive(Debug)]
 struct LazyMonitoringClient {
     cell: tokio::sync::OnceCell<anyhow::Result<MetricService>>,
 }
@@ -65,7 +52,6 @@ impl Gcp {
         monitored_resource_labels: HashMap<String, String>,
         metric_names: HashMap<String, String>,
         container_meta: ContainerMetadata,
-        first_seen: Arc<DashMap<u64, SystemTime>>,
     ) -> Self {
         Self {
             client: Arc::new(LazyMonitoringClient::new()),
@@ -74,7 +60,6 @@ impl Gcp {
             monitored_resource_labels,
             metric_names,
             container_meta,
-            first_seen,
         }
     }
 
@@ -91,7 +76,7 @@ impl Gcp {
             }
         };
 
-        log::info!(
+        log::trace!(
             "Exporting {} metrics to GCP project {}",
             metrics.len(),
             self.project_id
@@ -99,7 +84,6 @@ impl Gcp {
 
         // Convert our metrics to Google Cloud TimeSeries format
         let time_series = self.get_metric_data(metrics);
-        // TODO(fredr): add sys-metrics
 
         // Send metrics in batches (Google Cloud allows up to 200 time series per request)
         for batch in time_series.chunks(200) {
@@ -121,26 +105,32 @@ impl Gcp {
         let container_labels_len = container_labels.len();
 
         for metric in collected {
-            let cloud_metric_name = match self.metric_names.get(&metric.name) {
+            let cloud_metric_name = match self.metric_names.get(metric.key.name()) {
                 Some(name) => name,
-                None => continue,
+                None => {
+                    log::warn!(
+                        "Skipping metric '{}' - no cloud metric name configured",
+                        metric.key.name()
+                    );
+                    continue;
+                }
             };
 
             // Pre-allocate exact capacity for labels
             let mut labels: HashMap<String, String> =
-                HashMap::with_capacity(container_labels_len + metric.labels.len());
+                HashMap::with_capacity(container_labels_len + metric.key.labels().len());
             labels.extend(container_labels.clone());
-            labels.extend(metric.labels.clone());
+            labels.extend(
+                metric
+                    .key
+                    .labels()
+                    .map(|label| (label.key().to_string(), label.value().to_string())),
+            );
 
             let (kind, value_type, typed_value, interval) = match metric.value {
-                MetricValue::Counter(val) => {
-                    let start_time: google_cloud_wkt::Timestamp = self
-                        .first_seen
-                        .get(&metric.key.get_hash())
-                        .map(|entry| *entry)
-                        .unwrap_or_else(|| end_time - Duration::from_millis(1)) // this should never happen, but just so we dont have to handle errors
-                        .try_into()
-                        .unwrap_or_default();
+                MetricValue::CounterU64(val) => {
+                    let start_time: google_cloud_wkt::Timestamp =
+                        metric.registered_at.try_into().unwrap_or_default();
 
                     (
                         MetricKind::Cumulative,
@@ -151,12 +141,37 @@ impl Gcp {
                             .set_end_time(ts_end_time),
                     )
                 }
-                MetricValue::Gauge(val) => (
+                MetricValue::CounterI64(val) => {
+                    let start_time: google_cloud_wkt::Timestamp =
+                        metric.registered_at.try_into().unwrap_or_default();
+
+                    (
+                        MetricKind::Cumulative,
+                        ValueType::Int64,
+                        TypedValue::new().set_int64_value(val),
+                        TimeInterval::new()
+                            .set_start_time(start_time)
+                            .set_end_time(ts_end_time),
+                    )
+                }
+                MetricValue::GaugeF64(val) => (
                     MetricKind::Gauge,
                     ValueType::Double,
                     TypedValue::new().set_double_value(val),
                     TimeInterval::new().set_end_time(ts_end_time),
                 ),
+                MetricValue::GaugeU64(val) => (
+                    MetricKind::Gauge,
+                    ValueType::Int64,
+                    TypedValue::new().set_int64_value(val as i64),
+                    TimeInterval::new().set_end_time(ts_end_time),
+                ),
+                MetricValue::GaugeI64(val) => (
+                    MetricKind::Gauge,
+                    ValueType::Int64,
+                    TypedValue::new().set_int64_value(val),
+                    TimeInterval::new().set_end_time(ts_end_time),
+                ),
             };
 
             data.push(
@@ -195,7 +210,6 @@ impl Gcp {
             .await
             .map_err(anyhow::Error::new)?;
 
-        log::debug!("Successfully exported metrics batch to GCP");
         Ok(())
     }
 }
diff --git a/runtimes/core/src/metrics/exporter/mod.rs b/runtimes/core/src/metrics/exporter/mod.rs
index 77980efef5..a8fa51b2fc 100644
--- a/runtimes/core/src/metrics/exporter/mod.rs
+++ b/runtimes/core/src/metrics/exporter/mod.rs
@@ -1,2 +1,7 @@
 mod gcp;
 pub use gcp::Gcp;
+
+#[async_trait::async_trait]
+pub trait Exporter: Send + Sync + std::fmt::Debug {
+    async fn export(&self, metrics: Vec<crate::metrics::CollectedMetric>);
+}
diff --git a/runtimes/core/src/metrics/gauge.rs b/runtimes/core/src/metrics/gauge.rs
new file mode 100644
index 0000000000..8cb6dfa8c0
--- /dev/null
+++ b/runtimes/core/src/metrics/gauge.rs
@@ -0,0 +1,135 @@
+use crate::metrics;
+use std::collections::{HashMap, HashSet};
+use std::marker::PhantomData;
+use std::sync::atomic::AtomicU64;
+use std::sync::Arc;
+
+pub trait GaugeOps<T> {
+    fn set(&self, value: T);
+    fn get(&self) -> crate::metrics::MetricValue;
+}
+
+/// A typed gauge that can be set, incremented, or decremented
+/// T must be compatible with GaugeOps for type-safe operations
+pub struct Gauge<T> {
+    atomic: Arc<AtomicU64>,
+    _phantom: PhantomData<T>,
+}
+
+impl<T> Gauge<T>
+where
+    Arc<AtomicU64>: GaugeOps<T>,
+{
+    /// Create a new gauge with the given atomic storage
+    /// This is typically called by Registry, not directly by users
+    pub(crate) fn new(atomic: Arc<AtomicU64>) -> Self {
+        Self {
+            atomic,
+            _phantom: PhantomData,
+        }
+    }
+
+    /// Set the gauge to the specified value
+    pub fn set(&self, value: T) {
+        GaugeOps::set(&self.atomic, value);
+    }
+
+    /// Get the current value of the gauge
+    pub fn get(&self) -> metrics::MetricValue {
+        GaugeOps::get(&self.atomic)
+    }
+}
+
+/// A gauge schema that defines static labels and required dynamic label keys
+/// Validates dynamic labels at set/add/sub time and creates separate time series
+/// for each unique combination of static + dynamic labels
+#[derive(Clone, Debug)]
+pub struct Schema<T> {
+    name: String,
+    static_labels: Vec<(String, String)>,
+    required_dynamic_keys: HashSet<String>,
+    registry: Arc<metrics::Registry>,
+    _phantom: PhantomData<T>,
+}
+
+impl<T> Schema<T>
+where
+    Arc<AtomicU64>: GaugeOps<T>,
+    T: Send + Sync + 'static,
+{
+    /// Create a new gauge schema
+    pub(crate) fn new(
+        name: String,
+        static_labels: Vec<(String, String)>,
+        required_dynamic_keys: HashSet<String>,
+        registry: Arc<metrics::Registry>,
+    ) -> Self {
+        Self {
+            name,
+            static_labels,
+            required_dynamic_keys,
+            registry,
+            _phantom: PhantomData,
+        }
+    }
+
+    /// Set the gauge value directly without dynamic labels
+    pub fn set(&self, value: T) {
+        if !self.required_dynamic_keys.is_empty() {
+            log::warn!(
+                "setting gauge '{}' without required dynamic labels, required keys: {:?}",
+                self.name,
+                self.required_dynamic_keys
+            );
+        }
+
+        self.get_or_create_gauge(HashMap::new()).set(value);
+    }
+
+    // Set the dynamic label values and return a completed Gauge
+    pub fn with<L, K, V>(&self, dynamic_labels: L) -> Gauge<T>
+    where
+        L: IntoIterator<Item = (K, V)>,
+        K: AsRef<str>,
+        V: AsRef<str>,
+    {
+        // Convert dynamic_labels to HashMap first
+        let dynamic_labels_map: HashMap<String, String> = dynamic_labels
+            .into_iter()
+            .map(|(k, v)| (k.as_ref().to_string(), v.as_ref().to_string()))
+            .collect();
+
+        // Validate required keys are present
+        let missing: Vec<String> = self
+            .required_dynamic_keys
+            .iter()
+            .filter(|key| !dynamic_labels_map.contains_key(*key))
+            .cloned()
+            .collect();
+
+        if !missing.is_empty() {
+            log::warn!(
+                "missing required dynamic labels for metric '{}': {:?}, required keys: {:?}",
+                self.name,
+                missing,
+                self.required_dynamic_keys
+            );
+        }
+
+        self.get_or_create_gauge(dynamic_labels_map)
+    }
+
+    /// Get or create a gauge for the given dynamic labels
+    fn get_or_create_gauge(&self, dynamic_labels: HashMap<String, String>) -> Gauge<T> {
+        // Create merged labels (static + dynamic)
+        let mut merged_labels = self.static_labels.clone();
+        for (key, value) in dynamic_labels {
+            merged_labels.push((key, value));
+        }
+
+        self.registry.get_or_create_gauge(
+            &self.name,
+            merged_labels.iter().map(|(k, v)| (k.as_str(), v.as_str())),
+        )
+    }
+}
diff --git a/runtimes/core/src/metrics/manager.rs b/runtimes/core/src/metrics/manager.rs
index 8328b895d9..89f2cdabd4 100644
--- a/runtimes/core/src/metrics/manager.rs
+++ b/runtimes/core/src/metrics/manager.rs
@@ -1,7 +1,10 @@
 use crate::{
     encore::runtime::v1::{self as pb, Environment},
     metadata::{process_env_substitution, ContainerMetadata},
-    metrics::{exporter, registry::Registry},
+    metrics::{
+        exporter::{self, Exporter},
+        registry::Registry,
+    },
 };
 use std::sync::Arc;
 use std::time::Duration;
@@ -32,21 +35,19 @@ impl ProviderType {
 
     fn create_exporter(
         &self,
-        reg: &Registry,
         env: &Environment,
         http_client: &reqwest::Client,
         runtime_handle: tokio::runtime::Handle,
     ) -> Arc<dyn Exporter + Send + Sync> {
         match self {
             Self::Gcp(config) | Self::EncoreCloud(config) => {
-                runtime_handle.block_on(Self::create_gcp_exporter(config, reg, env, http_client))
+                runtime_handle.block_on(Self::create_gcp_exporter(config, env, http_client))
             }
         }
     }
 
     async fn create_gcp_exporter(
         provider_cfg: &pb::metrics_provider::GcpCloudMonitoring,
-        reg: &Registry,
         env: &Environment,
         http_client: &reqwest::Client,
     ) -> Arc<dyn Exporter + Send + Sync> {
@@ -75,7 +76,6 @@ impl ProviderType {
             labels,
             provider_cfg.metric_names.clone(),
             container_meta,
-            reg.first_seen(),
         ))
     }
 }
@@ -90,20 +90,15 @@ impl Manager {
     pub fn new() -> Self {
         let registry = Registry::new();
 
-        #[cfg(not(test))]
-        if let Err(e) = metrics::set_global_recorder(registry.clone()) {
-            log::warn!("Failed to set metrics recorder: {}", e);
-        }
-
         Self {
             exporter: None,
             registry,
         }
     }
 
-    #[cfg(test)]
-    pub fn with_local_recorder<T>(&self, f: impl FnOnce() -> T) -> T {
-        metrics::with_local_recorder(&self.registry, f)
+    /// Get direct access to the registry
+    pub fn registry(&self) -> &Registry {
+        &self.registry
     }
 
     pub fn from_runtime_config(
@@ -117,7 +112,6 @@ impl Manager {
         for metrics_provider in &observability.metrics {
             if let Some(provider_type) = ProviderType::from_config(metrics_provider) {
                 manager.exporter = Some(provider_type.create_exporter(
-                    &manager.registry,
                     environment,
                     http_client,
                     runtime_handle.clone(),
@@ -178,8 +172,3 @@ impl Default for Manager {
         Self::new()
     }
 }
-
-#[async_trait::async_trait]
-pub trait Exporter: Send + Sync + std::fmt::Debug {
-    async fn export(&self, metrics: Vec<crate::metrics::CollectedMetric>);
-}
diff --git a/runtimes/core/src/metrics/mod.rs b/runtimes/core/src/metrics/mod.rs
index 136beae91c..bee83257eb 100644
--- a/runtimes/core/src/metrics/mod.rs
+++ b/runtimes/core/src/metrics/mod.rs
@@ -1,18 +1,37 @@
-mod counter;
+mod atomic;
 mod exporter;
 mod manager;
 mod registry;
+mod system;
+
+pub mod counter;
+pub mod gauge;
 
 #[cfg(test)]
 mod test;
 
-pub use counter::Counter;
+pub use counter::{Counter, CounterOps};
+pub use gauge::{Gauge, GaugeOps};
 pub use manager::Manager;
-pub use registry::{CollectedMetric, MetricInfo, MetricValue, Registry};
+pub use registry::{CollectedMetric, MetricValue, Registry};
+pub use system::SystemMetricsCollector;
+
+/// Create a requests counter schema with service and endpoint static labels, requiring code as dynamic label
+pub fn requests_total_counter(
+    registry: &Registry,
+    service: &str,
+    endpoint: &str,
+) -> counter::Schema<u64> {
+    registry
+        .counter_schema::<u64>("e_requests_total")
+        .static_labels([("service", service), ("endpoint", endpoint)])
+        .require_dynamic_key("code")
+        .build()
+}
 
-pub fn requests_total_counter(service: &str, endpoint: &str) -> Counter {
-    crate::metrics::Counter::new("e_requests_total").with_labels([
-        ("service", service.to_string()),
-        ("endpoint", endpoint.to_string()),
-    ])
+/// Create a memory usage gauge schema requiring type label as dynamic
+pub fn memory_usage_gauge_schema(registry: &Registry) -> gauge::Schema<u64> {
+    registry
+        .gauge_schema::<u64>("e_sys_memory_used_bytes")
+        .build()
 }
diff --git a/runtimes/core/src/metrics/registry.rs b/runtimes/core/src/metrics/registry.rs
index 2c66e4dfb4..2ce2afdad4 100644
--- a/runtimes/core/src/metrics/registry.rs
+++ b/runtimes/core/src/metrics/registry.rs
@@ -1,154 +1,333 @@
+use crate::metrics::counter::CounterOps;
+use crate::metrics::gauge::GaugeOps;
+use crate::metrics::{counter, gauge};
+
+use super::system::SystemMetricsCollector;
+use super::{Counter, Gauge};
 use dashmap::DashMap;
-use metrics::{Key, KeyName, Metadata, Recorder, Unit};
-use metrics_util::registry::{AtomicStorage, Registry as MetricsRegistry};
-use std::sync::atomic::Ordering;
+use malachite::base::num::basic::traits::One;
+use metrics::{Key, Label};
+use std::collections::HashSet;
+use std::sync::atomic::AtomicU64;
 use std::sync::Arc;
 use std::time::SystemTime;
 
-#[derive(Clone)]
+/// Storage for a metric with its atomic value and getter closure
+struct MetricStorage {
+    atomic: Arc<AtomicU64>,
+    getter: Box<dyn Fn() -> MetricValue + Send + Sync>,
+    registered_at: SystemTime,
+}
+
+impl std::fmt::Debug for MetricStorage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("MetricStorage")
+            .field("atomic", &self.atomic)
+            .field("registered_at", &self.registered_at)
+            .finish()
+    }
+}
+
+#[derive(Debug, Clone)]
 pub struct Registry {
-    inner: Arc<MetricsRegistry<Key, AtomicStorage>>,
-    first_seen: Arc<DashMap<u64, SystemTime>>,
+    counters: Arc<DashMap<Key, MetricStorage>>,
+    gauges: Arc<DashMap<Key, MetricStorage>>,
+    system_metrics: Arc<SystemMetricsCollector>,
 }
 
 impl Registry {
     pub fn new() -> Self {
         Self {
-            inner: Arc::new(MetricsRegistry::atomic()),
-            first_seen: Arc::new(DashMap::new()),
+            counters: Arc::new(DashMap::new()),
+            gauges: Arc::new(DashMap::new()),
+            system_metrics: Arc::new(SystemMetricsCollector::new()),
         }
     }
 
-    pub fn first_seen(&self) -> Arc<DashMap<u64, SystemTime>> {
-        Arc::clone(&self.first_seen)
+    /// Create a counter with the given name and labels
+    pub fn get_or_create_counter<'a, T>(
+        &self,
+        name: &str,
+        labels: impl IntoIterator<Item = (&'a str, &'a str)>,
+    ) -> Counter<T>
+    where
+        Arc<AtomicU64>: CounterOps<T>,
+        T: One + Send + Sync + 'static,
+    {
+        let labels_vec: Vec<Label> = labels
+            .into_iter()
+            .map(|(k, v)| Label::new(k.to_string(), v.to_string()))
+            .collect();
+        let key = Key::from_parts(name.to_string(), labels_vec);
+
+        let entry = self.counters.entry(key).or_insert_with(|| {
+            let atomic = Arc::new(AtomicU64::new(0));
+            let counter = Counter::new(Arc::clone(&atomic));
+            let getter = Box::new(move || counter.get());
+            MetricStorage {
+                atomic,
+                getter,
+                registered_at: SystemTime::now(),
+            }
+        });
+
+        Counter::new(Arc::clone(&entry.atomic))
+    }
+
+    /// Create a gauge with the given name and labels
+    pub fn get_or_create_gauge<'a, T>(
+        &self,
+        name: &str,
+        labels: impl IntoIterator<Item = (&'a str, &'a str)>,
+    ) -> Gauge<T>
+    where
+        Arc<AtomicU64>: GaugeOps<T>,
+        T: Send + Sync + 'static,
+    {
+        let labels_vec: Vec<Label> = labels
+            .into_iter()
+            .map(|(k, v)| Label::new(k.to_string(), v.to_string()))
+            .collect();
+        let key = Key::from_parts(name.to_string(), labels_vec);
+
+        let entry = self.gauges.entry(key).or_insert_with(|| {
+            let atomic = Arc::new(AtomicU64::new(0));
+            let gauge = Gauge::new(Arc::clone(&atomic));
+            let getter = Box::new(move || gauge.get());
+            MetricStorage {
+                atomic,
+                getter,
+                registered_at: SystemTime::now(),
+            }
+        });
+
+        Gauge::new(Arc::clone(&entry.atomic))
+    }
+
+    /// Create a counter schema builder for defining static and dynamic labels
+    pub fn counter_schema<T>(&self, name: &str) -> CounterSchemaBuilder<T>
+    where
+        Arc<AtomicU64>: CounterOps<T>,
+        T: One + Send + Sync + 'static,
+    {
+        CounterSchemaBuilder::new(name.to_string(), Arc::new(self.clone()))
+    }
+
+    /// Create a gauge schema builder for defining static and dynamic labels
+    pub fn gauge_schema<T>(&self, name: &str) -> GaugeSchemaBuilder<T>
+    where
+        Arc<AtomicU64>: GaugeOps<T>,
+        T: Send + Sync + 'static,
+    {
+        GaugeSchemaBuilder::new(name.to_string(), Arc::new(self.clone()))
     }
 
     pub fn collect(&self) -> Vec<CollectedMetric> {
         let mut collected_metrics = Vec::new();
-        let timestamp = SystemTime::now();
+
+        self.system_metrics.update(self);
 
         // Collect counters
-        self.inner.visit_counters(|key, counter| {
-            let name = key.name().to_string();
-            let labels: Vec<(String, String)> = key
-                .labels()
-                .map(|label| (label.key().to_string(), label.value().to_string()))
-                .collect();
-
-            let count_value = counter.load(Ordering::Relaxed);
+        for entry in self.counters.iter() {
+            let key = entry.key();
+            let store = entry.value();
+
+            let value = (store.getter)();
+
             collected_metrics.push(CollectedMetric {
-                name,
-                labels,
-                value: MetricValue::Counter(count_value),
-                timestamp,
+                value,
                 key: key.clone(),
+                registered_at: store.registered_at,
             });
-        });
+        }
 
         // Collect gauges
-        self.inner.visit_gauges(|key, gauge| {
-            let name = key.name().to_string();
-            let labels: Vec<(String, String)> = key
-                .labels()
-                .map(|label| (label.key().to_string(), label.value().to_string()))
-                .collect();
-
-            let f64_value = f64::from_bits(gauge.load(Ordering::Relaxed));
+        for entry in self.gauges.iter() {
+            let key = entry.key();
+            let store = entry.value();
+
+            let value = (store.getter)();
+
             collected_metrics.push(CollectedMetric {
-                name,
-                labels,
-                value: MetricValue::Gauge(f64_value),
-                timestamp,
+                value,
                 key: key.clone(),
+                registered_at: store.registered_at,
             });
-        });
-
-        // TODO(fredr): Collect histograms
+        }
 
         collected_metrics
     }
+}
 
-    /// Record the first registration time for a timeseries ID (only if not already registered)
-    fn record_first_seen(&self, key: &Key) {
-        self.first_seen
-            .entry(key.get_hash())
-            .or_insert_with(SystemTime::now);
+impl Default for Registry {
+    fn default() -> Self {
+        Self::new()
     }
 }
 
-// Implement the metrics Recorder trait to capture metrics
-impl Recorder for Registry {
-    fn describe_counter(
-        &self,
-        _key: KeyName,
-        _unit: Option<Unit>,
-        _description: metrics::SharedString,
-    ) {
-    }
+#[derive(Debug, Clone, PartialEq)]
+pub enum MetricValue {
+    // Counter variants
+    CounterU64(u64),
+    CounterI64(i64),
 
-    fn describe_gauge(
-        &self,
-        _key: KeyName,
-        _unit: Option<Unit>,
-        _description: metrics::SharedString,
-    ) {
+    // Gauge variants
+    GaugeU64(u64),
+    GaugeI64(i64),
+    GaugeF64(f64),
+}
+
+#[derive(Debug, Clone)]
+pub struct CollectedMetric {
+    pub key: Key,
+    pub value: MetricValue,
+    pub registered_at: SystemTime,
+}
+
+/// Builder for creating counter schemas with static labels and required dynamic keys
+pub struct CounterSchemaBuilder<T> {
+    name: String,
+    static_labels: Vec<(String, String)>,
+    required_dynamic_keys: HashSet<String>,
+    registry: Arc<Registry>,
+    _phantom: std::marker::PhantomData<T>,
+}
+
+impl<T> CounterSchemaBuilder<T>
+where
+    Arc<AtomicU64>: CounterOps<T>,
+    T: One + Send + Sync + 'static,
+{
+    pub(crate) fn new(name: String, registry: Arc<Registry>) -> Self {
+        Self {
+            name,
+            static_labels: Vec::new(),
+            required_dynamic_keys: HashSet::new(),
+            registry,
+            _phantom: std::marker::PhantomData,
+        }
     }
 
-    fn describe_histogram(
-        &self,
-        _key: KeyName,
-        _unit: Option<Unit>,
-        _description: metrics::SharedString,
-    ) {
+    /// Add static labels that are set once when the schema is created
+    pub fn static_labels<I, K, V>(mut self, labels: I) -> Self
+    where
+        I: IntoIterator<Item = (K, V)>,
+        K: AsRef<str>,
+        V: AsRef<str>,
+    {
+        for (key, value) in labels {
+            self.static_labels
+                .push((key.as_ref().to_string(), value.as_ref().to_string()));
+        }
+        self
     }
 
-    fn register_counter(&self, key: &Key, _metadata: &Metadata<'_>) -> metrics::Counter {
-        self.record_first_seen(key);
-        let counter_handle = self.inner.get_or_create_counter(key, |c| c.clone());
-        metrics::Counter::from_arc(counter_handle)
+    /// Add a single static label
+    pub fn static_label(mut self, key: &str, value: &str) -> Self {
+        self.static_labels
+            .push((key.to_string(), value.to_string()));
+        self
     }
 
-    fn register_gauge(&self, key: &Key, _metadata: &Metadata<'_>) -> metrics::Gauge {
-        self.record_first_seen(key);
-        let gauge_handle = self.inner.get_or_create_gauge(key, |g| g.clone());
-        metrics::Gauge::from_arc(gauge_handle)
+    /// Specify required dynamic label keys that must be provided at increment time
+    pub fn require_dynamic_keys<I, K>(mut self, keys: I) -> Self
+    where
+        I: IntoIterator<Item = K>,
+        K: AsRef<str>,
+    {
+        for key in keys {
+            self.required_dynamic_keys.insert(key.as_ref().to_string());
+        }
+        self
     }
 
-    fn register_histogram(&self, key: &Key, _metadata: &Metadata<'_>) -> metrics::Histogram {
-        self.record_first_seen(key);
-        let histogram_handle = self.inner.get_or_create_histogram(key, |h| h.clone());
-        metrics::Histogram::from_arc(histogram_handle)
+    /// Add a single required dynamic key
+    pub fn require_dynamic_key(mut self, key: &str) -> Self {
+        self.required_dynamic_keys.insert(key.to_string());
+        self
     }
-}
 
-impl Default for Registry {
-    fn default() -> Self {
-        Self::new()
+    /// Build the counter schema
+    pub fn build(self) -> counter::Schema<T> {
+        counter::Schema::new(
+            self.name,
+            self.static_labels,
+            self.required_dynamic_keys,
+            self.registry,
+        )
     }
 }
 
-#[derive(Debug, Clone)]
-pub struct MetricInfo {
-    pub name: String,
+/// Builder for creating gauge schemas with static labels and required dynamic keys
+pub struct GaugeSchemaBuilder<T> {
+    name: String,
+    static_labels: Vec<(String, String)>,
+    required_dynamic_keys: HashSet<String>,
+    registry: Arc<Registry>,
+    _phantom: std::marker::PhantomData<T>,
 }
 
-impl MetricInfo {
-    pub fn new(name: String) -> Self {
-        Self { name }
+impl<T> GaugeSchemaBuilder<T>
+where
+    Arc<AtomicU64>: GaugeOps<T>,
+    T: Send + Sync + 'static,
+{
+    pub(crate) fn new(name: String, registry: Arc<Registry>) -> Self {
+        Self {
+            name,
+            static_labels: Vec::new(),
+            required_dynamic_keys: HashSet::new(),
+            registry,
+            _phantom: std::marker::PhantomData,
+        }
     }
-}
 
-#[derive(Debug, Clone)]
-pub enum MetricValue {
-    Counter(u64),
-    Gauge(f64),
-}
+    /// Add static labels that are set once when the schema is created
+    pub fn static_labels<I, K, V>(mut self, labels: I) -> Self
+    where
+        I: IntoIterator<Item = (K, V)>,
+        K: AsRef<str>,
+        V: AsRef<str>,
+    {
+        for (key, value) in labels {
+            self.static_labels
+                .push((key.as_ref().to_string(), value.as_ref().to_string()));
+        }
+        self
+    }
 
-#[derive(Debug, Clone)]
-pub struct CollectedMetric {
-    pub name: String,
-    pub labels: Vec<(String, String)>,
-    pub value: MetricValue,
-    pub timestamp: std::time::SystemTime,
-    pub key: Key,
+    /// Add a single static label
+    pub fn static_label(mut self, key: &str, value: &str) -> Self {
+        self.static_labels
+            .push((key.to_string(), value.to_string()));
+        self
+    }
+
+    /// Specify required dynamic label keys that must be provided at set/add/sub time
+    pub fn require_dynamic_keys<I, K>(mut self, keys: I) -> Self
+    where
+        I: IntoIterator<Item = K>,
+        K: AsRef<str>,
+    {
+        for key in keys {
+            self.required_dynamic_keys.insert(key.as_ref().to_string());
+        }
+        self
+    }
+
+    /// Add a single required dynamic key
+    pub fn require_dynamic_key(mut self, key: &str) -> Self {
+        self.required_dynamic_keys.insert(key.to_string());
+        self
+    }
+
+    /// Build the gauge schema
+    pub fn build(self) -> gauge::Schema<T> {
+        gauge::Schema::new(
+            self.name,
+            self.static_labels,
+            self.required_dynamic_keys,
+            self.registry,
+        )
+    }
 }
diff --git a/runtimes/core/src/metrics/system.rs b/runtimes/core/src/metrics/system.rs
new file mode 100644
index 0000000000..60f9042024
--- /dev/null
+++ b/runtimes/core/src/metrics/system.rs
@@ -0,0 +1,86 @@
+use crate::metrics::gauge;
+
+use super::{memory_usage_gauge_schema, Registry};
+use std::sync::Mutex;
+use sysinfo::System;
+
+/// Collector for system metrics (CPU and memory usage)
+#[derive(Debug)]
+pub struct SystemMetricsCollector {
+    system: Mutex<System>,
+    memory_schema: std::sync::OnceLock<gauge::Schema<u64>>,
+}
+
+impl SystemMetricsCollector {
+    pub fn new() -> Self {
+        let mut system = System::new();
+        Self::refresh(&mut system);
+
+        Self {
+            system: Mutex::new(system),
+            memory_schema: std::sync::OnceLock::new(),
+        }
+    }
+
+    fn refresh(system: &mut System) {
+        system.refresh_cpu_usage();
+        system.refresh_memory();
+    }
+
+    /// Collect and record all system metrics directly to the metrics registry
+    pub fn update(&self, registry: &Registry) {
+        let mut system = match self.system.try_lock() {
+            Ok(guard) => guard,
+            Err(_) => {
+                // Already an update in progress
+                return;
+            }
+        };
+
+        Self::refresh(&mut system);
+
+        // Initialize schemas if not already done (lazy initialization)
+        let memory_schema = self
+            .memory_schema
+            .get_or_init(|| memory_usage_gauge_schema(registry));
+
+        // Record memory metrics using schema
+        memory_schema.set(system.used_memory());
+    }
+}
+
+impl Default for SystemMetricsCollector {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_system_metrics_collector_creation() {
+        use crate::metrics::Manager;
+
+        let manager = Manager::new();
+        let collector = SystemMetricsCollector::new();
+
+        // Update system metrics using the registry directly
+        collector.update(manager.registry());
+
+        let collected = manager.collect_metrics();
+
+        // Check if system metrics were recorded
+        let memory_metrics: Vec<_> = collected
+            .iter()
+            .filter(|m| m.key.name() == "e_sys_memory_used_bytes")
+            .collect();
+
+        // Should have memory metrics
+        assert!(
+            !memory_metrics.is_empty(),
+            "Memory metrics should be present"
+        );
+    }
+}
diff --git a/runtimes/core/src/metrics/test.rs b/runtimes/core/src/metrics/test.rs
index 41dc56a5ea..80d153406c 100644
--- a/runtimes/core/src/metrics/test.rs
+++ b/runtimes/core/src/metrics/test.rs
@@ -1,5 +1,4 @@
 use super::*;
-use metrics::{Key, Label, Metadata, Recorder};
 use std::sync::Arc;
 
 #[cfg(test)]
@@ -9,82 +8,55 @@ mod counter_tests {
     #[test]
     fn test_counter_with_labels() {
         let manager = Manager::new();
+        let registry = manager.registry();
 
-        manager.with_local_recorder(|| {
-            let counter = Counter::new("test_counter_with_labels").with_labels([
-                ("service", "test_service".to_string()),
-                ("method", "GET".to_string()),
-            ]);
-            counter.increment();
-        });
+        registry
+            .get_or_create_counter::<u64>(
+                "test_counter_with_labels",
+                [("service", "test_service"), ("method", "GET")],
+            )
+            .increment();
 
         let collected = manager.collect_metrics();
         let metric = collected
             .iter()
-            .find(|m| m.name == "test_counter_with_labels");
+            .find(|m| m.key.name() == "test_counter_with_labels");
         assert!(metric.is_some());
 
         let m = metric.unwrap();
-        assert_eq!(m.labels.len(), 2);
-        assert!(m
-            .labels
-            .contains(&("service".to_string(), "test_service".to_string())));
-        assert!(m
-            .labels
-            .contains(&("method".to_string(), "GET".to_string())));
-    }
+        assert_eq!(m.key.labels().len(), 2);
 
-    #[test]
-    fn test_counter_increment() {
-        let manager = Manager::new();
+        let labels: Vec<_> = m.key.labels().map(|l| (l.key(), l.value())).collect();
 
-        manager.with_local_recorder(|| {
-            let counter = Counter::new("test_increment");
-            counter.increment();
-        });
-
-        let collected = manager.collect_metrics();
-        assert!(!collected.is_empty());
-
-        let metric = collected.iter().find(|m| m.name == "test_increment");
-        assert!(metric.is_some());
+        assert!(labels.contains(&("service", "test_service")));
+        assert!(labels.contains(&("method", "GET")));
 
-        if let Some(m) = metric {
-            match m.value {
-                MetricValue::Counter(value) => assert_eq!(value, 1),
-                _ => panic!("Expected counter value"),
-            }
+        // Verify it's the correct counter type
+        if let MetricValue::CounterU64(value) = m.value {
+            assert_eq!(value, 1);
+        } else {
+            panic!("Expected CounterU64, got {:?}", m.value);
         }
     }
 
     #[test]
-    fn test_counter_increment_with_extra_labels() {
+    fn test_counter_increment() {
         let manager = Manager::new();
+        let registry = manager.registry();
 
-        manager.with_local_recorder(|| {
-            let counter = Counter::new("test_increment_with_labels")
-                .with_labels([("service", "test".to_string())]);
-
-            counter.increment_with([("status", "200"), ("method", "POST")]);
-        });
+        registry
+            .get_or_create_counter::<u64>("test_increment", [])
+            .increment();
 
         let collected = manager.collect_metrics();
-        let metric = collected
-            .iter()
-            .find(|m| m.name == "test_increment_with_labels");
+        let metric = collected.iter().find(|m| m.key.name() == "test_increment");
         assert!(metric.is_some());
 
-        if let Some(m) = metric {
-            assert_eq!(m.labels.len(), 3); // base + 2 extra labels
-            assert!(m
-                .labels
-                .contains(&("service".to_string(), "test".to_string())));
-            assert!(m
-                .labels
-                .contains(&("status".to_string(), "200".to_string())));
-            assert!(m
-                .labels
-                .contains(&("method".to_string(), "POST".to_string())));
+        let m = metric.unwrap();
+        if let MetricValue::CounterU64(value) = m.value {
+            assert_eq!(value, 1);
+        } else {
+            panic!("Expected CounterU64, got {:?}", m.value);
         }
     }
 }
@@ -92,27 +64,29 @@ mod counter_tests {
 #[cfg(test)]
 mod registry_tests {
     use super::*;
-    use std::time::Duration;
 
     #[test]
     fn test_registry_collect_counters() {
         let registry = Registry::new();
 
-        // Register a counter manually
-        let key = Key::from_parts("test_counter", vec![Label::new("label", "value")]);
-        let metadata = Metadata::new(module_path!(), metrics::Level::INFO, Some(module_path!()));
-        let counter = registry.register_counter(&key, &metadata);
-        counter.increment(5);
+        let counter = registry.get_or_create_counter::<u64>("test_counter", [("label", "value")]);
+        counter.increment();
+        counter.increment();
+        counter.increment();
+        counter.increment();
+        counter.increment();
 
         let collected = registry.collect();
-        assert_eq!(collected.len(), 1);
 
-        let metric = &collected[0];
-        assert_eq!(metric.name, "test_counter");
-        assert_eq!(metric.labels.len(), 1);
+        let metric = collected
+            .iter()
+            .find(|m| m.key.name() == "test_counter")
+            .expect("test_counter not found");
+        assert_eq!(metric.key.name(), "test_counter");
+        assert_eq!(metric.key.labels().len(), 1);
         match metric.value {
-            MetricValue::Counter(value) => assert_eq!(value, 5),
-            _ => panic!("Expected counter value"),
+            MetricValue::CounterU64(value) => assert_eq!(value, 5),
+            _ => panic!("Expected CounterU64 value, got {:?}", metric.value),
         }
     }
 
@@ -120,87 +94,129 @@ mod registry_tests {
     fn test_registry_collect_gauges() {
         let registry = Registry::new();
 
-        let key = Key::from_parts("test_gauge", vec![]);
-        let metadata = Metadata::new(module_path!(), metrics::Level::INFO, Some(module_path!()));
-        let gauge = registry.register_gauge(&key, &metadata);
-        gauge.set(42.5);
+        registry
+            .get_or_create_gauge::<f64>("test_gauge", [])
+            .set(42.5);
 
         let collected = registry.collect();
-        assert_eq!(collected.len(), 1);
 
-        let metric = &collected[0];
-        assert_eq!(metric.name, "test_gauge");
+        let metric = collected
+            .iter()
+            .find(|m| m.key.name() == "test_gauge")
+            .expect("test_gauge not found");
+        assert_eq!(metric.key.name(), "test_gauge");
         match metric.value {
-            MetricValue::Gauge(value) => assert!((value - 42.5).abs() < f64::EPSILON),
-            _ => panic!("Expected gauge value"),
+            MetricValue::GaugeF64(value) => assert!((value - 42.5).abs() < f64::EPSILON),
+            _ => panic!("Expected GaugeF64 value, got {:?}", metric.value),
         }
     }
 
     #[test]
-    fn test_registry_first_seen() {
+    fn test_registry_registered_at() {
         let registry = Registry::new();
-        let key = Key::from_parts("test_metric", vec![]);
 
         let before = std::time::SystemTime::now();
-        let metadata = Metadata::new(module_path!(), metrics::Level::INFO, Some(module_path!()));
-        let _counter = registry.register_counter(&key, &metadata);
+        registry.get_or_create_counter::<u64>("test_metric", []);
         let after = std::time::SystemTime::now();
 
-        let first_seen = registry.first_seen();
-        let recorded_time = first_seen.get(&key.get_hash());
-        assert!(recorded_time.is_some());
+        // Find the key that was created
+        let collected = registry.collect();
+        let metric = collected
+            .iter()
+            .find(|m| m.key.name() == "test_metric")
+            .unwrap();
 
-        let time = *recorded_time.unwrap();
+        let time = metric.registered_at;
         assert!(time >= before && time <= after);
 
-        // re-register should not update first seen
-        let _counter = registry.register_counter(&key, &metadata);
-        let first_seen2 = registry.first_seen();
-        let recorded_time2 = first_seen2.get(&key.get_hash());
-        let time2 = *recorded_time2.unwrap();
+        // Creating the counter again should not update first seen
+        registry.get_or_create_counter::<u64>("test_metric", []);
+        // Find the key that was created
+        let collected = registry.collect();
+        let metric = collected
+            .iter()
+            .find(|m| m.key.name() == "test_metric")
+            .unwrap();
+        let time2 = metric.registered_at;
 
         assert_eq!(time, time2)
     }
 
     #[test]
-    fn test_registry_first_seen_only_once() {
+    fn test_registry_always_collects_system_metrics() {
         let registry = Registry::new();
-        let key = Key::from_parts("test_metric", vec![]);
 
-        let metadata = Metadata::new(module_path!(), metrics::Level::INFO, Some(module_path!()));
-        let _counter1 = registry.register_counter(&key, &metadata);
-        std::thread::sleep(Duration::from_millis(10));
-        let _counter2 = registry.register_counter(&key, &metadata);
+        let collected = registry.collect();
+
+        // Check that system metrics are present
+        let has_memory_metrics = collected
+            .iter()
+            .any(|m| m.key.name() == "e_sys_memory_used_bytes");
 
-        let first_seen = registry.first_seen();
-        assert_eq!(first_seen.len(), 1); // Only one entry should exist
+        assert!(has_memory_metrics, "Memory metrics should be present");
     }
 }
 
 #[cfg(test)]
-mod manager_tests {
+mod gauge_tests {
     use super::*;
 
     #[test]
-    fn test_manager_new() {
+    fn test_gauge_with_labels() {
         let manager = Manager::new();
-        // Test that manager starts with empty metrics
-        assert!(manager.collect_metrics().is_empty());
+
+        let registry = manager.registry();
+        // Create gauge with labels using new API
+        registry
+            .get_or_create_gauge::<f64>(
+                "test_gauge_with_labels",
+                [("service", "test_service"), ("region", "us-west")],
+            )
+            .set(42.5);
+
+        let collected = manager.collect_metrics();
+        let metric = collected
+            .iter()
+            .find(|m| m.key.name() == "test_gauge_with_labels");
+        assert!(metric.is_some());
+
+        let m = metric.unwrap();
+        assert_eq!(m.key.labels().len(), 2);
+        assert!(m
+            .key
+            .labels()
+            .any(|label| label.key() == "service" && label.value() == "test_service"));
+        assert!(m
+            .key
+            .labels()
+            .any(|label| label.key() == "region" && label.value() == "us-west"));
+
+        match m.value {
+            MetricValue::GaugeF64(value) => assert!((value - 42.5).abs() < f64::EPSILON),
+            _ => panic!("Expected gauge value"),
+        }
     }
+}
+
+#[cfg(test)]
+mod manager_tests {
+    use super::*;
 
     #[test]
     fn test_manager_collect_metrics() {
         let manager = Manager::new();
 
-        manager.with_local_recorder(|| {
-            let counter = Counter::new("test_manager_counter");
-            counter.increment();
-        });
+        manager
+            .registry()
+            .get_or_create_counter::<u64>("test_manager_counter", [])
+            .increment();
 
         let collected = manager.collect_metrics();
         assert!(!collected.is_empty());
 
-        let metric = collected.iter().find(|m| m.name == "test_manager_counter");
+        let metric = collected
+            .iter()
+            .find(|m| m.key.name() == "test_manager_counter");
         assert!(metric.is_some());
     }
 
@@ -222,7 +238,7 @@ mod manager_tests {
     }
 
     #[async_trait::async_trait]
-    impl super::super::manager::Exporter for MockExporter {
+    impl super::super::exporter::Exporter for MockExporter {
         async fn export(&self, metrics: Vec<CollectedMetric>) {
             self.exported_metrics.lock().unwrap().push(metrics);
         }
@@ -233,10 +249,10 @@ mod manager_tests {
         let mock_exporter = Arc::new(MockExporter::new());
         let manager = Manager::new().with_exporter(mock_exporter.clone());
 
-        manager.with_local_recorder(|| {
-            let counter = Counter::new("test_export_counter");
-            counter.increment();
-        });
+        let registry = manager.registry();
+        registry
+            .get_or_create_counter::<u64>("test_export_counter", [])
+            .increment();
 
         // Collect and export
         manager.collect_and_export().await;
@@ -245,110 +261,610 @@ mod manager_tests {
         assert_eq!(exported.len(), 1);
         assert!(!exported[0].is_empty());
 
-        let metric = exported[0].iter().find(|m| m.name == "test_export_counter");
+        let metric = exported[0]
+            .iter()
+            .find(|m| m.key.name() == "test_export_counter");
         assert!(metric.is_some());
     }
 }
 
 #[cfg(test)]
-mod helper_function_tests {
+mod collected_metric_tests {
     use super::*;
 
     #[test]
-    fn test_requests_total_counter() {
+    fn test_gauge_types_integer_and_float() {
         let manager = Manager::new();
 
-        manager.with_local_recorder(|| {
-            let counter = requests_total_counter("user_service", "/api/users");
-            counter.increment();
-        });
+        let registry = manager.registry();
+
+        // Test float gauge
+        let float_gauge: Gauge<f64> = registry.get_or_create_gauge("test_float_metric", []);
+        float_gauge.set(42.5);
+
+        let float_gauge_temp: Gauge<f64> =
+            registry.get_or_create_gauge("test_float_metric", [("type", "temperature")]);
+        float_gauge_temp.set(99.9);
+
+        // Test integer gauge
+        let int_gauge: Gauge<i64> = registry.get_or_create_gauge("test_int_metric", []);
+        int_gauge.set(12345);
+
+        let int_gauge_count: Gauge<i64> =
+            registry.get_or_create_gauge("test_int_metric", [("type", "count")]);
+        int_gauge_count.set(67890);
+
+        // Test large integer to verify precision
+        let large_int = i64::MAX;
+        let int_gauge_large: Gauge<i64> =
+            registry.get_or_create_gauge("test_int_metric", [("type", "large")]);
+        int_gauge_large.set(large_int);
+
+        // Test small negative integer to verify precision
+        let small_int = i64::MIN;
+        let int_gauge_small: Gauge<i64> =
+            registry.get_or_create_gauge("test_int_metric", [("type", "small")]);
+        int_gauge_small.set(small_int);
+
+        let metrics = manager.collect_metrics();
+
+        let float_metrics: Vec<_> = metrics
+            .iter()
+            .filter(|m| m.key.name() == "test_float_metric")
+            .collect();
+        let int_metrics: Vec<_> = metrics
+            .iter()
+            .filter(|m| m.key.name() == "test_int_metric")
+            .collect();
+
+        // Should have 2 float metrics and 4 int metrics
+        assert_eq!(float_metrics.len(), 2);
+        assert_eq!(int_metrics.len(), 4);
+
+        // Check float metrics with their labels
+        for m in &float_metrics {
+            if let MetricValue::GaugeF64(val) = m.value {
+                if m.key.labels().count() == 0 {
+                    // No labels - should be 42.5
+                    assert_eq!(val, 42.5);
+                } else {
+                    // Should have type=temperature label
+                    let has_temp_label = m
+                        .key
+                        .labels()
+                        .any(|l| l.key() == "type" && l.value() == "temperature");
+                    assert!(has_temp_label);
+                    assert_eq!(val, 99.9);
+                }
+            } else {
+                panic!("Float metric has wrong type: {:?}", m.value);
+            }
+        }
+
+        // Check int metrics with their labels
+        for m in &int_metrics {
+            if let MetricValue::GaugeI64(val) = m.value {
+                if m.key.labels().count() == 0 {
+                    // No labels - should be 12345
+                    assert_eq!(val, 12345);
+                } else {
+                    // Check which label it has
+                    let label_value = m
+                        .key
+                        .labels()
+                        .find(|l| l.key() == "type")
+                        .map(|l| l.value())
+                        .expect("Should have 'type' label");
+
+                    match label_value {
+                        "count" => assert_eq!(val, 67890),
+                        "large" => assert_eq!(val, i64::MAX),
+                        "small" => assert_eq!(val, i64::MIN),
+                        _ => panic!("Unexpected label value: {}", label_value),
+                    }
+                }
+            } else {
+                panic!("Integer metric has wrong type: {:?}", m.value);
+            }
+        }
+    }
+
+    #[test]
+    fn test_counter_types_integer() {
+        let manager = Manager::new();
+        let registry = manager.registry();
+
+        // Test u64 counter
+        let u64_counter: Counter<u64> = registry.get_or_create_counter("test_u64_counter", []);
+        u64_counter.increment();
+        u64_counter.increment();
+        u64_counter.increment();
+
+        let u64_counter_labeled: Counter<u64> =
+            registry.get_or_create_counter("test_u64_counter", [("type", "requests")]);
+        u64_counter_labeled.increment();
+        u64_counter_labeled.increment();
+
+        // Test i64 counter
+        let i64_counter = registry.get_or_create_counter::<i64>("test_i64_counter", []);
+        i64_counter.increment();
+        i64_counter.increment();
+        i64_counter.increment();
+        i64_counter.increment();
+
+        let i64_counter_labeled: Counter<i64> =
+            registry.get_or_create_counter("test_i64_counter", [("type", "errors")]);
+        i64_counter_labeled.increment();
+
+        // Collect metrics
+        let metrics = manager.collect_metrics();
+
+        let u64_metrics: Vec<_> = metrics
+            .iter()
+            .filter(|m| m.key.name() == "test_u64_counter")
+            .collect();
+        let i64_metrics: Vec<_> = metrics
+            .iter()
+            .filter(|m| m.key.name() == "test_i64_counter")
+            .collect();
+
+        // Should have 2 u64 metrics and 2 i64 metrics
+        assert_eq!(u64_metrics.len(), 2);
+        assert_eq!(i64_metrics.len(), 2);
+
+        // Check u64 counter metrics
+        for m in &u64_metrics {
+            if let MetricValue::CounterU64(val) = m.value {
+                if m.key.labels().count() == 0 {
+                    // No labels - should be 3
+                    assert_eq!(val, 3);
+                } else {
+                    // Should have type=requests label
+                    let has_requests_label = m
+                        .key
+                        .labels()
+                        .any(|l| l.key() == "type" && l.value() == "requests");
+                    assert!(has_requests_label);
+                    assert_eq!(val, 2);
+                }
+            } else {
+                panic!("u64 counter metric has wrong type: {:?}", m.value);
+            }
+        }
+
+        // Check i64 counter metrics
+        for m in &i64_metrics {
+            if let MetricValue::CounterI64(val) = m.value {
+                if m.key.labels().count() == 0 {
+                    // No labels - should be 4
+                    assert_eq!(val, 4);
+                } else {
+                    // Should have type=errors label
+                    let has_errors_label = m
+                        .key
+                        .labels()
+                        .any(|l| l.key() == "type" && l.value() == "errors");
+                    assert!(has_errors_label);
+                    assert_eq!(val, 1);
+                }
+            } else {
+                panic!("i64 counter metric has wrong type: {:?}", m.value);
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod concurrency_tests {
+    use super::*;
+    use std::sync::{Arc, Barrier};
+    use std::thread;
+
+    #[test]
+    fn test_counter_concurrent_increments() {
+        let manager = Manager::new();
+        let registry = manager.registry();
+
+        let num_threads = 10;
+        let increments_per_thread = 1000;
+        let barrier = Arc::new(Barrier::new(num_threads));
+
+        let handles: Vec<_> = (0..num_threads)
+            .map(|_| {
+                let counter = registry.get_or_create_counter::<u64>("concurrent_counter", []);
+                let barrier = barrier.clone();
+                thread::spawn(move || {
+                    barrier.wait();
+                    for _ in 0..increments_per_thread {
+                        counter.increment();
+                    }
+                })
+            })
+            .collect();
+
+        for handle in handles {
+            handle.join().unwrap();
+        }
 
         let collected = manager.collect_metrics();
-        let metric = collected.iter().find(|m| m.name == "e_requests_total");
-        assert!(metric.is_some());
+        let metric = collected
+            .iter()
+            .find(|m| m.key.name() == "concurrent_counter")
+            .unwrap();
 
-        let m = metric.unwrap();
-        assert_eq!(m.labels.len(), 2);
-        assert!(m
-            .labels
-            .contains(&("service".to_string(), "user_service".to_string())));
-        assert!(m
-            .labels
-            .contains(&("endpoint".to_string(), "/api/users".to_string())));
+        if let MetricValue::CounterU64(value) = metric.value {
+            assert_eq!(value, (num_threads * increments_per_thread) as u64);
+        } else {
+            panic!("Expected CounterU64");
+        }
     }
 
     #[test]
-    fn test_requests_total_counter_usage() {
+    fn test_gauge_concurrent_operations() {
         let manager = Manager::new();
+        let registry = manager.registry();
+        let num_threads = 8;
+        let operations_per_thread = 100;
+
+        let handles: Vec<_> = (0..num_threads)
+            .map(|thread_id| {
+                let registry = registry.clone();
+                thread::spawn(move || {
+                    for i in 0..operations_per_thread {
+                        let thread_id_str = thread_id.to_string();
+                        let gauge = registry.get_or_create_gauge::<f64>(
+                            "concurrent_gauge",
+                            [("thread", thread_id_str.as_str())],
+                        );
+                        gauge.set((thread_id * operations_per_thread + i) as f64);
+                    }
+                })
+            })
+            .collect();
+
+        for handle in handles {
+            handle.join().unwrap();
+        }
 
-        manager.with_local_recorder(|| {
-            let counter = requests_total_counter("api", "/health");
-            counter.increment();
-            counter.increment();
+        let collected = manager.collect_metrics();
+        let gauge_metrics: Vec<_> = collected
+            .iter()
+            .filter(|m| m.key.name() == "concurrent_gauge")
+            .collect();
+
+        assert_eq!(gauge_metrics.len(), num_threads);
+
+        for metric in gauge_metrics {
+            if let MetricValue::GaugeF64(value) = metric.value {
+                let thread_id: usize = metric
+                    .key
+                    .labels()
+                    .find(|l| l.key() == "thread")
+                    .expect("no thread label set on metric")
+                    .value()
+                    .parse()
+                    .expect("couldn't parse thread id");
+
+                assert_eq!(
+                    value,
+                    (thread_id * operations_per_thread + operations_per_thread - 1) as f64 // last value written in the loop for each thread
+                );
+            } else {
+                panic!("Expected GaugeF64");
+            }
+        }
+    }
+
+    #[test]
+    fn test_registry_concurrent_metric_creation() {
+        let registry = Registry::new();
+        let num_threads = 16;
+        let metrics_per_thread = 50;
+
+        let handles: Vec<_> = (0..num_threads)
+            .map(|thread_id| {
+                let registry = registry.clone();
+                thread::spawn(move || {
+                    for i in 0..metrics_per_thread {
+                        let metric_name = format!("metric_{}_{}", thread_id, i);
+                        registry
+                            .get_or_create_counter::<u64>(&metric_name, [])
+                            .increment();
+                        registry
+                            .get_or_create_gauge::<f64>(&metric_name, [("type", "gauge")])
+                            .set(i as f64);
+                    }
+                })
+            })
+            .collect();
+
+        for handle in handles {
+            handle.join().unwrap();
+        }
+
+        let collected = registry.collect();
+
+        let counters = collected
+            .iter()
+            .filter(|m| matches!(m.value, MetricValue::CounterU64(_)))
+            .count();
+        let gauges = collected
+            .iter()
+            .filter(|m| matches!(m.value, MetricValue::GaugeF64(_)))
+            .count();
+
+        // Account for system metrics that are always collected
+        assert!(counters >= num_threads * metrics_per_thread);
+        assert!(gauges >= num_threads * metrics_per_thread);
+    }
+
+    #[test]
+    fn test_concurrent_collection_and_updates() {
+        let manager = Manager::new();
+        let registry = manager.registry();
+
+        let registry_clone = registry.clone();
+        let manager_clone = manager.clone();
+
+        let updater_handle = thread::spawn(move || {
+            let counter = registry_clone.get_or_create_counter::<u64>("collection_test", []);
+            let gauge = registry_clone.get_or_create_gauge::<f64>("collection_test_gauge", []);
+            for i in 0..1000 {
+                counter.increment();
+                gauge.set(i as f64);
+                thread::sleep(std::time::Duration::from_micros(1));
+            }
         });
 
+        let collector_handle = thread::spawn(move || {
+            for _ in 0..100 {
+                let _metrics = manager_clone.collect_metrics();
+                thread::sleep(std::time::Duration::from_micros(10));
+            }
+        });
+
+        updater_handle.join().unwrap();
+        collector_handle.join().unwrap();
+
+        let final_metrics = manager.collect_metrics();
+        assert!(!final_metrics.is_empty());
+    }
+}
+
+#[cfg(test)]
+mod memory_performance_tests {
+    use super::*;
+
+    #[test]
+    fn test_high_cardinality_metrics() {
+        let manager = Manager::new();
+        let registry = manager.registry();
+
+        let num_services = 20;
+        let num_endpoints = 50;
+        let num_status_codes = 10;
+
+        for service_id in 0..num_services {
+            for endpoint_id in 0..num_endpoints {
+                for status_code in 200..(200 + num_status_codes) {
+                    let service_str = format!("service_{}", service_id);
+                    let endpoint_str = format!("endpoint_{}", endpoint_id);
+                    let status_str = status_code.to_string();
+                    let counter = registry.get_or_create_counter::<u64>(
+                        "high_cardinality_requests",
+                        [
+                            ("service", service_str.as_str()),
+                            ("endpoint", endpoint_str.as_str()),
+                            ("status", status_str.as_str()),
+                        ],
+                    );
+                    counter.increment();
+                }
+            }
+        }
+
         let collected = manager.collect_metrics();
-        let metric = collected.iter().find(|m| m.name == "e_requests_total");
-        assert!(metric.is_some());
+        let request_metrics: Vec<_> = collected
+            .iter()
+            .filter(|m| m.key.name() == "high_cardinality_requests")
+            .collect();
+
+        let expected_count = num_services * num_endpoints * num_status_codes;
+        assert_eq!(request_metrics.len(), expected_count);
+
+        for metric in request_metrics {
+            assert_eq!(metric.key.labels().count(), 3);
+            if let MetricValue::CounterU64(value) = metric.value {
+                assert_eq!(value, 1);
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod manager_export_tests {
+    use super::*;
+    use std::sync::Arc;
+    use std::time::Duration;
+
+    #[tokio::test]
+    async fn test_manager_without_exporter() {
+        let manager = Manager::new();
+        let registry = manager.registry();
+
+        registry
+            .get_or_create_counter::<u64>("no_exporter_test", [])
+            .increment();
 
-        if let Some(m) = metric {
-            match m.value {
-                MetricValue::Counter(value) => assert_eq!(value, 2),
-                _ => panic!("Expected counter value"),
+        manager.collect_and_export().await;
+
+        let metrics = manager.collect_metrics();
+        assert!(!metrics.is_empty());
+
+        let found = metrics.iter().any(|m| m.key.name() == "no_exporter_test");
+        assert!(found);
+    }
+
+    #[tokio::test]
+    async fn test_manager_concurrent_collect_and_export() {
+        let manager = Arc::new(Manager::new());
+        let registry = manager.registry();
+
+        let manager1 = manager.clone();
+        let manager2 = manager.clone();
+        let registry_clone = registry.clone();
+
+        let updater = tokio::spawn(async move {
+            let counter = registry_clone.get_or_create_counter::<u64>("concurrent_export_test", []);
+            for _ in 0..100 {
+                counter.increment();
+                tokio::time::sleep(Duration::from_millis(1)).await;
             }
+        });
+
+        let collector1 = tokio::spawn(async move {
+            for _ in 0..10 {
+                manager1.collect_and_export().await;
+                tokio::time::sleep(Duration::from_millis(5)).await;
+            }
+        });
+
+        let collector2 = tokio::spawn(async move {
+            for _ in 0..10 {
+                let _metrics = manager2.collect_metrics();
+                tokio::time::sleep(Duration::from_millis(3)).await;
+            }
+        });
+
+        let _ = tokio::try_join!(updater, collector1, collector2);
+
+        let final_metrics = manager.collect_metrics();
+        let test_metric = final_metrics
+            .iter()
+            .find(|m| m.key.name() == "concurrent_export_test")
+            .unwrap();
 
-            assert!(m
-                .labels
-                .contains(&("service".to_string(), "api".to_string())));
-            assert!(m
-                .labels
-                .contains(&("endpoint".to_string(), "/health".to_string())));
+        if let MetricValue::CounterU64(value) = test_metric.value {
+            assert_eq!(value, 100);
         }
     }
 }
 
 #[cfg(test)]
-mod collected_metric_tests {
+mod type_system_atomic_tests {
+    use malachite::base::num::basic::floats::PrimitiveFloat;
+
     use super::*;
 
     #[test]
-    fn test_collected_metric_new() {
-        let key = Key::from_parts("test", vec![]);
-        let timestamp = std::time::SystemTime::now();
-        let metric = CollectedMetric {
-            name: "test_metric".to_string(),
-            labels: vec![("label".to_string(), "value".to_string())],
-            value: MetricValue::Counter(42),
-            timestamp,
-            key: key.clone(),
-        };
-
-        assert_eq!(metric.name, "test_metric");
-        assert_eq!(
-            metric.labels,
-            vec![("label".to_string(), "value".to_string())]
-        );
-        assert_eq!(metric.timestamp, timestamp);
-        assert_eq!(metric.key, key);
-        match metric.value {
-            MetricValue::Counter(value) => assert_eq!(value, 42),
-            _ => panic!("Expected counter value"),
+    fn test_float_precision_in_atomic_operations() {
+        let registry = Registry::new();
+
+        let test_values = [
+            0.0,
+            -0.0,
+            1.0,
+            -1.0,
+            f64::MIN,
+            f64::MAX,
+            f64::EPSILON,
+            std::f64::consts::PI,
+            std::f64::consts::E,
+            1.23456789012345,
+            -9.87654321098765,
+        ];
+
+        for (i, &value) in test_values.iter().enumerate() {
+            let gauge = registry.get_or_create_gauge::<f64>(&format!("precision_test_{}", i), []);
+            gauge.set(value);
+
+            let collected = registry.collect();
+            let metric = collected
+                .iter()
+                .find(|m| m.key.name() == format!("precision_test_{}", i))
+                .unwrap();
+
+            if let MetricValue::GaugeF64(stored_value) = metric.value {
+                assert_eq!(stored_value, value, "Precision lost for value: {}", value);
+            } else {
+                panic!("Expected GaugeF64, got {:?}", metric.value);
+            }
+        }
+    }
+
+    #[test]
+    fn test_special_float_values() {
+        let registry = Registry::new();
+
+        let special_values = [f64::NAN, f64::INFINITY, f64::NEG_INFINITY, 0.0, -0.0];
+
+        for (i, &value) in special_values.iter().enumerate() {
+            let gauge = registry.get_or_create_gauge::<f64>(&format!("special_float_{}", i), []);
+            gauge.set(value);
+
+            let collected = registry.collect();
+            let metric = collected
+                .iter()
+                .find(|m| m.key.name() == format!("special_float_{}", i))
+                .unwrap();
+
+            if let MetricValue::GaugeF64(stored_value) = metric.value {
+                if value.is_nan() {
+                    assert!(stored_value.is_nan());
+                } else if value.is_infinite() {
+                    assert!(stored_value.is_infinite());
+                    assert_eq!(stored_value.is_sign_positive(), value.is_sign_positive());
+                } else if value.is_negative_zero() {
+                    assert!(stored_value.is_negative_zero())
+                } else {
+                    assert_eq!(stored_value.to_bits(), value.to_bits());
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn test_counter_ops_trait_consistency() {
+        use crate::metrics::CounterOps;
+        use std::sync::atomic::{AtomicU64, Ordering};
+
+        let atomic = Arc::new(AtomicU64::new(0));
+
+        atomic.increment(5u64);
+        assert_eq!(atomic.load(Ordering::Acquire), 5);
+
+        atomic.increment(10i64);
+        assert_eq!(atomic.load(Ordering::Acquire), 15);
+
+        if let MetricValue::CounterU64(value) = CounterOps::<u64>::get(&atomic) {
+            assert_eq!(value, 15);
+        }
+
+        if let MetricValue::CounterI64(value) = CounterOps::<i64>::get(&atomic) {
+            assert_eq!(value, 15);
         }
     }
 
     #[test]
-    fn test_metric_value_variants() {
-        let counter_value = MetricValue::Counter(100);
-        let gauge_value = MetricValue::Gauge(3.21);
+    fn test_gauge_ops_trait_consistency() {
+        use crate::metrics::GaugeOps;
+        use std::sync::atomic::AtomicU64;
+
+        let atomic = Arc::new(AtomicU64::new(0));
+
+        atomic.set(42u64);
+        if let MetricValue::GaugeU64(value) = GaugeOps::<u64>::get(&atomic) {
+            assert_eq!(value, 42);
+        }
 
-        match counter_value {
-            MetricValue::Counter(val) => assert_eq!(val, 100),
-            _ => panic!("Expected counter"),
+        atomic.set(-42i64);
+        if let MetricValue::GaugeI64(value) = GaugeOps::<i64>::get(&atomic) {
+            assert_eq!(value, -42);
         }
 
-        match gauge_value {
-            MetricValue::Gauge(val) => assert!((val - 3.21).abs() < f64::EPSILON),
-            _ => panic!("Expected gauge"),
+        atomic.set(3.21f64);
+        if let MetricValue::GaugeF64(value) = GaugeOps::<f64>::get(&atomic) {
+            assert!((value - 3.21).abs() < f64::EPSILON);
         }
     }
 }
diff --git a/runtimes/core/src/pubsub/manager.rs b/runtimes/core/src/pubsub/manager.rs
index 65aa83e6f4..8f98faef06 100644
--- a/runtimes/core/src/pubsub/manager.rs
+++ b/runtimes/core/src/pubsub/manager.rs
@@ -15,7 +15,7 @@ use crate::encore::parser::meta::v1 as meta;
 use crate::encore::parser::schema::v1 as schema;
 use crate::encore::runtime::v1 as pb;
 use crate::log::LogFromRust;
-use crate::metrics::{requests_total_counter, Counter};
+use crate::metrics::counter;
 use crate::model::{PubSubRequestData, RequestData, ResponseData, SpanId, SpanKey, TraceId};
 use crate::names::EncoreName;
 use crate::pubsub::noop::NoopCluster;
@@ -37,6 +37,7 @@ pub struct Manager {
     topics: Arc<RwLock<HashMap<EncoreName, Arc<TopicInner>>>>,
     subs: Arc<RwLock<HashMap<SubName, Arc<SubscriptionObj>>>>,
     push_registry: PushHandlerRegistry,
+    metrics_registry: Arc<crate::metrics::Registry>,
 }
 
 #[derive(Debug)]
@@ -141,6 +142,7 @@ pub struct SubscriptionObj {
 
     handler: OnceLock<Arc<SubHandler>>,
     subscribe_fut: OnceLock<Shared<SubscribeFut>>,
+    metrics_registry: Arc<crate::metrics::Registry>,
 }
 
 type SubscribeFut = Pin<Box<dyn Future<Output = APIResult<()>> + Send>>;
@@ -155,7 +157,8 @@ impl SubscriptionObj {
                 obj: self.clone(),
                 handlers: RwLock::new(Vec::new()),
                 counter: AtomicUsize::new(0),
-                requests_total: requests_total_counter(
+                requests_total: crate::metrics::requests_total_counter(
+                    &self.metrics_registry,
                     &self.service,
                     &format!("{}/{}", &self.topic, &self.subscription),
                 ),
@@ -175,7 +178,7 @@ pub struct SubHandler {
     obj: Arc<SubscriptionObj>,
     handlers: RwLock<Vec<Arc<dyn SubscriptionHandler>>>,
     counter: AtomicUsize,
-    requests_total: Counter,
+    requests_total: counter::Schema<u64>,
 }
 
 const ATTR_PARENT_TRACE_ID: &str = "encore_parent_trace_id";
@@ -272,7 +275,7 @@ impl SubHandler {
             };
 
             self.obj.tracer.request_span_end(&resp, false);
-            self.requests_total.increment_with([("code", code)]);
+            self.requests_total.with([("code", &code)]).increment();
             result
         })
     }
@@ -298,6 +301,7 @@ impl Manager {
         tracer: Tracer,
         clusters: Vec<pb::PubSubCluster>,
         md: &meta::Data,
+        metrics_registry: Arc<crate::metrics::Registry>,
     ) -> anyhow::Result<Self> {
         let (topic_cfg, sub_cfg) = make_cfg_maps(clusters, md)?;
 
@@ -309,6 +313,7 @@ impl Manager {
             topics: Arc::default(),
             subs: Arc::default(),
             push_registry: PushHandlerRegistry::new(),
+            metrics_registry,
         })
     }
 
@@ -370,6 +375,7 @@ impl Manager {
                     schema: cfg.schema.clone(),
                     handler: OnceLock::new(),
                     subscribe_fut: Default::default(),
+                    metrics_registry: Arc::clone(&self.metrics_registry),
                 })
             } else {
                 let inner = Arc::new(noop::NoopSubscription);
@@ -390,6 +396,7 @@ impl Manager {
 
                     handler: OnceLock::new(),
                     subscribe_fut: Default::default(),
+                    metrics_registry: Arc::clone(&self.metrics_registry),
                 })
             }
         };

From 3946bbf48cc5f61f415bb81aa7be83ad5e9d2516 Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Fri, 17 Oct 2025 12:07:21 +0200
Subject: [PATCH 04/17] fmt

---
 runtimes/core/src/lib.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/runtimes/core/src/lib.rs b/runtimes/core/src/lib.rs
index ad4a9a68ac..55ad72e448 100644
--- a/runtimes/core/src/lib.rs
+++ b/runtimes/core/src/lib.rs
@@ -341,7 +341,12 @@ impl Runtime {
             .collect::<Result<HashMap<_, _>, anyhow::Error>>()
             .context("failed to resolve gateway push subscriptions")?;
 
-        let pubsub = pubsub::Manager::new(tracer.clone(), resources.pubsub_clusters, &md, Arc::new(metrics_manager.registry().clone()))?;
+        let pubsub = pubsub::Manager::new(
+            tracer.clone(),
+            resources.pubsub_clusters,
+            &md,
+            Arc::new(metrics_manager.registry().clone()),
+        )?;
         let objects =
             objects::Manager::new(&secrets, tracer.clone(), resources.bucket_clusters, &md);
         let sqldb = sqldb::ManagerConfig {

From cf66858f48650fba89319d9b03185a5016409192 Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Fri, 17 Oct 2025 13:39:38 +0200
Subject: [PATCH 05/17] tidy up a bit

---
 runtimes/core/src/api/auth/local.rs       |   2 +-
 runtimes/core/src/api/endpoint.rs         |   2 +-
 runtimes/core/src/metrics/counter.rs      |  80 ++++++++-
 runtimes/core/src/metrics/exporter/gcp.rs |   2 -
 runtimes/core/src/metrics/gauge.rs        |  80 ++++++++-
 runtimes/core/src/metrics/manager.rs      |   1 -
 runtimes/core/src/metrics/mod.rs          |   4 +-
 runtimes/core/src/metrics/registry.rs     | 193 +++-------------------
 runtimes/core/src/metrics/system.rs       |   2 +-
 runtimes/core/src/pubsub/manager.rs       |  12 +-
 10 files changed, 186 insertions(+), 192 deletions(-)

diff --git a/runtimes/core/src/api/auth/local.rs b/runtimes/core/src/api/auth/local.rs
index 79e3c39f98..3eef2ea931 100644
--- a/runtimes/core/src/api/auth/local.rs
+++ b/runtimes/core/src/api/auth/local.rs
@@ -171,7 +171,7 @@ impl AuthHandler for LocalAuthHandler {
                     };
                     self.tracer.request_span_end(&model_resp, false);
                     self.requests_total
-                        .with([("code", &e.code.to_string())])
+                        .with([("code", e.code.to_string())])
                         .increment();
                     Err(e)
                 }
diff --git a/runtimes/core/src/api/endpoint.rs b/runtimes/core/src/api/endpoint.rs
index cbe091e74c..5ba8ba7545 100644
--- a/runtimes/core/src/api/endpoint.rs
+++ b/runtimes/core/src/api/endpoint.rs
@@ -687,7 +687,7 @@ impl EndpointHandler {
                     }),
                 };
                 self.shared.tracer.request_span_end(&model_resp, sensitive);
-                self.requests_total.with([("code", &code)]).increment();
+                self.requests_total.with([("code", code)]).increment();
             }
 
             if let Ok(val) = HeaderValue::from_str(request.span.0.serialize_encore().as_str()) {
diff --git a/runtimes/core/src/metrics/counter.rs b/runtimes/core/src/metrics/counter.rs
index 0e0df078af..d85ced1a08 100644
--- a/runtimes/core/src/metrics/counter.rs
+++ b/runtimes/core/src/metrics/counter.rs
@@ -79,13 +79,13 @@ where
     pub fn with<L, K, V>(&self, dynamic_labels: L) -> Counter<T>
     where
         L: IntoIterator<Item = (K, V)>,
-        K: AsRef<str>,
-        V: AsRef<str>,
+        K: Into<String>,
+        V: Into<String>,
     {
         // Convert dynamic_labels to HashMap first
         let dynamic_labels_map: HashMap<String, String> = dynamic_labels
             .into_iter()
-            .map(|(k, v)| (k.as_ref().to_string(), v.as_ref().to_string()))
+            .map(|(k, v)| (k.into(), v.into()))
             .collect();
 
         // Validate required keys are present
@@ -138,3 +138,77 @@ where
         )
     }
 }
+
+/// Builder for creating counter schemas with static labels and required dynamic keys
+pub struct CounterSchemaBuilder<T> {
+    name: String,
+    static_labels: Vec<(String, String)>,
+    required_dynamic_keys: HashSet<String>,
+    registry: Arc<metrics::Registry>,
+    _phantom: std::marker::PhantomData<T>,
+}
+
+impl<T> CounterSchemaBuilder<T>
+where
+    Arc<AtomicU64>: CounterOps<T>,
+    T: One + Send + Sync + 'static,
+{
+    pub(crate) fn new(name: String, registry: Arc<metrics::Registry>) -> Self {
+        Self {
+            name,
+            static_labels: Vec::new(),
+            required_dynamic_keys: HashSet::new(),
+            registry,
+            _phantom: std::marker::PhantomData,
+        }
+    }
+
+    /// Add static labels that are set once when the schema is created
+    pub fn static_labels<I, K, V>(mut self, labels: I) -> Self
+    where
+        I: IntoIterator<Item = (K, V)>,
+        K: AsRef<str>,
+        V: AsRef<str>,
+    {
+        for (key, value) in labels {
+            self.static_labels
+                .push((key.as_ref().to_string(), value.as_ref().to_string()));
+        }
+        self
+    }
+
+    /// Add a single static label
+    pub fn static_label(mut self, key: &str, value: &str) -> Self {
+        self.static_labels
+            .push((key.to_string(), value.to_string()));
+        self
+    }
+
+    /// Specify required dynamic label keys that must be provided at increment time
+    pub fn require_dynamic_keys<I, K>(mut self, keys: I) -> Self
+    where
+        I: IntoIterator<Item = K>,
+        K: AsRef<str>,
+    {
+        for key in keys {
+            self.required_dynamic_keys.insert(key.as_ref().to_string());
+        }
+        self
+    }
+
+    /// Add a single required dynamic key
+    pub fn require_dynamic_key(mut self, key: &str) -> Self {
+        self.required_dynamic_keys.insert(key.to_string());
+        self
+    }
+
+    /// Build the counter schema
+    pub fn build(self) -> Schema<T> {
+        Schema::new(
+            self.name,
+            self.static_labels,
+            self.required_dynamic_keys,
+            self.registry,
+        )
+    }
+}
diff --git a/runtimes/core/src/metrics/exporter/gcp.rs b/runtimes/core/src/metrics/exporter/gcp.rs
index 22cd05427c..50edab1799 100644
--- a/runtimes/core/src/metrics/exporter/gcp.rs
+++ b/runtimes/core/src/metrics/exporter/gcp.rs
@@ -82,14 +82,12 @@ impl Gcp {
             self.project_id
         );
 
-        // Convert our metrics to Google Cloud TimeSeries format
         let time_series = self.get_metric_data(metrics);
 
         // Send metrics in batches (Google Cloud allows up to 200 time series per request)
         for batch in time_series.chunks(200) {
             if let Err(e) = self.send_time_series_batch(client, batch.to_vec()).await {
                 log::error!("Failed to export metrics batch: {}", e);
-                // Continue with remaining batches even if one fails
             }
         }
 
diff --git a/runtimes/core/src/metrics/gauge.rs b/runtimes/core/src/metrics/gauge.rs
index 8cb6dfa8c0..9fa937f3b7 100644
--- a/runtimes/core/src/metrics/gauge.rs
+++ b/runtimes/core/src/metrics/gauge.rs
@@ -90,13 +90,13 @@ where
     pub fn with<L, K, V>(&self, dynamic_labels: L) -> Gauge<T>
     where
         L: IntoIterator<Item = (K, V)>,
-        K: AsRef<str>,
-        V: AsRef<str>,
+        K: Into<String>,
+        V: Into<String>,
     {
         // Convert dynamic_labels to HashMap first
         let dynamic_labels_map: HashMap<String, String> = dynamic_labels
             .into_iter()
-            .map(|(k, v)| (k.as_ref().to_string(), v.as_ref().to_string()))
+            .map(|(k, v)| (k.into(), v.into()))
             .collect();
 
         // Validate required keys are present
@@ -133,3 +133,77 @@ where
         )
     }
 }
+
+/// Builder for creating gauge schemas with static labels and required dynamic keys
+pub struct GaugeSchemaBuilder<T> {
+    name: String,
+    static_labels: Vec<(String, String)>,
+    required_dynamic_keys: HashSet<String>,
+    registry: Arc<metrics::Registry>,
+    _phantom: std::marker::PhantomData<T>,
+}
+
+impl<T> GaugeSchemaBuilder<T>
+where
+    Arc<AtomicU64>: GaugeOps<T>,
+    T: Send + Sync + 'static,
+{
+    pub(crate) fn new(name: String, registry: Arc<metrics::Registry>) -> Self {
+        Self {
+            name,
+            static_labels: Vec::new(),
+            required_dynamic_keys: HashSet::new(),
+            registry,
+            _phantom: std::marker::PhantomData,
+        }
+    }
+
+    /// Add static labels that are set once when the schema is created
+    pub fn static_labels<I, K, V>(mut self, labels: I) -> Self
+    where
+        I: IntoIterator<Item = (K, V)>,
+        K: AsRef<str>,
+        V: AsRef<str>,
+    {
+        for (key, value) in labels {
+            self.static_labels
+                .push((key.as_ref().to_string(), value.as_ref().to_string()));
+        }
+        self
+    }
+
+    /// Add a single static label
+    pub fn static_label(mut self, key: &str, value: &str) -> Self {
+        self.static_labels
+            .push((key.to_string(), value.to_string()));
+        self
+    }
+
+    /// Specify required dynamic label keys that must be provided at set/add/sub time
+    pub fn require_dynamic_keys<I, K>(mut self, keys: I) -> Self
+    where
+        I: IntoIterator<Item = K>,
+        K: AsRef<str>,
+    {
+        for key in keys {
+            self.required_dynamic_keys.insert(key.as_ref().to_string());
+        }
+        self
+    }
+
+    /// Add a single required dynamic key
+    pub fn require_dynamic_key(mut self, key: &str) -> Self {
+        self.required_dynamic_keys.insert(key.to_string());
+        self
+    }
+
+    /// Build the gauge schema
+    pub fn build(self) -> Schema<T> {
+        Schema::new(
+            self.name,
+            self.static_labels,
+            self.required_dynamic_keys,
+            self.registry,
+        )
+    }
+}
diff --git a/runtimes/core/src/metrics/manager.rs b/runtimes/core/src/metrics/manager.rs
index 89f2cdabd4..83f816c102 100644
--- a/runtimes/core/src/metrics/manager.rs
+++ b/runtimes/core/src/metrics/manager.rs
@@ -96,7 +96,6 @@ impl Manager {
         }
     }
 
-    /// Get direct access to the registry
     pub fn registry(&self) -> &Registry {
         &self.registry
     }
diff --git a/runtimes/core/src/metrics/mod.rs b/runtimes/core/src/metrics/mod.rs
index bee83257eb..7fa32aad99 100644
--- a/runtimes/core/src/metrics/mod.rs
+++ b/runtimes/core/src/metrics/mod.rs
@@ -16,7 +16,7 @@ pub use manager::Manager;
 pub use registry::{CollectedMetric, MetricValue, Registry};
 pub use system::SystemMetricsCollector;
 
-/// Create a requests counter schema with service and endpoint static labels, requiring code as dynamic label
+/// Create a requests counter schema
 pub fn requests_total_counter(
     registry: &Registry,
     service: &str,
@@ -29,7 +29,7 @@ pub fn requests_total_counter(
         .build()
 }
 
-/// Create a memory usage gauge schema requiring type label as dynamic
+/// Create a memory usage gauge schema
 pub fn memory_usage_gauge_schema(registry: &Registry) -> gauge::Schema<u64> {
     registry
         .gauge_schema::<u64>("e_sys_memory_used_bytes")
diff --git a/runtimes/core/src/metrics/registry.rs b/runtimes/core/src/metrics/registry.rs
index 2ce2afdad4..691c71a437 100644
--- a/runtimes/core/src/metrics/registry.rs
+++ b/runtimes/core/src/metrics/registry.rs
@@ -1,18 +1,15 @@
-use crate::metrics::counter::CounterOps;
-use crate::metrics::gauge::GaugeOps;
-use crate::metrics::{counter, gauge};
+use crate::metrics::counter::{CounterOps, CounterSchemaBuilder};
+use crate::metrics::gauge::{GaugeOps, GaugeSchemaBuilder};
 
 use super::system::SystemMetricsCollector;
 use super::{Counter, Gauge};
 use dashmap::DashMap;
 use malachite::base::num::basic::traits::One;
 use metrics::{Key, Label};
-use std::collections::HashSet;
 use std::sync::atomic::AtomicU64;
 use std::sync::Arc;
 use std::time::SystemTime;
 
-/// Storage for a metric with its atomic value and getter closure
 struct MetricStorage {
     atomic: Arc<AtomicU64>,
     getter: Box<dyn Fn() -> MetricValue + Send + Sync>,
@@ -28,6 +25,25 @@ impl std::fmt::Debug for MetricStorage {
     }
 }
 
+#[derive(Debug, Clone, PartialEq)]
+pub enum MetricValue {
+    // Counter variants
+    CounterU64(u64),
+    CounterI64(i64),
+
+    // Gauge variants
+    GaugeU64(u64),
+    GaugeI64(i64),
+    GaugeF64(f64),
+}
+
+#[derive(Debug, Clone)]
+pub struct CollectedMetric {
+    pub key: Key,
+    pub value: MetricValue,
+    pub registered_at: SystemTime,
+}
+
 #[derive(Debug, Clone)]
 pub struct Registry {
     counters: Arc<DashMap<Key, MetricStorage>>,
@@ -164,170 +180,3 @@ impl Default for Registry {
         Self::new()
     }
 }
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum MetricValue {
-    // Counter variants
-    CounterU64(u64),
-    CounterI64(i64),
-
-    // Gauge variants
-    GaugeU64(u64),
-    GaugeI64(i64),
-    GaugeF64(f64),
-}
-
-#[derive(Debug, Clone)]
-pub struct CollectedMetric {
-    pub key: Key,
-    pub value: MetricValue,
-    pub registered_at: SystemTime,
-}
-
-/// Builder for creating counter schemas with static labels and required dynamic keys
-pub struct CounterSchemaBuilder<T> {
-    name: String,
-    static_labels: Vec<(String, String)>,
-    required_dynamic_keys: HashSet<String>,
-    registry: Arc<Registry>,
-    _phantom: std::marker::PhantomData<T>,
-}
-
-impl<T> CounterSchemaBuilder<T>
-where
-    Arc<AtomicU64>: CounterOps<T>,
-    T: One + Send + Sync + 'static,
-{
-    pub(crate) fn new(name: String, registry: Arc<Registry>) -> Self {
-        Self {
-            name,
-            static_labels: Vec::new(),
-            required_dynamic_keys: HashSet::new(),
-            registry,
-            _phantom: std::marker::PhantomData,
-        }
-    }
-
-    /// Add static labels that are set once when the schema is created
-    pub fn static_labels<I, K, V>(mut self, labels: I) -> Self
-    where
-        I: IntoIterator<Item = (K, V)>,
-        K: AsRef<str>,
-        V: AsRef<str>,
-    {
-        for (key, value) in labels {
-            self.static_labels
-                .push((key.as_ref().to_string(), value.as_ref().to_string()));
-        }
-        self
-    }
-
-    /// Add a single static label
-    pub fn static_label(mut self, key: &str, value: &str) -> Self {
-        self.static_labels
-            .push((key.to_string(), value.to_string()));
-        self
-    }
-
-    /// Specify required dynamic label keys that must be provided at increment time
-    pub fn require_dynamic_keys<I, K>(mut self, keys: I) -> Self
-    where
-        I: IntoIterator<Item = K>,
-        K: AsRef<str>,
-    {
-        for key in keys {
-            self.required_dynamic_keys.insert(key.as_ref().to_string());
-        }
-        self
-    }
-
-    /// Add a single required dynamic key
-    pub fn require_dynamic_key(mut self, key: &str) -> Self {
-        self.required_dynamic_keys.insert(key.to_string());
-        self
-    }
-
-    /// Build the counter schema
-    pub fn build(self) -> counter::Schema<T> {
-        counter::Schema::new(
-            self.name,
-            self.static_labels,
-            self.required_dynamic_keys,
-            self.registry,
-        )
-    }
-}
-
-/// Builder for creating gauge schemas with static labels and required dynamic keys
-pub struct GaugeSchemaBuilder<T> {
-    name: String,
-    static_labels: Vec<(String, String)>,
-    required_dynamic_keys: HashSet<String>,
-    registry: Arc<Registry>,
-    _phantom: std::marker::PhantomData<T>,
-}
-
-impl<T> GaugeSchemaBuilder<T>
-where
-    Arc<AtomicU64>: GaugeOps<T>,
-    T: Send + Sync + 'static,
-{
-    pub(crate) fn new(name: String, registry: Arc<Registry>) -> Self {
-        Self {
-            name,
-            static_labels: Vec::new(),
-            required_dynamic_keys: HashSet::new(),
-            registry,
-            _phantom: std::marker::PhantomData,
-        }
-    }
-
-    /// Add static labels that are set once when the schema is created
-    pub fn static_labels<I, K, V>(mut self, labels: I) -> Self
-    where
-        I: IntoIterator<Item = (K, V)>,
-        K: AsRef<str>,
-        V: AsRef<str>,
-    {
-        for (key, value) in labels {
-            self.static_labels
-                .push((key.as_ref().to_string(), value.as_ref().to_string()));
-        }
-        self
-    }
-
-    /// Add a single static label
-    pub fn static_label(mut self, key: &str, value: &str) -> Self {
-        self.static_labels
-            .push((key.to_string(), value.to_string()));
-        self
-    }
-
-    /// Specify required dynamic label keys that must be provided at set/add/sub time
-    pub fn require_dynamic_keys<I, K>(mut self, keys: I) -> Self
-    where
-        I: IntoIterator<Item = K>,
-        K: AsRef<str>,
-    {
-        for key in keys {
-            self.required_dynamic_keys.insert(key.as_ref().to_string());
-        }
-        self
-    }
-
-    /// Add a single required dynamic key
-    pub fn require_dynamic_key(mut self, key: &str) -> Self {
-        self.required_dynamic_keys.insert(key.to_string());
-        self
-    }
-
-    /// Build the gauge schema
-    pub fn build(self) -> gauge::Schema<T> {
-        gauge::Schema::new(
-            self.name,
-            self.static_labels,
-            self.required_dynamic_keys,
-            self.registry,
-        )
-    }
-}
diff --git a/runtimes/core/src/metrics/system.rs b/runtimes/core/src/metrics/system.rs
index 60f9042024..2a00ab24c6 100644
--- a/runtimes/core/src/metrics/system.rs
+++ b/runtimes/core/src/metrics/system.rs
@@ -4,7 +4,7 @@ use super::{memory_usage_gauge_schema, Registry};
 use std::sync::Mutex;
 use sysinfo::System;
 
-/// Collector for system metrics (CPU and memory usage)
+/// Collector for system metrics
 #[derive(Debug)]
 pub struct SystemMetricsCollector {
     system: Mutex<System>,
diff --git a/runtimes/core/src/pubsub/manager.rs b/runtimes/core/src/pubsub/manager.rs
index 8f98faef06..86a02718af 100644
--- a/runtimes/core/src/pubsub/manager.rs
+++ b/runtimes/core/src/pubsub/manager.rs
@@ -15,7 +15,7 @@ use crate::encore::parser::meta::v1 as meta;
 use crate::encore::parser::schema::v1 as schema;
 use crate::encore::runtime::v1 as pb;
 use crate::log::LogFromRust;
-use crate::metrics::counter;
+use crate::metrics::{self, counter};
 use crate::model::{PubSubRequestData, RequestData, ResponseData, SpanId, SpanKey, TraceId};
 use crate::names::EncoreName;
 use crate::pubsub::noop::NoopCluster;
@@ -37,7 +37,7 @@ pub struct Manager {
     topics: Arc<RwLock<HashMap<EncoreName, Arc<TopicInner>>>>,
     subs: Arc<RwLock<HashMap<SubName, Arc<SubscriptionObj>>>>,
     push_registry: PushHandlerRegistry,
-    metrics_registry: Arc<crate::metrics::Registry>,
+    metrics_registry: Arc<metrics::Registry>,
 }
 
 #[derive(Debug)]
@@ -142,7 +142,7 @@ pub struct SubscriptionObj {
 
     handler: OnceLock<Arc<SubHandler>>,
     subscribe_fut: OnceLock<Shared<SubscribeFut>>,
-    metrics_registry: Arc<crate::metrics::Registry>,
+    metrics_registry: Arc<metrics::Registry>,
 }
 
 type SubscribeFut = Pin<Box<dyn Future<Output = APIResult<()>> + Send>>;
@@ -157,7 +157,7 @@ impl SubscriptionObj {
                 obj: self.clone(),
                 handlers: RwLock::new(Vec::new()),
                 counter: AtomicUsize::new(0),
-                requests_total: crate::metrics::requests_total_counter(
+                requests_total: metrics::requests_total_counter(
                     &self.metrics_registry,
                     &self.service,
                     &format!("{}/{}", &self.topic, &self.subscription),
@@ -275,7 +275,7 @@ impl SubHandler {
             };
 
             self.obj.tracer.request_span_end(&resp, false);
-            self.requests_total.with([("code", &code)]).increment();
+            self.requests_total.with([("code", code)]).increment();
             result
         })
     }
@@ -301,7 +301,7 @@ impl Manager {
         tracer: Tracer,
         clusters: Vec<pb::PubSubCluster>,
         md: &meta::Data,
-        metrics_registry: Arc<crate::metrics::Registry>,
+        metrics_registry: Arc<metrics::Registry>,
     ) -> anyhow::Result<Self> {
         let (topic_cfg, sub_cfg) = make_cfg_maps(clusters, md)?;
 

From 361d79c77d3bb73a3dad392b7089463435429daf Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Tue, 21 Oct 2025 16:01:33 +0200
Subject: [PATCH 06/17] one less clone

---
 runtimes/core/src/metrics/exporter/gcp.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/runtimes/core/src/metrics/exporter/gcp.rs b/runtimes/core/src/metrics/exporter/gcp.rs
index 50edab1799..b69e1acc82 100644
--- a/runtimes/core/src/metrics/exporter/gcp.rs
+++ b/runtimes/core/src/metrics/exporter/gcp.rs
@@ -99,8 +99,6 @@ impl Gcp {
         let ts_end_time: google_cloud_wkt::Timestamp = end_time.try_into().unwrap_or_default();
 
         let mut data: Vec<TimeSeries> = Vec::with_capacity(collected.len());
-        let container_labels = self.container_meta.labels();
-        let container_labels_len = container_labels.len();
 
         for metric in collected {
             let cloud_metric_name = match self.metric_names.get(metric.key.name()) {
@@ -114,10 +112,11 @@ impl Gcp {
                 }
             };
 
-            // Pre-allocate exact capacity for labels
-            let mut labels: HashMap<String, String> =
+            let container_labels = self.container_meta.labels();
+            let container_labels_len = container_labels.len();
+            let mut labels =
                 HashMap::with_capacity(container_labels_len + metric.key.labels().len());
-            labels.extend(container_labels.clone());
+            labels.extend(container_labels);
             labels.extend(
                 metric
                     .key

From 2b617df37bf1b76f859136a8c467e5818441a8c8 Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Tue, 21 Oct 2025 17:09:22 +0200
Subject: [PATCH 07/17] container meta lazy client to avoid block_on

---
 runtimes/core/src/metadata/mod.rs         | 35 ++++++++++++++++++++++
 runtimes/core/src/metrics/exporter/gcp.rs | 36 +++++++++++++++--------
 runtimes/core/src/metrics/manager.rs      | 31 ++++---------------
 3 files changed, 64 insertions(+), 38 deletions(-)

diff --git a/runtimes/core/src/metadata/mod.rs b/runtimes/core/src/metadata/mod.rs
index b84faebb6d..96379d5382 100644
--- a/runtimes/core/src/metadata/mod.rs
+++ b/runtimes/core/src/metadata/mod.rs
@@ -2,9 +2,44 @@ use std::collections::HashMap;
 
 use crate::encore::runtime::v1::{environment::Cloud, Environment};
 use anyhow::Context;
+use tokio::sync::OnceCell;
 
 mod gce;
 
+#[derive(Debug)]
+pub struct ContainerMetaClient {
+    cell: OnceCell<ContainerMetadata>,
+    env: Environment,
+    http_client: reqwest::Client,
+    fallback: ContainerMetadata,
+}
+
+impl ContainerMetaClient {
+    pub fn new(env: Environment, http_client: reqwest::Client) -> Self {
+        Self {
+            cell: OnceCell::new(),
+            fallback: ContainerMetadata {
+                env_name: env.env_name.clone(),
+                ..Default::default()
+            },
+            env,
+            http_client,
+        }
+    }
+
+    pub async fn collect(&self) -> &ContainerMetadata {
+        self.cell
+            .get_or_try_init(|| async {
+                ContainerMetadata::collect(&self.env, &self.http_client).await
+            })
+            .await
+            .unwrap_or_else(|err| {
+                log::warn!("failed to fetch container metadata: {err}");
+                &self.fallback
+            })
+    }
+}
+
 #[derive(Debug, Clone, Default)]
 pub struct ContainerMetadata {
     pub service_id: String,
diff --git a/runtimes/core/src/metrics/exporter/gcp.rs b/runtimes/core/src/metrics/exporter/gcp.rs
index b69e1acc82..d07d677bbc 100644
--- a/runtimes/core/src/metrics/exporter/gcp.rs
+++ b/runtimes/core/src/metrics/exporter/gcp.rs
@@ -1,4 +1,4 @@
-use crate::metadata::ContainerMetadata;
+use crate::metadata::ContainerMetaClient;
 use crate::metrics::exporter::Exporter;
 use crate::metrics::{CollectedMetric, MetricValue};
 use anyhow::Context;
@@ -17,7 +17,7 @@ pub struct Gcp {
     monitored_resource_type: String,
     monitored_resource_labels: HashMap<String, String>,
     metric_names: HashMap<String, String>,
-    container_meta: ContainerMetadata,
+    container_meta_client: Arc<ContainerMetaClient>,
 }
 
 #[derive(Debug)]
@@ -51,7 +51,7 @@ impl Gcp {
         monitored_resource_type: String,
         monitored_resource_labels: HashMap<String, String>,
         metric_names: HashMap<String, String>,
-        container_meta: ContainerMetadata,
+        container_meta_client: ContainerMetaClient,
     ) -> Self {
         Self {
             client: Arc::new(LazyMonitoringClient::new()),
@@ -59,7 +59,7 @@ impl Gcp {
             monitored_resource_type,
             monitored_resource_labels,
             metric_names,
-            container_meta,
+            container_meta_client: Arc::new(container_meta_client),
         }
     }
 
@@ -82,7 +82,7 @@ impl Gcp {
             self.project_id
         );
 
-        let time_series = self.get_metric_data(metrics);
+        let time_series = self.get_metric_data(metrics).await;
 
         // Send metrics in batches (Google Cloud allows up to 200 time series per request)
         for batch in time_series.chunks(200) {
@@ -94,12 +94,14 @@ impl Gcp {
         Ok(())
     }
 
-    fn get_metric_data(&self, collected: Vec<CollectedMetric>) -> Vec<TimeSeries> {
+    async fn get_metric_data(&self, collected: Vec<CollectedMetric>) -> Vec<TimeSeries> {
         let end_time = SystemTime::now();
         let ts_end_time: google_cloud_wkt::Timestamp = end_time.try_into().unwrap_or_default();
 
         let mut data: Vec<TimeSeries> = Vec::with_capacity(collected.len());
 
+        let container_meta = self.container_meta_client.collect().await;
+
         for metric in collected {
             let cloud_metric_name = match self.metric_names.get(metric.key.name()) {
                 Some(name) => name,
@@ -112,11 +114,11 @@ impl Gcp {
                 }
             };
 
-            let container_labels = self.container_meta.labels();
+            let container_labels = container_meta.labels();
             let container_labels_len = container_labels.len();
             let mut labels =
                 HashMap::with_capacity(container_labels_len + metric.key.labels().len());
-            labels.extend(container_labels);
+            labels.extend(container_labels.clone());
             labels.extend(
                 metric
                     .key
@@ -171,6 +173,18 @@ impl Gcp {
                 ),
             };
 
+            // Add container instance ID to node_id if present
+            let mut monitored_resource_labels = self.monitored_resource_labels.clone();
+            if let Some(node_id) = monitored_resource_labels.get("node_id") {
+                monitored_resource_labels.insert(
+                    "node_id".to_string(),
+                    format!("{}-{}", node_id, container_meta.instance_id),
+                );
+            }
+
+            let mut mr = MonitoredResource::new().set_type(&self.monitored_resource_type);
+            mr.labels = monitored_resource_labels;
+
             data.push(
                 TimeSeries::new()
                     .set_metric_kind(kind)
@@ -179,11 +193,7 @@ impl Gcp {
                             .set_type(format!("custom.googleapis.com/{}", cloud_metric_name))
                             .set_labels(labels),
                     )
-                    .set_resource(
-                        MonitoredResource::new()
-                            .set_type(&self.monitored_resource_type)
-                            .set_labels(&self.monitored_resource_labels),
-                    )
+                    .set_resource(mr)
                     .set_value_type(value_type)
                     .set_points(vec![Point::new()
                         .set_interval(interval)
diff --git a/runtimes/core/src/metrics/manager.rs b/runtimes/core/src/metrics/manager.rs
index 83f816c102..6685c1422d 100644
--- a/runtimes/core/src/metrics/manager.rs
+++ b/runtimes/core/src/metrics/manager.rs
@@ -1,6 +1,6 @@
 use crate::{
     encore::runtime::v1::{self as pb, Environment},
-    metadata::{process_env_substitution, ContainerMetadata},
+    metadata::{process_env_substitution, ContainerMetaClient},
     metrics::{
         exporter::{self, Exporter},
         registry::Registry,
@@ -37,37 +37,22 @@ impl ProviderType {
         &self,
         env: &Environment,
         http_client: &reqwest::Client,
-        runtime_handle: tokio::runtime::Handle,
     ) -> Arc<dyn Exporter + Send + Sync> {
         match self {
             Self::Gcp(config) | Self::EncoreCloud(config) => {
-                runtime_handle.block_on(Self::create_gcp_exporter(config, env, http_client))
+                Self::create_gcp_exporter(config, env, http_client)
             }
         }
     }
 
-    async fn create_gcp_exporter(
+    fn create_gcp_exporter(
         provider_cfg: &pb::metrics_provider::GcpCloudMonitoring,
         env: &Environment,
         http_client: &reqwest::Client,
     ) -> Arc<dyn Exporter + Send + Sync> {
-        let container_meta = ContainerMetadata::collect(env, http_client)
-            .await
-            .unwrap_or_else(|_| ContainerMetadata {
-                env_name: env.env_name.clone(),
-                ..Default::default()
-            });
+        let container_meta_client = ContainerMetaClient::new(env.clone(), http_client.clone());
 
         let mut labels = provider_cfg.monitored_resource_labels.clone();
-
-        // Add container instance ID to node_id if present
-        if let Some(node_id) = labels.get("node_id").cloned() {
-            labels.insert(
-                "node_id".to_string(),
-                format!("{}-{}", node_id, container_meta.instance_id),
-            );
-        }
-
         process_env_substitution(&mut labels);
 
         Arc::new(exporter::Gcp::new(
@@ -75,7 +60,7 @@ impl ProviderType {
             provider_cfg.monitored_resource_type.clone(),
             labels,
             provider_cfg.metric_names.clone(),
-            container_meta,
+            container_meta_client,
         ))
     }
 }
@@ -110,11 +95,7 @@ impl Manager {
 
         for metrics_provider in &observability.metrics {
             if let Some(provider_type) = ProviderType::from_config(metrics_provider) {
-                manager.exporter = Some(provider_type.create_exporter(
-                    environment,
-                    http_client,
-                    runtime_handle.clone(),
-                ));
+                manager.exporter = Some(provider_type.create_exporter(environment, http_client));
                 break; // Take the first valid provider
             }
         }

From 0ded97c57aaf5bb8fabfbaab2449d8acc65c9054 Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Tue, 21 Oct 2025 17:44:25 +0200
Subject: [PATCH 08/17] wrap registry in arc instead of its internal

---
 runtimes/core/src/api/manager.rs          | 19 ++++++++----------
 runtimes/core/src/lib.rs                  |  2 +-
 runtimes/core/src/metrics/exporter/mod.rs |  2 +-
 runtimes/core/src/metrics/manager.rs      |  6 +++---
 runtimes/core/src/metrics/mod.rs          |  6 ++++--
 runtimes/core/src/metrics/registry.rs     | 24 +++++++++++------------
 runtimes/core/src/metrics/system.rs       |  2 +-
 runtimes/core/src/metrics/test.rs         | 22 ++++++++++-----------
 8 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/runtimes/core/src/api/manager.rs b/runtimes/core/src/api/manager.rs
index a65a27d9d1..49343d21f3 100644
--- a/runtimes/core/src/api/manager.rs
+++ b/runtimes/core/src/api/manager.rs
@@ -19,7 +19,7 @@ use crate::api::{
 use crate::encore::parser::meta::v1 as meta;
 use crate::encore::runtime::v1 as runtime;
 use crate::trace::Tracer;
-use crate::{api, model, pubsub, secrets, EncoreName, EndpointName, Hosted};
+use crate::{api, metrics, model, pubsub, secrets, EncoreName, EndpointName, Hosted};
 
 use super::encore_routes::healthz;
 use super::websocket_client::WebSocketClient;
@@ -43,7 +43,7 @@ pub struct ManagerConfig<'a> {
     pub runtime: tokio::runtime::Handle,
     pub testing: bool,
     pub proxied_push_subs: HashMap<String, EncoreName>,
-    pub metrics: &'a crate::metrics::Manager,
+    pub metrics: &'a metrics::Manager,
 }
 
 pub struct Manager {
@@ -58,7 +58,7 @@ pub struct Manager {
 
     gateways: HashMap<EncoreName, Gateway>,
     testing: bool,
-    metrics: crate::metrics::Manager,
+    metrics: metrics::Manager,
 }
 
 impl ManagerConfig<'_> {
@@ -203,7 +203,7 @@ impl ManagerConfig<'_> {
                 inbound_svc_auth,
                 self.tracer.clone(),
                 auth_data_schemas,
-                Arc::new(self.metrics.registry().clone()),
+                Arc::clone(self.metrics.registry()),
             )
             .context("unable to create API server")?;
             Some(server)
@@ -250,7 +250,7 @@ fn build_auth_handler(
     service_registry: &ServiceRegistry,
     http_client: reqwest::Client,
     tracer: Tracer,
-    metrics_registry: &crate::metrics::Registry,
+    metrics_registry: &Arc<metrics::Registry>,
 ) -> anyhow::Result<Option<auth::Authenticator>> {
     let Some(explicit) = &gw.explicit else {
         return Ok(None);
@@ -289,11 +289,8 @@ fn build_auth_handler(
     // let is_local = hosted_services.contains(&explicit.service_name);
     let is_local = true;
     let name = EndpointName::new(explicit.service_name.clone(), auth.name.clone());
-    let requests_total = crate::metrics::requests_total_counter(
-        metrics_registry,
-        &explicit.service_name,
-        &auth.name,
-    );
+    let requests_total =
+        metrics::requests_total_counter(metrics_registry, &explicit.service_name, &auth.name);
 
     let auth_data = registry.schema(auth_data_schema_idx);
     let auth_handler = if is_local {
@@ -342,7 +339,7 @@ impl Manager {
         self.service_registry.endpoints()
     }
 
-    pub fn metrics_registry(&self) -> &crate::metrics::Registry {
+    pub fn metrics_registry(&self) -> &Arc<metrics::Registry> {
         self.metrics.registry()
     }
 
diff --git a/runtimes/core/src/lib.rs b/runtimes/core/src/lib.rs
index 55ad72e448..eb0b40af44 100644
--- a/runtimes/core/src/lib.rs
+++ b/runtimes/core/src/lib.rs
@@ -345,7 +345,7 @@ impl Runtime {
             tracer.clone(),
             resources.pubsub_clusters,
             &md,
-            Arc::new(metrics_manager.registry().clone()),
+            Arc::clone(metrics_manager.registry()),
         )?;
         let objects =
             objects::Manager::new(&secrets, tracer.clone(), resources.bucket_clusters, &md);
diff --git a/runtimes/core/src/metrics/exporter/mod.rs b/runtimes/core/src/metrics/exporter/mod.rs
index a8fa51b2fc..f1b43465f8 100644
--- a/runtimes/core/src/metrics/exporter/mod.rs
+++ b/runtimes/core/src/metrics/exporter/mod.rs
@@ -2,6 +2,6 @@ mod gcp;
 pub use gcp::Gcp;
 
 #[async_trait::async_trait]
-pub trait Exporter: Send + Sync + std::fmt::Debug {
+pub trait Exporter: Send + Sync {
     async fn export(&self, metrics: Vec<crate::metrics::CollectedMetric>);
 }
diff --git a/runtimes/core/src/metrics/manager.rs b/runtimes/core/src/metrics/manager.rs
index 6685c1422d..32af04b601 100644
--- a/runtimes/core/src/metrics/manager.rs
+++ b/runtimes/core/src/metrics/manager.rs
@@ -68,12 +68,12 @@ impl ProviderType {
 #[derive(Clone)]
 pub struct Manager {
     exporter: Option<Arc<dyn Exporter>>,
-    registry: Registry,
+    registry: Arc<Registry>,
 }
 
 impl Manager {
     pub fn new() -> Self {
-        let registry = Registry::new();
+        let registry = Arc::new(Registry::new());
 
         Self {
             exporter: None,
@@ -81,7 +81,7 @@ impl Manager {
         }
     }
 
-    pub fn registry(&self) -> &Registry {
+    pub fn registry(&self) -> &Arc<Registry> {
         &self.registry
     }
 
diff --git a/runtimes/core/src/metrics/mod.rs b/runtimes/core/src/metrics/mod.rs
index 7fa32aad99..812fa9c8ae 100644
--- a/runtimes/core/src/metrics/mod.rs
+++ b/runtimes/core/src/metrics/mod.rs
@@ -10,6 +10,8 @@ pub mod gauge;
 #[cfg(test)]
 mod test;
 
+use std::sync::Arc;
+
 pub use counter::{Counter, CounterOps};
 pub use gauge::{Gauge, GaugeOps};
 pub use manager::Manager;
@@ -18,7 +20,7 @@ pub use system::SystemMetricsCollector;
 
 /// Create a requests counter schema
 pub fn requests_total_counter(
-    registry: &Registry,
+    registry: &Arc<Registry>,
     service: &str,
     endpoint: &str,
 ) -> counter::Schema<u64> {
@@ -30,7 +32,7 @@ pub fn requests_total_counter(
 }
 
 /// Create a memory usage gauge schema
-pub fn memory_usage_gauge_schema(registry: &Registry) -> gauge::Schema<u64> {
+pub fn memory_usage_gauge_schema(registry: &Arc<Registry>) -> gauge::Schema<u64> {
     registry
         .gauge_schema::<u64>("e_sys_memory_used_bytes")
         .build()
diff --git a/runtimes/core/src/metrics/registry.rs b/runtimes/core/src/metrics/registry.rs
index 691c71a437..d1e0f1bb34 100644
--- a/runtimes/core/src/metrics/registry.rs
+++ b/runtimes/core/src/metrics/registry.rs
@@ -44,19 +44,19 @@ pub struct CollectedMetric {
     pub registered_at: SystemTime,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct Registry {
-    counters: Arc<DashMap<Key, MetricStorage>>,
-    gauges: Arc<DashMap<Key, MetricStorage>>,
-    system_metrics: Arc<SystemMetricsCollector>,
+    counters: DashMap<Key, MetricStorage>,
+    gauges: DashMap<Key, MetricStorage>,
+    system_metrics: SystemMetricsCollector,
 }
 
 impl Registry {
     pub fn new() -> Self {
         Self {
-            counters: Arc::new(DashMap::new()),
-            gauges: Arc::new(DashMap::new()),
-            system_metrics: Arc::new(SystemMetricsCollector::new()),
+            counters: DashMap::new(),
+            gauges: DashMap::new(),
+            system_metrics: SystemMetricsCollector::new(),
         }
     }
 
@@ -121,24 +121,24 @@ impl Registry {
     }
 
     /// Create a counter schema builder for defining static and dynamic labels
-    pub fn counter_schema<T>(&self, name: &str) -> CounterSchemaBuilder<T>
+    pub fn counter_schema<T>(self: &Arc<Self>, name: &str) -> CounterSchemaBuilder<T>
     where
         Arc<AtomicU64>: CounterOps<T>,
         T: One + Send + Sync + 'static,
     {
-        CounterSchemaBuilder::new(name.to_string(), Arc::new(self.clone()))
+        CounterSchemaBuilder::new(name.to_string(), Arc::clone(self))
     }
 
     /// Create a gauge schema builder for defining static and dynamic labels
-    pub fn gauge_schema<T>(&self, name: &str) -> GaugeSchemaBuilder<T>
+    pub fn gauge_schema<T>(self: &Arc<Self>, name: &str) -> GaugeSchemaBuilder<T>
     where
         Arc<AtomicU64>: GaugeOps<T>,
         T: Send + Sync + 'static,
     {
-        GaugeSchemaBuilder::new(name.to_string(), Arc::new(self.clone()))
+        GaugeSchemaBuilder::new(name.to_string(), Arc::clone(self))
     }
 
-    pub fn collect(&self) -> Vec<CollectedMetric> {
+    pub fn collect(self: &Arc<Self>) -> Vec<CollectedMetric> {
         let mut collected_metrics = Vec::new();
 
         self.system_metrics.update(self);
diff --git a/runtimes/core/src/metrics/system.rs b/runtimes/core/src/metrics/system.rs
index 2a00ab24c6..00614b99b0 100644
--- a/runtimes/core/src/metrics/system.rs
+++ b/runtimes/core/src/metrics/system.rs
@@ -28,7 +28,7 @@ impl SystemMetricsCollector {
     }
 
     /// Collect and record all system metrics directly to the metrics registry
-    pub fn update(&self, registry: &Registry) {
+    pub fn update(&self, registry: &std::sync::Arc<Registry>) {
         let mut system = match self.system.try_lock() {
             Ok(guard) => guard,
             Err(_) => {
diff --git a/runtimes/core/src/metrics/test.rs b/runtimes/core/src/metrics/test.rs
index 80d153406c..3480783c70 100644
--- a/runtimes/core/src/metrics/test.rs
+++ b/runtimes/core/src/metrics/test.rs
@@ -67,7 +67,7 @@ mod registry_tests {
 
     #[test]
     fn test_registry_collect_counters() {
-        let registry = Registry::new();
+        let registry = Arc::new(Registry::new());
 
         let counter = registry.get_or_create_counter::<u64>("test_counter", [("label", "value")]);
         counter.increment();
@@ -92,7 +92,7 @@ mod registry_tests {
 
     #[test]
     fn test_registry_collect_gauges() {
-        let registry = Registry::new();
+        let registry = Arc::new(Registry::new());
 
         registry
             .get_or_create_gauge::<f64>("test_gauge", [])
@@ -113,7 +113,7 @@ mod registry_tests {
 
     #[test]
     fn test_registry_registered_at() {
-        let registry = Registry::new();
+        let registry = Arc::new(Registry::new());
 
         let before = std::time::SystemTime::now();
         registry.get_or_create_counter::<u64>("test_metric", []);
@@ -144,7 +144,7 @@ mod registry_tests {
 
     #[test]
     fn test_registry_always_collects_system_metrics() {
-        let registry = Registry::new();
+        let registry = Arc::new(Registry::new());
 
         let collected = registry.collect();
 
@@ -508,7 +508,7 @@ mod concurrency_tests {
 
         let handles: Vec<_> = (0..num_threads)
             .map(|thread_id| {
-                let registry = registry.clone();
+                let registry = Arc::clone(registry);
                 thread::spawn(move || {
                     for i in 0..operations_per_thread {
                         let thread_id_str = thread_id.to_string();
@@ -557,13 +557,13 @@ mod concurrency_tests {
 
     #[test]
     fn test_registry_concurrent_metric_creation() {
-        let registry = Registry::new();
+        let registry = Arc::new(Registry::new());
         let num_threads = 16;
         let metrics_per_thread = 50;
 
         let handles: Vec<_> = (0..num_threads)
             .map(|thread_id| {
-                let registry = registry.clone();
+                let registry = Arc::clone(&registry);
                 thread::spawn(move || {
                     for i in 0..metrics_per_thread {
                         let metric_name = format!("metric_{}_{}", thread_id, i);
@@ -603,7 +603,7 @@ mod concurrency_tests {
         let manager = Manager::new();
         let registry = manager.registry();
 
-        let registry_clone = registry.clone();
+        let registry_clone = Arc::clone(registry);
         let manager_clone = manager.clone();
 
         let updater_handle = thread::spawn(move || {
@@ -712,7 +712,7 @@ mod manager_export_tests {
 
         let manager1 = manager.clone();
         let manager2 = manager.clone();
-        let registry_clone = registry.clone();
+        let registry_clone = Arc::clone(registry);
 
         let updater = tokio::spawn(async move {
             let counter = registry_clone.get_or_create_counter::<u64>("concurrent_export_test", []);
@@ -758,7 +758,7 @@ mod type_system_atomic_tests {
 
     #[test]
     fn test_float_precision_in_atomic_operations() {
-        let registry = Registry::new();
+        let registry = Arc::new(Registry::new());
 
         let test_values = [
             0.0,
@@ -794,7 +794,7 @@ mod type_system_atomic_tests {
 
     #[test]
     fn test_special_float_values() {
-        let registry = Registry::new();
+        let registry = Arc::new(Registry::new());
 
         let special_values = [f64::NAN, f64::INFINITY, f64::NEG_INFINITY, 0.0, -0.0];
 

From 67539f0d30aa66818dda7c03629e9828fc8eb133 Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Wed, 22 Oct 2025 12:27:09 +0200
Subject: [PATCH 09/17] cache container labels in the gcp exporter

---
 runtimes/core/src/metadata/mod.rs         | 10 +++---
 runtimes/core/src/metrics/exporter/gcp.rs | 41 ++++++++++++++++++-----
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/runtimes/core/src/metadata/mod.rs b/runtimes/core/src/metadata/mod.rs
index 96379d5382..9eed96742b 100644
--- a/runtimes/core/src/metadata/mod.rs
+++ b/runtimes/core/src/metadata/mod.rs
@@ -27,16 +27,16 @@ impl ContainerMetaClient {
         }
     }
 
-    pub async fn collect(&self) -> &ContainerMetadata {
+    pub async fn collect(&self) -> anyhow::Result<&ContainerMetadata> {
         self.cell
             .get_or_try_init(|| async {
                 ContainerMetadata::collect(&self.env, &self.http_client).await
             })
             .await
-            .unwrap_or_else(|err| {
-                log::warn!("failed to fetch container metadata: {err}");
-                &self.fallback
-            })
+    }
+
+    pub fn fallback(&self) -> &ContainerMetadata {
+        &self.fallback
     }
 }
 
diff --git a/runtimes/core/src/metrics/exporter/gcp.rs b/runtimes/core/src/metrics/exporter/gcp.rs
index d07d677bbc..799e0d1696 100644
--- a/runtimes/core/src/metrics/exporter/gcp.rs
+++ b/runtimes/core/src/metrics/exporter/gcp.rs
@@ -9,8 +9,11 @@ use google_cloud_monitoring_v3::model::{Point, TimeInterval, TimeSeries, TypedVa
 use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::SystemTime;
+use tokio::sync::OnceCell;
 
-#[derive(Clone, Debug)]
+type LabelPairs = Vec<(String, String)>;
+
+#[derive(Debug)]
 pub struct Gcp {
     client: Arc<LazyMonitoringClient>,
     project_id: String,
@@ -18,17 +21,18 @@ pub struct Gcp {
     monitored_resource_labels: HashMap<String, String>,
     metric_names: HashMap<String, String>,
     container_meta_client: Arc<ContainerMetaClient>,
+    container_labels: Arc<OnceCell<Arc<LabelPairs>>>,
 }
 
 #[derive(Debug)]
 struct LazyMonitoringClient {
-    cell: tokio::sync::OnceCell<anyhow::Result<MetricService>>,
+    cell: OnceCell<anyhow::Result<MetricService>>,
 }
 
 impl LazyMonitoringClient {
     fn new() -> Self {
         Self {
-            cell: tokio::sync::OnceCell::new(),
+            cell: OnceCell::new(),
         }
     }
 
@@ -60,6 +64,7 @@ impl Gcp {
             monitored_resource_labels,
             metric_names,
             container_meta_client: Arc::new(container_meta_client),
+            container_labels: Arc::new(OnceCell::new()),
         }
     }
 
@@ -94,13 +99,35 @@ impl Gcp {
         Ok(())
     }
 
+    async fn container_labels(&self) -> Arc<Vec<(String, String)>> {
+        self.container_labels
+            .get_or_try_init(|| async {
+                let container_metadata = self.container_meta_client.collect().await?;
+                anyhow::Ok(Arc::new(container_metadata.labels()))
+            })
+            .await
+            .map(Arc::clone)
+            .unwrap_or_else(|e| {
+                log::warn!("failed fetching container metadata: {e}, using fallback");
+                Arc::new(self.container_meta_client.fallback().labels())
+            })
+    }
+
     async fn get_metric_data(&self, collected: Vec<CollectedMetric>) -> Vec<TimeSeries> {
         let end_time = SystemTime::now();
         let ts_end_time: google_cloud_wkt::Timestamp = end_time.try_into().unwrap_or_default();
 
         let mut data: Vec<TimeSeries> = Vec::with_capacity(collected.len());
 
-        let container_meta = self.container_meta_client.collect().await;
+        let container_labels = self.container_labels().await;
+        let container_labels_len = container_labels.len();
+
+        let instance_id = &self
+            .container_meta_client
+            .collect()
+            .await
+            .unwrap_or(self.container_meta_client.fallback())
+            .instance_id;
 
         for metric in collected {
             let cloud_metric_name = match self.metric_names.get(metric.key.name()) {
@@ -114,11 +141,9 @@ impl Gcp {
                 }
             };
 
-            let container_labels = container_meta.labels();
-            let container_labels_len = container_labels.len();
             let mut labels =
                 HashMap::with_capacity(container_labels_len + metric.key.labels().len());
-            labels.extend(container_labels.clone());
+            labels.extend(container_labels.iter().cloned());
             labels.extend(
                 metric
                     .key
@@ -178,7 +203,7 @@ impl Gcp {
             if let Some(node_id) = monitored_resource_labels.get("node_id") {
                 monitored_resource_labels.insert(
                     "node_id".to_string(),
-                    format!("{}-{}", node_id, container_meta.instance_id),
+                    format!("{}-{}", node_id, instance_id),
                 );
             }
 

From 0e249381c8d21084073937f14e94358414fc6712 Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Mon, 20 Oct 2025 11:05:01 +0200
Subject: [PATCH 10/17] runtimes/core: collect container meta on aws

---
 runtimes/core/src/metadata/aws.rs | 50 +++++++++++++++++++++++++++++++
 runtimes/core/src/metadata/mod.rs | 37 +++++++++++++++++++----
 2 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 runtimes/core/src/metadata/aws.rs

diff --git a/runtimes/core/src/metadata/aws.rs b/runtimes/core/src/metadata/aws.rs
new file mode 100644
index 0000000000..bff93a072d
--- /dev/null
+++ b/runtimes/core/src/metadata/aws.rs
@@ -0,0 +1,50 @@
+use std::time::Duration;
+
+use anyhow::Context;
+
+#[derive(serde::Deserialize)]
+pub struct AwsTaskMeta {
+    #[serde(rename = "ServiceName")]
+    pub service_name: String,
+    #[serde(rename = "Revision")]
+    pub revision: String,
+    #[serde(rename = "TaskARN")]
+    pub task_arn: String,
+}
+
+#[derive(Debug)]
+pub struct AwsMetadataClient {
+    http_client: reqwest::Client,
+    metadata_uri: String,
+}
+
+impl AwsMetadataClient {
+    pub fn new(http_client: reqwest::Client, metadata_uri: String) -> Self {
+        AwsMetadataClient {
+            http_client,
+            metadata_uri,
+        }
+    }
+
+    pub async fn fetch_task_meta(&self) -> anyhow::Result<AwsTaskMeta> {
+        let req = self
+            .http_client
+            .get(format!("{}/task", self.metadata_uri))
+            .timeout(Duration::from_secs(30))
+            .build()
+            .context("create metadata request")?;
+
+        let resp = self
+            .http_client
+            .execute(req)
+            .await
+            .context("send metadata request")?;
+
+        let task_meta = resp
+            .json::<AwsTaskMeta>()
+            .await
+            .context("deserialize task metadata")?;
+
+        Ok(task_meta)
+    }
+}
diff --git a/runtimes/core/src/metadata/mod.rs b/runtimes/core/src/metadata/mod.rs
index 9eed96742b..2482e01e2f 100644
--- a/runtimes/core/src/metadata/mod.rs
+++ b/runtimes/core/src/metadata/mod.rs
@@ -1,9 +1,13 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, time::Duration};
 
-use crate::encore::runtime::v1::{environment::Cloud, Environment};
+use crate::{
+    encore::runtime::v1::{environment::Cloud, Environment},
+    metadata::aws::AwsMetadataClient,
+};
 use anyhow::Context;
 use tokio::sync::OnceCell;
 
+mod aws;
 mod gce;
 
 #[derive(Debug)]
@@ -61,13 +65,38 @@ impl ContainerMetadata {
     pub async fn collect(env: &Environment, http_client: &reqwest::Client) -> anyhow::Result<Self> {
         match env.cloud() {
             Cloud::Gcp | Cloud::Encore => Self::collect_gcp(env, http_client).await,
-            Cloud::Aws | Cloud::Azure | Cloud::Unspecified | Cloud::Local => anyhow::bail!(
+            Cloud::Aws => Self::collect_aws(env, http_client).await,
+            Cloud::Azure | Cloud::Unspecified | Cloud::Local => anyhow::bail!(
                 "can't collect container meta in {}",
                 env.cloud().as_str_name()
             ),
         }
     }
 
+    async fn collect_aws(env: &Environment, http_client: &reqwest::Client) -> anyhow::Result<Self> {
+        // Encore supports running on both ECS Fargate and EKS.
+        // For Fargate, we can get the metadata from the ECS metadata service.
+        // For EKS there doesn't appear to be a standard way to get the metadata, so skip it in that case.
+        let metadata_uri = std::env::var("ECS_CONTAINER_METADATA_URI_V4")
+            .map_err(|_| anyhow::anyhow!("unable to get ecs container metadata uri"))?;
+
+        let client = AwsMetadataClient::new(http_client.clone(), metadata_uri);
+        let task_meta = client.fetch_task_meta().await?;
+
+        let instance_id = task_meta
+            .task_arn
+            .get(task_meta.task_arn.len().saturating_sub(8)..)
+            .unwrap_or(&task_meta.task_arn)
+            .to_string();
+
+        Ok(Self {
+            service_id: task_meta.service_name,
+            revision_id: task_meta.revision,
+            instance_id,
+            env_name: env.env_name.clone(),
+        })
+    }
+
     async fn collect_gcp(env: &Environment, http_client: &reqwest::Client) -> anyhow::Result<Self> {
         let service = std::env::var("K_SERVICE").map_err(|_| {
             anyhow::anyhow!("unable to get service ID: env variable 'K_SERVICE' unset")
@@ -112,8 +141,6 @@ impl ContainerMetadata {
             env_name: env.env_name.clone(),
         })
     }
-
-    // TODO(fredr): implement collect for aws
 }
 
 /// Process environment variable substitution in labels

From e1eecd743ba463d4cf364632340baf170b6df38a Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Mon, 20 Oct 2025 15:54:46 +0200
Subject: [PATCH 11/17] runtime/core: export to aws cloudwatch

---
 Cargo.lock                                | 358 +++++++++++++++++-----
 runtimes/core/Cargo.toml                  |   1 +
 runtimes/core/src/metadata/mod.rs         |   2 +-
 runtimes/core/src/metrics/exporter/aws.rs | 172 +++++++++++
 runtimes/core/src/metrics/exporter/mod.rs |   2 +
 runtimes/core/src/metrics/manager.rs      |  16 +-
 runtimes/core/src/objects/s3/mod.rs       |   2 +-
 7 files changed, 473 insertions(+), 80 deletions(-)
 create mode 100644 runtimes/core/src/metrics/exporter/aws.rs

diff --git a/Cargo.lock b/Cargo.lock
index f22cc9b710..adef2c5bf3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -295,7 +295,7 @@ dependencies = [
  "aws-sdk-ssooidc",
  "aws-sdk-sts",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.11",
  "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -315,9 +315,9 @@ dependencies = [
 
 [[package]]
 name = "aws-credential-types"
-version = "1.2.1"
+version = "1.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da"
+checksum = "faf26925f4a5b59eb76722b63c2892b1d70d06fa053c72e4a100ec308c1d47bc"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
@@ -325,17 +325,40 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "aws-lc-rs"
+version = "1.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879b6c89592deb404ba4dc0ae6b58ffd1795c78991cbb5b8bc441c48a070440d"
+dependencies = [
+ "aws-lc-sys",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.32.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "107a4e9d9cab9963e04e84bb8dee0e25f2a987f9a8bad5ed054abd439caa8f8c"
+dependencies = [
+ "bindgen 0.72.1",
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+]
+
 [[package]]
 name = "aws-runtime"
-version = "1.5.3"
+version = "1.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16d1aa50accc11a4b4d5c50f7fb81cc0cf60328259c587d0e6b0f11385bde46"
+checksum = "bfa006bb32360ed90ac51203feafb9d02e3d21046e1fd3a450a404b90ea73e5d"
 dependencies = [
  "aws-credential-types",
  "aws-sigv4",
  "aws-smithy-async",
  "aws-smithy-eventstream",
- "aws-smithy-http",
+ "aws-smithy-http 0.62.4",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -344,13 +367,38 @@ dependencies = [
  "fastrand",
  "http 0.2.12",
  "http-body 0.4.6",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "tracing",
  "uuid",
 ]
 
+[[package]]
+name = "aws-sdk-cloudwatch"
+version = "1.94.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d643daaf9ff124bb86ceda77e9c0aa0a480a42c0d670b95106602d34a05bd5a"
+dependencies = [
+ "aws-credential-types",
+ "aws-runtime",
+ "aws-smithy-async",
+ "aws-smithy-compression",
+ "aws-smithy-http 0.62.4",
+ "aws-smithy-json",
+ "aws-smithy-query",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-smithy-xml",
+ "aws-types",
+ "fastrand",
+ "flate2",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "regex-lite",
+ "tracing",
+]
+
 [[package]]
 name = "aws-sdk-s3"
 version = "1.68.0"
@@ -363,7 +411,7 @@ dependencies = [
  "aws-smithy-async",
  "aws-smithy-checksums",
  "aws-smithy-eventstream",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.11",
  "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -394,7 +442,7 @@ dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.11",
  "aws-smithy-json",
  "aws-smithy-query",
  "aws-smithy-runtime",
@@ -417,7 +465,7 @@ dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.11",
  "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -439,7 +487,7 @@ dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.11",
  "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -461,7 +509,7 @@ dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.11",
  "aws-smithy-json",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -483,7 +531,7 @@ dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.60.11",
  "aws-smithy-json",
  "aws-smithy-query",
  "aws-smithy-runtime",
@@ -499,13 +547,13 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "1.2.6"
+version = "1.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d3820e0c08d0737872ff3c7c1f21ebbb6693d832312d6152bf18ef50a5471c2"
+checksum = "bffc03068fbb9c8dd5ce1c6fb240678a5cffb86fb2b7b1985c999c4b83c8df68"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-eventstream",
- "aws-smithy-http",
+ "aws-smithy-http 0.62.4",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "bytes",
@@ -515,7 +563,6 @@ dependencies = [
  "hmac",
  "http 0.2.12",
  "http 1.2.0",
- "once_cell",
  "p256",
  "percent-encoding",
  "ring 0.17.8",
@@ -528,9 +575,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-async"
-version = "1.2.3"
+version = "1.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427cb637d15d63d6f9aae26358e1c9a9c09d5aa490d64b09354c8217cfef0f28"
+checksum = "127fcfad33b7dfc531141fda7e1c402ac65f88aca5511a4d31e2e3d2cd01ce9c"
 dependencies = [
  "futures-util",
  "pin-project-lite",
@@ -543,7 +590,7 @@ version = "0.60.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba1a71073fca26775c8b5189175ea8863afb1c9ea2cceb02a5de5ad9dfbaa795"
 dependencies = [
- "aws-smithy-http",
+ "aws-smithy-http 0.60.11",
  "aws-smithy-types",
  "bytes",
  "crc32c",
@@ -558,11 +605,28 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "aws-smithy-compression"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81a710da85cdc17745cc49cad5f24a3c92b26da14999ac3c7696981e6ef63666"
+dependencies = [
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "bytes",
+ "flate2",
+ "futures-util",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "pin-project-lite",
+ "tracing",
+]
+
 [[package]]
 name = "aws-smithy-eventstream"
-version = "0.60.5"
+version = "0.60.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cef7d0a272725f87e51ba2bf89f8c21e4df61b9e49ae1ac367a6d69916ef7c90"
+checksum = "9656b85088f8d9dc7ad40f9a6c7228e1e8447cdf4b046c87e152e0805dea02fa"
 dependencies = [
  "aws-smithy-types",
  "bytes",
@@ -590,20 +654,79 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "aws-smithy-http"
+version = "0.62.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3feafd437c763db26aa04e0cc7591185d0961e64c61885bece0fb9d50ceac671"
+dependencies = [
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "bytes",
+ "bytes-utils",
+ "futures-core",
+ "http 0.2.12",
+ "http 1.2.0",
+ "http-body 0.4.6",
+ "percent-encoding",
+ "pin-project-lite",
+ "pin-utils",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-http-client"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1053b5e587e6fa40ce5a79ea27957b04ba660baa02b28b7436f64850152234f1"
+dependencies = [
+ "aws-smithy-async",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "h2 0.3.26",
+ "h2 0.4.12",
+ "http 0.2.12",
+ "http 1.2.0",
+ "http-body 0.4.6",
+ "hyper 0.14.32",
+ "hyper 1.7.0",
+ "hyper-rustls 0.24.2",
+ "hyper-rustls 0.27.5",
+ "hyper-util",
+ "pin-project-lite",
+ "rustls 0.21.12",
+ "rustls 0.23.33",
+ "rustls-native-certs 0.8.1",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.4",
+ "tower 0.5.2",
+ "tracing",
+]
+
 [[package]]
 name = "aws-smithy-json"
-version = "0.61.1"
+version = "0.61.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4e69cc50921eb913c6b662f8d909131bb3e6ad6cb6090d3a39b66fc5c52095"
+checksum = "cff418fc8ec5cadf8173b10125f05c2e7e1d46771406187b2c878557d4503390"
 dependencies = [
  "aws-smithy-types",
 ]
 
+[[package]]
+name = "aws-smithy-observability"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d1881b1ea6d313f9890710d65c158bdab6fb08c91ea825f74c1c8c357baf4cc"
+dependencies = [
+ "aws-smithy-runtime-api",
+]
+
 [[package]]
 name = "aws-smithy-query"
-version = "0.60.7"
+version = "0.60.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb"
+checksum = "d28a63441360c477465f80c7abac3b9c4d075ca638f982e605b7dc2a2c7156c9"
 dependencies = [
  "aws-smithy-types",
  "urlencoding",
@@ -611,36 +734,33 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.7.6"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a05dd41a70fc74051758ee75b5c4db2c0ca070ed9229c3df50e9475cda1cb985"
+checksum = "40ab99739082da5347660c556689256438defae3bcefd66c52b095905730e404"
 dependencies = [
  "aws-smithy-async",
- "aws-smithy-http",
+ "aws-smithy-http 0.62.4",
+ "aws-smithy-http-client",
+ "aws-smithy-observability",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "bytes",
  "fastrand",
- "h2 0.3.26",
  "http 0.2.12",
+ "http 1.2.0",
  "http-body 0.4.6",
  "http-body 1.0.1",
- "httparse",
- "hyper 0.14.32",
- "hyper-rustls 0.24.2",
- "once_cell",
  "pin-project-lite",
  "pin-utils",
- "rustls 0.21.12",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "aws-smithy-runtime-api"
-version = "1.7.3"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd"
+checksum = "3683c5b152d2ad753607179ed71988e8cfd52964443b4f74fd8e552d0bbfeb46"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
@@ -655,9 +775,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "1.2.11"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ddc9bd6c28aeb303477170ddd183760a956a03e083b3902a990238a7e3792d"
+checksum = "9f5b3a7486f6690ba25952cabf1e7d75e34d69eaff5081904a47bc79074d6457"
 dependencies = [
  "base64-simd",
  "bytes",
@@ -681,18 +801,18 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-xml"
-version = "0.60.9"
+version = "0.60.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc"
+checksum = "e9c34127e8c624bc2999f3b657e749c1393bedc9cd97b92a804db8ced4d2e163"
 dependencies = [
  "xmlparser",
 ]
 
 [[package]]
 name = "aws-types"
-version = "1.3.3"
+version = "1.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef"
+checksum = "e2fd329bf0e901ff3f60425691410c69094dc2a1f34b331f37bfc4e9ac1565a1"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-async",
@@ -931,6 +1051,26 @@ dependencies = [
  "which",
 ]
 
+[[package]]
+name = "bindgen"
+version = "0.72.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
+dependencies = [
+ "bitflags 2.9.4",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.13.0",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash 2.1.1",
+ "shlex",
+ "syn 2.0.95",
+]
+
 [[package]]
 name = "bit-set"
 version = "0.8.0"
@@ -1093,10 +1233,11 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.7"
+version = "1.2.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
+checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -1202,9 +1343,9 @@ checksum = "aaa6b4b263a5d737e9bf6b7c09b72c41a5480aec4d7219af827f6564e950b6a5"
 
 [[package]]
 name = "cmake"
-version = "0.1.52"
+version = "0.1.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e"
+checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
 dependencies = [
  "cc",
 ]
@@ -1287,6 +1428,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -1615,6 +1766,12 @@ dependencies = [
  "shared_child",
 ]
 
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
 [[package]]
 name = "duration-string"
 version = "0.3.0"
@@ -1717,6 +1874,7 @@ dependencies = [
  "async-trait",
  "aws-config",
  "aws-credential-types",
+ "aws-sdk-cloudwatch",
  "aws-sdk-s3",
  "aws-sdk-sns",
  "aws-sdk-sqs",
@@ -1987,6 +2145,12 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
@@ -2342,7 +2506,7 @@ dependencies = [
  "http 1.2.0",
  "reqwest 0.12.23",
  "rustc_version",
- "rustls 0.23.20",
+ "rustls 0.23.33",
  "rustls-pemfile 2.2.0",
  "serde",
  "serde_json",
@@ -2598,9 +2762,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.7"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
+checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -2848,7 +3012,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
- "h2 0.4.7",
+ "h2 0.4.12",
  "http 1.2.0",
  "http-body 1.0.1",
  "httparse",
@@ -2887,10 +3051,11 @@ dependencies = [
  "http 1.2.0",
  "hyper 1.7.0",
  "hyper-util",
- "rustls 0.23.20",
+ "rustls 0.23.33",
+ "rustls-native-certs 0.8.1",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.1",
+ "tokio-rustls 0.26.4",
  "tower-service",
  "webpki-roots 0.26.11",
 ]
@@ -3702,7 +3867,7 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework",
+ "security-framework 2.11.1",
  "security-framework-sys",
  "tempfile",
 ]
@@ -4103,7 +4268,7 @@ version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ca6fdb8f9d32182abf17328789f87f305dd8c8ce5bf48c5aa2b5cffc94e1c04"
 dependencies = [
- "bindgen",
+ "bindgen 0.66.1",
  "cc",
  "fs_extra",
  "glob",
@@ -4308,7 +4473,7 @@ dependencies = [
  "daemonize",
  "flate2",
  "futures",
- "h2 0.4.7",
+ "h2 0.4.12",
  "http 1.2.0",
  "httparse",
  "httpdate",
@@ -4458,7 +4623,7 @@ dependencies = [
  "bytes",
  "clap",
  "futures",
- "h2 0.4.7",
+ "h2 0.4.12",
  "http 1.2.0",
  "log",
  "once_cell",
@@ -4884,7 +5049,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.1.1",
- "rustls 0.23.20",
+ "rustls 0.23.33",
  "socket2 0.6.0",
  "thiserror 2.0.10",
  "tokio",
@@ -4904,7 +5069,7 @@ dependencies = [
  "rand 0.9.2",
  "ring 0.17.8",
  "rustc-hash 2.1.1",
- "rustls 0.23.20",
+ "rustls 0.23.33",
  "rustls-pki-types",
  "slab",
  "thiserror 2.0.10",
@@ -5214,7 +5379,7 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.4.7",
+ "h2 0.4.12",
  "http 1.2.0",
  "http-body 1.0.1",
  "http-body-util",
@@ -5230,7 +5395,7 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.20",
+ "rustls 0.23.33",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -5238,7 +5403,7 @@ dependencies = [
  "sync_wrapper 1.0.2",
  "tokio",
  "tokio-native-tls",
- "tokio-rustls 0.26.1",
+ "tokio-rustls 0.26.4",
  "tokio-util",
  "tower 0.5.2",
  "tower-http 0.6.6",
@@ -5440,15 +5605,16 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.20"
+version = "0.23.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
+checksum = "751e04a496ca00bb97a5e043158d23d66b5aabf2e1d5aa2a0aaebb1aafe6f82c"
 dependencies = [
+ "aws-lc-rs",
  "log",
  "once_cell",
  "ring 0.17.8",
  "rustls-pki-types",
- "rustls-webpki 0.102.8",
+ "rustls-webpki 0.103.7",
  "subtle",
  "zeroize",
 ]
@@ -5462,7 +5628,7 @@ dependencies = [
  "openssl-probe",
  "rustls-pemfile 1.0.4",
  "schannel",
- "security-framework",
+ "security-framework 2.11.1",
 ]
 
 [[package]]
@@ -5475,7 +5641,19 @@ dependencies = [
  "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "schannel",
- "security-framework",
+ "security-framework 2.11.1",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework 3.5.1",
 ]
 
 [[package]]
@@ -5498,11 +5676,12 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
 dependencies = [
  "web-time",
+ "zeroize",
 ]
 
 [[package]]
@@ -5526,6 +5705,18 @@ dependencies = [
  "untrusted 0.9.0",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.103.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf"
+dependencies = [
+ "aws-lc-rs",
+ "ring 0.17.8",
+ "rustls-pki-types",
+ "untrusted 0.9.0",
+]
+
 [[package]]
 name = "rustracing"
 version = "0.5.1"
@@ -5657,7 +5848,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
  "bitflags 2.9.4",
- "core-foundation",
+ "core-foundation 0.9.4",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework"
+version = "3.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
+dependencies = [
+ "bitflags 2.9.4",
+ "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -5665,9 +5869,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.14.0"
+version = "2.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -6502,7 +6706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "system-configuration-sys 0.5.0",
 ]
 
@@ -6513,7 +6717,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
  "bitflags 2.9.4",
- "core-foundation",
+ "core-foundation 0.9.4",
  "system-configuration-sys 0.6.0",
 ]
 
@@ -6858,11 +7062,11 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.1"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
- "rustls 0.23.20",
+ "rustls 0.23.33",
  "tokio",
 ]
 
diff --git a/runtimes/core/Cargo.toml b/runtimes/core/Cargo.toml
index 71cc6406a4..4d6ae7a6b4 100644
--- a/runtimes/core/Cargo.toml
+++ b/runtimes/core/Cargo.toml
@@ -130,6 +130,7 @@ google-cloud-monitoring-v3 = "1.0.0"
 google-cloud-api = "1.0.0"
 google-cloud-wkt = "1.0.0"
 sysinfo = "0.37.2"
+aws-sdk-cloudwatch = "1.94.0"
 
 [build-dependencies]
 prost-build = "0.12.3"
diff --git a/runtimes/core/src/metadata/mod.rs b/runtimes/core/src/metadata/mod.rs
index 2482e01e2f..fb444ce7b0 100644
--- a/runtimes/core/src/metadata/mod.rs
+++ b/runtimes/core/src/metadata/mod.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, time::Duration};
+use std::collections::HashMap;
 
 use crate::{
     encore::runtime::v1::{environment::Cloud, Environment},
diff --git a/runtimes/core/src/metrics/exporter/aws.rs b/runtimes/core/src/metrics/exporter/aws.rs
new file mode 100644
index 0000000000..ef7d487eeb
--- /dev/null
+++ b/runtimes/core/src/metrics/exporter/aws.rs
@@ -0,0 +1,172 @@
+use crate::metadata::{ContainerMetaClient, ContainerMetadata};
+use crate::metrics::exporter::Exporter;
+use crate::metrics::{CollectedMetric, MetricValue};
+use anyhow::Context;
+use aws_sdk_cloudwatch as cloudwatch;
+use aws_sdk_cloudwatch::types::{Dimension, MetricDatum};
+use std::sync::Arc;
+use std::time::SystemTime;
+
+#[derive(Debug)]
+pub struct Aws {
+    client: Arc<LazyCloudWatchClient>,
+    namespace: String,
+    container_meta_client: ContainerMetaClient,
+}
+
+#[derive(Debug)]
+struct LazyCloudWatchClient {
+    cell: tokio::sync::OnceCell<anyhow::Result<cloudwatch::Client>>,
+}
+
+impl LazyCloudWatchClient {
+    fn new() -> Self {
+        Self {
+            cell: tokio::sync::OnceCell::new(),
+        }
+    }
+
+    async fn get(&self) -> &anyhow::Result<cloudwatch::Client> {
+        self.cell
+            .get_or_init(|| async {
+                let config = aws_config::defaults(aws_config::BehaviorVersion::v2025_08_07())
+                    .load()
+                    .await;
+
+                Ok(cloudwatch::Client::new(&config))
+            })
+            .await
+    }
+}
+
+impl Aws {
+    pub fn new(namespace: String, container_meta_client: ContainerMetaClient) -> Self {
+        Self {
+            client: Arc::new(LazyCloudWatchClient::new()),
+            namespace,
+            container_meta_client,
+        }
+    }
+
+    async fn export_metrics(&self, metrics: Vec<CollectedMetric>) -> Result<(), anyhow::Error> {
+        if metrics.is_empty() {
+            return Ok(());
+        }
+
+        let client = match self.client.get().await {
+            Ok(client) => client,
+            Err(e) => {
+                log::error!("failed to get CloudWatch client: {}", e);
+                return Err(anyhow::anyhow!("failed to get CloudWatch client: {}", e));
+            }
+        };
+
+        log::trace!(
+            "Exporting {} metrics to AWS CloudWatch namespace {}",
+            metrics.len(),
+            self.namespace
+        );
+
+        let metric_data = self.get_metric_data(metrics).await;
+
+        // Send metrics in batches (CloudWatch allows up to 1000 metrics per request)
+        for batch in metric_data.chunks(1000) {
+            if let Err(e) = self.send_metric_batch(client, batch.to_vec()).await {
+                log::error!("failed to export metrics batch: {}", e);
+            }
+        }
+
+        Ok(())
+    }
+
+    async fn get_metric_data(&self, collected: Vec<CollectedMetric>) -> Vec<MetricDatum> {
+        let now = SystemTime::now();
+        let mut data: Vec<MetricDatum> = Vec::with_capacity(collected.len());
+
+        let container_metadata_dims: Vec<Dimension> = self
+            .container_meta_client
+            .collect()
+            .await
+            .labels()
+            .into_iter()
+            .map(|(key, value)| Dimension::builder().name(key).value(value).build())
+            .collect();
+        let container_dims_len = container_metadata_dims.len();
+
+        for metric in collected {
+            let metric_name = metric.key.name().to_string();
+
+            let mut dimensions: Vec<Dimension> =
+                Vec::with_capacity(container_dims_len + metric.key.labels().count());
+
+            dimensions.extend(container_metadata_dims.clone());
+
+            for label in metric.key.labels() {
+                let value = label.value();
+                if value.is_empty() {
+                    log::warn!(
+                        "Skipping empty label '{}' for metric '{}' - CloudWatch does not support empty dimension values",
+                        label.key(),
+                        metric_name
+                    );
+                    continue;
+                }
+
+                dimensions.push(Dimension::builder().name(label.key()).value(value).build());
+            }
+
+            let value = match metric.value {
+                MetricValue::CounterU64(val) => val as f64,
+                MetricValue::CounterI64(val) => val as f64,
+                MetricValue::GaugeF64(val) => val,
+                MetricValue::GaugeU64(val) => val as f64,
+                MetricValue::GaugeI64(val) => val as f64,
+            };
+
+            let mut datum_builder = MetricDatum::builder()
+                .metric_name(metric_name)
+                .timestamp(aws_smithy_types::DateTime::from(now))
+                .value(value)
+                .set_dimensions(Some(dimensions));
+
+            // For cumulative counters, include the start time
+            if matches!(
+                metric.value,
+                MetricValue::CounterU64(_) | MetricValue::CounterI64(_)
+            ) {
+                // CloudWatch uses storage resolution to determine how data is aggregated
+                // For counters, we use high resolution (1 second) to better track cumulative values
+                datum_builder = datum_builder.storage_resolution(1);
+            }
+
+            data.push(datum_builder.build())
+        }
+
+        data
+    }
+
+    async fn send_metric_batch(
+        &self,
+        client: &cloudwatch::Client,
+        metric_data: Vec<MetricDatum>,
+    ) -> Result<(), anyhow::Error> {
+        client
+            .put_metric_data()
+            .namespace(&self.namespace)
+            .set_metric_data(Some(metric_data))
+            .send()
+            .await
+            .context("send metrics to CloudWatch")?;
+
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+impl Exporter for Aws {
+    async fn export(&self, metrics: Vec<CollectedMetric>) {
+        if let Err(err) = self.export_metrics(metrics).await {
+            log::error!("Failed to export metrics to AWS CloudWatch: {}", err);
+        }
+    }
+}
diff --git a/runtimes/core/src/metrics/exporter/mod.rs b/runtimes/core/src/metrics/exporter/mod.rs
index f1b43465f8..a72aa12fb2 100644
--- a/runtimes/core/src/metrics/exporter/mod.rs
+++ b/runtimes/core/src/metrics/exporter/mod.rs
@@ -1,4 +1,6 @@
+mod aws;
 mod gcp;
+pub use aws::Aws;
 pub use gcp::Gcp;
 
 #[async_trait::async_trait]
diff --git a/runtimes/core/src/metrics/manager.rs b/runtimes/core/src/metrics/manager.rs
index 32af04b601..e0a680f957 100644
--- a/runtimes/core/src/metrics/manager.rs
+++ b/runtimes/core/src/metrics/manager.rs
@@ -13,8 +13,8 @@ use std::time::Duration;
 enum ProviderType {
     Gcp(pb::metrics_provider::GcpCloudMonitoring),
     EncoreCloud(pb::metrics_provider::GcpCloudMonitoring),
+    Aws(pb::metrics_provider::AwsCloudWatch),
     // TODO(fredr) add these:
-    // - Aws(pb::metrics_provider::AwsCloudWatch),
     // - Prometheus(pb::metrics_provider::PrometheusRemoteWrite),
     // - Datadog(pb::metrics_provider::Datadog),
 }
@@ -26,6 +26,7 @@ impl ProviderType {
             Some(pb::metrics_provider::Provider::EncoreCloud(config)) => {
                 Some(Self::EncoreCloud(config.clone()))
             }
+            Some(pb::metrics_provider::Provider::Aws(config)) => Some(Self::Aws(config.clone())),
             _ => {
                 log::warn!("unsupported metrics provider: {:?}", provider.provider);
                 None
@@ -42,9 +43,22 @@ impl ProviderType {
             Self::Gcp(config) | Self::EncoreCloud(config) => {
                 Self::create_gcp_exporter(config, env, http_client)
             }
+            Self::Aws(config) => Self::create_aws_exporter(config, env, http_client),
         }
     }
 
+    fn create_aws_exporter(
+        provider_cfg: &pb::metrics_provider::AwsCloudWatch,
+        env: &Environment,
+        http_client: &reqwest::Client,
+    ) -> Arc<dyn Exporter + Send + Sync> {
+        let container_meta_client = ContainerMetaClient::new(env.clone(), http_client.clone());
+        Arc::new(exporter::Aws::new(
+            provider_cfg.namespace.clone(),
+            container_meta_client,
+        ))
+    }
+
     fn create_gcp_exporter(
         provider_cfg: &pb::metrics_provider::GcpCloudMonitoring,
         env: &Environment,
diff --git a/runtimes/core/src/objects/s3/mod.rs b/runtimes/core/src/objects/s3/mod.rs
index c31dc3bbdd..6058761a8d 100644
--- a/runtimes/core/src/objects/s3/mod.rs
+++ b/runtimes/core/src/objects/s3/mod.rs
@@ -52,7 +52,7 @@ impl LazyS3Client {
             .get_or_init(|| async {
                 let region = aws_config::Region::new(self.cfg.region.clone());
                 let mut builder =
-                    aws_config::defaults(aws_config::BehaviorVersion::v2024_03_28()).region(region);
+                    aws_config::defaults(aws_config::BehaviorVersion::v2025_08_07()).region(region);
                 if let Some(endpoint) = self.cfg.endpoint.as_ref() {
                     builder = builder.endpoint_url(endpoint.clone());
                 }

From c606101a0b192538ac6487598c0356972c4dda11 Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Tue, 21 Oct 2025 15:14:08 +0200
Subject: [PATCH 12/17] runtime/core: export to datadog

---
 Cargo.lock                                    | 196 +++++++++++++--
 runtimes/core/Cargo.toml                      |   1 +
 runtimes/core/src/lib.rs                      |   1 +
 runtimes/core/src/metrics/exporter/aws.rs     |   4 +-
 runtimes/core/src/metrics/exporter/datadog.rs | 228 ++++++++++++++++++
 runtimes/core/src/metrics/exporter/mod.rs     |   2 +
 runtimes/core/src/metrics/manager.rs          |  42 +++-
 7 files changed, 450 insertions(+), 24 deletions(-)
 create mode 100644 runtimes/core/src/metrics/exporter/datadog.rs

diff --git a/Cargo.lock b/Cargo.lock
index adef2c5bf3..e41083afe7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1004,7 +1004,7 @@ checksum = "d89aabfae550a5c44b43ab941844ffcd2e993cb6900b342debf59e9ea74acdb8"
 dependencies = [
  "async-trait",
  "futures-util",
- "parking_lot",
+ "parking_lot 0.12.3",
  "tokio",
 ]
 
@@ -1654,7 +1654,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core",
+ "parking_lot_core 0.9.10",
 ]
 
 [[package]]
@@ -1668,7 +1668,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core",
+ "parking_lot_core 0.9.10",
 ]
 
 [[package]]
@@ -1677,6 +1677,31 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
+[[package]]
+name = "datadog-api-client"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2c9e94efe831111077425078ad734568df3360461f5822de89c73ced862a046"
+dependencies = [
+ "async-stream",
+ "chrono",
+ "flate2",
+ "form-data-builder",
+ "futures-core",
+ "lazy_static",
+ "log",
+ "reqwest 0.11.27",
+ "reqwest-middleware 0.2.5",
+ "reqwest-retry",
+ "rustc_version",
+ "serde",
+ "serde_json",
+ "serde_with",
+ "url",
+ "uuid",
+ "zstd",
+]
+
 [[package]]
 name = "der"
 version = "0.6.1"
@@ -1892,6 +1917,7 @@ dependencies = [
  "colored",
  "cookie",
  "dashmap 6.1.0",
+ "datadog-api-client",
  "duct",
  "email_address",
  "env_logger 0.10.2",
@@ -2204,6 +2230,16 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
+[[package]]
+name = "form-data-builder"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ff8fb4527b05539a9f573ba2831a1127038a7b45eea385a338a63dc5ab6829"
+dependencies = [
+ "base64 0.13.1",
+ "rand 0.8.5",
+]
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -2680,7 +2716,7 @@ dependencies = [
  "pkcs8 0.10.2",
  "regex",
  "reqwest 0.12.23",
- "reqwest-middleware",
+ "reqwest-middleware 0.3.3",
  "ring 0.17.8",
  "serde",
  "serde_json",
@@ -3355,6 +3391,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
@@ -4135,6 +4174,17 @@ dependencies = [
  "sha2",
 ]
 
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -4142,7 +4192,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.9.10",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
 ]
 
 [[package]]
@@ -4153,7 +4217,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.5.8",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -4441,7 +4505,7 @@ dependencies = [
  "log",
  "lru",
  "once_cell",
- "parking_lot",
+ "parking_lot 0.12.3",
  "pingora-core",
  "pingora-error",
  "pingora-header-serde",
@@ -4483,7 +4547,7 @@ dependencies = [
  "nix",
  "once_cell",
  "openssl-probe",
- "parking_lot",
+ "parking_lot 0.12.3",
  "percent-encoding",
  "pingora-error",
  "pingora-http",
@@ -4580,7 +4644,7 @@ checksum = "cb50f65f06c4b81ccb3edcceaa54bb9439608506b0b3b8c048798169a64aad8e"
 dependencies = [
  "arrayvec",
  "hashbrown 0.15.2",
- "parking_lot",
+ "parking_lot 0.12.3",
  "rand 0.9.2",
 ]
 
@@ -4607,7 +4671,7 @@ dependencies = [
  "crossbeam-queue",
  "log",
  "lru",
- "parking_lot",
+ "parking_lot 0.12.3",
  "pingora-timeout",
  "thread_local",
  "tokio",
@@ -4655,7 +4719,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "685bb8808cc1919c63a06ab14fdac9b84a4887ced49259a5c0adc8bfb2ffe558"
 dependencies = [
  "once_cell",
- "parking_lot",
+ "parking_lot 0.12.3",
  "pin-project-lite",
  "thread_local",
  "tokio",
@@ -4884,7 +4948,7 @@ dependencies = [
  "fnv",
  "lazy_static",
  "memchr",
- "parking_lot",
+ "parking_lot 0.12.3",
  "protobuf",
  "thiserror 1.0.69",
 ]
@@ -5259,6 +5323,15 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.8"
@@ -5347,6 +5420,7 @@ dependencies = [
  "js-sys",
  "log",
  "mime",
+ "mime_guess",
  "native-tls",
  "once_cell",
  "percent-encoding",
@@ -5416,6 +5490,21 @@ dependencies = [
  "webpki-roots 1.0.2",
 ]
 
+[[package]]
+name = "reqwest-middleware"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "http 0.2.12",
+ "reqwest 0.11.27",
+ "serde",
+ "task-local-extensions",
+ "thiserror 1.0.69",
+]
+
 [[package]]
 name = "reqwest-middleware"
 version = "0.3.3"
@@ -5431,6 +5520,40 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "reqwest-retry"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9af20b65c2ee9746cc575acb6bd28a05ffc0d15e25c992a8f4462d8686aacb4f"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "chrono",
+ "futures",
+ "getrandom 0.2.15",
+ "http 0.2.12",
+ "hyper 0.14.32",
+ "parking_lot 0.11.2",
+ "reqwest 0.11.27",
+ "reqwest-middleware 0.2.5",
+ "retry-policies",
+ "task-local-extensions",
+ "tokio",
+ "tracing",
+ "wasm-timer",
+]
+
+[[package]]
+name = "retry-policies"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "rand 0.8.5",
+]
+
 [[package]]
 name = "rfc6979"
 version = "0.3.1"
@@ -6269,7 +6392,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
 dependencies = [
  "new_debug_unreachable",
  "once_cell",
- "parking_lot",
+ "parking_lot 0.12.3",
  "phf_shared 0.10.0",
  "precomputed-hash",
  "serde",
@@ -6741,6 +6864,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "task-local-extensions"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8"
+dependencies = [
+ "pin-utils",
+]
+
 [[package]]
 name = "tempdir"
 version = "0.3.7"
@@ -6912,7 +7044,7 @@ dependencies = [
  "bytes",
  "libc",
  "mio",
- "parking_lot",
+ "parking_lot 0.12.3",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2 0.5.8",
@@ -7004,7 +7136,7 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "log",
- "parking_lot",
+ "parking_lot 0.12.3",
  "percent-encoding",
  "phf 0.11.3",
  "pin-project-lite",
@@ -7596,6 +7728,23 @@ name = "uuid"
 version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
+dependencies = [
+ "getrandom 0.2.15",
+ "rand 0.8.5",
+ "serde",
+ "uuid-macro-internal",
+]
+
+[[package]]
+name = "uuid-macro-internal"
+version = "1.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9384a660318abfbd7f8932c34d67e4d1ec511095f95972ddc01e19d7ba8413f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+]
 
 [[package]]
 name = "valuable"
@@ -7797,6 +7946,21 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "wasm-timer"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
+dependencies = [
+ "futures",
+ "js-sys",
+ "parking_lot 0.11.2",
+ "pin-utils",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.81"
@@ -7869,7 +8033,7 @@ version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
- "redox_syscall",
+ "redox_syscall 0.5.8",
  "wasite",
  "web-sys",
 ]
diff --git a/runtimes/core/Cargo.toml b/runtimes/core/Cargo.toml
index 4d6ae7a6b4..ac59171198 100644
--- a/runtimes/core/Cargo.toml
+++ b/runtimes/core/Cargo.toml
@@ -131,6 +131,7 @@ google-cloud-api = "1.0.0"
 google-cloud-wkt = "1.0.0"
 sysinfo = "0.37.2"
 aws-sdk-cloudwatch = "1.94.0"
+datadog-api-client = "0.20.0"
 
 [build-dependencies]
 prost-build = "0.12.3"
diff --git a/runtimes/core/src/lib.rs b/runtimes/core/src/lib.rs
index eb0b40af44..7fb2a3049a 100644
--- a/runtimes/core/src/lib.rs
+++ b/runtimes/core/src/lib.rs
@@ -258,6 +258,7 @@ impl Runtime {
         let metrics_manager = metrics::Manager::from_runtime_config(
             &observability,
             &environment,
+            &secrets,
             &http_client,
             tokio_rt.handle().clone(),
         );
diff --git a/runtimes/core/src/metrics/exporter/aws.rs b/runtimes/core/src/metrics/exporter/aws.rs
index ef7d487eeb..c805d4cdc1 100644
--- a/runtimes/core/src/metrics/exporter/aws.rs
+++ b/runtimes/core/src/metrics/exporter/aws.rs
@@ -1,4 +1,4 @@
-use crate::metadata::{ContainerMetaClient, ContainerMetadata};
+use crate::metadata::ContainerMetaClient;
 use crate::metrics::exporter::Exporter;
 use crate::metrics::{CollectedMetric, MetricValue};
 use anyhow::Context;
@@ -48,7 +48,7 @@ impl Aws {
         }
     }
 
-    async fn export_metrics(&self, metrics: Vec<CollectedMetric>) -> Result<(), anyhow::Error> {
+    async fn export_metrics(&self, metrics: Vec<CollectedMetric>) -> anyhow::Result<()> {
         if metrics.is_empty() {
             return Ok(());
         }
diff --git a/runtimes/core/src/metrics/exporter/datadog.rs b/runtimes/core/src/metrics/exporter/datadog.rs
new file mode 100644
index 0000000000..3588b8afe5
--- /dev/null
+++ b/runtimes/core/src/metrics/exporter/datadog.rs
@@ -0,0 +1,228 @@
+use crate::{
+    encore::runtime::v1 as pb,
+    metadata::ContainerMetaClient,
+    metrics::{exporter::Exporter, CollectedMetric, MetricValue},
+    secrets,
+};
+use anyhow::Context;
+use dashmap::DashMap;
+use datadog_api_client::datadog;
+use datadog_api_client::datadogV2::api_metrics::{MetricsAPI, SubmitMetricsOptionalParams};
+use datadog_api_client::datadogV2::model::{
+    MetricIntakeType, MetricPayload, MetricPoint, MetricSeries,
+};
+use std::sync::{Arc, Mutex};
+use std::time::SystemTime;
+
+pub struct Datadog {
+    client: Arc<LazyDatadogClient>,
+    container_meta_client: ContainerMetaClient,
+    last_export: Arc<Mutex<i64>>,
+    last_value: Arc<DashMap<u64, f64>>,
+}
+
+#[derive(Clone)]
+struct DatadogClient {
+    config: datadog::Configuration,
+}
+
+impl DatadogClient {
+    async fn send_metrics(&self, metric_series: Vec<MetricSeries>) -> Result<(), anyhow::Error> {
+        let api = MetricsAPI::with_config(self.config.clone());
+        let payload = MetricPayload::new(metric_series);
+
+        api.submit_metrics(payload, SubmitMetricsOptionalParams::default())
+            .await
+            .context("submit metrics to Datadog")?;
+
+        Ok(())
+    }
+}
+
+struct LazyDatadogClient {
+    cell: tokio::sync::OnceCell<anyhow::Result<DatadogClient>>,
+    site: String,
+    api_key: String,
+}
+
+impl LazyDatadogClient {
+    fn new(site: String, api_key: String) -> Self {
+        Self {
+            cell: tokio::sync::OnceCell::new(),
+            site,
+            api_key,
+        }
+    }
+
+    async fn get(&self) -> &anyhow::Result<DatadogClient> {
+        self.cell
+            .get_or_init(|| async {
+                // Create Datadog API client configuration
+                let mut configuration = datadog::Configuration::new();
+                configuration
+                    .server_variables
+                    .insert("site".to_string(), self.site.clone());
+                configuration.set_auth_key(
+                    "apiKeyAuth",
+                    datadog::APIKey {
+                        key: self.api_key.clone(),
+                        prefix: String::new(),
+                    },
+                );
+
+                Ok(DatadogClient {
+                    config: configuration,
+                })
+            })
+            .await
+    }
+}
+
+impl Datadog {
+    pub fn new(
+        provider_cfg: &pb::metrics_provider::Datadog,
+        secrets: &secrets::Manager,
+        container_meta_client: ContainerMetaClient,
+    ) -> anyhow::Result<Self> {
+        let api_key = match &provider_cfg.api_key {
+            Some(data) => {
+                let secret = secrets.load(data.clone());
+                let api_key_bytes = secret.get().context("failed to resolve Datadog API key")?;
+                std::str::from_utf8(api_key_bytes)
+                    .context("Datadog API key is not valid UTF-8")?
+                    .to_string()
+            }
+            None => {
+                return Err(anyhow::anyhow!("Datadog API key not provided"));
+            }
+        };
+
+        Ok(Self {
+            client: Arc::new(LazyDatadogClient::new(provider_cfg.site.clone(), api_key)),
+            container_meta_client,
+            last_export: Arc::new(Mutex::new(
+                SystemTime::now()
+                    .duration_since(SystemTime::UNIX_EPOCH)
+                    .expect("system time before Unix epoch")
+                    .as_secs() as i64,
+            )),
+            last_value: Arc::new(DashMap::new()),
+        })
+    }
+
+    async fn export_metrics(&self, metrics: Vec<CollectedMetric>) -> anyhow::Result<()> {
+        if metrics.is_empty() {
+            return Ok(());
+        }
+
+        let client = match self.client.get().await {
+            Ok(client) => client,
+            Err(e) => {
+                log::error!("failed to get Datadog client: {}", e);
+                return Err(anyhow::anyhow!("failed to get Datadog client: {}", e));
+            }
+        };
+
+        log::trace!(
+            "Exporting {} metrics to Datadog site {}",
+            metrics.len(),
+            self.client.site
+        );
+
+        let now = SystemTime::now()
+            .duration_since(SystemTime::UNIX_EPOCH)
+            .expect("system time before Unix epoch")
+            .as_secs() as i64;
+
+        let metric_series = self.get_metric_data(metrics, now).await;
+
+        if !metric_series.is_empty() {
+            client.send_metrics(metric_series).await?;
+        }
+
+        // Update last export time
+        if let Ok(mut last_export) = self.last_export.lock() {
+            *last_export = now;
+        }
+
+        Ok(())
+    }
+
+    async fn get_metric_data(
+        &self,
+        collected: Vec<CollectedMetric>,
+        now: i64,
+    ) -> Vec<MetricSeries> {
+        let mut data: Vec<MetricSeries> = Vec::with_capacity(collected.len());
+
+        // Convert container metadata to Datadog tags (key:value format)
+        let container_metadata_tags: Vec<String> = self
+            .container_meta_client
+            .collect()
+            .await
+            .labels()
+            .into_iter()
+            .map(|(key, value)| format!("{}:{}", key, value))
+            .collect();
+
+        let container_tags_len = container_metadata_tags.len();
+
+        let last_export = self.last_export.lock().ok().map(|t| *t).unwrap_or(now);
+        let interval = now - last_export;
+
+        for metric in collected {
+            let metric_name = metric.key.name().to_string();
+
+            // Build tags: container metadata + metric labels
+            let mut tags: Vec<String> =
+                Vec::with_capacity(container_tags_len + metric.key.labels().count());
+            tags.extend(container_metadata_tags.clone());
+
+            for label in metric.key.labels() {
+                tags.push(format!("{}:{}", label.key(), label.value()));
+            }
+
+            let (metric_type, value) = match metric.value {
+                MetricValue::CounterU64(val) => {
+                    let value = val as f64;
+                    let key = metric.key.get_hash();
+                    let last_val = self.last_value.get(&key).map(|v| *v).unwrap_or(0.0);
+                    self.last_value.insert(key, value);
+                    let delta = value - last_val;
+                    (MetricIntakeType::COUNT, delta)
+                }
+                MetricValue::CounterI64(val) => {
+                    let value = val as f64;
+                    let key = metric.key.get_hash();
+                    let last_val = self.last_value.get(&key).map(|v| *v).unwrap_or(0.0);
+                    self.last_value.insert(key, value);
+                    let delta = value - last_val;
+                    (MetricIntakeType::COUNT, delta)
+                }
+                MetricValue::GaugeF64(val) => (MetricIntakeType::GAUGE, val),
+                MetricValue::GaugeU64(val) => (MetricIntakeType::GAUGE, val as f64),
+                MetricValue::GaugeI64(val) => (MetricIntakeType::GAUGE, val as f64),
+            };
+
+            let point = MetricPoint::new().timestamp(now).value(value);
+
+            let series = MetricSeries::new(metric_name, vec![point])
+                .type_(metric_type)
+                .interval(interval)
+                .tags(tags);
+
+            data.push(series);
+        }
+
+        data
+    }
+}
+
+#[async_trait::async_trait]
+impl Exporter for Datadog {
+    async fn export(&self, metrics: Vec<CollectedMetric>) {
+        if let Err(err) = self.export_metrics(metrics).await {
+            log::error!("Failed to export metrics to Datadog: {}", err);
+        }
+    }
+}
diff --git a/runtimes/core/src/metrics/exporter/mod.rs b/runtimes/core/src/metrics/exporter/mod.rs
index a72aa12fb2..b54d5b54b1 100644
--- a/runtimes/core/src/metrics/exporter/mod.rs
+++ b/runtimes/core/src/metrics/exporter/mod.rs
@@ -1,6 +1,8 @@
 mod aws;
+mod datadog;
 mod gcp;
 pub use aws::Aws;
+pub use datadog::Datadog;
 pub use gcp::Gcp;
 
 #[async_trait::async_trait]
diff --git a/runtimes/core/src/metrics/manager.rs b/runtimes/core/src/metrics/manager.rs
index e0a680f957..a3950ec623 100644
--- a/runtimes/core/src/metrics/manager.rs
+++ b/runtimes/core/src/metrics/manager.rs
@@ -5,6 +5,7 @@ use crate::{
         exporter::{self, Exporter},
         registry::Registry,
     },
+    secrets,
 };
 use std::sync::Arc;
 use std::time::Duration;
@@ -14,9 +15,9 @@ enum ProviderType {
     Gcp(pb::metrics_provider::GcpCloudMonitoring),
     EncoreCloud(pb::metrics_provider::GcpCloudMonitoring),
     Aws(pb::metrics_provider::AwsCloudWatch),
+    Datadog(pb::metrics_provider::Datadog),
     // TODO(fredr) add these:
     // - Prometheus(pb::metrics_provider::PrometheusRemoteWrite),
-    // - Datadog(pb::metrics_provider::Datadog),
 }
 
 impl ProviderType {
@@ -27,6 +28,9 @@ impl ProviderType {
                 Some(Self::EncoreCloud(config.clone()))
             }
             Some(pb::metrics_provider::Provider::Aws(config)) => Some(Self::Aws(config.clone())),
+            Some(pb::metrics_provider::Provider::Datadog(config)) => {
+                Some(Self::Datadog(config.clone()))
+            }
             _ => {
                 log::warn!("unsupported metrics provider: {:?}", provider.provider);
                 None
@@ -37,16 +41,34 @@ impl ProviderType {
     fn create_exporter(
         &self,
         env: &Environment,
+        secrets: &secrets::Manager,
         http_client: &reqwest::Client,
-    ) -> Arc<dyn Exporter + Send + Sync> {
+    ) -> anyhow::Result<Arc<dyn Exporter + Send + Sync>> {
         match self {
             Self::Gcp(config) | Self::EncoreCloud(config) => {
-                Self::create_gcp_exporter(config, env, http_client)
+                Ok(Self::create_gcp_exporter(config, env, http_client))
+            }
+            Self::Aws(config) => Ok(Self::create_aws_exporter(config, env, http_client)),
+            Self::Datadog(config) => {
+                Self::create_datadog_exporter(config, secrets, env, http_client)
             }
-            Self::Aws(config) => Self::create_aws_exporter(config, env, http_client),
         }
     }
 
+    fn create_datadog_exporter(
+        provider_cfg: &pb::metrics_provider::Datadog,
+        secrets: &secrets::Manager,
+        env: &Environment,
+        http_client: &reqwest::Client,
+    ) -> anyhow::Result<Arc<dyn Exporter + Send + Sync>> {
+        let container_meta_client = ContainerMetaClient::new(env.clone(), http_client.clone());
+        Ok(Arc::new(exporter::Datadog::new(
+            provider_cfg,
+            secrets,
+            container_meta_client,
+        )?))
+    }
+
     fn create_aws_exporter(
         provider_cfg: &pb::metrics_provider::AwsCloudWatch,
         env: &Environment,
@@ -102,6 +124,7 @@ impl Manager {
     pub fn from_runtime_config(
         observability: &pb::Observability,
         environment: &pb::Environment,
+        secrets: &secrets::Manager,
         http_client: &reqwest::Client,
         runtime_handle: tokio::runtime::Handle,
     ) -> Self {
@@ -109,8 +132,15 @@ impl Manager {
 
         for metrics_provider in &observability.metrics {
             if let Some(provider_type) = ProviderType::from_config(metrics_provider) {
-                manager.exporter = Some(provider_type.create_exporter(environment, http_client));
-                break; // Take the first valid provider
+                match provider_type.create_exporter(environment, secrets, http_client) {
+                    Ok(exporter) => {
+                        manager.exporter = Some(exporter);
+                        break; // Take the first valid provider
+                    }
+                    Err(err) => {
+                        log::error!("Failed to create metrics exporter: {}", err);
+                    }
+                }
             }
         }
 

From 0b685a04f05019e455db863bed71eab0e408b64d Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Wed, 22 Oct 2025 12:07:42 +0200
Subject: [PATCH 13/17] runtime/core: export to prometheus

---
 Cargo.lock                                    |   1 +
 proto/prometheus/remote.proto                 |  93 ++++++++
 proto/prometheus/types.proto                  | 184 +++++++++++++++
 runtimes/core/Cargo.toml                      |   1 +
 runtimes/core/build.rs                        |   1 +
 runtimes/core/src/metrics/exporter/aws.rs     |  43 +++-
 runtimes/core/src/metrics/exporter/datadog.rs |  45 +++-
 runtimes/core/src/metrics/exporter/mod.rs     |   2 +
 .../core/src/metrics/exporter/prometheus.rs   | 214 ++++++++++++++++++
 runtimes/core/src/metrics/manager.rs          |  27 ++-
 10 files changed, 585 insertions(+), 26 deletions(-)
 create mode 100644 proto/prometheus/remote.proto
 create mode 100644 proto/prometheus/types.proto
 create mode 100644 runtimes/core/src/metrics/exporter/prometheus.rs

diff --git a/Cargo.lock b/Cargo.lock
index e41083afe7..dcc1dff075 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1975,6 +1975,7 @@ dependencies = [
  "serde_with",
  "sha2",
  "sha3",
+ "snap",
  "subtle",
  "sysinfo",
  "thiserror 1.0.69",
diff --git a/proto/prometheus/remote.proto b/proto/prometheus/remote.proto
new file mode 100644
index 0000000000..6b7ad8a18e
--- /dev/null
+++ b/proto/prometheus/remote.proto
@@ -0,0 +1,93 @@
+// Copyright 2016 Prometheus Team
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+package prometheus;
+
+option go_package = "encore.dev/appruntime/metrics/prometheus/prompb";
+
+import "prometheus/types.proto";
+
+message WriteRequest {
+  repeated prometheus.TimeSeries timeseries = 1;
+  // Cortex uses this field to determine the source of the write request.
+  // We reserve it to avoid any compatibility issues.
+  reserved 2;
+  repeated prometheus.MetricMetadata metadata = 3;
+}
+
+// ReadRequest represents a remote read request.
+message ReadRequest {
+  repeated Query queries = 1;
+
+  enum ResponseType {
+    // Server will return a single ReadResponse message with matched series that
+    // includes list of raw samples. It's recommended to use streamed response
+    // types instead.
+    //
+    // Response headers:
+    // Content-Type: "application/x-protobuf"
+    // Content-Encoding: "snappy"
+    SAMPLES = 0;
+    // Server will stream a delimited ChunkedReadResponse message that
+    // contains XOR or HISTOGRAM(!) encoded chunks for a single series.
+    // Each message is following varint size and fixed size bigendian
+    // uint32 for CRC32 Castagnoli checksum.
+    //
+    // Response headers:
+    // Content-Type: "application/x-streamed-protobuf;
+    // proto=prometheus.ChunkedReadResponse" Content-Encoding: ""
+    STREAMED_XOR_CHUNKS = 1;
+  }
+
+  // accepted_response_types allows negotiating the content type of the
+  // response.
+  //
+  // Response types are taken from the list in the FIFO order. If no response
+  // type in `accepted_response_types` is implemented by server, error is
+  // returned. For request that do not contain `accepted_response_types` field
+  // the SAMPLES response type will be used.
+  repeated ResponseType accepted_response_types = 2;
+}
+
+// ReadResponse is a response when response_type equals SAMPLES.
+message ReadResponse {
+  // In same order as the request's queries.
+  repeated QueryResult results = 1;
+}
+
+message Query {
+  int64 start_timestamp_ms = 1;
+  int64 end_timestamp_ms = 2;
+  repeated prometheus.LabelMatcher matchers = 3;
+  prometheus.ReadHints hints = 4;
+}
+
+message QueryResult {
+  // Samples within a time series must be ordered by time.
+  repeated prometheus.TimeSeries timeseries = 1;
+}
+
+// ChunkedReadResponse is a response when response_type equals
+// STREAMED_XOR_CHUNKS. We strictly stream full series after series, optionally
+// split by time. This means that a single frame can contain partition of the
+// single series, but once a new series is started to be streamed it means that
+// no more chunks will be sent for previous one. Series are returned sorted in
+// the same way TSDB block are internally.
+message ChunkedReadResponse {
+  repeated prometheus.ChunkedSeries chunked_series = 1;
+
+  // query_index represents an index of the query from ReadRequest.queries these
+  // chunks relates to.
+  int64 query_index = 2;
+}
diff --git a/proto/prometheus/types.proto b/proto/prometheus/types.proto
new file mode 100644
index 0000000000..e85f0f9449
--- /dev/null
+++ b/proto/prometheus/types.proto
@@ -0,0 +1,184 @@
+// Copyright 2017 Prometheus Team
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+package prometheus;
+
+option go_package = "encore.dev/appruntime/metrics/prometheus/prompb";
+
+message MetricMetadata {
+  enum MetricType {
+    UNKNOWN        = 0;
+    COUNTER        = 1;
+    GAUGE          = 2;
+    HISTOGRAM      = 3;
+    GAUGEHISTOGRAM = 4;
+    SUMMARY        = 5;
+    INFO           = 6;
+    STATESET       = 7;
+  }
+
+  // Represents the metric type, these match the set from Prometheus.
+  // Refer to model/textparse/interface.go for details.
+  MetricType type = 1;
+  string metric_family_name = 2;
+  string help = 4;
+  string unit = 5;
+}
+
+message Sample {
+  double value    = 1;
+  // timestamp is in ms format, see model/timestamp/timestamp.go for
+  // conversion from time.Time to Prometheus timestamp.
+  int64 timestamp = 2;
+}
+
+message Exemplar {
+  // Optional, can be empty.
+  repeated Label labels = 1;
+  double value = 2;
+  // timestamp is in ms format, see model/timestamp/timestamp.go for
+  // conversion from time.Time to Prometheus timestamp.
+  int64 timestamp = 3;
+}
+
+// A native histogram, also known as a sparse histogram.
+// Original design doc:
+// https://docs.google.com/document/d/1cLNv3aufPZb3fNfaJgdaRBZsInZKKIHo9E6HinJVbpM/edit
+// The appendix of this design doc also explains the concept of float
+// histograms. This Histogram message can represent both, the usual
+// integer histogram as well as a float histogram.
+message Histogram {
+  enum ResetHint {
+    UNKNOWN = 0; // Need to test for a counter reset explicitly.
+    YES     = 1; // This is the 1st histogram after a counter reset.
+    NO      = 2; // There was no counter reset between this and the previous Histogram.
+    GAUGE   = 3; // This is a gauge histogram where counter resets don't happen.
+  }
+
+  oneof count { // Count of observations in the histogram.
+    uint64 count_int   = 1;
+    double count_float = 2;
+  }
+  double sum = 3; // Sum of observations in the histogram.
+  // The schema defines the bucket schema. Currently, valid numbers
+  // are -4 <= n <= 8. They are all for base-2 bucket schemas, where 1
+  // is a bucket boundary in each case, and then each power of two is
+  // divided into 2^n logarithmic buckets. Or in other words, each
+  // bucket boundary is the previous boundary times 2^(2^-n). In the
+  // future, more bucket schemas may be added using numbers < -4 or >
+  // 8.
+  sint32 schema             = 4;
+  double zero_threshold     = 5; // Breadth of the zero bucket.
+  oneof zero_count { // Count in zero bucket.
+    uint64 zero_count_int     = 6;
+    double zero_count_float   = 7;
+  }
+  
+  // Negative Buckets.
+  repeated BucketSpan negative_spans =  8;
+  // Use either "negative_deltas" or "negative_counts", the former for
+  // regular histograms with integer counts, the latter for float
+  // histograms.
+  repeated sint64 negative_deltas    =  9; // Count delta of each bucket compared to previous one (or to zero for 1st bucket).
+  repeated double negative_counts    = 10; // Absolute count of each bucket.
+
+  // Positive Buckets.
+  repeated BucketSpan positive_spans = 11;
+  // Use either "positive_deltas" or "positive_counts", the former for
+  // regular histograms with integer counts, the latter for float
+  // histograms.
+  repeated sint64 positive_deltas    = 12; // Count delta of each bucket compared to previous one (or to zero for 1st bucket).
+  repeated double positive_counts    = 13; // Absolute count of each bucket.
+
+  ResetHint reset_hint               = 14;
+  // timestamp is in ms format, see model/timestamp/timestamp.go for
+  // conversion from time.Time to Prometheus timestamp.
+  int64 timestamp = 15;
+} 
+
+// A BucketSpan defines a number of consecutive buckets with their
+// offset. Logically, it would be more straightforward to include the
+// bucket counts in the Span. However, the protobuf representation is
+// more compact in the way the data is structured here (with all the
+// buckets in a single array separate from the Spans).
+message BucketSpan {
+  sint32 offset = 1; // Gap to previous span, or starting point for 1st span (which can be negative).
+  uint32 length = 2; // Length of consecutive buckets.
+}
+
+// TimeSeries represents samples and labels for a single time series.
+message TimeSeries {
+  // For a timeseries to be valid, and for the samples and exemplars
+  // to be ingested by the remote system properly, the labels field is required.
+  repeated Label labels         = 1;
+  repeated Sample samples       = 2;
+  repeated Exemplar exemplars   = 3;
+  repeated Histogram histograms = 4;
+}
+
+message Label {
+  string name  = 1;
+  string value = 2;
+}
+
+message Labels {
+  repeated Label labels = 1;
+}
+
+// Matcher specifies a rule, which can match or set of labels or not.
+message LabelMatcher {
+  enum Type {
+    EQ  = 0;
+    NEQ = 1;
+    RE  = 2;
+    NRE = 3;
+  }
+  Type type    = 1;
+  string name  = 2;
+  string value = 3;
+}
+
+message ReadHints {
+  int64 step_ms = 1;  // Query step size in milliseconds.
+  string func = 2;    // String representation of surrounding function or aggregation.
+  int64 start_ms = 3; // Start time in milliseconds.
+  int64 end_ms = 4;   // End time in milliseconds.
+  repeated string grouping = 5; // List of label names used in aggregation.
+  bool by = 6; // Indicate whether it is without or by.
+  int64 range_ms = 7; // Range vector selector range in milliseconds.
+}
+
+// Chunk represents a TSDB chunk.
+// Time range [min, max] is inclusive.
+message Chunk {
+  int64 min_time_ms = 1;
+  int64 max_time_ms = 2;
+
+  // We require this to match chunkenc.Encoding.
+  enum Encoding {
+    UNKNOWN   = 0;
+    XOR       = 1;
+    HISTOGRAM = 2;
+  }
+  Encoding type  = 3;
+  bytes data     = 4;
+}
+
+// ChunkedSeries represents single, encoded time series.
+message ChunkedSeries {
+  // Labels should be sorted.
+  repeated Label labels = 1;
+  // Chunks will be in start time order and may overlap.
+  repeated Chunk chunks = 2;
+}
diff --git a/runtimes/core/Cargo.toml b/runtimes/core/Cargo.toml
index ac59171198..650544cfb9 100644
--- a/runtimes/core/Cargo.toml
+++ b/runtimes/core/Cargo.toml
@@ -132,6 +132,7 @@ google-cloud-wkt = "1.0.0"
 sysinfo = "0.37.2"
 aws-sdk-cloudwatch = "1.94.0"
 datadog-api-client = "0.20.0"
+snap = "1.1.1"
 
 [build-dependencies]
 prost-build = "0.12.3"
diff --git a/runtimes/core/build.rs b/runtimes/core/build.rs
index 94627339df..c261a5cb3a 100644
--- a/runtimes/core/build.rs
+++ b/runtimes/core/build.rs
@@ -5,6 +5,7 @@ fn main() -> std::io::Result<()> {
         &[
             "../../proto/encore/runtime/v1/runtime.proto",
             "../../proto/encore/parser/meta/v1/meta.proto",
+            "../../proto/prometheus/remote.proto",
         ],
         &["../../proto/"],
     )?;
diff --git a/runtimes/core/src/metrics/exporter/aws.rs b/runtimes/core/src/metrics/exporter/aws.rs
index c805d4cdc1..13b544c619 100644
--- a/runtimes/core/src/metrics/exporter/aws.rs
+++ b/runtimes/core/src/metrics/exporter/aws.rs
@@ -12,6 +12,7 @@ pub struct Aws {
     client: Arc<LazyCloudWatchClient>,
     namespace: String,
     container_meta_client: ContainerMetaClient,
+    container_dims: tokio::sync::OnceCell<Arc<Vec<Dimension>>>,
 }
 
 #[derive(Debug)]
@@ -45,6 +46,7 @@ impl Aws {
             client: Arc::new(LazyCloudWatchClient::new()),
             namespace,
             container_meta_client,
+            container_dims: tokio::sync::OnceCell::new(),
         }
     }
 
@@ -79,19 +81,39 @@ impl Aws {
         Ok(())
     }
 
+    async fn container_dimensions(&self) -> Arc<Vec<Dimension>> {
+        self.container_dims
+            .get_or_try_init(|| async {
+                let container_metadata = self.container_meta_client.collect().await?;
+                anyhow::Ok(Arc::new(
+                    container_metadata
+                        .labels()
+                        .into_iter()
+                        .map(|(key, value)| Dimension::builder().name(key).value(value).build())
+                        .collect(),
+                ))
+            })
+            .await
+            .map(Arc::clone)
+            .unwrap_or_else(|e| {
+                log::warn!("failed fetching container metadata: {e}, using fallback");
+                Arc::new(
+                    self.container_meta_client
+                        .fallback()
+                        .labels()
+                        .into_iter()
+                        .map(|(key, value)| Dimension::builder().name(key).value(value).build())
+                        .collect(),
+                )
+            })
+    }
+
     async fn get_metric_data(&self, collected: Vec<CollectedMetric>) -> Vec<MetricDatum> {
         let now = SystemTime::now();
         let mut data: Vec<MetricDatum> = Vec::with_capacity(collected.len());
 
-        let container_metadata_dims: Vec<Dimension> = self
-            .container_meta_client
-            .collect()
-            .await
-            .labels()
-            .into_iter()
-            .map(|(key, value)| Dimension::builder().name(key).value(value).build())
-            .collect();
-        let container_dims_len = container_metadata_dims.len();
+        let container_dims = self.container_dimensions().await;
+        let container_dims_len = container_dims.len();
 
         for metric in collected {
             let metric_name = metric.key.name().to_string();
@@ -99,7 +121,8 @@ impl Aws {
             let mut dimensions: Vec<Dimension> =
                 Vec::with_capacity(container_dims_len + metric.key.labels().count());
 
-            dimensions.extend(container_metadata_dims.clone());
+            // Add container metadata dimensions
+            dimensions.extend(container_dims.iter().cloned());
 
             for label in metric.key.labels() {
                 let value = label.value();
diff --git a/runtimes/core/src/metrics/exporter/datadog.rs b/runtimes/core/src/metrics/exporter/datadog.rs
index 3588b8afe5..9a8d6eafba 100644
--- a/runtimes/core/src/metrics/exporter/datadog.rs
+++ b/runtimes/core/src/metrics/exporter/datadog.rs
@@ -19,6 +19,7 @@ pub struct Datadog {
     container_meta_client: ContainerMetaClient,
     last_export: Arc<Mutex<i64>>,
     last_value: Arc<DashMap<u64, f64>>,
+    container_tags: tokio::sync::OnceCell<Arc<Vec<String>>>,
 }
 
 #[derive(Clone)]
@@ -107,6 +108,7 @@ impl Datadog {
                     .as_secs() as i64,
             )),
             last_value: Arc::new(DashMap::new()),
+            container_tags: tokio::sync::OnceCell::new(),
         })
     }
 
@@ -148,6 +150,33 @@ impl Datadog {
         Ok(())
     }
 
+    async fn container_tags_vec(&self) -> Arc<Vec<String>> {
+        self.container_tags
+            .get_or_try_init(|| async {
+                let container_metadata = self.container_meta_client.collect().await?;
+                anyhow::Ok(Arc::new(
+                    container_metadata
+                        .labels()
+                        .into_iter()
+                        .map(|(key, value)| format!("{}:{}", key, value))
+                        .collect(),
+                ))
+            })
+            .await
+            .map(Arc::clone)
+            .unwrap_or_else(|e| {
+                log::warn!("failed fetching container metadata: {e}, using fallback");
+                Arc::new(
+                    self.container_meta_client
+                        .fallback()
+                        .labels()
+                        .into_iter()
+                        .map(|(key, value)| format!("{}:{}", key, value))
+                        .collect(),
+                )
+            })
+    }
+
     async fn get_metric_data(
         &self,
         collected: Vec<CollectedMetric>,
@@ -155,17 +184,8 @@ impl Datadog {
     ) -> Vec<MetricSeries> {
         let mut data: Vec<MetricSeries> = Vec::with_capacity(collected.len());
 
-        // Convert container metadata to Datadog tags (key:value format)
-        let container_metadata_tags: Vec<String> = self
-            .container_meta_client
-            .collect()
-            .await
-            .labels()
-            .into_iter()
-            .map(|(key, value)| format!("{}:{}", key, value))
-            .collect();
-
-        let container_tags_len = container_metadata_tags.len();
+        let container_tags = self.container_tags_vec().await;
+        let container_tags_len = container_tags.len();
 
         let last_export = self.last_export.lock().ok().map(|t| *t).unwrap_or(now);
         let interval = now - last_export;
@@ -176,7 +196,8 @@ impl Datadog {
             // Build tags: container metadata + metric labels
             let mut tags: Vec<String> =
                 Vec::with_capacity(container_tags_len + metric.key.labels().count());
-            tags.extend(container_metadata_tags.clone());
+            // Add container metadata tags
+            tags.extend(container_tags.iter().cloned());
 
             for label in metric.key.labels() {
                 tags.push(format!("{}:{}", label.key(), label.value()));
diff --git a/runtimes/core/src/metrics/exporter/mod.rs b/runtimes/core/src/metrics/exporter/mod.rs
index b54d5b54b1..6328149b87 100644
--- a/runtimes/core/src/metrics/exporter/mod.rs
+++ b/runtimes/core/src/metrics/exporter/mod.rs
@@ -1,9 +1,11 @@
 mod aws;
 mod datadog;
 mod gcp;
+mod prometheus;
 pub use aws::Aws;
 pub use datadog::Datadog;
 pub use gcp::Gcp;
+pub use prometheus::Prometheus;
 
 #[async_trait::async_trait]
 pub trait Exporter: Send + Sync {
diff --git a/runtimes/core/src/metrics/exporter/prometheus.rs b/runtimes/core/src/metrics/exporter/prometheus.rs
new file mode 100644
index 0000000000..05917bc334
--- /dev/null
+++ b/runtimes/core/src/metrics/exporter/prometheus.rs
@@ -0,0 +1,214 @@
+use crate::encore::runtime::v1 as pb;
+use crate::metadata::ContainerMetaClient;
+use crate::metrics::exporter::Exporter;
+use crate::metrics::{CollectedMetric, MetricValue};
+use crate::secrets;
+use anyhow::Context;
+use prost::Message;
+use std::sync::Arc;
+use std::time::SystemTime;
+use tokio::sync::OnceCell;
+use url::Url;
+
+#[derive(Debug)]
+pub struct Prometheus {
+    client: reqwest::Client,
+    remote_write_url: Url,
+    container_meta_client: ContainerMetaClient,
+    container_labels: OnceCell<Arc<Vec<prompb::Label>>>,
+}
+
+impl Prometheus {
+    pub fn new(
+        provider_cfg: &pb::metrics_provider::PrometheusRemoteWrite,
+        secrets: &secrets::Manager,
+        container_meta_client: ContainerMetaClient,
+    ) -> anyhow::Result<Self> {
+        let remote_write_url = match &provider_cfg.remote_write_url {
+            Some(data) => {
+                let secret = secrets.load(data.clone());
+                let url_bytes = secret
+                    .get()
+                    .context("failed to resolve Prometheus Remote Write Url")?;
+                let s = std::str::from_utf8(url_bytes)
+                    .context("Prometheus Remote Write Url is not valid UTF-8")?;
+                Url::parse(s).context("Prometheus Remote Write Url not valid")?
+            }
+            None => {
+                return Err(anyhow::anyhow!("Prometheus Remote Write Url not provided"));
+            }
+        };
+
+        Ok(Self {
+            client: reqwest::Client::new(),
+            remote_write_url,
+            container_meta_client,
+            container_labels: OnceCell::new(),
+        })
+    }
+
+    async fn export_metrics(&self, metrics: Vec<CollectedMetric>) -> anyhow::Result<()> {
+        if metrics.is_empty() {
+            return Ok(());
+        }
+
+        log::trace!(
+            "Exporting {} metrics to Prometheus remote write host {}",
+            metrics.len(),
+            self.remote_write_url.host_str().unwrap_or_default()
+        );
+
+        let time_series = self.get_metric_data(metrics).await;
+
+        // Create WriteRequest with the time series
+        let write_request = prompb::WriteRequest {
+            timeseries: time_series,
+            metadata: vec![],
+        };
+
+        // Serialize to protobuf
+        let mut proto_buf = Vec::new();
+        write_request
+            .encode(&mut proto_buf)
+            .context("marshal metrics into Protobuf")?;
+
+        // Compress with Snappy
+        let mut encoder = snap::raw::Encoder::new();
+        let encoded = encoder
+            .compress_vec(&proto_buf)
+            .context("compress metrics with Snappy")?;
+
+        // Send HTTP request
+        let response = self
+            .client
+            .post(self.remote_write_url.clone())
+            .header("Content-Type", "application/x-protobuf")
+            .header("Content-Encoding", "snappy")
+            .header("User-Agent", "encore")
+            .header("X-Prometheus-Remote-Write-Version", "0.1.0")
+            .body(encoded)
+            .send()
+            .await
+            .context("send metrics to Prometheus remote write destination")?;
+
+        if !response.status().is_success() {
+            let status = response.status();
+            let body = response
+                .text()
+                .await
+                .unwrap_or_else(|_| "<unable to read response body>".to_string());
+            anyhow::bail!(
+                "Prometheus remote write returned non-success status {}: {}",
+                status,
+                body
+            );
+        }
+
+        Ok(())
+    }
+
+    async fn container_labels(&self) -> Arc<Vec<prompb::Label>> {
+        self.container_labels
+            .get_or_try_init(|| async {
+                let container_metadata = self.container_meta_client.collect().await?;
+                anyhow::Ok(Arc::new(
+                    container_metadata
+                        .labels()
+                        .into_iter()
+                        .map(|(name, value)| prompb::Label { name, value })
+                        .collect(),
+                ))
+            })
+            .await
+            .map(Arc::clone)
+            .unwrap_or_else(|e| {
+                log::warn!("failed fetching container metadata: {e}, using fallback");
+                Arc::new(
+                    self.container_meta_client
+                        .fallback()
+                        .labels()
+                        .into_iter()
+                        .map(|(name, value)| prompb::Label { name, value })
+                        .collect(),
+                )
+            })
+    }
+
+    async fn get_metric_data(&self, collected: Vec<CollectedMetric>) -> Vec<prompb::TimeSeries> {
+        let now = SystemTime::now();
+        let timestamp = from_time(now);
+        let mut data: Vec<prompb::TimeSeries> = Vec::with_capacity(collected.len());
+
+        let container_labels = self.container_labels().await;
+        let container_labels_len = container_labels.len();
+
+        for metric in collected {
+            let metric_name = metric.key.name().to_string();
+
+            // Build labels: container metadata + metric labels + __name__
+            let mut labels: Vec<prompb::Label> =
+                Vec::with_capacity(container_labels_len + metric.key.labels().len() + 1);
+
+            // Add container metadata labels
+            labels.extend(container_labels.iter().cloned());
+
+            // Add metric-specific labels
+            for label in metric.key.labels() {
+                labels.push(prompb::Label {
+                    name: label.key().to_string(),
+                    value: label.value().to_string(),
+                });
+            }
+
+            // Add __name__ label for the metric name
+            labels.push(prompb::Label {
+                name: "__name__".to_string(),
+                value: metric_name,
+            });
+
+            // Convert metric value to float64
+            let value = match metric.value {
+                MetricValue::CounterU64(val) => val as f64,
+                MetricValue::CounterI64(val) => val as f64,
+                MetricValue::GaugeF64(val) => val,
+                MetricValue::GaugeU64(val) => val as f64,
+                MetricValue::GaugeI64(val) => val as f64,
+            };
+
+            data.push(prompb::TimeSeries {
+                labels,
+                samples: vec![prompb::Sample { value, timestamp }],
+                exemplars: vec![],
+                histograms: vec![],
+            });
+        }
+
+        data
+    }
+}
+
+#[async_trait::async_trait]
+impl Exporter for Prometheus {
+    async fn export(&self, metrics: Vec<CollectedMetric>) {
+        if let Err(err) = self.export_metrics(metrics).await {
+            log::error!("Failed to export metrics to Prometheus: {}", err);
+        }
+    }
+}
+
+/// Convert SystemTime to Prometheus timestamp (milliseconds since Unix epoch)
+fn from_time(t: SystemTime) -> i64 {
+    match t.duration_since(SystemTime::UNIX_EPOCH) {
+        Ok(duration) => {
+            let secs = duration.as_secs() as i64;
+            let nanos = duration.subsec_nanos() as i64;
+            secs * 1000 + nanos / 1_000_000
+        }
+        Err(_) => 0, // If time is before Unix epoch, return 0
+    }
+}
+
+#[allow(dead_code)]
+mod prompb {
+    include!(concat!(env!("OUT_DIR"), "/prometheus.rs"));
+}
diff --git a/runtimes/core/src/metrics/manager.rs b/runtimes/core/src/metrics/manager.rs
index a3950ec623..39e9a06f76 100644
--- a/runtimes/core/src/metrics/manager.rs
+++ b/runtimes/core/src/metrics/manager.rs
@@ -16,8 +16,7 @@ enum ProviderType {
     EncoreCloud(pb::metrics_provider::GcpCloudMonitoring),
     Aws(pb::metrics_provider::AwsCloudWatch),
     Datadog(pb::metrics_provider::Datadog),
-    // TODO(fredr) add these:
-    // - Prometheus(pb::metrics_provider::PrometheusRemoteWrite),
+    Prometheus(pb::metrics_provider::PrometheusRemoteWrite),
 }
 
 impl ProviderType {
@@ -31,8 +30,11 @@ impl ProviderType {
             Some(pb::metrics_provider::Provider::Datadog(config)) => {
                 Some(Self::Datadog(config.clone()))
             }
-            _ => {
-                log::warn!("unsupported metrics provider: {:?}", provider.provider);
+            Some(pb::metrics_provider::Provider::PromRemoteWrite(config)) => {
+                Some(Self::Prometheus(config.clone()))
+            }
+            None => {
+                log::warn!("no metrics provider configured");
                 None
             }
         }
@@ -52,9 +54,26 @@ impl ProviderType {
             Self::Datadog(config) => {
                 Self::create_datadog_exporter(config, secrets, env, http_client)
             }
+            Self::Prometheus(config) => {
+                Self::create_prometheus_exporter(config, secrets, env, http_client)
+            }
         }
     }
 
+    fn create_prometheus_exporter(
+        provider_cfg: &pb::metrics_provider::PrometheusRemoteWrite,
+        secrets: &secrets::Manager,
+        env: &Environment,
+        http_client: &reqwest::Client,
+    ) -> anyhow::Result<Arc<dyn Exporter + Send + Sync>> {
+        let container_meta_client = ContainerMetaClient::new(env.clone(), http_client.clone());
+        Ok(Arc::new(exporter::Prometheus::new(
+            provider_cfg,
+            secrets,
+            container_meta_client,
+        )?))
+    }
+
     fn create_datadog_exporter(
         provider_cfg: &pb::metrics_provider::Datadog,
         secrets: &secrets::Manager,

From 3ecfb871f18fb98b79ded74f55cf81638a95696f Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Wed, 22 Oct 2025 14:57:44 +0200
Subject: [PATCH 14/17] prompb: generate both go and rust from same proto

---
 proto/gen.sh                              | 6 ++++++
 proto/{prometheus => prompb}/remote.proto | 2 +-
 proto/{prometheus => prompb}/types.proto  | 0
 3 files changed, 7 insertions(+), 1 deletion(-)
 rename proto/{prometheus => prompb}/remote.proto (99%)
 rename proto/{prometheus => prompb}/types.proto (100%)

diff --git a/proto/gen.sh b/proto/gen.sh
index 1f0a7e0ef4..e522aeaf31 100755
--- a/proto/gen.sh
+++ b/proto/gen.sh
@@ -31,3 +31,9 @@ protoc -I . --go_out=. --go_opt=$GO_OPT \
 
 protoc -I . --go_out=. --go_opt=$GO_OPT \
 ./encore/runtime/v1/secretdata.proto
+
+# Prometheus protos for metrics exporter
+protoc -I . --go_out=../runtimes/go/appruntime/infrasdk/metrics/prometheus --go_opt=$GO_OPT \
+./prompb/types.proto
+protoc -I . --go_out=../runtimes/go/appruntime/infrasdk/metrics/prometheus --go_opt=$GO_OPT \
+./prompb/remote.proto
diff --git a/proto/prometheus/remote.proto b/proto/prompb/remote.proto
similarity index 99%
rename from proto/prometheus/remote.proto
rename to proto/prompb/remote.proto
index 6b7ad8a18e..7e13bab79e 100644
--- a/proto/prometheus/remote.proto
+++ b/proto/prompb/remote.proto
@@ -16,7 +16,7 @@ package prometheus;
 
 option go_package = "encore.dev/appruntime/metrics/prometheus/prompb";
 
-import "prometheus/types.proto";
+import "prompb/types.proto";
 
 message WriteRequest {
   repeated prometheus.TimeSeries timeseries = 1;
diff --git a/proto/prometheus/types.proto b/proto/prompb/types.proto
similarity index 100%
rename from proto/prometheus/types.proto
rename to proto/prompb/types.proto

From a4e4e36d19c1b9961472c8f2936088826b159393 Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Wed, 22 Oct 2025 14:58:03 +0200
Subject: [PATCH 15/17] prompb: generate both go and rust from same proto

---
 runtimes/core/build.rs                        |   2 +-
 .../metrics/prometheus/prompb/remote.pb.go    | 255 +++++-----
 .../metrics/prometheus/prompb/remote.proto    |  87 ----
 .../metrics/prometheus/prompb/types.pb.go     | 458 +++++++++---------
 .../metrics/prometheus/prompb/types.proto     | 184 -------
 5 files changed, 362 insertions(+), 624 deletions(-)
 delete mode 100644 runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/remote.proto
 delete mode 100644 runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/types.proto

diff --git a/runtimes/core/build.rs b/runtimes/core/build.rs
index c261a5cb3a..9700f87c2b 100644
--- a/runtimes/core/build.rs
+++ b/runtimes/core/build.rs
@@ -5,7 +5,7 @@ fn main() -> std::io::Result<()> {
         &[
             "../../proto/encore/runtime/v1/runtime.proto",
             "../../proto/encore/parser/meta/v1/meta.proto",
-            "../../proto/prometheus/remote.proto",
+            "../../proto/prompb/remote.proto",
         ],
         &["../../proto/"],
     )?;
diff --git a/runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/remote.pb.go b/runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/remote.pb.go
index a2e3f6d2d6..134c040eb0 100644
--- a/runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/remote.pb.go
+++ b/runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/remote.pb.go
@@ -13,9 +13,9 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.7
-// source: remote.proto
+// 	protoc-gen-go v1.31.0
+// 	protoc        v4.23.4
+// source: prompb/remote.proto
 
 package prompb
 
@@ -36,8 +36,9 @@ const (
 type ReadRequest_ResponseType int32
 
 const (
-	// Server will return a single ReadResponse message with matched series that includes list of raw samples.
-	// It's recommended to use streamed response types instead.
+	// Server will return a single ReadResponse message with matched series that
+	// includes list of raw samples. It's recommended to use streamed response
+	// types instead.
 	//
 	// Response headers:
 	// Content-Type: "application/x-protobuf"
@@ -49,8 +50,8 @@ const (
 	// uint32 for CRC32 Castagnoli checksum.
 	//
 	// Response headers:
-	// Content-Type: "application/x-streamed-protobuf; proto=prometheus.ChunkedReadResponse"
-	// Content-Encoding: ""
+	// Content-Type: "application/x-streamed-protobuf;
+	// proto=prometheus.ChunkedReadResponse" Content-Encoding: ""
 	ReadRequest_STREAMED_XOR_CHUNKS ReadRequest_ResponseType = 1
 )
 
@@ -77,11 +78,11 @@ func (x ReadRequest_ResponseType) String() string {
 }
 
 func (ReadRequest_ResponseType) Descriptor() protoreflect.EnumDescriptor {
-	return file_remote_proto_enumTypes[0].Descriptor()
+	return file_prompb_remote_proto_enumTypes[0].Descriptor()
 }
 
 func (ReadRequest_ResponseType) Type() protoreflect.EnumType {
-	return &file_remote_proto_enumTypes[0]
+	return &file_prompb_remote_proto_enumTypes[0]
 }
 
 func (x ReadRequest_ResponseType) Number() protoreflect.EnumNumber {
@@ -90,7 +91,7 @@ func (x ReadRequest_ResponseType) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use ReadRequest_ResponseType.Descriptor instead.
 func (ReadRequest_ResponseType) EnumDescriptor() ([]byte, []int) {
-	return file_remote_proto_rawDescGZIP(), []int{1, 0}
+	return file_prompb_remote_proto_rawDescGZIP(), []int{1, 0}
 }
 
 type WriteRequest struct {
@@ -105,7 +106,7 @@ type WriteRequest struct {
 func (x *WriteRequest) Reset() {
 	*x = WriteRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_remote_proto_msgTypes[0]
+		mi := &file_prompb_remote_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -118,7 +119,7 @@ func (x *WriteRequest) String() string {
 func (*WriteRequest) ProtoMessage() {}
 
 func (x *WriteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_remote_proto_msgTypes[0]
+	mi := &file_prompb_remote_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -131,7 +132,7 @@ func (x *WriteRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WriteRequest.ProtoReflect.Descriptor instead.
 func (*WriteRequest) Descriptor() ([]byte, []int) {
-	return file_remote_proto_rawDescGZIP(), []int{0}
+	return file_prompb_remote_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *WriteRequest) GetTimeseries() []*TimeSeries {
@@ -155,18 +156,20 @@ type ReadRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	Queries []*Query `protobuf:"bytes,1,rep,name=queries,proto3" json:"queries,omitempty"`
-	// accepted_response_types allows negotiating the content type of the response.
+	// accepted_response_types allows negotiating the content type of the
+	// response.
 	//
-	// Response types are taken from the list in the FIFO order. If no response type in `accepted_response_types` is
-	// implemented by server, error is returned.
-	// For request that do not contain `accepted_response_types` field the SAMPLES response type will be used.
+	// Response types are taken from the list in the FIFO order. If no response
+	// type in `accepted_response_types` is implemented by server, error is
+	// returned. For request that do not contain `accepted_response_types` field
+	// the SAMPLES response type will be used.
 	AcceptedResponseTypes []ReadRequest_ResponseType `protobuf:"varint,2,rep,packed,name=accepted_response_types,json=acceptedResponseTypes,proto3,enum=prometheus.ReadRequest_ResponseType" json:"accepted_response_types,omitempty"`
 }
 
 func (x *ReadRequest) Reset() {
 	*x = ReadRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_remote_proto_msgTypes[1]
+		mi := &file_prompb_remote_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -179,7 +182,7 @@ func (x *ReadRequest) String() string {
 func (*ReadRequest) ProtoMessage() {}
 
 func (x *ReadRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_remote_proto_msgTypes[1]
+	mi := &file_prompb_remote_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -192,7 +195,7 @@ func (x *ReadRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ReadRequest.ProtoReflect.Descriptor instead.
 func (*ReadRequest) Descriptor() ([]byte, []int) {
-	return file_remote_proto_rawDescGZIP(), []int{1}
+	return file_prompb_remote_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *ReadRequest) GetQueries() []*Query {
@@ -222,7 +225,7 @@ type ReadResponse struct {
 func (x *ReadResponse) Reset() {
 	*x = ReadResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_remote_proto_msgTypes[2]
+		mi := &file_prompb_remote_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -235,7 +238,7 @@ func (x *ReadResponse) String() string {
 func (*ReadResponse) ProtoMessage() {}
 
 func (x *ReadResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_remote_proto_msgTypes[2]
+	mi := &file_prompb_remote_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -248,7 +251,7 @@ func (x *ReadResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ReadResponse.ProtoReflect.Descriptor instead.
 func (*ReadResponse) Descriptor() ([]byte, []int) {
-	return file_remote_proto_rawDescGZIP(), []int{2}
+	return file_prompb_remote_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *ReadResponse) GetResults() []*QueryResult {
@@ -272,7 +275,7 @@ type Query struct {
 func (x *Query) Reset() {
 	*x = Query{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_remote_proto_msgTypes[3]
+		mi := &file_prompb_remote_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -285,7 +288,7 @@ func (x *Query) String() string {
 func (*Query) ProtoMessage() {}
 
 func (x *Query) ProtoReflect() protoreflect.Message {
-	mi := &file_remote_proto_msgTypes[3]
+	mi := &file_prompb_remote_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -298,7 +301,7 @@ func (x *Query) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Query.ProtoReflect.Descriptor instead.
 func (*Query) Descriptor() ([]byte, []int) {
-	return file_remote_proto_rawDescGZIP(), []int{3}
+	return file_prompb_remote_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *Query) GetStartTimestampMs() int64 {
@@ -341,7 +344,7 @@ type QueryResult struct {
 func (x *QueryResult) Reset() {
 	*x = QueryResult{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_remote_proto_msgTypes[4]
+		mi := &file_prompb_remote_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -354,7 +357,7 @@ func (x *QueryResult) String() string {
 func (*QueryResult) ProtoMessage() {}
 
 func (x *QueryResult) ProtoReflect() protoreflect.Message {
-	mi := &file_remote_proto_msgTypes[4]
+	mi := &file_prompb_remote_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -367,7 +370,7 @@ func (x *QueryResult) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use QueryResult.ProtoReflect.Descriptor instead.
 func (*QueryResult) Descriptor() ([]byte, []int) {
-	return file_remote_proto_rawDescGZIP(), []int{4}
+	return file_prompb_remote_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *QueryResult) GetTimeseries() []*TimeSeries {
@@ -377,24 +380,27 @@ func (x *QueryResult) GetTimeseries() []*TimeSeries {
 	return nil
 }
 
-// ChunkedReadResponse is a response when response_type equals STREAMED_XOR_CHUNKS.
-// We strictly stream full series after series, optionally split by time. This means that a single frame can contain
-// partition of the single series, but once a new series is started to be streamed it means that no more chunks will
-// be sent for previous one. Series are returned sorted in the same way TSDB block are internally.
+// ChunkedReadResponse is a response when response_type equals
+// STREAMED_XOR_CHUNKS. We strictly stream full series after series, optionally
+// split by time. This means that a single frame can contain partition of the
+// single series, but once a new series is started to be streamed it means that
+// no more chunks will be sent for previous one. Series are returned sorted in
+// the same way TSDB block are internally.
 type ChunkedReadResponse struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
 	ChunkedSeries []*ChunkedSeries `protobuf:"bytes,1,rep,name=chunked_series,json=chunkedSeries,proto3" json:"chunked_series,omitempty"`
-	// query_index represents an index of the query from ReadRequest.queries these chunks relates to.
+	// query_index represents an index of the query from ReadRequest.queries these
+	// chunks relates to.
 	QueryIndex int64 `protobuf:"varint,2,opt,name=query_index,json=queryIndex,proto3" json:"query_index,omitempty"`
 }
 
 func (x *ChunkedReadResponse) Reset() {
 	*x = ChunkedReadResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_remote_proto_msgTypes[5]
+		mi := &file_prompb_remote_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -407,7 +413,7 @@ func (x *ChunkedReadResponse) String() string {
 func (*ChunkedReadResponse) ProtoMessage() {}
 
 func (x *ChunkedReadResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_remote_proto_msgTypes[5]
+	mi := &file_prompb_remote_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -420,7 +426,7 @@ func (x *ChunkedReadResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChunkedReadResponse.ProtoReflect.Descriptor instead.
 func (*ChunkedReadResponse) Descriptor() ([]byte, []int) {
-	return file_remote_proto_rawDescGZIP(), []int{5}
+	return file_prompb_remote_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *ChunkedReadResponse) GetChunkedSeries() []*ChunkedSeries {
@@ -437,83 +443,84 @@ func (x *ChunkedReadResponse) GetQueryIndex() int64 {
 	return 0
 }
 
-var File_remote_proto protoreflect.FileDescriptor
-
-var file_remote_proto_rawDesc = []byte{
-	0x0a, 0x0c, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0a,
-	0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x1a, 0x0b, 0x74, 0x79, 0x70, 0x65,
-	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x84, 0x01, 0x0a, 0x0c, 0x57, 0x72, 0x69, 0x74,
-	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x36, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65,
-	0x73, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70,
-	0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x65,
-	0x72, 0x69, 0x65, 0x73, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x65, 0x72, 0x69, 0x65, 0x73,
-	0x12, 0x36, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e,
-	0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x08,
-	0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x22, 0xce,
-	0x01, 0x0a, 0x0b, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2b,
-	0x0a, 0x07, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x11, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x51, 0x75, 0x65,
-	0x72, 0x79, 0x52, 0x07, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x5c, 0x0a, 0x17, 0x61,
-	0x63, 0x63, 0x65, 0x70, 0x74, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x24, 0x2e, 0x70,
-	0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x79,
-	0x70, 0x65, 0x52, 0x15, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x22, 0x34, 0x0a, 0x0c, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x41, 0x4d,
-	0x50, 0x4c, 0x45, 0x53, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d,
-	0x45, 0x44, 0x5f, 0x58, 0x4f, 0x52, 0x5f, 0x43, 0x48, 0x55, 0x4e, 0x4b, 0x53, 0x10, 0x01, 0x22,
-	0x41, 0x0a, 0x0c, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x31, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x17, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x51, 0x75,
-	0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c,
-	0x74, 0x73, 0x22, 0xc2, 0x01, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x2c, 0x0a, 0x12,
-	0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x5f,
-	0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54,
-	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x4d, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x65, 0x6e,
-	0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x5f, 0x6d, 0x73, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x0e, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
-	0x6d, 0x70, 0x4d, 0x73, 0x12, 0x34, 0x0a, 0x08, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68,
-	0x65, 0x75, 0x73, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
-	0x52, 0x08, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73, 0x12, 0x2b, 0x0a, 0x05, 0x68, 0x69,
-	0x6e, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x70, 0x72, 0x6f, 0x6d,
-	0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x48, 0x69, 0x6e, 0x74, 0x73,
-	0x52, 0x05, 0x68, 0x69, 0x6e, 0x74, 0x73, 0x22, 0x45, 0x0a, 0x0b, 0x51, 0x75, 0x65, 0x72, 0x79,
-	0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x36, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x65,
+var File_prompb_remote_proto protoreflect.FileDescriptor
+
+var file_prompb_remote_proto_rawDesc = []byte{
+	0x0a, 0x13, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x62, 0x2f, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0a, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75,
+	0x73, 0x1a, 0x12, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x62, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x84, 0x01, 0x0a, 0x0c, 0x57, 0x72, 0x69, 0x74, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x36, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x65,
 	0x72, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70, 0x72, 0x6f,
 	0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x65, 0x72, 0x69,
-	0x65, 0x73, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x65, 0x72, 0x69, 0x65, 0x73, 0x22, 0x78,
-	0x0a, 0x13, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x65, 0x64, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x40, 0x0a, 0x0e, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x65, 0x64,
-	0x5f, 0x73, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e,
-	0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x43, 0x68, 0x75, 0x6e, 0x6b,
-	0x65, 0x64, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x52, 0x0d, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x65,
-	0x64, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x71, 0x75, 0x65, 0x72, 0x79,
-	0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x71, 0x75,
-	0x65, 0x72, 0x79, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x42, 0x31, 0x5a, 0x2f, 0x65, 0x6e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x64, 0x65, 0x76, 0x2f, 0x61, 0x70, 0x70, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x2f, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74,
-	0x68, 0x65, 0x75, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x65, 0x73, 0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x36,
+	0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x4d, 0x65,
+	0x74, 0x72, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x08, 0x6d, 0x65,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x22, 0xce, 0x01, 0x0a,
+	0x0b, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2b, 0x0a, 0x07,
+	0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e,
+	0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79,
+	0x52, 0x07, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x5c, 0x0a, 0x17, 0x61, 0x63, 0x63,
+	0x65, 0x70, 0x74, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74,
+	0x79, 0x70, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x24, 0x2e, 0x70, 0x72, 0x6f,
+	0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65,
+	0x52, 0x15, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x22, 0x34, 0x0a, 0x0c, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x41, 0x4d, 0x50, 0x4c,
+	0x45, 0x53, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d, 0x45, 0x44,
+	0x5f, 0x58, 0x4f, 0x52, 0x5f, 0x43, 0x48, 0x55, 0x4e, 0x4b, 0x53, 0x10, 0x01, 0x22, 0x41, 0x0a,
+	0x0c, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x31, 0x0a,
+	0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17,
+	0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x51, 0x75, 0x65, 0x72,
+	0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73,
+	0x22, 0xc2, 0x01, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x2c, 0x0a, 0x12, 0x73, 0x74,
+	0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x5f, 0x6d, 0x73,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d,
+	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x4d, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x65, 0x6e, 0x64, 0x5f,
+	0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x5f, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x0e, 0x65, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
+	0x4d, 0x73, 0x12, 0x34, 0x0a, 0x08, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73, 0x18, 0x03,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75,
+	0x73, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x08,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73, 0x12, 0x2b, 0x0a, 0x05, 0x68, 0x69, 0x6e, 0x74,
+	0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74,
+	0x68, 0x65, 0x75, 0x73, 0x2e, 0x52, 0x65, 0x61, 0x64, 0x48, 0x69, 0x6e, 0x74, 0x73, 0x52, 0x05,
+	0x68, 0x69, 0x6e, 0x74, 0x73, 0x22, 0x45, 0x0a, 0x0b, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x12, 0x36, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x65, 0x72, 0x69,
+	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65,
+	0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73,
+	0x52, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x65, 0x72, 0x69, 0x65, 0x73, 0x22, 0x78, 0x0a, 0x13,
+	0x43, 0x68, 0x75, 0x6e, 0x6b, 0x65, 0x64, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x40, 0x0a, 0x0e, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x65, 0x64, 0x5f, 0x73,
+	0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x72,
+	0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x65, 0x64,
+	0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x52, 0x0d, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x65, 0x64, 0x53,
+	0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x69,
+	0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x71, 0x75, 0x65, 0x72,
+	0x79, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x42, 0x31, 0x5a, 0x2f, 0x65, 0x6e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x64, 0x65, 0x76, 0x2f, 0x61, 0x70, 0x70, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f,
+	0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65,
+	0x75, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
-	file_remote_proto_rawDescOnce sync.Once
-	file_remote_proto_rawDescData = file_remote_proto_rawDesc
+	file_prompb_remote_proto_rawDescOnce sync.Once
+	file_prompb_remote_proto_rawDescData = file_prompb_remote_proto_rawDesc
 )
 
-func file_remote_proto_rawDescGZIP() []byte {
-	file_remote_proto_rawDescOnce.Do(func() {
-		file_remote_proto_rawDescData = protoimpl.X.CompressGZIP(file_remote_proto_rawDescData)
+func file_prompb_remote_proto_rawDescGZIP() []byte {
+	file_prompb_remote_proto_rawDescOnce.Do(func() {
+		file_prompb_remote_proto_rawDescData = protoimpl.X.CompressGZIP(file_prompb_remote_proto_rawDescData)
 	})
-	return file_remote_proto_rawDescData
+	return file_prompb_remote_proto_rawDescData
 }
 
-var file_remote_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_remote_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
-var file_remote_proto_goTypes = []interface{}{
+var file_prompb_remote_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_prompb_remote_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_prompb_remote_proto_goTypes = []interface{}{
 	(ReadRequest_ResponseType)(0), // 0: prometheus.ReadRequest.ResponseType
 	(*WriteRequest)(nil),          // 1: prometheus.WriteRequest
 	(*ReadRequest)(nil),           // 2: prometheus.ReadRequest
@@ -527,7 +534,7 @@ var file_remote_proto_goTypes = []interface{}{
 	(*ReadHints)(nil),             // 10: prometheus.ReadHints
 	(*ChunkedSeries)(nil),         // 11: prometheus.ChunkedSeries
 }
-var file_remote_proto_depIdxs = []int32{
+var file_prompb_remote_proto_depIdxs = []int32{
 	7,  // 0: prometheus.WriteRequest.timeseries:type_name -> prometheus.TimeSeries
 	8,  // 1: prometheus.WriteRequest.metadata:type_name -> prometheus.MetricMetadata
 	4,  // 2: prometheus.ReadRequest.queries:type_name -> prometheus.Query
@@ -544,14 +551,14 @@ var file_remote_proto_depIdxs = []int32{
 	0,  // [0:9] is the sub-list for field type_name
 }
 
-func init() { file_remote_proto_init() }
-func file_remote_proto_init() {
-	if File_remote_proto != nil {
+func init() { file_prompb_remote_proto_init() }
+func file_prompb_remote_proto_init() {
+	if File_prompb_remote_proto != nil {
 		return
 	}
-	file_types_proto_init()
+	file_prompb_types_proto_init()
 	if !protoimpl.UnsafeEnabled {
-		file_remote_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_remote_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*WriteRequest); i {
 			case 0:
 				return &v.state
@@ -563,7 +570,7 @@ func file_remote_proto_init() {
 				return nil
 			}
 		}
-		file_remote_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_remote_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ReadRequest); i {
 			case 0:
 				return &v.state
@@ -575,7 +582,7 @@ func file_remote_proto_init() {
 				return nil
 			}
 		}
-		file_remote_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_remote_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ReadResponse); i {
 			case 0:
 				return &v.state
@@ -587,7 +594,7 @@ func file_remote_proto_init() {
 				return nil
 			}
 		}
-		file_remote_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_remote_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Query); i {
 			case 0:
 				return &v.state
@@ -599,7 +606,7 @@ func file_remote_proto_init() {
 				return nil
 			}
 		}
-		file_remote_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_remote_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*QueryResult); i {
 			case 0:
 				return &v.state
@@ -611,7 +618,7 @@ func file_remote_proto_init() {
 				return nil
 			}
 		}
-		file_remote_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_remote_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ChunkedReadResponse); i {
 			case 0:
 				return &v.state
@@ -628,19 +635,19 @@ func file_remote_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_remote_proto_rawDesc,
+			RawDescriptor: file_prompb_remote_proto_rawDesc,
 			NumEnums:      1,
 			NumMessages:   6,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_remote_proto_goTypes,
-		DependencyIndexes: file_remote_proto_depIdxs,
-		EnumInfos:         file_remote_proto_enumTypes,
-		MessageInfos:      file_remote_proto_msgTypes,
+		GoTypes:           file_prompb_remote_proto_goTypes,
+		DependencyIndexes: file_prompb_remote_proto_depIdxs,
+		EnumInfos:         file_prompb_remote_proto_enumTypes,
+		MessageInfos:      file_prompb_remote_proto_msgTypes,
 	}.Build()
-	File_remote_proto = out.File
-	file_remote_proto_rawDesc = nil
-	file_remote_proto_goTypes = nil
-	file_remote_proto_depIdxs = nil
+	File_prompb_remote_proto = out.File
+	file_prompb_remote_proto_rawDesc = nil
+	file_prompb_remote_proto_goTypes = nil
+	file_prompb_remote_proto_depIdxs = nil
 }
diff --git a/runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/remote.proto b/runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/remote.proto
deleted file mode 100644
index 3c791320e4..0000000000
--- a/runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/remote.proto
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2016 Prometheus Team
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-package prometheus;
-
-option go_package = "encore.dev/appruntime/metrics/prometheus/prompb";
-
-import "types.proto";
-
-message WriteRequest {
-  repeated prometheus.TimeSeries timeseries = 1;
-  // Cortex uses this field to determine the source of the write request.
-  // We reserve it to avoid any compatibility issues.
-  reserved  2;
-  repeated prometheus.MetricMetadata metadata = 3;
-}
-
-// ReadRequest represents a remote read request.
-message ReadRequest {
-  repeated Query queries = 1;
-
-  enum ResponseType {
-    // Server will return a single ReadResponse message with matched series that includes list of raw samples.
-    // It's recommended to use streamed response types instead.
-    //
-    // Response headers:
-    // Content-Type: "application/x-protobuf"
-    // Content-Encoding: "snappy"
-    SAMPLES = 0;
-    // Server will stream a delimited ChunkedReadResponse message that
-    // contains XOR or HISTOGRAM(!) encoded chunks for a single series.
-    // Each message is following varint size and fixed size bigendian
-    // uint32 for CRC32 Castagnoli checksum.
-    //
-    // Response headers:
-    // Content-Type: "application/x-streamed-protobuf; proto=prometheus.ChunkedReadResponse"
-    // Content-Encoding: ""
-    STREAMED_XOR_CHUNKS = 1;
-  }
-
-  // accepted_response_types allows negotiating the content type of the response.
-  //
-  // Response types are taken from the list in the FIFO order. If no response type in `accepted_response_types` is
-  // implemented by server, error is returned.
-  // For request that do not contain `accepted_response_types` field the SAMPLES response type will be used.
-  repeated ResponseType accepted_response_types = 2;
-}
-
-// ReadResponse is a response when response_type equals SAMPLES.
-message ReadResponse {
-  // In same order as the request's queries.
-  repeated QueryResult results = 1;
-}
-
-message Query {
-  int64 start_timestamp_ms = 1;
-  int64 end_timestamp_ms = 2;
-  repeated prometheus.LabelMatcher matchers = 3;
-  prometheus.ReadHints hints = 4;
-}
-
-message QueryResult {
-  // Samples within a time series must be ordered by time.
-  repeated prometheus.TimeSeries timeseries = 1;
-}
-
-// ChunkedReadResponse is a response when response_type equals STREAMED_XOR_CHUNKS.
-// We strictly stream full series after series, optionally split by time. This means that a single frame can contain
-// partition of the single series, but once a new series is started to be streamed it means that no more chunks will
-// be sent for previous one. Series are returned sorted in the same way TSDB block are internally.
-message ChunkedReadResponse {
-  repeated prometheus.ChunkedSeries chunked_series = 1;
-
-  // query_index represents an index of the query from ReadRequest.queries these chunks relates to.
-  int64 query_index = 2;
-}
diff --git a/runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/types.pb.go b/runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/types.pb.go
index a748ac4c33..ed20ae591a 100644
--- a/runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/types.pb.go
+++ b/runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/types.pb.go
@@ -13,9 +13,9 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
-// 	protoc        v3.21.7
-// source: types.proto
+// 	protoc-gen-go v1.31.0
+// 	protoc        v4.23.4
+// source: prompb/types.proto
 
 package prompb
 
@@ -81,11 +81,11 @@ func (x MetricMetadata_MetricType) String() string {
 }
 
 func (MetricMetadata_MetricType) Descriptor() protoreflect.EnumDescriptor {
-	return file_types_proto_enumTypes[0].Descriptor()
+	return file_prompb_types_proto_enumTypes[0].Descriptor()
 }
 
 func (MetricMetadata_MetricType) Type() protoreflect.EnumType {
-	return &file_types_proto_enumTypes[0]
+	return &file_prompb_types_proto_enumTypes[0]
 }
 
 func (x MetricMetadata_MetricType) Number() protoreflect.EnumNumber {
@@ -94,7 +94,7 @@ func (x MetricMetadata_MetricType) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use MetricMetadata_MetricType.Descriptor instead.
 func (MetricMetadata_MetricType) EnumDescriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{0, 0}
+	return file_prompb_types_proto_rawDescGZIP(), []int{0, 0}
 }
 
 type Histogram_ResetHint int32
@@ -133,11 +133,11 @@ func (x Histogram_ResetHint) String() string {
 }
 
 func (Histogram_ResetHint) Descriptor() protoreflect.EnumDescriptor {
-	return file_types_proto_enumTypes[1].Descriptor()
+	return file_prompb_types_proto_enumTypes[1].Descriptor()
 }
 
 func (Histogram_ResetHint) Type() protoreflect.EnumType {
-	return &file_types_proto_enumTypes[1]
+	return &file_prompb_types_proto_enumTypes[1]
 }
 
 func (x Histogram_ResetHint) Number() protoreflect.EnumNumber {
@@ -146,7 +146,7 @@ func (x Histogram_ResetHint) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use Histogram_ResetHint.Descriptor instead.
 func (Histogram_ResetHint) EnumDescriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{3, 0}
+	return file_prompb_types_proto_rawDescGZIP(), []int{3, 0}
 }
 
 type LabelMatcher_Type int32
@@ -185,11 +185,11 @@ func (x LabelMatcher_Type) String() string {
 }
 
 func (LabelMatcher_Type) Descriptor() protoreflect.EnumDescriptor {
-	return file_types_proto_enumTypes[2].Descriptor()
+	return file_prompb_types_proto_enumTypes[2].Descriptor()
 }
 
 func (LabelMatcher_Type) Type() protoreflect.EnumType {
-	return &file_types_proto_enumTypes[2]
+	return &file_prompb_types_proto_enumTypes[2]
 }
 
 func (x LabelMatcher_Type) Number() protoreflect.EnumNumber {
@@ -198,7 +198,7 @@ func (x LabelMatcher_Type) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use LabelMatcher_Type.Descriptor instead.
 func (LabelMatcher_Type) EnumDescriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{8, 0}
+	return file_prompb_types_proto_rawDescGZIP(), []int{8, 0}
 }
 
 // We require this to match chunkenc.Encoding.
@@ -235,11 +235,11 @@ func (x Chunk_Encoding) String() string {
 }
 
 func (Chunk_Encoding) Descriptor() protoreflect.EnumDescriptor {
-	return file_types_proto_enumTypes[3].Descriptor()
+	return file_prompb_types_proto_enumTypes[3].Descriptor()
 }
 
 func (Chunk_Encoding) Type() protoreflect.EnumType {
-	return &file_types_proto_enumTypes[3]
+	return &file_prompb_types_proto_enumTypes[3]
 }
 
 func (x Chunk_Encoding) Number() protoreflect.EnumNumber {
@@ -248,7 +248,7 @@ func (x Chunk_Encoding) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use Chunk_Encoding.Descriptor instead.
 func (Chunk_Encoding) EnumDescriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{10, 0}
+	return file_prompb_types_proto_rawDescGZIP(), []int{10, 0}
 }
 
 type MetricMetadata struct {
@@ -267,7 +267,7 @@ type MetricMetadata struct {
 func (x *MetricMetadata) Reset() {
 	*x = MetricMetadata{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_types_proto_msgTypes[0]
+		mi := &file_prompb_types_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -280,7 +280,7 @@ func (x *MetricMetadata) String() string {
 func (*MetricMetadata) ProtoMessage() {}
 
 func (x *MetricMetadata) ProtoReflect() protoreflect.Message {
-	mi := &file_types_proto_msgTypes[0]
+	mi := &file_prompb_types_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -293,7 +293,7 @@ func (x *MetricMetadata) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MetricMetadata.ProtoReflect.Descriptor instead.
 func (*MetricMetadata) Descriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{0}
+	return file_prompb_types_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *MetricMetadata) GetType() MetricMetadata_MetricType {
@@ -338,7 +338,7 @@ type Sample struct {
 func (x *Sample) Reset() {
 	*x = Sample{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_types_proto_msgTypes[1]
+		mi := &file_prompb_types_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -351,7 +351,7 @@ func (x *Sample) String() string {
 func (*Sample) ProtoMessage() {}
 
 func (x *Sample) ProtoReflect() protoreflect.Message {
-	mi := &file_types_proto_msgTypes[1]
+	mi := &file_prompb_types_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -364,7 +364,7 @@ func (x *Sample) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Sample.ProtoReflect.Descriptor instead.
 func (*Sample) Descriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{1}
+	return file_prompb_types_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *Sample) GetValue() float64 {
@@ -397,7 +397,7 @@ type Exemplar struct {
 func (x *Exemplar) Reset() {
 	*x = Exemplar{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_types_proto_msgTypes[2]
+		mi := &file_prompb_types_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -410,7 +410,7 @@ func (x *Exemplar) String() string {
 func (*Exemplar) ProtoMessage() {}
 
 func (x *Exemplar) ProtoReflect() protoreflect.Message {
-	mi := &file_types_proto_msgTypes[2]
+	mi := &file_prompb_types_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -423,7 +423,7 @@ func (x *Exemplar) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Exemplar.ProtoReflect.Descriptor instead.
 func (*Exemplar) Descriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{2}
+	return file_prompb_types_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *Exemplar) GetLabels() []*Label {
@@ -459,6 +459,7 @@ type Histogram struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Count:
+	//
 	//	*Histogram_CountInt
 	//	*Histogram_CountFloat
 	Count isHistogram_Count `protobuf_oneof:"count"`
@@ -473,6 +474,7 @@ type Histogram struct {
 	Schema        int32   `protobuf:"zigzag32,4,opt,name=schema,proto3" json:"schema,omitempty"`
 	ZeroThreshold float64 `protobuf:"fixed64,5,opt,name=zero_threshold,json=zeroThreshold,proto3" json:"zero_threshold,omitempty"` // Breadth of the zero bucket.
 	// Types that are assignable to ZeroCount:
+	//
 	//	*Histogram_ZeroCountInt
 	//	*Histogram_ZeroCountFloat
 	ZeroCount isHistogram_ZeroCount `protobuf_oneof:"zero_count"`
@@ -499,7 +501,7 @@ type Histogram struct {
 func (x *Histogram) Reset() {
 	*x = Histogram{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_types_proto_msgTypes[3]
+		mi := &file_prompb_types_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -512,7 +514,7 @@ func (x *Histogram) String() string {
 func (*Histogram) ProtoMessage() {}
 
 func (x *Histogram) ProtoReflect() protoreflect.Message {
-	mi := &file_types_proto_msgTypes[3]
+	mi := &file_prompb_types_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -525,7 +527,7 @@ func (x *Histogram) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Histogram.ProtoReflect.Descriptor instead.
 func (*Histogram) Descriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{3}
+	return file_prompb_types_proto_rawDescGZIP(), []int{3}
 }
 
 func (m *Histogram) GetCount() isHistogram_Count {
@@ -696,7 +698,7 @@ type BucketSpan struct {
 func (x *BucketSpan) Reset() {
 	*x = BucketSpan{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_types_proto_msgTypes[4]
+		mi := &file_prompb_types_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -709,7 +711,7 @@ func (x *BucketSpan) String() string {
 func (*BucketSpan) ProtoMessage() {}
 
 func (x *BucketSpan) ProtoReflect() protoreflect.Message {
-	mi := &file_types_proto_msgTypes[4]
+	mi := &file_prompb_types_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -722,7 +724,7 @@ func (x *BucketSpan) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BucketSpan.ProtoReflect.Descriptor instead.
 func (*BucketSpan) Descriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{4}
+	return file_prompb_types_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *BucketSpan) GetOffset() int32 {
@@ -756,7 +758,7 @@ type TimeSeries struct {
 func (x *TimeSeries) Reset() {
 	*x = TimeSeries{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_types_proto_msgTypes[5]
+		mi := &file_prompb_types_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -769,7 +771,7 @@ func (x *TimeSeries) String() string {
 func (*TimeSeries) ProtoMessage() {}
 
 func (x *TimeSeries) ProtoReflect() protoreflect.Message {
-	mi := &file_types_proto_msgTypes[5]
+	mi := &file_prompb_types_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -782,7 +784,7 @@ func (x *TimeSeries) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TimeSeries.ProtoReflect.Descriptor instead.
 func (*TimeSeries) Descriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{5}
+	return file_prompb_types_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *TimeSeries) GetLabels() []*Label {
@@ -825,7 +827,7 @@ type Label struct {
 func (x *Label) Reset() {
 	*x = Label{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_types_proto_msgTypes[6]
+		mi := &file_prompb_types_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -838,7 +840,7 @@ func (x *Label) String() string {
 func (*Label) ProtoMessage() {}
 
 func (x *Label) ProtoReflect() protoreflect.Message {
-	mi := &file_types_proto_msgTypes[6]
+	mi := &file_prompb_types_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -851,7 +853,7 @@ func (x *Label) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Label.ProtoReflect.Descriptor instead.
 func (*Label) Descriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{6}
+	return file_prompb_types_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *Label) GetName() string {
@@ -879,7 +881,7 @@ type Labels struct {
 func (x *Labels) Reset() {
 	*x = Labels{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_types_proto_msgTypes[7]
+		mi := &file_prompb_types_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -892,7 +894,7 @@ func (x *Labels) String() string {
 func (*Labels) ProtoMessage() {}
 
 func (x *Labels) ProtoReflect() protoreflect.Message {
-	mi := &file_types_proto_msgTypes[7]
+	mi := &file_prompb_types_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -905,7 +907,7 @@ func (x *Labels) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Labels.ProtoReflect.Descriptor instead.
 func (*Labels) Descriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{7}
+	return file_prompb_types_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *Labels) GetLabels() []*Label {
@@ -929,7 +931,7 @@ type LabelMatcher struct {
 func (x *LabelMatcher) Reset() {
 	*x = LabelMatcher{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_types_proto_msgTypes[8]
+		mi := &file_prompb_types_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -942,7 +944,7 @@ func (x *LabelMatcher) String() string {
 func (*LabelMatcher) ProtoMessage() {}
 
 func (x *LabelMatcher) ProtoReflect() protoreflect.Message {
-	mi := &file_types_proto_msgTypes[8]
+	mi := &file_prompb_types_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -955,7 +957,7 @@ func (x *LabelMatcher) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LabelMatcher.ProtoReflect.Descriptor instead.
 func (*LabelMatcher) Descriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{8}
+	return file_prompb_types_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *LabelMatcher) GetType() LabelMatcher_Type {
@@ -996,7 +998,7 @@ type ReadHints struct {
 func (x *ReadHints) Reset() {
 	*x = ReadHints{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_types_proto_msgTypes[9]
+		mi := &file_prompb_types_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1009,7 +1011,7 @@ func (x *ReadHints) String() string {
 func (*ReadHints) ProtoMessage() {}
 
 func (x *ReadHints) ProtoReflect() protoreflect.Message {
-	mi := &file_types_proto_msgTypes[9]
+	mi := &file_prompb_types_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1022,7 +1024,7 @@ func (x *ReadHints) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ReadHints.ProtoReflect.Descriptor instead.
 func (*ReadHints) Descriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{9}
+	return file_prompb_types_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *ReadHints) GetStepMs() int64 {
@@ -1090,7 +1092,7 @@ type Chunk struct {
 func (x *Chunk) Reset() {
 	*x = Chunk{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_types_proto_msgTypes[10]
+		mi := &file_prompb_types_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1103,7 +1105,7 @@ func (x *Chunk) String() string {
 func (*Chunk) ProtoMessage() {}
 
 func (x *Chunk) ProtoReflect() protoreflect.Message {
-	mi := &file_types_proto_msgTypes[10]
+	mi := &file_prompb_types_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1116,7 +1118,7 @@ func (x *Chunk) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Chunk.ProtoReflect.Descriptor instead.
 func (*Chunk) Descriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{10}
+	return file_prompb_types_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *Chunk) GetMinTimeMs() int64 {
@@ -1162,7 +1164,7 @@ type ChunkedSeries struct {
 func (x *ChunkedSeries) Reset() {
 	*x = ChunkedSeries{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_types_proto_msgTypes[11]
+		mi := &file_prompb_types_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1175,7 +1177,7 @@ func (x *ChunkedSeries) String() string {
 func (*ChunkedSeries) ProtoMessage() {}
 
 func (x *ChunkedSeries) ProtoReflect() protoreflect.Message {
-	mi := &file_types_proto_msgTypes[11]
+	mi := &file_prompb_types_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1188,7 +1190,7 @@ func (x *ChunkedSeries) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChunkedSeries.ProtoReflect.Descriptor instead.
 func (*ChunkedSeries) Descriptor() ([]byte, []int) {
-	return file_types_proto_rawDescGZIP(), []int{11}
+	return file_prompb_types_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *ChunkedSeries) GetLabels() []*Label {
@@ -1205,167 +1207,167 @@ func (x *ChunkedSeries) GetChunks() []*Chunk {
 	return nil
 }
 
-var File_types_proto protoreflect.FileDescriptor
-
-var file_types_proto_rawDesc = []byte{
-	0x0a, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0a, 0x70,
-	0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x22, 0x9c, 0x02, 0x0a, 0x0e, 0x4d, 0x65,
-	0x74, 0x72, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x39, 0x0a, 0x04,
-	0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x70, 0x72, 0x6f,
-	0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x4d, 0x65,
-	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x79, 0x70,
-	0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x6d, 0x65, 0x74, 0x72, 0x69,
-	0x63, 0x5f, 0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x10, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x46, 0x61, 0x6d, 0x69, 0x6c,
-	0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x6c, 0x70, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x6c, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x6e, 0x69,
-	0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x6e, 0x69, 0x74, 0x22, 0x79, 0x0a,
-	0x0a, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55,
-	0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x4f, 0x55, 0x4e,
-	0x54, 0x45, 0x52, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x47, 0x41, 0x55, 0x47, 0x45, 0x10, 0x02,
-	0x12, 0x0d, 0x0a, 0x09, 0x48, 0x49, 0x53, 0x54, 0x4f, 0x47, 0x52, 0x41, 0x4d, 0x10, 0x03, 0x12,
-	0x12, 0x0a, 0x0e, 0x47, 0x41, 0x55, 0x47, 0x45, 0x48, 0x49, 0x53, 0x54, 0x4f, 0x47, 0x52, 0x41,
-	0x4d, 0x10, 0x04, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x4d, 0x4d, 0x41, 0x52, 0x59, 0x10, 0x05,
-	0x12, 0x08, 0x0a, 0x04, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0x06, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x54,
-	0x41, 0x54, 0x45, 0x53, 0x45, 0x54, 0x10, 0x07, 0x22, 0x3c, 0x0a, 0x06, 0x53, 0x61, 0x6d, 0x70,
-	0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65,
-	0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d,
-	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x69, 0x0a, 0x08, 0x45, 0x78, 0x65, 0x6d, 0x70, 0x6c,
-	0x61, 0x72, 0x12, 0x29, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e,
-	0x4c, 0x61, 0x62, 0x65, 0x6c, 0x52, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x14, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
-	0x70, 0x22, 0xbf, 0x05, 0x0a, 0x09, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x12,
-	0x1d, 0x0a, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x04, 0x48, 0x00, 0x52, 0x08, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x6e, 0x74, 0x12, 0x21,
-	0x0a, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x46, 0x6c, 0x6f, 0x61,
-	0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x03,
-	0x73, 0x75, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x11, 0x52, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x25, 0x0a, 0x0e, 0x7a,
-	0x65, 0x72, 0x6f, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x01, 0x52, 0x0d, 0x7a, 0x65, 0x72, 0x6f, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f,
-	0x6c, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x7a, 0x65, 0x72, 0x6f, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x5f, 0x69, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x48, 0x01, 0x52, 0x0c, 0x7a, 0x65,
-	0x72, 0x6f, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x6e, 0x74, 0x12, 0x2a, 0x0a, 0x10, 0x7a, 0x65,
-	0x72, 0x6f, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x01, 0x48, 0x01, 0x52, 0x0e, 0x7a, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x75, 0x6e,
-	0x74, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x3d, 0x0a, 0x0e, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69,
-	0x76, 0x65, 0x5f, 0x73, 0x70, 0x61, 0x6e, 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16,
-	0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x42, 0x75, 0x63, 0x6b,
-	0x65, 0x74, 0x53, 0x70, 0x61, 0x6e, 0x52, 0x0d, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65,
-	0x53, 0x70, 0x61, 0x6e, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76,
-	0x65, 0x5f, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x12, 0x52, 0x0e,
-	0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x73, 0x12, 0x27,
-	0x0a, 0x0f, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x01, 0x52, 0x0e, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76,
-	0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x3d, 0x0a, 0x0e, 0x70, 0x6f, 0x73, 0x69, 0x74,
-	0x69, 0x76, 0x65, 0x5f, 0x73, 0x70, 0x61, 0x6e, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x16, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x42, 0x75, 0x63,
-	0x6b, 0x65, 0x74, 0x53, 0x70, 0x61, 0x6e, 0x52, 0x0d, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76,
-	0x65, 0x53, 0x70, 0x61, 0x6e, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
-	0x76, 0x65, 0x5f, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x12, 0x52,
-	0x0e, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x73, 0x12,
-	0x27, 0x0a, 0x0f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x01, 0x52, 0x0e, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
-	0x76, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x3e, 0x0a, 0x0a, 0x72, 0x65, 0x73, 0x65,
-	0x74, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x70,
-	0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x67,
-	0x72, 0x61, 0x6d, 0x2e, 0x52, 0x65, 0x73, 0x65, 0x74, 0x48, 0x69, 0x6e, 0x74, 0x52, 0x09, 0x72,
-	0x65, 0x73, 0x65, 0x74, 0x48, 0x69, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65,
-	0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d,
-	0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x34, 0x0a, 0x09, 0x52, 0x65, 0x73, 0x65, 0x74, 0x48,
-	0x69, 0x6e, 0x74, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00,
-	0x12, 0x07, 0x0a, 0x03, 0x59, 0x45, 0x53, 0x10, 0x01, 0x12, 0x06, 0x0a, 0x02, 0x4e, 0x4f, 0x10,
-	0x02, 0x12, 0x09, 0x0a, 0x05, 0x47, 0x41, 0x55, 0x47, 0x45, 0x10, 0x03, 0x42, 0x07, 0x0a, 0x05,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x0c, 0x0a, 0x0a, 0x7a, 0x65, 0x72, 0x6f, 0x5f, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x22, 0x3c, 0x0a, 0x0a, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x53, 0x70, 0x61,
-	0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x11, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x65, 0x6e,
-	0x67, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x6c, 0x65, 0x6e, 0x67, 0x74,
-	0x68, 0x22, 0xd0, 0x01, 0x0a, 0x0a, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73,
-	0x12, 0x29, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x4c, 0x61,
-	0x62, 0x65, 0x6c, 0x52, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x2c, 0x0a, 0x07, 0x73,
-	0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70,
-	0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65,
-	0x52, 0x07, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x12, 0x32, 0x0a, 0x09, 0x65, 0x78, 0x65,
-	0x6d, 0x70, 0x6c, 0x61, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70,
-	0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x45, 0x78, 0x65, 0x6d, 0x70, 0x6c,
-	0x61, 0x72, 0x52, 0x09, 0x65, 0x78, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x72, 0x73, 0x12, 0x35, 0x0a,
-	0x0a, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x15, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x48,
-	0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x52, 0x0a, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x67,
-	0x72, 0x61, 0x6d, 0x73, 0x22, 0x31, 0x0a, 0x05, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x12, 0x0a,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x33, 0x0a, 0x06, 0x4c, 0x61, 0x62, 0x65, 0x6c,
-	0x73, 0x12, 0x29, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x4c,
-	0x61, 0x62, 0x65, 0x6c, 0x52, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x22, 0x95, 0x01, 0x0a,
-	0x0c, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x31, 0x0a,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1d, 0x2e, 0x70, 0x72,
-	0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65,
-	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x28, 0x0a, 0x04, 0x54, 0x79,
-	0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x45, 0x51, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x4e, 0x45,
-	0x51, 0x10, 0x01, 0x12, 0x06, 0x0a, 0x02, 0x52, 0x45, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x4e,
-	0x52, 0x45, 0x10, 0x03, 0x22, 0xb1, 0x01, 0x0a, 0x09, 0x52, 0x65, 0x61, 0x64, 0x48, 0x69, 0x6e,
-	0x74, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x73, 0x74, 0x65, 0x70, 0x5f, 0x6d, 0x73, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x06, 0x73, 0x74, 0x65, 0x70, 0x4d, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x66,
-	0x75, 0x6e, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x75, 0x6e, 0x63, 0x12,
-	0x19, 0x0a, 0x08, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x07, 0x73, 0x74, 0x61, 0x72, 0x74, 0x4d, 0x73, 0x12, 0x15, 0x0a, 0x06, 0x65, 0x6e,
-	0x64, 0x5f, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x6e, 0x64, 0x4d,
-	0x73, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x08, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x0e, 0x0a,
-	0x02, 0x62, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x02, 0x62, 0x79, 0x12, 0x19, 0x0a,
-	0x08, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x6d, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x07, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x73, 0x22, 0xbc, 0x01, 0x0a, 0x05, 0x43, 0x68, 0x75,
-	0x6e, 0x6b, 0x12, 0x1e, 0x0a, 0x0b, 0x6d, 0x69, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6d,
-	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6d, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65,
-	0x4d, 0x73, 0x12, 0x1e, 0x0a, 0x0b, 0x6d, 0x61, 0x78, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6d,
-	0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6d, 0x61, 0x78, 0x54, 0x69, 0x6d, 0x65,
-	0x4d, 0x73, 0x12, 0x2e, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e,
-	0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x43, 0x68,
-	0x75, 0x6e, 0x6b, 0x2e, 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x74, 0x79,
-	0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c,
-	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2f, 0x0a, 0x08, 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x69,
-	0x6e, 0x67, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12,
-	0x07, 0x0a, 0x03, 0x58, 0x4f, 0x52, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x48, 0x49, 0x53, 0x54,
-	0x4f, 0x47, 0x52, 0x41, 0x4d, 0x10, 0x02, 0x22, 0x65, 0x0a, 0x0d, 0x43, 0x68, 0x75, 0x6e, 0x6b,
-	0x65, 0x64, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x29, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65,
+var File_prompb_types_proto protoreflect.FileDescriptor
+
+var file_prompb_types_proto_rawDesc = []byte{
+	0x0a, 0x12, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x62, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0a, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73,
+	0x22, 0x9c, 0x02, 0x0a, 0x0e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64,
+	0x61, 0x74, 0x61, 0x12, 0x39, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x25, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x4d,
+	0x65, 0x74, 0x72, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x4d, 0x65,
+	0x74, 0x72, 0x69, 0x63, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x2c,
+	0x0a, 0x12, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x5f, 0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x5f,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6d, 0x65, 0x74, 0x72,
+	0x69, 0x63, 0x46, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04,
+	0x68, 0x65, 0x6c, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x6c, 0x70,
+	0x12, 0x12, 0x0a, 0x04, 0x75, 0x6e, 0x69, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x75, 0x6e, 0x69, 0x74, 0x22, 0x79, 0x0a, 0x0a, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x54, 0x79,
+	0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12,
+	0x0b, 0x0a, 0x07, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x45, 0x52, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05,
+	0x47, 0x41, 0x55, 0x47, 0x45, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x48, 0x49, 0x53, 0x54, 0x4f,
+	0x47, 0x52, 0x41, 0x4d, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x47, 0x41, 0x55, 0x47, 0x45, 0x48,
+	0x49, 0x53, 0x54, 0x4f, 0x47, 0x52, 0x41, 0x4d, 0x10, 0x04, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55,
+	0x4d, 0x4d, 0x41, 0x52, 0x59, 0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, 0x49, 0x4e, 0x46, 0x4f, 0x10,
+	0x06, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x54, 0x41, 0x54, 0x45, 0x53, 0x45, 0x54, 0x10, 0x07, 0x22,
+	0x3c, 0x0a, 0x06, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12,
+	0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x69, 0x0a,
+	0x08, 0x45, 0x78, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x72, 0x12, 0x29, 0x0a, 0x06, 0x6c, 0x61, 0x62,
+	0x65, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x6d,
+	0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x52, 0x06, 0x6c, 0x61,
+	0x62, 0x65, 0x6c, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69,
+	0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74,
+	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xbf, 0x05, 0x0a, 0x09, 0x48, 0x69, 0x73,
+	0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x12, 0x1d, 0x0a, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f,
+	0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x08, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x49, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x66,
+	0x6c, 0x6f, 0x61, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x0a, 0x63, 0x6f,
+	0x75, 0x6e, 0x74, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x03, 0x73, 0x75, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63,
+	0x68, 0x65, 0x6d, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x11, 0x52, 0x06, 0x73, 0x63, 0x68, 0x65,
+	0x6d, 0x61, 0x12, 0x25, 0x0a, 0x0e, 0x7a, 0x65, 0x72, 0x6f, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73,
+	0x68, 0x6f, 0x6c, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0d, 0x7a, 0x65, 0x72, 0x6f,
+	0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x7a, 0x65, 0x72,
+	0x6f, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x04, 0x48, 0x01, 0x52, 0x0c, 0x7a, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x6e,
+	0x74, 0x12, 0x2a, 0x0a, 0x10, 0x7a, 0x65, 0x72, 0x6f, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f,
+	0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x01, 0x48, 0x01, 0x52, 0x0e, 0x7a,
+	0x65, 0x72, 0x6f, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x3d, 0x0a,
+	0x0e, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x73, 0x70, 0x61, 0x6e, 0x73, 0x18,
+	0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65,
+	0x75, 0x73, 0x2e, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x53, 0x70, 0x61, 0x6e, 0x52, 0x0d, 0x6e,
+	0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65, 0x53, 0x70, 0x61, 0x6e, 0x73, 0x12, 0x27, 0x0a, 0x0f,
+	0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x73, 0x18,
+	0x09, 0x20, 0x03, 0x28, 0x12, 0x52, 0x0e, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65, 0x44,
+	0x65, 0x6c, 0x74, 0x61, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76,
+	0x65, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x01, 0x52, 0x0e,
+	0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x3d,
+	0x0a, 0x0e, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x73, 0x70, 0x61, 0x6e, 0x73,
+	0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68,
+	0x65, 0x75, 0x73, 0x2e, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x53, 0x70, 0x61, 0x6e, 0x52, 0x0d,
+	0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x53, 0x70, 0x61, 0x6e, 0x73, 0x12, 0x27, 0x0a,
+	0x0f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x73,
+	0x18, 0x0c, 0x20, 0x03, 0x28, 0x12, 0x52, 0x0e, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65,
+	0x44, 0x65, 0x6c, 0x74, 0x61, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
+	0x76, 0x65, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x01, 0x52,
+	0x0e, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12,
+	0x3e, 0x0a, 0x0a, 0x72, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x18, 0x0e, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73,
+	0x2e, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x2e, 0x52, 0x65, 0x73, 0x65, 0x74,
+	0x48, 0x69, 0x6e, 0x74, 0x52, 0x09, 0x72, 0x65, 0x73, 0x65, 0x74, 0x48, 0x69, 0x6e, 0x74, 0x12,
+	0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x0f, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x34, 0x0a,
+	0x09, 0x52, 0x65, 0x73, 0x65, 0x74, 0x48, 0x69, 0x6e, 0x74, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e,
+	0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x59, 0x45, 0x53, 0x10, 0x01,
+	0x12, 0x06, 0x0a, 0x02, 0x4e, 0x4f, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x47, 0x41, 0x55, 0x47,
+	0x45, 0x10, 0x03, 0x42, 0x07, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x0c, 0x0a, 0x0a,
+	0x7a, 0x65, 0x72, 0x6f, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x3c, 0x0a, 0x0a, 0x42, 0x75,
+	0x63, 0x6b, 0x65, 0x74, 0x53, 0x70, 0x61, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x66, 0x66, 0x73,
+	0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x11, 0x52, 0x06, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x12, 0x16, 0x0a, 0x06, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d,
+	0x52, 0x06, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x22, 0xd0, 0x01, 0x0a, 0x0a, 0x54, 0x69, 0x6d,
+	0x65, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x29, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74,
+	0x68, 0x65, 0x75, 0x73, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x52, 0x06, 0x6c, 0x61, 0x62, 0x65,
+	0x6c, 0x73, 0x12, 0x2c, 0x0a, 0x07, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73,
+	0x2e, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x07, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73,
+	0x12, 0x32, 0x0a, 0x09, 0x65, 0x78, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x72, 0x73, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73,
+	0x2e, 0x45, 0x78, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x72, 0x52, 0x09, 0x65, 0x78, 0x65, 0x6d, 0x70,
+	0x6c, 0x61, 0x72, 0x73, 0x12, 0x35, 0x0a, 0x0a, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61,
+	0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65,
+	0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x52,
+	0x0a, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x31, 0x0a, 0x05, 0x4c,
+	0x61, 0x62, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x33,
+	0x0a, 0x06, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x29, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65,
 	0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65,
 	0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x52, 0x06, 0x6c, 0x61, 0x62,
-	0x65, 0x6c, 0x73, 0x12, 0x29, 0x0a, 0x06, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x73, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73,
-	0x2e, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x06, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x73, 0x42, 0x31,
-	0x5a, 0x2f, 0x65, 0x6e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x64, 0x65, 0x76, 0x2f, 0x61, 0x70, 0x70,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2f,
-	0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x6d, 0x70,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x6c, 0x73, 0x22, 0x95, 0x01, 0x0a, 0x0c, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x12, 0x31, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x1d, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e,
+	0x4c, 0x61, 0x62, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x54, 0x79, 0x70,
+	0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x22, 0x28, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x45, 0x51, 0x10,
+	0x00, 0x12, 0x07, 0x0a, 0x03, 0x4e, 0x45, 0x51, 0x10, 0x01, 0x12, 0x06, 0x0a, 0x02, 0x52, 0x45,
+	0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x4e, 0x52, 0x45, 0x10, 0x03, 0x22, 0xb1, 0x01, 0x0a, 0x09,
+	0x52, 0x65, 0x61, 0x64, 0x48, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x73, 0x74, 0x65,
+	0x70, 0x5f, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x73, 0x74, 0x65, 0x70,
+	0x4d, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x75, 0x6e, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x66, 0x75, 0x6e, 0x63, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f,
+	0x6d, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x73, 0x74, 0x61, 0x72, 0x74, 0x4d,
+	0x73, 0x12, 0x15, 0x0a, 0x06, 0x65, 0x6e, 0x64, 0x5f, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x05, 0x65, 0x6e, 0x64, 0x4d, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x72, 0x6f, 0x75,
+	0x70, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x67, 0x72, 0x6f, 0x75,
+	0x70, 0x69, 0x6e, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x62, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x02, 0x62, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x6d, 0x73,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x73, 0x22,
+	0xbc, 0x01, 0x0a, 0x05, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x12, 0x1e, 0x0a, 0x0b, 0x6d, 0x69, 0x6e,
+	0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09,
+	0x6d, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x4d, 0x73, 0x12, 0x1e, 0x0a, 0x0b, 0x6d, 0x61, 0x78,
+	0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09,
+	0x6d, 0x61, 0x78, 0x54, 0x69, 0x6d, 0x65, 0x4d, 0x73, 0x12, 0x2e, 0x0a, 0x04, 0x74, 0x79, 0x70,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74,
+	0x68, 0x65, 0x75, 0x73, 0x2e, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x2e, 0x45, 0x6e, 0x63, 0x6f, 0x64,
+	0x69, 0x6e, 0x67, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74,
+	0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2f, 0x0a,
+	0x08, 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b,
+	0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x58, 0x4f, 0x52, 0x10, 0x01, 0x12,
+	0x0d, 0x0a, 0x09, 0x48, 0x49, 0x53, 0x54, 0x4f, 0x47, 0x52, 0x41, 0x4d, 0x10, 0x02, 0x22, 0x65,
+	0x0a, 0x0d, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x65, 0x64, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12,
+	0x29, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x11, 0x2e, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x4c, 0x61, 0x62,
+	0x65, 0x6c, 0x52, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x29, 0x0a, 0x06, 0x63, 0x68,
+	0x75, 0x6e, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, 0x72, 0x6f,
+	0x6d, 0x65, 0x74, 0x68, 0x65, 0x75, 0x73, 0x2e, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x52, 0x06, 0x63,
+	0x68, 0x75, 0x6e, 0x6b, 0x73, 0x42, 0x31, 0x5a, 0x2f, 0x65, 0x6e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
+	0x64, 0x65, 0x76, 0x2f, 0x61, 0x70, 0x70, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x6d,
+	0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x65, 0x75,
+	0x73, 0x2f, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_types_proto_rawDescOnce sync.Once
-	file_types_proto_rawDescData = file_types_proto_rawDesc
+	file_prompb_types_proto_rawDescOnce sync.Once
+	file_prompb_types_proto_rawDescData = file_prompb_types_proto_rawDesc
 )
 
-func file_types_proto_rawDescGZIP() []byte {
-	file_types_proto_rawDescOnce.Do(func() {
-		file_types_proto_rawDescData = protoimpl.X.CompressGZIP(file_types_proto_rawDescData)
+func file_prompb_types_proto_rawDescGZIP() []byte {
+	file_prompb_types_proto_rawDescOnce.Do(func() {
+		file_prompb_types_proto_rawDescData = protoimpl.X.CompressGZIP(file_prompb_types_proto_rawDescData)
 	})
-	return file_types_proto_rawDescData
+	return file_prompb_types_proto_rawDescData
 }
 
-var file_types_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
-var file_types_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
-var file_types_proto_goTypes = []interface{}{
+var file_prompb_types_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
+var file_prompb_types_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
+var file_prompb_types_proto_goTypes = []interface{}{
 	(MetricMetadata_MetricType)(0), // 0: prometheus.MetricMetadata.MetricType
 	(Histogram_ResetHint)(0),       // 1: prometheus.Histogram.ResetHint
 	(LabelMatcher_Type)(0),         // 2: prometheus.LabelMatcher.Type
@@ -1383,7 +1385,7 @@ var file_types_proto_goTypes = []interface{}{
 	(*Chunk)(nil),                  // 14: prometheus.Chunk
 	(*ChunkedSeries)(nil),          // 15: prometheus.ChunkedSeries
 }
-var file_types_proto_depIdxs = []int32{
+var file_prompb_types_proto_depIdxs = []int32{
 	0,  // 0: prometheus.MetricMetadata.type:type_name -> prometheus.MetricMetadata.MetricType
 	10, // 1: prometheus.Exemplar.labels:type_name -> prometheus.Label
 	8,  // 2: prometheus.Histogram.negative_spans:type_name -> prometheus.BucketSpan
@@ -1405,13 +1407,13 @@ var file_types_proto_depIdxs = []int32{
 	0,  // [0:14] is the sub-list for field type_name
 }
 
-func init() { file_types_proto_init() }
-func file_types_proto_init() {
-	if File_types_proto != nil {
+func init() { file_prompb_types_proto_init() }
+func file_prompb_types_proto_init() {
+	if File_prompb_types_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_types_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_types_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MetricMetadata); i {
 			case 0:
 				return &v.state
@@ -1423,7 +1425,7 @@ func file_types_proto_init() {
 				return nil
 			}
 		}
-		file_types_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_types_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Sample); i {
 			case 0:
 				return &v.state
@@ -1435,7 +1437,7 @@ func file_types_proto_init() {
 				return nil
 			}
 		}
-		file_types_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_types_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Exemplar); i {
 			case 0:
 				return &v.state
@@ -1447,7 +1449,7 @@ func file_types_proto_init() {
 				return nil
 			}
 		}
-		file_types_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_types_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Histogram); i {
 			case 0:
 				return &v.state
@@ -1459,7 +1461,7 @@ func file_types_proto_init() {
 				return nil
 			}
 		}
-		file_types_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_types_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*BucketSpan); i {
 			case 0:
 				return &v.state
@@ -1471,7 +1473,7 @@ func file_types_proto_init() {
 				return nil
 			}
 		}
-		file_types_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_types_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TimeSeries); i {
 			case 0:
 				return &v.state
@@ -1483,7 +1485,7 @@ func file_types_proto_init() {
 				return nil
 			}
 		}
-		file_types_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_types_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Label); i {
 			case 0:
 				return &v.state
@@ -1495,7 +1497,7 @@ func file_types_proto_init() {
 				return nil
 			}
 		}
-		file_types_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_types_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Labels); i {
 			case 0:
 				return &v.state
@@ -1507,7 +1509,7 @@ func file_types_proto_init() {
 				return nil
 			}
 		}
-		file_types_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_types_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LabelMatcher); i {
 			case 0:
 				return &v.state
@@ -1519,7 +1521,7 @@ func file_types_proto_init() {
 				return nil
 			}
 		}
-		file_types_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_types_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ReadHints); i {
 			case 0:
 				return &v.state
@@ -1531,7 +1533,7 @@ func file_types_proto_init() {
 				return nil
 			}
 		}
-		file_types_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_types_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Chunk); i {
 			case 0:
 				return &v.state
@@ -1543,7 +1545,7 @@ func file_types_proto_init() {
 				return nil
 			}
 		}
-		file_types_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_prompb_types_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ChunkedSeries); i {
 			case 0:
 				return &v.state
@@ -1556,7 +1558,7 @@ func file_types_proto_init() {
 			}
 		}
 	}
-	file_types_proto_msgTypes[3].OneofWrappers = []interface{}{
+	file_prompb_types_proto_msgTypes[3].OneofWrappers = []interface{}{
 		(*Histogram_CountInt)(nil),
 		(*Histogram_CountFloat)(nil),
 		(*Histogram_ZeroCountInt)(nil),
@@ -1566,19 +1568,19 @@ func file_types_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_types_proto_rawDesc,
+			RawDescriptor: file_prompb_types_proto_rawDesc,
 			NumEnums:      4,
 			NumMessages:   12,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_types_proto_goTypes,
-		DependencyIndexes: file_types_proto_depIdxs,
-		EnumInfos:         file_types_proto_enumTypes,
-		MessageInfos:      file_types_proto_msgTypes,
+		GoTypes:           file_prompb_types_proto_goTypes,
+		DependencyIndexes: file_prompb_types_proto_depIdxs,
+		EnumInfos:         file_prompb_types_proto_enumTypes,
+		MessageInfos:      file_prompb_types_proto_msgTypes,
 	}.Build()
-	File_types_proto = out.File
-	file_types_proto_rawDesc = nil
-	file_types_proto_goTypes = nil
-	file_types_proto_depIdxs = nil
+	File_prompb_types_proto = out.File
+	file_prompb_types_proto_rawDesc = nil
+	file_prompb_types_proto_goTypes = nil
+	file_prompb_types_proto_depIdxs = nil
 }
diff --git a/runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/types.proto b/runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/types.proto
deleted file mode 100644
index e85f0f9449..0000000000
--- a/runtimes/go/appruntime/infrasdk/metrics/prometheus/prompb/types.proto
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2017 Prometheus Team
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-package prometheus;
-
-option go_package = "encore.dev/appruntime/metrics/prometheus/prompb";
-
-message MetricMetadata {
-  enum MetricType {
-    UNKNOWN        = 0;
-    COUNTER        = 1;
-    GAUGE          = 2;
-    HISTOGRAM      = 3;
-    GAUGEHISTOGRAM = 4;
-    SUMMARY        = 5;
-    INFO           = 6;
-    STATESET       = 7;
-  }
-
-  // Represents the metric type, these match the set from Prometheus.
-  // Refer to model/textparse/interface.go for details.
-  MetricType type = 1;
-  string metric_family_name = 2;
-  string help = 4;
-  string unit = 5;
-}
-
-message Sample {
-  double value    = 1;
-  // timestamp is in ms format, see model/timestamp/timestamp.go for
-  // conversion from time.Time to Prometheus timestamp.
-  int64 timestamp = 2;
-}
-
-message Exemplar {
-  // Optional, can be empty.
-  repeated Label labels = 1;
-  double value = 2;
-  // timestamp is in ms format, see model/timestamp/timestamp.go for
-  // conversion from time.Time to Prometheus timestamp.
-  int64 timestamp = 3;
-}
-
-// A native histogram, also known as a sparse histogram.
-// Original design doc:
-// https://docs.google.com/document/d/1cLNv3aufPZb3fNfaJgdaRBZsInZKKIHo9E6HinJVbpM/edit
-// The appendix of this design doc also explains the concept of float
-// histograms. This Histogram message can represent both, the usual
-// integer histogram as well as a float histogram.
-message Histogram {
-  enum ResetHint {
-    UNKNOWN = 0; // Need to test for a counter reset explicitly.
-    YES     = 1; // This is the 1st histogram after a counter reset.
-    NO      = 2; // There was no counter reset between this and the previous Histogram.
-    GAUGE   = 3; // This is a gauge histogram where counter resets don't happen.
-  }
-
-  oneof count { // Count of observations in the histogram.
-    uint64 count_int   = 1;
-    double count_float = 2;
-  }
-  double sum = 3; // Sum of observations in the histogram.
-  // The schema defines the bucket schema. Currently, valid numbers
-  // are -4 <= n <= 8. They are all for base-2 bucket schemas, where 1
-  // is a bucket boundary in each case, and then each power of two is
-  // divided into 2^n logarithmic buckets. Or in other words, each
-  // bucket boundary is the previous boundary times 2^(2^-n). In the
-  // future, more bucket schemas may be added using numbers < -4 or >
-  // 8.
-  sint32 schema             = 4;
-  double zero_threshold     = 5; // Breadth of the zero bucket.
-  oneof zero_count { // Count in zero bucket.
-    uint64 zero_count_int     = 6;
-    double zero_count_float   = 7;
-  }
-  
-  // Negative Buckets.
-  repeated BucketSpan negative_spans =  8;
-  // Use either "negative_deltas" or "negative_counts", the former for
-  // regular histograms with integer counts, the latter for float
-  // histograms.
-  repeated sint64 negative_deltas    =  9; // Count delta of each bucket compared to previous one (or to zero for 1st bucket).
-  repeated double negative_counts    = 10; // Absolute count of each bucket.
-
-  // Positive Buckets.
-  repeated BucketSpan positive_spans = 11;
-  // Use either "positive_deltas" or "positive_counts", the former for
-  // regular histograms with integer counts, the latter for float
-  // histograms.
-  repeated sint64 positive_deltas    = 12; // Count delta of each bucket compared to previous one (or to zero for 1st bucket).
-  repeated double positive_counts    = 13; // Absolute count of each bucket.
-
-  ResetHint reset_hint               = 14;
-  // timestamp is in ms format, see model/timestamp/timestamp.go for
-  // conversion from time.Time to Prometheus timestamp.
-  int64 timestamp = 15;
-} 
-
-// A BucketSpan defines a number of consecutive buckets with their
-// offset. Logically, it would be more straightforward to include the
-// bucket counts in the Span. However, the protobuf representation is
-// more compact in the way the data is structured here (with all the
-// buckets in a single array separate from the Spans).
-message BucketSpan {
-  sint32 offset = 1; // Gap to previous span, or starting point for 1st span (which can be negative).
-  uint32 length = 2; // Length of consecutive buckets.
-}
-
-// TimeSeries represents samples and labels for a single time series.
-message TimeSeries {
-  // For a timeseries to be valid, and for the samples and exemplars
-  // to be ingested by the remote system properly, the labels field is required.
-  repeated Label labels         = 1;
-  repeated Sample samples       = 2;
-  repeated Exemplar exemplars   = 3;
-  repeated Histogram histograms = 4;
-}
-
-message Label {
-  string name  = 1;
-  string value = 2;
-}
-
-message Labels {
-  repeated Label labels = 1;
-}
-
-// Matcher specifies a rule, which can match or set of labels or not.
-message LabelMatcher {
-  enum Type {
-    EQ  = 0;
-    NEQ = 1;
-    RE  = 2;
-    NRE = 3;
-  }
-  Type type    = 1;
-  string name  = 2;
-  string value = 3;
-}
-
-message ReadHints {
-  int64 step_ms = 1;  // Query step size in milliseconds.
-  string func = 2;    // String representation of surrounding function or aggregation.
-  int64 start_ms = 3; // Start time in milliseconds.
-  int64 end_ms = 4;   // End time in milliseconds.
-  repeated string grouping = 5; // List of label names used in aggregation.
-  bool by = 6; // Indicate whether it is without or by.
-  int64 range_ms = 7; // Range vector selector range in milliseconds.
-}
-
-// Chunk represents a TSDB chunk.
-// Time range [min, max] is inclusive.
-message Chunk {
-  int64 min_time_ms = 1;
-  int64 max_time_ms = 2;
-
-  // We require this to match chunkenc.Encoding.
-  enum Encoding {
-    UNKNOWN   = 0;
-    XOR       = 1;
-    HISTOGRAM = 2;
-  }
-  Encoding type  = 3;
-  bytes data     = 4;
-}
-
-// ChunkedSeries represents single, encoded time series.
-message ChunkedSeries {
-  // Labels should be sorted.
-  repeated Label labels = 1;
-  // Chunks will be in start time order and may overlap.
-  repeated Chunk chunks = 2;
-}

From 11e6ffea19d697308c1611e4eee198ee51b03e91 Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Thu, 30 Oct 2025 14:02:59 +0100
Subject: [PATCH 16/17] small fixup

---
 runtimes/core/src/metrics/exporter/datadog.rs | 16 +++++-----------
 runtimes/core/src/metrics/system.rs           |  1 -
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/runtimes/core/src/metrics/exporter/datadog.rs b/runtimes/core/src/metrics/exporter/datadog.rs
index 9a8d6eafba..3cea3b4d29 100644
--- a/runtimes/core/src/metrics/exporter/datadog.rs
+++ b/runtimes/core/src/metrics/exporter/datadog.rs
@@ -41,7 +41,7 @@ impl DatadogClient {
 }
 
 struct LazyDatadogClient {
-    cell: tokio::sync::OnceCell<anyhow::Result<DatadogClient>>,
+    cell: tokio::sync::OnceCell<DatadogClient>,
     site: String,
     api_key: String,
 }
@@ -55,7 +55,7 @@ impl LazyDatadogClient {
         }
     }
 
-    async fn get(&self) -> &anyhow::Result<DatadogClient> {
+    async fn get(&self) -> &DatadogClient {
         self.cell
             .get_or_init(|| async {
                 // Create Datadog API client configuration
@@ -71,9 +71,9 @@ impl LazyDatadogClient {
                     },
                 );
 
-                Ok(DatadogClient {
+                DatadogClient {
                     config: configuration,
-                })
+                }
             })
             .await
     }
@@ -117,13 +117,7 @@ impl Datadog {
             return Ok(());
         }
 
-        let client = match self.client.get().await {
-            Ok(client) => client,
-            Err(e) => {
-                log::error!("failed to get Datadog client: {}", e);
-                return Err(anyhow::anyhow!("failed to get Datadog client: {}", e));
-            }
-        };
+        let client = self.client.get().await;
 
         log::trace!(
             "Exporting {} metrics to Datadog site {}",
diff --git a/runtimes/core/src/metrics/system.rs b/runtimes/core/src/metrics/system.rs
index 00614b99b0..90080b8bcf 100644
--- a/runtimes/core/src/metrics/system.rs
+++ b/runtimes/core/src/metrics/system.rs
@@ -23,7 +23,6 @@ impl SystemMetricsCollector {
     }
 
     fn refresh(system: &mut System) {
-        system.refresh_cpu_usage();
         system.refresh_memory();
     }
 

From 41895546770140209109a5a606995c1cac48b21c Mon Sep 17 00:00:00 2001
From: Fredrik Enestad <fredrik@enestad.com>
Date: Thu, 30 Oct 2025 14:48:57 +0100
Subject: [PATCH 17/17] remove request_total from pubsub, misinterpreted the go
 framework

---
 runtimes/core/src/lib.rs            |  7 +------
 runtimes/core/src/pubsub/manager.rs | 19 -------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/runtimes/core/src/lib.rs b/runtimes/core/src/lib.rs
index 7fb2a3049a..8cc24122d4 100644
--- a/runtimes/core/src/lib.rs
+++ b/runtimes/core/src/lib.rs
@@ -342,12 +342,7 @@ impl Runtime {
             .collect::<Result<HashMap<_, _>, anyhow::Error>>()
             .context("failed to resolve gateway push subscriptions")?;
 
-        let pubsub = pubsub::Manager::new(
-            tracer.clone(),
-            resources.pubsub_clusters,
-            &md,
-            Arc::clone(metrics_manager.registry()),
-        )?;
+        let pubsub = pubsub::Manager::new(tracer.clone(), resources.pubsub_clusters, &md)?;
         let objects =
             objects::Manager::new(&secrets, tracer.clone(), resources.bucket_clusters, &md);
         let sqldb = sqldb::ManagerConfig {
diff --git a/runtimes/core/src/pubsub/manager.rs b/runtimes/core/src/pubsub/manager.rs
index 86a02718af..833ad6de47 100644
--- a/runtimes/core/src/pubsub/manager.rs
+++ b/runtimes/core/src/pubsub/manager.rs
@@ -15,7 +15,6 @@ use crate::encore::parser::meta::v1 as meta;
 use crate::encore::parser::schema::v1 as schema;
 use crate::encore::runtime::v1 as pb;
 use crate::log::LogFromRust;
-use crate::metrics::{self, counter};
 use crate::model::{PubSubRequestData, RequestData, ResponseData, SpanId, SpanKey, TraceId};
 use crate::names::EncoreName;
 use crate::pubsub::noop::NoopCluster;
@@ -37,7 +36,6 @@ pub struct Manager {
     topics: Arc<RwLock<HashMap<EncoreName, Arc<TopicInner>>>>,
     subs: Arc<RwLock<HashMap<SubName, Arc<SubscriptionObj>>>>,
     push_registry: PushHandlerRegistry,
-    metrics_registry: Arc<metrics::Registry>,
 }
 
 #[derive(Debug)]
@@ -142,7 +140,6 @@ pub struct SubscriptionObj {
 
     handler: OnceLock<Arc<SubHandler>>,
     subscribe_fut: OnceLock<Shared<SubscribeFut>>,
-    metrics_registry: Arc<metrics::Registry>,
 }
 
 type SubscribeFut = Pin<Box<dyn Future<Output = APIResult<()>> + Send>>;
@@ -157,11 +154,6 @@ impl SubscriptionObj {
                 obj: self.clone(),
                 handlers: RwLock::new(Vec::new()),
                 counter: AtomicUsize::new(0),
-                requests_total: metrics::requests_total_counter(
-                    &self.metrics_registry,
-                    &self.service,
-                    &format!("{}/{}", &self.topic, &self.subscription),
-                ),
             })
         });
         h.add_handler(handler);
@@ -178,7 +170,6 @@ pub struct SubHandler {
     obj: Arc<SubscriptionObj>,
     handlers: RwLock<Vec<Arc<dyn SubscriptionHandler>>>,
     counter: AtomicUsize,
-    requests_total: counter::Schema<u64>,
 }
 
 const ATTR_PARENT_TRACE_ID: &str = "encore_parent_trace_id";
@@ -269,13 +260,7 @@ impl SubHandler {
                 data: ResponseData::PubSub(result.clone()),
             };
 
-            let code = match &result {
-                Ok(_) => "ok".to_string(),
-                Err(err) => err.code.to_string(),
-            };
-
             self.obj.tracer.request_span_end(&resp, false);
-            self.requests_total.with([("code", code)]).increment();
             result
         })
     }
@@ -301,7 +286,6 @@ impl Manager {
         tracer: Tracer,
         clusters: Vec<pb::PubSubCluster>,
         md: &meta::Data,
-        metrics_registry: Arc<metrics::Registry>,
     ) -> anyhow::Result<Self> {
         let (topic_cfg, sub_cfg) = make_cfg_maps(clusters, md)?;
 
@@ -313,7 +297,6 @@ impl Manager {
             topics: Arc::default(),
             subs: Arc::default(),
             push_registry: PushHandlerRegistry::new(),
-            metrics_registry,
         })
     }
 
@@ -375,7 +358,6 @@ impl Manager {
                     schema: cfg.schema.clone(),
                     handler: OnceLock::new(),
                     subscribe_fut: Default::default(),
-                    metrics_registry: Arc::clone(&self.metrics_registry),
                 })
             } else {
                 let inner = Arc::new(noop::NoopSubscription);
@@ -396,7 +378,6 @@ impl Manager {
 
                     handler: OnceLock::new(),
                     subscribe_fut: Default::default(),
-                    metrics_registry: Arc::clone(&self.metrics_registry),
                 })
             }
         };